Mercurial > hg > sonic-visualiser

changeset 844:ce4d9e149086

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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().
author Chris Cannam
date Tue, 09 Sep 2014 16:33:52 +0100
parents d12d4c11a55b
children da43c4461f9e
files main/MainWindow.cpp main/main.cpp
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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) {
--- 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);
             }
         }
     }