comparison 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
comparison
equal deleted inserted replaced
737:48bd87b0a84e 738:5ebce191aa04
354 application.installTranslator(&svTranslator); 354 application.installTranslator(&svTranslator);
355 355
356 StoreStartupLocale(); 356 StoreStartupLocale();
357 357
358 // Permit size_t and PropertyName to be used as args in queued signal calls 358 // Permit size_t and PropertyName to be used as args in queued signal calls
359 qRegisterMetaType<size_t>("size_t");
360 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); 359 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
361 360
362 MainWindow *gui = new MainWindow(audioOutput, oscSupport); 361 MainWindow *gui = new MainWindow(audioOutput, oscSupport);
363 application.setMainWindow(gui); 362 application.setMainWindow(gui);
364 if (splash) { 363 if (splash) {
511 path.replace("\\", "/"); 510 path.replace("\\", "/");
512 #endif 511 #endif
513 512
514 if (path.endsWith("sv")) { 513 if (path.endsWith("sv")) {
515 if (!haveSession) { 514 if (!haveSession) {
516 status = m_mainWindow->openSessionFile(path); 515 status = m_mainWindow->openSessionPath(path);
517 if (status == MainWindow::FileOpenSucceeded) { 516 if (status == MainWindow::FileOpenSucceeded) {
518 haveSession = true; 517 haveSession = true;
519 haveMainModel = true; 518 haveMainModel = true;
520 } 519 }
521 } else { 520 } else {