# HG changeset patch # User Chris Cannam # Date 1589376446 -3600 # Node ID 11a552b3ad8806847f07f32b35b8326349ff3e96 # Parent 32718f05903d7bd29ad8badceb271ec94c598258 Fix following prior merge diff -r 32718f05903d -r 11a552b3ad88 main/MainWindow.cpp --- 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, diff -r 32718f05903d -r 11a552b3ad88 main/MainWindow.h --- 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; diff -r 32718f05903d -r 11a552b3ad88 repoint-lock.json --- 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"