comparison main/MainWindow.h @ 1360:ffc3daf092dd 3.0-integration

Merge
author Chris Cannam
date Fri, 25 Nov 2016 11:39:20 +0000
parents 3ef81d81b767
children 05d35ce6ea72
comparison
equal deleted inserted replaced
1359:e83df965c56c 1360:ffc3daf092dd
88 88
89 virtual void setInstantsNumbering(); 89 virtual void setInstantsNumbering();
90 virtual void setInstantsCounterCycle(); 90 virtual void setInstantsCounterCycle();
91 virtual void setInstantsCounters(); 91 virtual void setInstantsCounters();
92 virtual void resetInstantsCounters(); 92 virtual void resetInstantsCounters();
93 virtual void subdivideInstants();
94 virtual void winnowInstants();
93 95
94 virtual void modelGenerationFailed(QString, QString); 96 virtual void modelGenerationFailed(QString, QString);
95 virtual void modelGenerationWarning(QString, QString); 97 virtual void modelGenerationWarning(QString, QString);
96 virtual void modelRegenerationFailed(QString, QString, QString); 98 virtual void modelRegenerationFailed(QString, QString, QString);
97 virtual void modelRegenerationWarning(QString, QString, QString); 99 virtual void modelRegenerationWarning(QString, QString, QString);