summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-01-15 15:57:53 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-01-15 16:43:05 +0100
commit533ab6d1fc0b1eab0506929c03c5a18082e3a43a (patch)
tree4b60427cef5a2eeac25dfc5f8136c9c0f71db016
parent33be6cd0407060cee76c7164e5de12874ffd053e (diff)
Fix inconsistent missing overrides in Mixxx codebase
This fixes 83 instances of [-Winconstent-missing-override]: $ grep missing-override clazy-master.log | sort | uniq src/library/baseexternallibraryfeature.h:23:18: warning: 'bindSidebarWidget' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/baseexternallibraryfeature.h:24:18: warning: 'onRightClick' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/baseexternallibraryfeature.h:25:18: warning: 'onRightClickChild' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/baseplaylistfeature.h:32:20: warning: 'getChildModel' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/baseplaylistfeature.h:34:10: warning: 'bindLibraryWidget' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/baseplaylistfeature.h:42:18: warning: 'activate' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/baseplaylistfeature.h:43:18: warning: 'activateChild' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/recording/recordingfeature.h:29:10: warning: 'bindLibraryWidget' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/recording/recordingfeature.h:32:20: warning: 'getChildModel' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/recording/recordingfeature.h:35:10: warning: 'activate' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/rekordbox/rekordboxfeature.h:55:18: warning: 'initSortColumnMapping' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/rekordbox/rekordboxfeature.h:70:20: warning: 'getChildModel' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/rekordbox/rekordboxfeature.h:73:10: warning: 'activate' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/rekordbox/rekordboxfeature.h:74:10: warning: 'activateChild' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/traktor/traktorfeature.h:45:20: warning: 'getChildModel' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/traktor/traktorfeature.h:48:10: warning: 'activate' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/traktor/traktorfeature.h:49:10: warning: 'activateChild' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/library/traktor/traktorfeature.h:54:32: warning: 'getPlaylistModelForPlaylist' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/test/autodjprocessor_test.cpp:77:18: warning: 'getLoadedTrack' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/test/mockedenginebackendtest.h:40:10: warning: 'clear' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] src/test/portmidicontroller_test.cpp:28:10: warning: 'sendShortMsg' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
-rw-r--r--src/library/baseexternallibraryfeature.h6
-rw-r--r--src/library/baseplaylistfeature.h8
-rw-r--r--src/library/recording/recordingfeature.h6
-rw-r--r--src/library/rekordbox/rekordboxfeature.h8
-rw-r--r--src/library/traktor/traktorfeature.h8
-rw-r--r--src/test/autodjprocessor_test.cpp2
-rw-r--r--src/test/mockedenginebackendtest.h2
-rw-r--r--src/test/portmidicontroller_test.cpp2
8 files changed, 21 insertions, 21 deletions
diff --git a/src/library/baseexternallibraryfeature.h b/src/library/baseexternallibraryfeature.h
index c8a09ac461..8b944e1fa0 100644
--- a/src/library/baseexternallibraryfeature.h
+++ b/src/library/baseexternallibraryfeature.h
@@ -20,9 +20,9 @@ class BaseExternalLibraryFeature : public LibraryFeature {
~BaseExternalLibraryFeature() override;
public slots:
- virtual void bindSidebarWidget(WLibrarySidebar* pSidebarWidget);
- virtual void onRightClick(const QPoint& globalPos);
- virtual void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+ virtual void bindSidebarWidget(WLibrarySidebar* pSidebarWidget) override;
+ virtual void onRightClick(const QPoint& globalPos) override;
+ virtual void onRightClickChild(const QPoint& globalPos, QModelIndex index) override;
protected:
// Must be implemented by external Libraries copied to Mixxx DB
diff --git a/src/library/baseplaylistfeature.h b/src/library/baseplaylistfeature.h
index 415f45e7b5..5915eb25ee 100644
--- a/src/library/baseplaylistfeature.h
+++ b/src/library/baseplaylistfeature.h
@@ -29,18 +29,18 @@ class BasePlaylistFeature : public LibraryFeature {
const QString& rootViewName);
~BasePlaylistFeature() override = default;
- TreeItemModel* getChildModel();
+ TreeItemModel* getChildModel() override;
void bindLibraryWidget(WLibrary* libraryWidget,
- KeyboardEventFilter* keyboard);
+ KeyboardEventFilter* keyboard) override;
signals:
void showPage(const QUrl& page);
void analyzeTracks(QList<TrackId>);
public slots:
- virtual void activate();
- virtual void activateChild(const QModelIndex& index);
+ virtual void activate() override;
+ virtual void activateChild(const QModelIndex& index) override;
virtual void activatePlaylist(int playlistId);
virtual void htmlLinkClicked(const QUrl& link);
diff --git a/src/library/recording/recordingfeature.h b/src/library/recording/recordingfeature.h
index 732f0664c5..2fb8234f73 100644
--- a/src/library/recording/recordingfeature.h
+++ b/src/library/recording/recordingfeature.h
@@ -27,12 +27,12 @@ class RecordingFeature final : public LibraryFeature {
QIcon getIcon() override;
void bindLibraryWidget(WLibrary* libraryWidget,
- KeyboardEventFilter* keyboard);
+ KeyboardEventFilter* keyboard) override;
- TreeItemModel* getChildModel();
+ TreeItemModel* getChildModel() override;
public slots:
- void activate();
+ void activate() override;
signals:
void setRootIndex(const QModelIndex&);
diff --git a/src/library/rekordbox/rekordboxfeature.h b/src/library/rekordbox/rekordboxfeature.h
index c56a4b2b03..bd08b24d23 100644
--- a/src/library/rekordbox/rekordboxfeature.h
+++ b/src/library/rekordbox/rekordboxfeature.h
@@ -52,7 +52,7 @@ class RekordboxPlaylistModel : public BaseExternalPlaylistModel {
bool isColumnHiddenByDefault(int column) override;
protected:
- virtual void initSortColumnMapping();
+ virtual void initSortColumnMapping() override;
};
class RekordboxFeature : public BaseExternalLibraryFeature {
@@ -67,11 +67,11 @@ class RekordboxFeature : public BaseExternalLibraryFeature {
void bindLibraryWidget(WLibrary* libraryWidget,
KeyboardEventFilter* keyboard) override;
- TreeItemModel* getChildModel();
+ TreeItemModel* getChildModel() override;
public slots:
- void activate();
- void activateChild(const QModelIndex& index);
+ void activate() override;
+ void activateChild(const QModelIndex& index) override;
void refreshLibraryModels();
void onRekordboxDevicesFound();
void onTracksFound();
diff --git a/src/library/traktor/traktorfeature.h b/src/library/traktor/traktorfeature.h
index d4ee70d61e..081e1847fd 100644
--- a/src/library/traktor/traktorfeature.h
+++ b/src/library/traktor/traktorfeature.h
@@ -42,16 +42,16 @@ class TraktorFeature : public BaseExternalLibraryFeature {
QIcon getIcon() override;
static bool isSupported();
- TreeItemModel* getChildModel();
+ TreeItemModel* getChildModel() override;
public slots:
- void activate();
- void activateChild(const QModelIndex& index);
+ void activate() override;
+ void activateChild(const QModelIndex& index) override;
void refreshLibraryModels();
void onTrackCollectionLoaded();
private:
- virtual BaseSqlTableModel* getPlaylistModelForPlaylist(QString playlist);
+ virtual BaseSqlTableModel* getPlaylistModelForPlaylist(QString playlist) override;
TreeItem* importLibrary(QString file);
// parses a track in the music collection
void parseTrack(QXmlStreamReader &xml, QSqlQuery &query);
diff --git a/src/test/autodjprocessor_test.cpp b/src/test/autodjprocessor_test.cpp
index 7041d993a8..debdd7af4c 100644
--- a/src/test/autodjprocessor_test.cpp
+++ b/src/test/autodjprocessor_test.cpp
@@ -74,7 +74,7 @@ class FakeDeck : public BaseTrackPlayer {
emit playerEmpty();
}
- TrackPointer getLoadedTrack() const {
+ TrackPointer getLoadedTrack() const override {
return loadedTrack;
}
diff --git a/src/test/mockedenginebackendtest.h b/src/test/mockedenginebackendtest.h
index e1902d5b2b..5bc89b7b54 100644
--- a/src/test/mockedenginebackendtest.h
+++ b/src/test/mockedenginebackendtest.h
@@ -37,7 +37,7 @@ class MockScaler : public EngineBufferScale {
m_processedTempo(-1),
m_processedPitch(-1) {
}
- void clear() { }
+ void clear() override { }
double scaleBuffer(CSAMPLE* pOutput, SINT buf_size) override {
Q_UNUSED(pOutput);
m_processedTempo = m_dTempoRatio;
diff --git a/src/test/portmidicontroller_test.cpp b/src/test/portmidicontroller_test.cpp
index b8b9cb6359..ad007b7909 100644
--- a/src/test/portmidicontroller_test.cpp
+++ b/src/test/portmidicontroller_test.cpp
@@ -25,7 +25,7 @@ class MockPortMidiController : public PortMidiController {
~MockPortMidiController() override {
}
- void sendShortMsg(unsigned char status, unsigned char byte1, unsigned char byte2) {
+ void sendShortMsg(unsigned char status, unsigned char byte1, unsigned char byte2) override {
PortMidiController::sendShortMsg(status, byte1, byte2);
}