# HG changeset patch
# User Chris Cannam
# Date 1410276929 -3600
# Node ID 0649ac148bf7f1828ee6c06045a901f5302cb3e8
# Parent  50958c4e88d56f1e7ff4b871d07a0cff1fc2b741
open -> openPath (for progress, with remote URLs)

diff -r 50958c4e88d5 -r 0649ac148bf7 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/src/MainWindow.cpp	Tue Sep 09 16:35:29 2014 +0100
@@ -1689,7 +1689,7 @@
 
     if (path.isEmpty()) return;
 
-    FileOpenStatus status = open(path, ReplaceSession);
+    FileOpenStatus status = openPath(path, ReplaceSession);
 
     if (status == FileOpenFailed) {
         QMessageBox::critical(this, tr("Failed to open file"),
@@ -1719,7 +1719,7 @@
 
     if (text.isEmpty()) return;
 
-    FileOpenStatus status = open(text, ReplaceSession);
+    FileOpenStatus status = openPath(text, ReplaceSession);
 
     if (status == FileOpenFailed) {
         QMessageBox::critical(this, tr("Failed to open location"),
@@ -1745,7 +1745,7 @@
     QString path = action->text();
     if (path == "") return;
 
-    FileOpenStatus status = open(path, ReplaceSession);
+    FileOpenStatus status = openPath(path, ReplaceSession);
 
     if (status == FileOpenFailed) {
         QMessageBox::critical(this, tr("Failed to open location"),
@@ -1783,7 +1783,7 @@
 
     for (QStringList::iterator i = uriList.begin(); i != uriList.end(); ++i) {
 
-        FileOpenStatus status = open(*i, ReplaceSession);
+        FileOpenStatus status = openPath(*i, ReplaceSession);
 
         if (status == FileOpenFailed) {
             QMessageBox::critical(this, tr("Failed to open dropped URL"),
diff -r 50958c4e88d5 -r 0649ac148bf7 src/main.cpp
--- 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);
             }
         }
     }