Mercurial > hg > tony
comparison src/MainWindow.h @ 520:30fbc53d8150
Merge latest SV 3.0 branch code
| author | Chris Cannam |
|---|---|
| date | Fri, 19 Aug 2016 15:58:57 +0100 |
| parents | 5865c6e296c5 |
| children | 25aa28a27252 |
comparison
equal
deleted
inserted
replaced
| 519:34668179c803 | 520:30fbc53d8150 |
|---|---|
| 141 | 141 |
| 142 virtual void modelGenerationFailed(QString, QString); | 142 virtual void modelGenerationFailed(QString, QString); |
| 143 virtual void modelGenerationWarning(QString, QString); | 143 virtual void modelGenerationWarning(QString, QString); |
| 144 virtual void modelRegenerationFailed(QString, QString, QString); | 144 virtual void modelRegenerationFailed(QString, QString, QString); |
| 145 virtual void modelRegenerationWarning(QString, QString, QString); | 145 virtual void modelRegenerationWarning(QString, QString, QString); |
| 146 virtual void alignmentFailed(QString, QString); | 146 virtual void alignmentFailed(QString); |
| 147 | 147 |
| 148 virtual void rightButtonMenuRequested(Pane *, QPoint point); | 148 virtual void rightButtonMenuRequested(Pane *, QPoint point); |
| 149 | 149 |
| 150 virtual void setupRecentFilesMenu(); | 150 virtual void setupRecentFilesMenu(); |
| 151 | 151 |
