# HG changeset patch
# User Chris Cannam
# Date 1444830741 -3600
# Node ID 2e3d388489e5d881bb96c9ae038915ea8bf05d09
# Parent  89f44d182d379d5555954093016d32948db16b53# Parent  5fdf5cd032acfe2f31fcd1c35b174ddb3521db15
Merge from branch "3.0-integration"

diff -r 89f44d182d37 -r 2e3d388489e5 view/View.cpp
--- a/view/View.cpp	Tue Oct 13 14:24:51 2015 +0100
+++ b/view/View.cpp	Wed Oct 14 14:52:21 2015 +0100
@@ -46,8 +46,8 @@
 
 #include <unistd.h>
 
-#define DEBUG_VIEW 1
-#define DEBUG_VIEW_WIDGET_PAINT 1
+//#define DEBUG_VIEW 1
+//#define DEBUG_VIEW_WIDGET_PAINT 1
 
 
 View::View(QWidget *w, bool showProgress) :
diff -r 89f44d182d37 -r 2e3d388489e5 widgets/IconLoader.cpp
--- a/widgets/IconLoader.cpp	Tue Oct 13 14:24:51 2015 +0100
+++ b/widgets/IconLoader.cpp	Wed Oct 14 14:52:21 2015 +0100
@@ -126,7 +126,7 @@
 IconLoader::loadScalable(QString name, int size)
 {
     if (!QFile(name).exists()) {
-        cerr << "loadScalable: no such file as: \"" << name << "\"" << endl;
+//        cerr << "loadScalable: no such file as: \"" << name << "\"" << endl;
         return QPixmap();
     }
     QPixmap pmap(size, size);
@@ -134,9 +134,9 @@
     QSvgRenderer renderer(name);
     QPainter painter;
     painter.begin(&pmap);
-    cerr << "calling renderer for " << name << " at size " << size << "..." << endl;
+//    cerr << "calling renderer for " << name << " at size " << size << "..." << endl;
     renderer.render(&painter);
-    cerr << "renderer completed" << endl;
+//    cerr << "renderer completed" << endl;
     painter.end();
     return pmap;
 }