# HG changeset patch
# User Chris Cannam
# Date 1410276832 -3600
# Node ID ce4d9e14908683441f3b3a6a905fb974b16d41d6
# Parent  d12d4c11a55b04492eb3228e66c5dd02fcd429f4
Use openPath instead of open() when opening local file or URL (for progress indicator). I think I didn't realise this distinction between the two functions, which formerly were both named open().

diff -r d12d4c11a55b -r ce4d9e149086 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Sep 03 13:12:38 2014 +0100
+++ b/main/MainWindow.cpp	Tue Sep 09 16:33:52 2014 +0100
@@ -2968,7 +2968,7 @@
 
     if (path.isEmpty()) return;
 
-    FileOpenStatus status = open(path, ReplaceSession);
+    FileOpenStatus status = openPath(path, ReplaceSession);
 
     if (status == FileOpenFailed) {
         emit hideSplash();
@@ -3000,7 +3000,7 @@
 
     if (text.isEmpty()) return;
 
-    FileOpenStatus status = open(text, AskUser);
+    FileOpenStatus status = openPath(text, AskUser);
 
     if (status == FileOpenFailed) {
         emit hideSplash();
@@ -3028,7 +3028,7 @@
     QString path = action->text();
     if (path == "") return;
 
-    FileOpenStatus status = open(path, ReplaceSession);
+    FileOpenStatus status = openPath(path, ReplaceSession);
 
     if (status == FileOpenFailed) {
         emit hideSplash();
@@ -3156,9 +3156,9 @@
         FileOpenStatus status;
 
         if (i == uriList.begin()) {
-            status = open(*i, ReplaceCurrentPane);
+            status = openPath(*i, ReplaceCurrentPane);
         } else {
-            status = open(*i, CreateAdditionalModel);
+            status = openPath(*i, CreateAdditionalModel);
         }
 
         if (status == FileOpenFailed) {
diff -r d12d4c11a55b -r ce4d9e149086 main/main.cpp
--- a/main/main.cpp	Wed Sep 03 13:12:38 2014 +0100
+++ b/main/main.cpp	Tue Sep 09 16:33:52 2014 +0100
@@ -512,18 +512,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);
             }
         }
     }