changeset 801:8be221f18313 tonioni

Merge
author Chris Cannam
date Mon, 16 Jun 2014 11:49:05 +0100
parents 102ffad481e6 (diff) d6b79166ae0d (current diff)
children 584b11df8e4f
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/view/View.cpp	Mon Jun 16 11:44:14 2014 +0100
+++ b/view/View.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -1620,7 +1620,7 @@
 View::paintEvent(QPaintEvent *e)
 {
 //    Profiler prof("View::paintEvent", false);
-//    SVDEBUG << "View::paintEvent: centre frame is " << m_centreFrame << endl;
+//    cerr << "View::paintEvent: centre frame is " << m_centreFrame << endl;
 
     if (m_layers.empty()) {
 	QFrame::paintEvent(e);
--- a/widgets/CommandHistory.cpp	Mon Jun 16 11:44:14 2014 +0100
+++ b/widgets/CommandHistory.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -37,7 +37,7 @@
 
 #include <typeinfo>
 
-#define DEBUG_COMMAND_HISTORY 1
+//#define DEBUG_COMMAND_HISTORY 1
 
 CommandHistory *CommandHistory::m_instance = 0;