Mercurial > hg > sonic-visualiser
changeset 738:5ebce191aa04
Subrepos, and update in line with latest no-warning changes
author | Chris Cannam |
---|---|
date | Tue, 01 Jul 2014 15:34:11 +0100 (2014-07-01) |
parents | 48bd87b0a84e |
children | 1192963e2d83 |
files | .hgsubstate main/main.cpp |
diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Tue Jul 01 15:33:51 2014 +0100 +++ b/.hgsubstate Tue Jul 01 15:34:11 2014 +0100 @@ -1,5 +1,5 @@ d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay 3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds -dfcc5b355f33005e177317d738031a8515812c4e svapp -0c1d6de8f44bc158bcb55866874602bcb912e2cf svcore -c4ef666721bf7c5f1174e700736e1a84dea8a224 svgui +20bab95852c1d7cb55541ae32f83210dec91892a svapp +5bd05a24e32a95a7a347b086d7904be92801586c svcore +6c52314b31b024777e09ad0e6bc0d329bd87c8e8 svgui
--- a/main/main.cpp Tue Jul 01 15:33:51 2014 +0100 +++ b/main/main.cpp Tue Jul 01 15:34:11 2014 +0100 @@ -356,7 +356,6 @@ StoreStartupLocale(); // Permit size_t and PropertyName to be used as args in queued signal calls - qRegisterMetaType<size_t>("size_t"); qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); MainWindow *gui = new MainWindow(audioOutput, oscSupport); @@ -513,7 +512,7 @@ if (path.endsWith("sv")) { if (!haveSession) { - status = m_mainWindow->openSessionFile(path); + status = m_mainWindow->openSessionPath(path); if (status == MainWindow::FileOpenSucceeded) { haveSession = true; haveMainModel = true;