diff main/main.cpp @ 738:5ebce191aa04

Subrepos, and update in line with latest no-warning changes
author Chris Cannam
date Tue, 01 Jul 2014 15:34:11 +0100
parents 73a5884a0975
children ccf3749cbaea
line wrap: on
line diff
--- a/main/main.cpp	Tue Jul 01 15:33:51 2014 +0100
+++ b/main/main.cpp	Tue Jul 01 15:34:11 2014 +0100
@@ -356,7 +356,6 @@
     StoreStartupLocale();
 
     // Permit size_t and PropertyName to be used as args in queued signal calls
-    qRegisterMetaType<size_t>("size_t");
     qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
 
     MainWindow *gui = new MainWindow(audioOutput, oscSupport);
@@ -513,7 +512,7 @@
 
     if (path.endsWith("sv")) {
         if (!haveSession) {
-            status = m_mainWindow->openSessionFile(path);
+            status = m_mainWindow->openSessionPath(path);
             if (status == MainWindow::FileOpenSucceeded) {
                 haveSession = true;
                 haveMainModel = true;