diff main/MainWindow.cpp @ 547:8103ad8eef87

Merge from qt5 branch. Next release will require qt5

--- a/main/MainWindow.cpp	Tue Apr 16 15:21:47 2013 +0100
+++ b/main/MainWindow.cpp	Thu May 09 17:20:24 2013 +0100
@@ -82,7 +82,6 @@
 #include "rdf/PluginRDFIndexer.h"
 #include "rdf/RDFExporter.h"
 
-#include "Surveyer.h"
 #include "framework/VersionTester.h"
 
 // For version information
@@ -307,7 +306,6 @@
     
     TransformFactory::getInstance()->startPopulationThread();
 
-    Surveyer *surveyer = new Surveyer(this);
     VersionTester *vt = new VersionTester
         ("sonicvisualiser.org", "/latest-version.txt", SV_VERSION);
     connect(vt, SIGNAL(newerVersionAvailable(QString)),
@@ -1696,7 +1694,7 @@
             action->setShortcut(tr("Ctrl+R"));
             m_keyReference->registerShortcut
                 (tr("Re-open"),
-                 action->shortcut(),
+                 action->shortcut().toString(),
                  tr("Re-open the current or most recently opened file"));
         }
 	m_recentFilesMenu->addAction(action);
@@ -1772,7 +1770,7 @@
             ti->second->setShortcut(tr("Ctrl+T"));
             m_keyReference->registerShortcut
                 (tr("Repeat Transform"),
-                 ti->second->shortcut(),
+                 ti->second->shortcut().toString(),
                  tr("Re-select the most recently run transform"));
         } else {
             ti->second->setShortcut(QString(""));