comparison widgets/ActivityLog.cpp @ 1324:13d9b422f7fe zoom

Merge from default branch
author Chris Cannam
date Mon, 17 Sep 2018 13:51:31 +0100
parents c2e923aa4015
children
comparison
equal deleted inserted replaced
1183:57d192e26331 1324:13d9b422f7fe
28 #include "base/Debug.h" 28 #include "base/Debug.h"
29 29
30 using std::cerr; 30 using std::cerr;
31 using std::endl; 31 using std::endl;
32 32
33 //#define PRINT_ACTIVITY 1 33 #ifndef NO_PRINT_ACTIVITY
34 #define PRINT_ACTIVITY 1
35 #endif
34 36
35 ActivityLog::ActivityLog() : QDialog() 37 ActivityLog::ActivityLog() : QDialog()
36 { 38 {
37 setWindowTitle(tr("Activity Log")); 39 setWindowTitle(tr("Activity Log"));
38 40
60 ActivityLog::activityHappened(QString name) 62 ActivityLog::activityHappened(QString name)
61 { 63 {
62 name = name.replace("&", ""); 64 name = name.replace("&", "");
63 65
64 #ifdef PRINT_ACTIVITY 66 #ifdef PRINT_ACTIVITY
65 cerr << "ActivityLog: " << name; 67 SVDEBUG << "ActivityLog: " << name;
66 if (name == m_prevName) { 68 if (name == m_prevName) {
67 cerr << " (duplicate)"; 69 SVDEBUG << " (duplicate)";
68 } 70 }
69 cerr << endl; 71 SVDEBUG << endl;
70 #endif 72 #endif
71 73
72 if (name == m_prevName) { 74 if (name == m_prevName) {
73 return; 75 return;
74 } 76 }