comparison 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
comparison
equal deleted inserted replaced
386:50958c4e88d5 387:0649ac148bf7
299 status = MainWindow::FileOpenSucceeded; 299 status = MainWindow::FileOpenSucceeded;
300 } 300 }
301 } 301 }
302 if (status != MainWindow::FileOpenSucceeded) { 302 if (status != MainWindow::FileOpenSucceeded) {
303 if (!haveMainModel) { 303 if (!haveMainModel) {
304 status = m_mainWindow->open(path, MainWindow::ReplaceSession); 304 status = m_mainWindow->openPath(path, MainWindow::ReplaceSession);
305 if (status == MainWindow::FileOpenSucceeded) { 305 if (status == MainWindow::FileOpenSucceeded) {
306 haveMainModel = true; 306 haveMainModel = true;
307 } 307 }
308 } else { 308 } else {
309 if (haveSession && !havePriorCommandLineModel) { 309 if (haveSession && !havePriorCommandLineModel) {
310 status = m_mainWindow->open(path, MainWindow::AskUser); 310 status = m_mainWindow->openPath(path, MainWindow::AskUser);
311 if (status == MainWindow::FileOpenSucceeded) { 311 if (status == MainWindow::FileOpenSucceeded) {
312 havePriorCommandLineModel = true; 312 havePriorCommandLineModel = true;
313 } 313 }
314 } else { 314 } else {
315 status = m_mainWindow->open(path, MainWindow::CreateAdditionalModel); 315 status = m_mainWindow->openPath(path, MainWindow::CreateAdditionalModel);
316 } 316 }
317 } 317 }
318 } 318 }
319 if (status == MainWindow::FileOpenFailed) { 319 if (status == MainWindow::FileOpenFailed) {
320 if (splash) splash->hide(); 320 if (splash) splash->hide();