comparison main/MainWindow.h @ 601:5a240c668b5e with-dependencies

Merge from default branch
author Chris Cannam
date Wed, 24 Jul 2013 12:02:51 +0100
parents 110eecb5d9f6
children 2484381b53a1
comparison
equal deleted inserted replaced
595:e180e8b6f84b 601:5a240c668b5e
119 virtual void updateMenuStates(); 119 virtual void updateMenuStates();
120 virtual void updateDescriptionLabel(); 120 virtual void updateDescriptionLabel();
121 121
122 virtual void setInstantsNumbering(); 122 virtual void setInstantsNumbering();
123 virtual void setInstantsCounterCycle(); 123 virtual void setInstantsCounterCycle();
124 virtual void setInstantsCounters();
124 virtual void resetInstantsCounters(); 125 virtual void resetInstantsCounters();
125 126
126 virtual void modelGenerationFailed(QString, QString); 127 virtual void modelGenerationFailed(QString, QString);
127 virtual void modelGenerationWarning(QString, QString); 128 virtual void modelGenerationWarning(QString, QString);
128 virtual void modelRegenerationFailed(QString, QString, QString); 129 virtual void modelRegenerationFailed(QString, QString, QString);