comparison main/MainWindow.cpp @ 528:e5e6625deb85 qt5

Update for Qt5 compatibility; use subrepo for dataquay

 #include "layer/ColourDatabase.h"
 #include "widgets/ModelDataTableDialog.h"
 #include "rdf/PluginRDFIndexer.h"
 #include "rdf/RDFExporter.h"
 
-#include "Surveyer.h"
 #include "framework/VersionTester.h"
 
 // For version information
 #include <vamp/vamp.h>
 #include <vamp-hostsdk/PluginBase.h>

     connect(m_midiInput, SIGNAL(eventsAvailable()),
             this, SLOT(midiEventsAvailable()));
     
     TransformFactory::getInstance()->startPopulationThread();
 
-    Surveyer *surveyer = new Surveyer(this);
     VersionTester *vt = new VersionTester
         ("sonicvisualiser.org", "/latest-version.txt", SV_VERSION);
     connect(vt, SIGNAL(newerVersionAvailable(QString)),
             this, SLOT(newerVersionAvailable(QString)));
 }

 	connect(action, SIGNAL(triggered()), this, SLOT(openRecentFile()));
         if (i == 0) {
             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);
     }
 }

         }
         if (i == 0) {
             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(""));
         }
 	m_recentTransformsMenu->addAction(ti->second);