diff src/main.cpp @ 387:0649ac148bf7

open -> openPath (for progress, with remote URLs)
author Chris Cannam
date Tue, 09 Sep 2014 16:35:29 +0100
parents 6439ca6e7de1
children a0eedd10dee3
line wrap: on
line diff
--- a/src/main.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/src/main.cpp	Tue Sep 09 16:35:29 2014 +0100
@@ -301,18 +301,18 @@
     }
     if (status != MainWindow::FileOpenSucceeded) {
         if (!haveMainModel) {
-            status = m_mainWindow->open(path, MainWindow::ReplaceSession);
+            status = m_mainWindow->openPath(path, MainWindow::ReplaceSession);
             if (status == MainWindow::FileOpenSucceeded) {
                 haveMainModel = true;
             }
         } else {
             if (haveSession && !havePriorCommandLineModel) {
-                status = m_mainWindow->open(path, MainWindow::AskUser);
+                status = m_mainWindow->openPath(path, MainWindow::AskUser);
                 if (status == MainWindow::FileOpenSucceeded) {
                     havePriorCommandLineModel = true;
                 }
             } else {
-                status = m_mainWindow->open(path, MainWindow::CreateAdditionalModel);
+                status = m_mainWindow->openPath(path, MainWindow::CreateAdditionalModel);
             }
         }
     }