Mercurial > hg > sonic-visualiser

changeset 379:3d1c69b2215e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge
author Chris Cannam
date Mon, 18 Oct 2010 13:47:21 +0100
parents 210a409e135a (diff) 84fd4bb8d656 (current diff)
children b19bef1bc3f1
files main/main.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.h	Mon Oct 18 13:44:25 2010 +0100
+++ b/main/MainWindow.h	Mon Oct 18 13:47:21 2010 +0100
@@ -69,8 +69,8 @@
     virtual ~MainWindow();
 
 signals:
-    virtual void canChangeSolo(bool);
-    virtual void canAlign(bool);
+    void canChangeSolo(bool);
+    void canAlign(bool);
 
 public slots:
     virtual void preferenceChanged(PropertyContainer::PropertyName);
--- a/main/main.cpp	Mon Oct 18 13:44:25 2010 +0100
+++ b/main/main.cpp	Mon Oct 18 13:47:21 2010 +0100
@@ -209,6 +209,8 @@
 int
 main(int argc, char **argv)
 {
+    svSystemSpecificInitialisation();
+
 #ifdef Q_WS_X11
 #if QT_VERSION >= 0x040500
 //    QApplication::setGraphicsSystem("raster");
@@ -227,8 +229,6 @@
     signal(SIGQUIT, signalHandler);
 #endif
 
-    svSystemSpecificInitialisation();
-
     bool audioOutput = true;
     bool oscSupport = true;