comparison main/MainWindow.h @ 2537:11a552b3ad88

Fix following prior merge
author Chris Cannam
date Wed, 13 May 2020 14:27:26 +0100
parents d469d26ffeb1
children a004f981f6f5
comparison
equal deleted inserted replaced
2536:32718f05903d 2537:11a552b3ad88
96 96
97 void modelGenerationFailed(QString, QString) override; 97 void modelGenerationFailed(QString, QString) override;
98 void modelGenerationWarning(QString, QString) override; 98 void modelGenerationWarning(QString, QString) override;
99 void modelRegenerationFailed(QString, QString, QString) override; 99 void modelRegenerationFailed(QString, QString, QString) override;
100 void modelRegenerationWarning(QString, QString, QString) override; 100 void modelRegenerationWarning(QString, QString, QString) override;
101 void alignmentFailed(QString) override; 101 void alignmentFailed(ModelId, QString) override;
102 102
103 void paneRightButtonMenuRequested(Pane *, QPoint point) override; 103 void paneRightButtonMenuRequested(Pane *, QPoint point) override;
104 void panePropertiesRightButtonMenuRequested(Pane *, QPoint point) override; 104 void panePropertiesRightButtonMenuRequested(Pane *, QPoint point) override;
105 void layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint point) override; 105 void layerPropertiesRightButtonMenuRequested(Pane *, Layer *, QPoint point) override;
106 106