summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2019-11-10 19:38:58 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2019-11-10 22:31:18 +0100
commitf65ab095e75e8666618263cfa71f40f0af990f23 (patch)
tree4903c7a4901181fccd3cd19d84d80349d97bb03b
parent3e68b4b4a3f0b2e06372b83bf2b7c6da1888758d (diff)
Add missing override to fix clang's -Winconsistent-missing-override warnings
-rw-r--r--src/controllers/controlleroutputmappingtablemodel.h2
-rw-r--r--src/effects/builtin/loudnesscontoureffect.h2
-rw-r--r--src/effects/builtin/threebandbiquadeqeffect.h2
-rw-r--r--src/effects/effectrack.h8
-rw-r--r--src/engine/sidechain/enginerecord.h4
-rw-r--r--src/engine/sidechain/shoutconnection.h14
-rw-r--r--src/engine/sync/synccontrol.h30
-rw-r--r--src/library/analysisfeature.h14
-rw-r--r--src/library/autodj/autodjfeature.h18
-rw-r--r--src/library/basesqltablemodel.h4
-rw-r--r--src/library/coverartdelegate.h2
-rw-r--r--src/library/crate/cratefeature.h2
-rw-r--r--src/library/dao/libraryhashdao.h2
-rw-r--r--src/library/dao/playlistdao.h2
-rw-r--r--src/library/itunes/itunesfeature.h14
-rw-r--r--src/library/mixxxlibraryfeature.h16
-rw-r--r--src/library/playlistfeature.h22
-rw-r--r--src/library/playlisttablemodel.h2
-rw-r--r--src/library/scanner/libraryscanner.h2
-rw-r--r--src/library/setlogfeature.h20
-rw-r--r--src/library/sidebarmodel.h12
-rw-r--r--src/mixxx.h6
-rw-r--r--src/preferences/dialog/dlgpreflibrary.h12
-rw-r--r--src/track/beatgrid.h40
-rw-r--r--src/track/beatmap.h40
-rw-r--r--src/waveform/renderers/waveformrendermark.h6
-rw-r--r--src/waveform/widgets/glslwaveformwidget.h2
-rw-r--r--src/widget/wcoverart.h4
-rw-r--r--src/widget/woverview.h4
-rw-r--r--src/widget/wsingletoncontainer.h2
-rw-r--r--src/widget/wspinny.h4
-rw-r--r--src/widget/wtrackproperty.h4
-rw-r--r--src/widget/wtracktext.h4
-rw-r--r--src/widget/wwaveformviewer.h4
34 files changed, 163 insertions, 163 deletions
diff --git a/src/controllers/controlleroutputmappingtablemodel.h b/src/controllers/controlleroutputmappingtablemodel.h
index c2553806fe..781338c0e7 100644
--- a/src/controllers/controlleroutputmappingtablemodel.h
+++ b/src/controllers/controlleroutputmappingtablemodel.h
@@ -35,7 +35,7 @@ class ControllerOutputMappingTableModel : public ControllerMappingTableModel {
// QAbstractItemModel methods
////////////////////////////////////////////////////////////////////////////
int rowCount(const QModelIndex& parent = QModelIndex()) const override;
- int columnCount(const QModelIndex& parent = QModelIndex()) const;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex& index, const QVariant& value,
int role = Qt::EditRole) override;
diff --git a/src/effects/builtin/loudnesscontoureffect.h b/src/effects/builtin/loudnesscontoureffect.h
index b133a5b983..158b5af79a 100644
--- a/src/effects/builtin/loudnesscontoureffect.h
+++ b/src/effects/builtin/loudnesscontoureffect.h
@@ -47,7 +47,7 @@ class LoudnessContourEffect
const CSAMPLE* pInput, CSAMPLE *pOutput,
const mixxx::EngineParameters& bufferParameters,
const EffectEnableState enableState,
- const GroupFeatureState& groupFeatureState);
+ const GroupFeatureState& groupFeatureState) override;
private:
LoudnessContourEffect(const LoudnessContourEffect&) = delete;
diff --git a/src/effects/builtin/threebandbiquadeqeffect.h b/src/effects/builtin/threebandbiquadeqeffect.h
index 73a00891ef..08a641b8de 100644
--- a/src/effects/builtin/threebandbiquadeqeffect.h
+++ b/src/effects/builtin/threebandbiquadeqeffect.h
@@ -58,7 +58,7 @@ class ThreeBandBiquadEQEffect : public EffectProcessorImpl<ThreeBandBiquadEQEffe
const CSAMPLE* pInput, CSAMPLE *pOutput,
const mixxx::EngineParameters& bufferParameters,
const EffectEnableState enableState,
- const GroupFeatureState& groupFeatureState);
+ const GroupFeatureState& groupFeatureState) override;
private:
ThreeBandBiquadEQEffect(const ThreeBandBiquadEQEffect&) = delete;
diff --git a/src/effects/effectrack.h b/src/effects/effectrack.h
index 1f97f9f1d8..1ec660578b 100644
--- a/src/effects/effectrack.h
+++ b/src/effects/effectrack.h
@@ -187,7 +187,7 @@ class QuickEffectRack : public PerGroupRack {
}
QString formatEffectSlotGroupString(const unsigned int iEffectSlotNumber,
- const QString& group) const {
+ const QString& group) const override {
return formatEffectSlotGroupString(getRackNumber(), iEffectSlotNumber,
group);
}
@@ -203,7 +203,7 @@ class QuickEffectRack : public PerGroupRack {
virtual QString formatEffectChainSlotGroupForGroup(const unsigned int iRackNumber,
const unsigned int iChainSlotNumber,
- const QString& group) const {
+ const QString& group) const override {
Q_UNUSED(iChainSlotNumber);
return formatEffectChainSlotGroupString(iRackNumber, group);
}
@@ -239,7 +239,7 @@ class EqualizerRack : public PerGroupRack {
}
QString formatEffectSlotGroupString(const unsigned int iEffectSlotNumber,
- const QString& group) const {
+ const QString& group) const override {
return formatEffectSlotGroupString(getRackNumber(), iEffectSlotNumber,
group);
}
@@ -254,7 +254,7 @@ class EqualizerRack : public PerGroupRack {
const QString& group) override;
virtual QString formatEffectChainSlotGroupForGroup(const unsigned int iRackNumber,
const unsigned int iChainSlotNumber,
- const QString& group) const {
+ const QString& group) const override {
Q_UNUSED(iChainSlotNumber);
return formatEffectChainSlotGroupString(iRackNumber, group);
}
diff --git a/src/engine/sidechain/enginerecord.h b/src/engine/sidechain/enginerecord.h
index f219266a97..29ef65d39c 100644
--- a/src/engine/sidechain/enginerecord.h
+++ b/src/engine/sidechain/enginerecord.h
@@ -26,8 +26,8 @@ class EngineRecord : public QObject, public EncoderCallback, public SideChainWor
EngineRecord(UserSettingsPointer pConfig);
virtual ~EngineRecord();
- void process(const CSAMPLE* pBuffer, const int iBufferSize);
- void shutdown() {}
+ void process(const CSAMPLE* pBuffer, const int iBufferSize) override;
+ void shutdown() override {}
// writes compressed audio to file
void write(const unsigned char *header, const unsigned char *body, int headerLen, int bodyLen) override;
diff --git a/src/engine/sidechain/shoutconnection.h b/src/engine/sidechain/shoutconnection.h
index 74e94e9c72..b4e520c1fd 100644
--- a/src/engine/sidechain/shoutconnection.h
+++ b/src/engine/sidechain/shoutconnection.h
@@ -41,9 +41,9 @@ class ShoutConnection
// This is called by the Engine implementation for each sample. Encode and
// send the stream, as well as check for metadata changes.
- void process(const CSAMPLE* pBuffer, const int iBufferSize);
+ void process(const CSAMPLE* pBuffer, const int iBufferSize) override;
- void shutdown() {
+ void shutdown() override {
}
// Called by the encoder in method 'encodebuffer()' to flush the stream to
@@ -62,11 +62,11 @@ class ShoutConnection
bool isConnected();
void applySettings();
- virtual void outputAvailable();
- virtual void setOutputFifo(QSharedPointer<FIFO<CSAMPLE>> pOutputFifo);
- QSharedPointer<FIFO<CSAMPLE>> getOutputFifo();
- virtual bool threadWaiting();
- virtual void run();
+ virtual void outputAvailable() override;
+ virtual void setOutputFifo(QSharedPointer<FIFO<CSAMPLE>> pOutputFifo) override;
+ QSharedPointer<FIFO<CSAMPLE>> getOutputFifo() override;
+ virtual bool threadWaiting() override;
+ virtual void run() override;
BroadcastProfilePtr profile() {
return m_pProfile;
diff --git a/src/engine/sync/synccontrol.h b/src/engine/sync/synccontrol.h
index 63155d285b..756fc96517 100644
--- a/src/engine/sync/synccontrol.h
+++ b/src/engine/sync/synccontrol.h
@@ -24,34 +24,34 @@ class SyncControl : public EngineControl, public Syncable {
EngineChannel* pChannel, SyncableListener* pEngineSync);
~SyncControl() override;
- const QString& getGroup() const { return m_sGroup; }
- EngineChannel* getChannel() const { return m_pChannel; }
- double getBpm() const;
+ const QString& getGroup() const override { return m_sGroup; }
+ EngineChannel* getChannel() const override { return m_pChannel; }
+ double getBpm() const override;
- SyncMode getSyncMode() const;
- void notifySyncModeChanged(SyncMode mode);
- void notifyOnlyPlayingSyncable();
- void requestSync();
- bool isPlaying() const;
+ SyncMode getSyncMode() const override;
+ void notifySyncModeChanged(SyncMode mode) override;
+ void notifyOnlyPlayingSyncable() override;
+ void requestSync() override;
+ bool isPlaying() const override;
- double getBeatDistance() const;
+ double getBeatDistance() const override;
void setBeatDistance(double beatDistance);
- double getBaseBpm() const;
+ double getBaseBpm() const override;
void setLocalBpm(double local_bpm);
// Must never result in a call to
// SyncableListener::notifyBeatDistanceChanged or signal loops could occur.
- void setMasterBeatDistance(double beatDistance);
- void setMasterBaseBpm(double);
+ void setMasterBeatDistance(double beatDistance) override;
+ void setMasterBaseBpm(double) override;
// Must never result in a call to
// SyncableListener::notifyBpmChanged or signal loops could occur.
- void setMasterBpm(double bpm);
- void setMasterParams(double beatDistance, double baseBpm, double bpm);
+ void setMasterBpm(double bpm) override;
+ void setMasterParams(double beatDistance, double baseBpm, double bpm) override;
// Must never result in a call to
// SyncableListener::notifyInstantaneousBpmChanged or signal loops could
// occur.
- void setInstantaneousBpm(double bpm);
+ void setInstantaneousBpm(double bpm) override;
void setEngineControls(RateControl* pRateControl, BpmControl* pBpmControl);
diff --git a/src/library/analysisfeature.h b/src/library/analysisfeature.h
index 6a0606e9ad..f49459af3a 100644
--- a/src/library/analysisfeature.h
+++ b/src/library/analysisfeature.h
@@ -30,22 +30,22 @@ class AnalysisFeature : public LibraryFeature {
void stop();
- QVariant title();
- QIcon getIcon();
+ QVariant title() override;
+ QIcon getIcon() override;
- bool dropAccept(QList<QUrl> urls, QObject* pSource);
- bool dragMoveAccept(QUrl url);
+ bool dropAccept(QList<QUrl> urls, QObject* pSource) override;
+ bool dragMoveAccept(QUrl url) override;
void bindLibraryWidget(WLibrary* libraryWidget,
- KeyboardEventFilter* keyboard);
+ KeyboardEventFilter* keyboard) override;
- TreeItemModel* getChildModel();
+ TreeItemModel* getChildModel() override;
void refreshLibraryModels();
signals:
void analysisActive(bool bActive);
public slots:
- void activate();
+ void activate() override;
void analyzeTracks(QList<TrackId> trackIds);
void suspendAnalysis();
diff --git a/src/library/autodj/autodjfeature.h b/src/library/autodj/autodjfeature.h
index 2da3f84c9c..2389d327b8 100644
--- a/src/library/autodj/autodjfeature.h
+++ b/src/library/autodj/autodjfeature.h
@@ -39,27 +39,27 @@ class AutoDJFeature : public LibraryFeature {
TrackCollection* pTrackCollection);
virtual ~AutoDJFeature();
- QVariant title();
- QIcon getIcon();
+ QVariant title() override;
+ QIcon getIcon() override;
- bool dropAccept(QList<QUrl> urls, QObject* pSource);
- bool dragMoveAccept(QUrl url);
+ bool dropAccept(QList<QUrl> urls, QObject* pSource) override;
+ bool dragMoveAccept(QUrl url) override;
void bindLibraryWidget(WLibrary* libraryWidget,
- KeyboardEventFilter* keyboard);
- void bindSidebarWidget(WLibrarySidebar* pSidebarWidget);
+ KeyboardEventFilter* keyboard) override;
+ void bindSidebarWidget(WLibrarySidebar* pSidebarWidget) override;
- TreeItemModel* getChildModel();
+ TreeItemModel* getChildModel() override;
bool hasTrackTable() override {
return true;
}
public slots:
- void activate();
+ void activate() override;
// Temporary, until WCrateTableView can be written.
- void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+ void onRightClickChild(const QPoint& globalPos, QModelIndex index) override;
private:
UserSettingsPointer m_pConfig;
diff --git a/src/library/basesqltablemodel.h b/src/library/basesqltablemodel.h
index b98588d360..a7635d0b7f 100644
--- a/src/library/basesqltablemodel.h
+++ b/src/library/basesqltablemodel.h
@@ -60,7 +60,7 @@ class BaseSqlTableModel : public QAbstractTableModel, public TrackModel {
// calls readWriteFlags() by default, reimplement this if the child calls
// should be readOnly
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+ virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
///////////////////////////////////////////////////////////////////////////
// Inherited from TrackModel
@@ -85,7 +85,7 @@ class BaseSqlTableModel : public QAbstractTableModel, public TrackModel {
bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
public slots:
- void select();
+ void select() override;
protected:
void setTable(const QString& tableName, const QString& trackIdColumn,
diff --git a/src/library/coverartdelegate.h b/src/library/coverartdelegate.h
index 2713555bd4..026d67bca5 100644
--- a/src/library/coverartdelegate.h
+++ b/src/library/coverartdelegate.h
@@ -19,7 +19,7 @@ class CoverArtDelegate : public TableItemDelegate {
void paintItem(QPainter* painter,
const QStyleOptionViewItem& option,
- const QModelIndex& index) const;
+ const QModelIndex& index) const override;
signals:
void coverReadyForCell(int row, int column);
diff --git a/src/library/crate/cratefeature.h b/src/library/crate/cratefeature.h
index 6e33ae73d1..f2f46d5557 100644
--- a/src/library/crate/cratefeature.h
+++ b/src/library/crate/cratefeature.h
@@ -44,7 +44,7 @@ class CrateFeature : public LibraryFeature {
void bindLibraryWidget(WLibrary* libraryWidget,
KeyboardEventFilter* keyboard) override;
- void bindSidebarWidget(WLibrarySidebar* pSidebarWidget);
+ void bindSidebarWidget(WLibrarySidebar* pSidebarWidget) override;
TreeItemModel* getChildModel() override;
diff --git a/src/library/dao/libraryhashdao.h b/src/library/dao/libraryhashdao.h
index 5c8b3fbd66..123a95b2fa 100644
--- a/src/library/dao/libraryhashdao.h
+++ b/src/library/dao/libraryhashdao.h
@@ -12,7 +12,7 @@ class LibraryHashDAO : public DAO {
public:
~LibraryHashDAO() override {}
- void initialize(const QSqlDatabase& database) {
+ void initialize(const QSqlDatabase& database) override {
m_database = database;
};
diff --git a/src/library/dao/playlistdao.h b/src/library/dao/playlistdao.h
index 5f9af679a7..af882c445d 100644
--- a/src/library/dao/playlistdao.h
+++ b/src/library/dao/playlistdao.h
@@ -51,7 +51,7 @@ class PlaylistDAO : public QObject, public virtual DAO {
PlaylistDAO();
~PlaylistDAO() override {}
- void initialize(const QSqlDatabase& database);
+ void initialize(const QSqlDatabase& database) override;
// Create a playlist, fails with -1 if already exists
int createPlaylist(const QString& name, const HiddenType type = PLHT_NOT_HIDDEN);
diff --git a/src/library/itunes/itunesfeature.h b/src/library/itunes/itunesfeature.h
index 02081a03f1..1570f4a642 100644
--- a/src/library/itunes/itunesfeature.h
+++ b/src/library/itunes/itunesfeature.h
@@ -27,21 +27,21 @@ class ITunesFeature : public BaseExternalLibraryFeature {
virtual ~ITunesFeature();
static bool isSupported();
- QVariant title();
- QIcon getIcon();
- void bindSidebarWidget(WLibrarySidebar* pSidebarWidget);
+ QVariant title() override;
+ QIcon getIcon() override;
+ void bindSidebarWidget(WLibrarySidebar* pSidebarWidget) override;
- TreeItemModel* getChildModel();
+ TreeItemModel* getChildModel() override;
public slots:
- void activate();
+ void activate() override;
void activate(bool forceReload);
- void activateChild(const QModelIndex& index);
+ void activateChild(const QModelIndex& index) override;
void onRightClick(const QPoint& globalPos) override;
void onTrackCollectionLoaded();
private:
- virtual BaseSqlTableModel* getPlaylistModelForPlaylist(QString playlist);
+ virtual BaseSqlTableModel* getPlaylistModelForPlaylist(QString playlist) override;
static QString getiTunesMusicPath();
// returns the invisible rootItem for the sidebar model
TreeItem* importLibrary();
diff --git a/src/library/mixxxlibraryfeature.h b/src/library/mixxxlibraryfeature.h
index 621dd8ae35..28ba9ee620 100644
--- a/src/library/mixxxlibraryfeature.h
+++ b/src/library/mixxxlibraryfeature.h
@@ -34,21 +34,21 @@ class MixxxLibraryFeature : public LibraryFeature {
UserSettingsPointer pConfig);
virtual ~MixxxLibraryFeature();
- QVariant title();
- QIcon getIcon();
- bool dropAccept(QList<QUrl> urls, QObject* pSource);
- bool dragMoveAccept(QUrl url);
- TreeItemModel* getChildModel();
+ QVariant title() override;
+ QIcon getIcon() override;
+ bool dropAccept(QList<QUrl> urls, QObject* pSource) override;
+ bool dragMoveAccept(QUrl url) override;
+ TreeItemModel* getChildModel() override;
void bindLibraryWidget(WLibrary* pLibrary,
- KeyboardEventFilter* pKeyboard);
+ KeyboardEventFilter* pKeyboard) override;
bool hasTrackTable() override {
return true;
}
public slots:
- void activate();
- void activateChild(const QModelIndex& index);
+ void activate() override;
+ void activateChild(const QModelIndex& index) override;
void refreshLibraryModels();
private:
diff --git a/src/library/playlistfeature.h b/src/library/playlistfeature.h
index 1d0bb936d1..9e93c7b452 100644
--- a/src/library/playlistfeature.h
+++ b/src/library/playlistfeature.h
@@ -26,22 +26,22 @@ class PlaylistFeature : public BasePlaylistFeature {
UserSettingsPointer pConfig);
virtual ~PlaylistFeature();
- QVariant title();
- QIcon getIcon();
+ QVariant title() override;
+ QIcon getIcon() override;
- void bindSidebarWidget(WLibrarySidebar* pSidebarWidget);
+ void bindSidebarWidget(WLibrarySidebar* pSidebarWidget) override;
- bool dropAcceptChild(const QModelIndex& index, QList<QUrl> urls, QObject* pSource);
- bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
+ bool dropAcceptChild(const QModelIndex& index, QList<QUrl> urls, QObject* pSource) override;
+ bool dragMoveAcceptChild(const QModelIndex& index, QUrl url) override;
public slots:
- void onRightClick(const QPoint& globalPos);
- void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+ void onRightClick(const QPoint& globalPos) override;
+ void onRightClickChild(const QPoint& globalPos, QModelIndex index) override;
private slots:
- void slotPlaylistTableChanged(int playlistId);
- void slotPlaylistContentChanged(int playlistId);
- void slotPlaylistTableRenamed(int playlistId, QString a_strName);
+ void slotPlaylistTableChanged(int playlistId) override;
+ void slotPlaylistContentChanged(int playlistId) override;
+ void slotPlaylistTableRenamed(int playlistId, QString a_strName) override;
protected:
QList<BasePlaylistFeature::IdAndLabel> createPlaylistLabels() override;
@@ -49,7 +49,7 @@ class PlaylistFeature : public BasePlaylistFeature {
void decorateChild(TreeItem *pChild, int playlist_id) override;
private:
- QString getRootViewHtml() const;
+ QString getRootViewHtml() const override;
QIcon m_icon;
QPointer<WLibrarySidebar> m_pSidebarWidget;
};
diff --git a/src/library/playlisttablemodel.h b/src/library/playlisttablemodel.h
index 18fa3320be..10641d0f82 100644
--- a/src/library/playlisttablemodel.h
+++ b/src/library/playlisttablemodel.h
@@ -18,7 +18,7 @@ class PlaylistTableModel : public BaseSqlTableModel {
bool appendTrack(TrackId trackId);
void moveTrack(const QModelIndex& sourceIndex,
- const QModelIndex& destIndex);
+ const QModelIndex& destIndex) override;
void removeTrack(const QModelIndex& index);
void shuffleTracks(const QModelIndexList& shuffle, const QModelIndex& exclude);
diff --git a/src/library/scanner/libraryscanner.h b/src/library/scanner/libraryscanner.h
index 60eb497019..d8551e0e9b 100644
--- a/src/library/scanner/libraryscanner.h
+++ b/src/library/scanner/libraryscanner.h
@@ -57,7 +57,7 @@ class LibraryScanner : public QThread {
void startScan();
protected:
- void run();
+ void run() override;
public slots:
void queueTask(ScannerTask* pTask);
diff --git a/src/library/setlogfeature.h b/src/library/setlogfeature.h
index 1813e35f9d..ba5088e0b2 100644
--- a/src/library/setlogfeature.h
+++ b/src/library/setlogfeature.h
@@ -22,16 +22,16 @@ public:
TrackCollection* pTrackCollection);
virtual ~SetlogFeature();
- QVariant title();
- QIcon getIcon();
+ QVariant title() override;
+ QIcon getIcon() override;
virtual void bindLibraryWidget(WLibrary* libraryWidget,
- KeyboardEventFilter* keyboard);
- virtual void bindSidebarWidget(WLibrarySidebar* pSidebarWidget);
+ KeyboardEventFilter* keyboard) override;
+ virtual void bindSidebarWidget(WLibrarySidebar* pSidebarWidget) override;
public slots:
- void onRightClick(const QPoint& globalPos);
- void onRightClickChild(const QPoint& globalPos, QModelIndex index);
+ void onRightClick(const QPoint& globalPos) override;
+ void onRightClickChild(const QPoint& globalPos, QModelIndex index) override;
void slotJoinWithPrevious();
void slotGetNewPlaylist();
@@ -42,12 +42,12 @@ public:
private slots:
void slotPlayingTrackChanged(TrackPointer currentPlayingTrack);
- void slotPlaylistTableChanged(int playlistId);
- void slotPlaylistContentChanged(int playlistId);
- void slotPlaylistTableRenamed(int playlistId, QString a_strName);
+ void slotPlaylistTableChanged(int playlistId) override;
+ void slotPlaylistContentChanged(int playlistId) override;
+ void slotPlaylistTableRenamed(int playlistId, QString a_strName) override;
private:
- QString getRootViewHtml() const;
+ QString getRootViewHtml() const override;
QLinkedList<TrackId> m_recentTracks;
QAction* m_pJoinWithPreviousAction;
diff --git a/src/library/sidebarmodel.h b/src/library/sidebarmodel.h
index 3dc4891ed3..7329b00243 100644
--- a/src/library/sidebarmodel.h
+++ b/src/library/sidebarmodel.h
@@ -26,15 +26,15 @@ class SidebarModel : public QAbstractItemModel {
// Required for QAbstractItemModel
QModelIndex index(int row, int column,
- const QModelIndex& parent = QModelIndex()) const;
- QModelIndex parent(const QModelIndex& index) const;
- int rowCount(const QModelIndex& parent = QModelIndex()) const;
- int columnCount(const QModelIndex& parent = QModelIndex()) const;
+ const QModelIndex& parent = QModelIndex()) const override;
+ QModelIndex parent(const QModelIndex& index) const override;
+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+ int columnCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant data(const QModelIndex& index,
- int role = Qt::DisplayRole) const;
+ int role = Qt::DisplayRole) const override;
bool dropAccept(const QModelIndex& index, QList<QUrl> urls, QObject* pSource);
bool dragMoveAccept(const QModelIndex& index, QUrl url);
- virtual bool hasChildren(const QModelIndex& parent = QModelIndex()) const;
+ virtual bool hasChildren(const QModelIndex& parent = QModelIndex()) const override;
bool hasTrackTable(const QModelIndex& index) const;
public slots:
diff --git a/src/mixxx.h b/src/mixxx.h
index cb2549ed0a..bedd2ca962 100644
--- a/src/mixxx.h
+++ b/src/mixxx.h
@@ -111,9 +111,9 @@ class MixxxMainWindow : public QMainWindow {
protected:
// Event filter to block certain events (eg. tooltips if tooltips are disabled)
- virtual bool eventFilter(QObject *obj, QEvent *event);
- virtual void closeEvent(QCloseEvent *event);
- virtual bool event(QEvent* e);
+ virtual bool eventFilter(QObject *obj, QEvent *event) override;
+ virtual void closeEvent(QCloseEvent *event) override;
+ virtual bool event(QEvent* e) override;
private:
void initialize(QApplication *app, const CmdlineArgs& args);
diff --git a/src/preferences/dialog/dlgpreflibrary.h b/src/preferences/dialog/dlgpreflibrary.h
index 13c9be4f09..7ec3648242 100644
--- a/src/preferences/dialog/dlgpreflibrary.h
+++ b/src/preferences/dialog/dlgpreflibrary.h
@@ -32,12 +32,12 @@ class DlgPrefLibrary : public DlgPreferencePage, public Ui::DlgPrefLibraryDlg {
public slots:
// Common preference page slots.
- void slotUpdate();
- void slotShow();
- void slotHide();
- void slotResetToDefaults();
- void slotApply();
- void slotCancel();
+ void slotUpdate() override;
+ void slotShow() override;
+ void slotHide() override;
+ void slotResetToDefaults() override;
+ void slotApply() override;
+ void slotCancel() override;
// Dialog to browse for music file directory
void slotAddDir();
diff --git a/src/track/beatgrid.h b/src/track/beatgrid.h
index 90ad5ca0c8..25df0c1c90 100644
--- a/src/track/beatgrid.h
+++ b/src/track/beatgrid.h
@@ -33,43 +33,43 @@ class BeatGrid final : public Beats {
// The following are all methods from the Beats interface, see method
// comments in beats.h
- virtual Beats::CapabilitiesFlags getCapabilities() const {
+ virtual Beats::CapabilitiesFlags getCapabilities() const override {
return BEATSCAP_TRANSLATE | BEATSCAP_SCALE | BEATSCAP_SETBPM;
}
- virtual QByteArray toByteArray() const;
- virtual BeatsPointer clone() const;
- virtual QString getVersion() const;
- virtual QString getSubVersion() const;
+ virtual QByteArray toByteArray() const override;
+ virtual BeatsPointer clone() const override;
+ virtual QString getVersion() const override;
+ virtual QString getSubVersion() const override;
virtual void setSubVersion(QString subVersion);
////////////////////////////////////////////////////////////////////////////
// Beat calculations
////////////////////////////////////////////////////////////////////////////