Mercurial > hg > svgui
changeset 1004:2e3d388489e5 tony-2.0-integration
Merge from branch "3.0-integration"
| author | Chris Cannam |
|---|---|
| date | Wed, 14 Oct 2015 14:52:21 +0100 |
| parents | 89f44d182d37 (current diff) 5fdf5cd032ac (diff) |
| children | 7347cf34f538 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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) :
--- 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; }