Mercurial > hg > sonic-visualiser

changeset 2537:11a552b3ad88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix following prior merge
author Chris Cannam
date Wed, 13 May 2020 14:27:26 +0100
parents 32718f05903d
children 9910ba30a572
files main/MainWindow.cpp main/MainWindow.h repoint-lock.json
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Wed May 13 14:08:38 2020 +0100
+++ b/main/MainWindow.cpp	Wed May 13 14:27:26 2020 +0100
@@ -5059,7 +5059,7 @@
 }
 
 void
-MainWindow::alignmentFailed(QString message)
+MainWindow::alignmentFailed(ModelId, QString message)
 {
     QMessageBox::warning
         (this,
--- a/main/MainWindow.h	Wed May 13 14:08:38 2020 +0100
+++ b/main/MainWindow.h	Wed May 13 14:27:26 2020 +0100
@@ -98,7 +98,7 @@
     void modelGenerationWarning(QString, QString) override;
     void modelRegenerationFailed(QString, QString, QString) override;
     void modelRegenerationWarning(QString, QString, QString) override;
-    void alignmentFailed(QString) override;
+    void alignmentFailed(ModelId, QString) override;
 
     void paneRightButtonMenuRequested(Pane *, QPoint point) override;
     void panePropertiesRightButtonMenuRequested(Pane *, QPoint point) override;
--- a/repoint-lock.json	Wed May 13 14:08:38 2020 +0100
+++ b/repoint-lock.json	Wed May 13 14:27:26 2020 +0100
@@ -10,7 +10,7 @@
       "pin": "6616e1899daa"
     },
     "svapp": {
-      "pin": "83ae68de4401"
+      "pin": "4c91c95e146a"
     },
     "checker": {
       "pin": "e839338d3869"