Mercurial > hg > sonic-visualiser
changeset 2125:124de219669f fix-static-analysis
Use override throughout, + include guards
author | Chris Cannam |
---|---|
date | Mon, 26 Nov 2018 13:56:48 +0000 (2018-11-26) |
parents | 7c30a7f20c6a |
children | 0b15f3b16776 |
files | main/MainWindow.h main/SVSplash.h repoint-lock.json |
diffstat | 3 files changed, 43 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.h Thu Nov 22 14:57:22 2018 +0000 +++ b/main/MainWindow.h Mon Nov 26 13:56:48 2018 +0000 @@ -40,7 +40,7 @@ void canAlign(bool); public slots: - virtual void preferenceChanged(PropertyContainer::PropertyName); + void preferenceChanged(PropertyContainer::PropertyName) override; virtual void coloursChanged(); virtual bool commitData(bool mayAskUser); @@ -69,12 +69,12 @@ virtual void saveSession(); virtual void saveSessionAs(); virtual void newSession(); - virtual void closeSession(); + void closeSession() override; virtual void preferences(); - virtual void sampleRateMismatch(sv_samplerate_t, sv_samplerate_t, bool); - virtual void audioOverloadPluginDisabled(); - virtual void audioTimeStretchMultiChannelDisabled(); + void sampleRateMismatch(sv_samplerate_t, sv_samplerate_t, bool) override; + void audioOverloadPluginDisabled() override; + void audioTimeStretchMultiChannelDisabled() override; virtual void toolNavigateSelected(); virtual void toolSelectSelected(); @@ -83,12 +83,12 @@ virtual void toolEraseSelected(); virtual void toolMeasureSelected(); - virtual void documentModified(); - virtual void documentRestored(); + void documentModified() override; + void documentRestored() override; virtual void documentReplaced(); - virtual void updateMenuStates(); - virtual void updateDescriptionLabel(); + void updateMenuStates() override; + void updateDescriptionLabel() override; virtual void setInstantsNumbering(); virtual void setInstantsCounterCycle(); @@ -97,13 +97,13 @@ virtual void subdivideInstants(); virtual void winnowInstants(); - virtual void modelGenerationFailed(QString, QString); - virtual void modelGenerationWarning(QString, QString); - virtual void modelRegenerationFailed(QString, QString, QString); - virtual void modelRegenerationWarning(QString, QString, QString); - virtual void alignmentFailed(QString); + void modelGenerationFailed(QString, QString) override; + void modelGenerationWarning(QString, QString) override; + void modelRegenerationFailed(QString, QString, QString) override; + void modelRegenerationWarning(QString, QString, QString) override; + void alignmentFailed(QString) override; - virtual void rightButtonMenuRequested(Pane *, QPoint point); + void rightButtonMenuRequested(Pane *, QPoint point) override; virtual void propertyStacksResized(int); @@ -114,36 +114,36 @@ virtual void findTransform(); - virtual void paneAdded(Pane *); - virtual void paneHidden(Pane *); - virtual void paneAboutToBeDeleted(Pane *); - virtual void paneDropAccepted(Pane *, QStringList); - virtual void paneDropAccepted(Pane *, QString); + void paneAdded(Pane *) override; + void paneHidden(Pane *) override; + void paneAboutToBeDeleted(Pane *) override; + void paneDropAccepted(Pane *, QStringList) override; + void paneDropAccepted(Pane *, QString) override; virtual void setupRecentFilesMenu(); virtual void setupRecentTransformsMenu(); virtual void setupTemplatesMenu(); virtual void playSpeedChanged(int); - virtual void playSoloToggled(); + void playSoloToggled() override; virtual void alignToggled(); - virtual void currentPaneChanged(Pane *); + void currentPaneChanged(Pane *) override; virtual void speedUpPlayback(); virtual void slowDownPlayback(); virtual void restoreNormalPlayback(); - virtual void monitoringLevelsChanged(float, float); + void monitoringLevelsChanged(float, float) override; - virtual void layerRemoved(Layer *); - virtual void layerInAView(Layer *, bool); + void layerRemoved(Layer *) override; + void layerInAView(Layer *, bool) override; - virtual void mainModelChanged(WaveFileModel *); + void mainModelChanged(WaveFileModel *) override; virtual void mainModelGainChanged(float); virtual void mainModelPanChanged(float); - virtual void modelAdded(Model *); - virtual void modelAboutToBeDeleted(Model *); + void modelAdded(Model *) override; + void modelAboutToBeDeleted(Model *) override; virtual void showLayerTree(); virtual void showActivityLog(); @@ -152,7 +152,7 @@ virtual void mouseEnteredWidget(); virtual void mouseLeftWidget(); - virtual void handleOSCMessage(const OSCMessage &); + void handleOSCMessage(const OSCMessage &) override; virtual void midiEventsAvailable(); virtual void playStatusChanged(bool); @@ -169,7 +169,7 @@ virtual void about(); virtual void whatsNew(); virtual void keyReference(); - virtual void newerVersionAvailable(QString); + void newerVersionAvailable(QString) override; protected: Overview *m_overview; @@ -284,7 +284,7 @@ QString getReleaseText() const; - virtual void setupMenus(); + void setupMenus() override; virtual void setupFileMenu(); virtual void setupEditMenu(); virtual void setupViewMenu(); @@ -296,17 +296,17 @@ virtual void addPane(const LayerConfiguration &configuration, QString text); - virtual void closeEvent(QCloseEvent *e); - virtual bool checkSaveModified(); + void closeEvent(QCloseEvent *e) override; + bool checkSaveModified() override; virtual void exportAudio(bool asData); - virtual void updateVisibleRangeDisplay(Pane *p) const; - virtual void updatePositionStatusDisplays() const; + void updateVisibleRangeDisplay(Pane *p) const override; + void updatePositionStatusDisplays() const override; - virtual bool shouldCreateNewSessionForRDFAudio(bool *cancel); + bool shouldCreateNewSessionForRDFAudio(bool *cancel) override; - virtual void connectLayerEditDialog(ModelDataTableDialog *); + void connectLayerEditDialog(ModelDataTableDialog *) override; };
--- a/main/SVSplash.h Thu Nov 22 14:57:22 2018 +0000 +++ b/main/SVSplash.h Mon Nov 26 13:56:48 2018 +0000 @@ -31,7 +31,7 @@ void finishSplash(QWidget *); protected: - void drawContents(QPainter *); + void drawContents(QPainter *) override; QPixmap *m_pixmap; };
--- a/repoint-lock.json Thu Nov 22 14:57:22 2018 +0000 +++ b/repoint-lock.json Mon Nov 26 13:56:48 2018 +0000 @@ -4,13 +4,13 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "232d6ddf257d" + "pin": "ad5f892c0c4d" }, "svgui": { - "pin": "4c359c2b220c" + "pin": "05d614f6e46d" }, "svapp": { - "pin": "4612d44ae753" + "pin": "26a0cb8335e3" }, "checker": { "pin": "17fb9ff8e072" @@ -19,7 +19,7 @@ "pin": "f5a04ffe4d5a0ae01e77018a86a59b48a425e674" }, "piper-vamp-cpp": { - "pin": "269b6c25dae4864515651790553dd8167e5831e4" + "pin": "1034a6c73c106d72fa7e85ae6cc00576515c6155" }, "dataquay": { "pin": "807b55408d9e" @@ -34,7 +34,7 @@ "pin": "f5dee7d40378" }, "bqaudioio": { - "pin": "b5e34fdc1716" + "pin": "8c4162878ae6" }, "sv-dependency-builds": { "pin": "f1a9b270e043"