# HG changeset patch
# User Chris Cannam
# Date 1308061650 -3600
# Node ID 868f73825b377ed9750b4d6742b2e6c499f055cc
# Parent  9de86c1b980e7b494965ffa1a617bde048693a1b
Seems to be a bad idea to use plain DEBUG symbol on OS/X (system wants it)

diff -r 9de86c1b980e -r 868f73825b37 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Tue Jun 14 14:50:08 2011 +0100
+++ b/main/MainWindow.cpp	Tue Jun 14 15:27:30 2011 +0100
@@ -310,12 +310,12 @@
 
 MainWindow::~MainWindow()
 {
-//    DEBUG << "MainWindow::~MainWindow" << endl;
+//    SVDEBUG << "MainWindow::~MainWindow" << endl;
     delete m_keyReference;
     delete m_preferencesDialog;
     delete m_layerTreeDialog;
     Profiles::getInstance()->dump();
-//    DEBUG << "MainWindow::~MainWindow finishing" << endl;
+//    SVDEBUG << "MainWindow::~MainWindow finishing" << endl;
 }
 
 void
@@ -1648,7 +1648,7 @@
 {
     if (!m_existingLayersMenu) return; // should have been created by setupMenus
 
-//    DEBUG << "MainWindow::setupExistingLayersMenu" << endl;
+//    SVDEBUG << "MainWindow::setupExistingLayersMenu" << endl;
 
     m_existingLayersMenu->clear();
     m_existingLayerActions.clear();
@@ -2817,7 +2817,7 @@
 void
 MainWindow::closeEvent(QCloseEvent *e)
 {
-//    DEBUG << "MainWindow::closeEvent" << endl;
+//    SVDEBUG << "MainWindow::closeEvent" << endl;
 
     if (m_openingAudioFile) {
 //        std::cerr << "Busy - ignoring close event" << std::endl;
@@ -2826,7 +2826,7 @@
     }
 
     if (!m_abandoning && !checkSaveModified()) {
-//        DEBUG << "Ignoring close event" << endl;
+//        SVDEBUG << "Ignoring close event" << endl;
 	e->ignore();
 	return;
     }
@@ -3034,13 +3034,13 @@
 void
 MainWindow::propertyStacksResized(int width)
 {
-//    DEBUG << "MainWindow::propertyStacksResized(" << width << ")" << endl;
+//    SVDEBUG << "MainWindow::propertyStacksResized(" << width << ")" << endl;
 
     if (!m_playControlsSpacer) return;
 
     int spacerWidth = width - m_playControlsWidth - 4;
     
-//    DEBUG << "resizing spacer from " << m_playControlsSpacer->width() << " to " << spacerWidth << endl;
+//    SVDEBUG << "resizing spacer from " << m_playControlsSpacer->width() << " to " << spacerWidth << endl;
 
     m_playControlsSpacer->setFixedSize(QSize(spacerWidth, 2));
 }
@@ -3093,7 +3093,7 @@
 		(LayerFactory::TimeRuler);
 	}
 
-//	DEBUG << "adding time ruler layer " << m_timeRulerLayer << endl;
+//	SVDEBUG << "adding time ruler layer " << m_timeRulerLayer << endl;
 
 	m_document->addLayerToView(pane, m_timeRulerLayer);
     }
@@ -3133,7 +3133,7 @@
     m_paneStack->setCurrentPane(pane);
     m_paneStack->setCurrentLayer(pane, newLayer);
 
-//    DEBUG << "MainWindow::addPane: global centre frame is "
+//    SVDEBUG << "MainWindow::addPane: global centre frame is "
 //              << m_viewManager->getGlobalCentreFrame() << endl;
 //    pane->setCentreFrame(m_viewManager->getGlobalCentreFrame());
 
@@ -3340,7 +3340,7 @@
 
     if (!input.getModel()) return;
 
-//    DEBUG << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << endl << "transform:" << endl << transform.toXmlString() << endl;
+//    SVDEBUG << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << endl << "transform:" << endl << transform.toXmlString() << endl;
 
     Layer *newLayer = m_document->createDerivedLayer(transform, input);
 
@@ -3884,7 +3884,7 @@
 void
 MainWindow::rightButtonMenuRequested(Pane *pane, QPoint position)
 {
-//    DEBUG << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << endl;
+//    SVDEBUG << "MainWindow::rightButtonMenuRequested(" << pane << ", " << position.x() << ", " << position.y() << ")" << endl;
     m_paneStack->setCurrentPane(pane);
     m_rightButtonMenu->popup(position);
 }
diff -r 9de86c1b980e -r 868f73825b37 main/OSCHandler.cpp
--- a/main/OSCHandler.cpp	Tue Jun 14 14:50:08 2011 +0100
+++ b/main/OSCHandler.cpp	Tue Jun 14 15:27:30 2011 +0100
@@ -35,7 +35,7 @@
 void
 MainWindow::handleOSCMessage(const OSCMessage &message)
 {
-    DEBUG << "MainWindow::handleOSCMessage: thread id = " 
+    SVDEBUG << "MainWindow::handleOSCMessage: thread id = " 
               << QThread::currentThreadId() << endl;
 
     // This large function should really be abstracted out.
@@ -88,7 +88,7 @@
             message.getArg(0).canConvert(QVariant::String)) {
             path = message.getArg(0).toString();
             if (QFileInfo(path).exists()) {
-                DEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in save" << endl;
+                SVDEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in save" << endl;
             } else {
                 saveSessionFile(path);
             }
@@ -102,7 +102,7 @@
                 message.getArg(0).canConvert(QVariant::String)) {
                 path = message.getArg(0).toString();
                 if (QFileInfo(path).exists()) {
-                    DEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in export" << endl;
+                    SVDEBUG << "MainWindow::handleOSCMessage: Refusing to overwrite existing file in export" << endl;
                 } else {
                     WavFileWriter writer(path,
                                          getMainModel()->getSampleRate(),
diff -r 9de86c1b980e -r 868f73825b37 main/PreferencesDialog.cpp
--- a/main/PreferencesDialog.cpp	Tue Jun 14 14:50:08 2011 +0100
+++ b/main/PreferencesDialog.cpp	Tue Jun 14 15:27:30 2011 +0100
@@ -347,7 +347,7 @@
 
 PreferencesDialog::~PreferencesDialog()
 {
-    DEBUG << "PreferencesDialog::~PreferencesDialog()" << endl;
+    SVDEBUG << "PreferencesDialog::~PreferencesDialog()" << endl;
 }
 
 void
diff -r 9de86c1b980e -r 868f73825b37 main/main.cpp
--- a/main/main.cpp	Tue Jun 14 14:50:08 2011 +0100
+++ b/main/main.cpp	Tue Jun 14 15:27:30 2011 +0100
@@ -297,7 +297,7 @@
 
     QTranslator qtTranslator;
     QString qtTrName = QString("qt_%1").arg(language);
-    DEBUG << "Loading " << qtTrName << "... ";
+    SVDEBUG << "Loading " << qtTrName << "... ";
     bool success = false;
     if (!(success = qtTranslator.load(qtTrName))) {
         QString qtDir = getenv("QTDIR");
@@ -307,7 +307,7 @@
         }
     }
     if (!success) {
-        DEBUG << "Failed\nFailed to load Qt translation for locale" << endl;
+        SVDEBUG << "Failed\nFailed to load Qt translation for locale" << endl;
     } else {
         std::cerr << "Done" << std::endl;
     }
@@ -315,9 +315,9 @@
 
     QTranslator svTranslator;
     QString svTrName = QString("sonic-visualiser_%1").arg(language);
-    DEBUG << "Loading " << svTrName << "... ";
+    SVDEBUG << "Loading " << svTrName << "... ";
     svTranslator.load(svTrName, ":i18n");
-    DEBUG << "Done" << endl;
+    SVDEBUG << "Done" << endl;
     application.installTranslator(&svTranslator);
 
     StoreStartupLocale();