From 651020388da3a405bda7ca1790aeff87bfe2bfcf Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 15 Jun 2020 21:55:05 +0200 Subject: [PATCH] Use override --- 3rdparty/taglib/asf/asffile.cpp | 44 ++++----- 3rdparty/taglib/fileref.cpp | 2 +- 3rdparty/taglib/mpeg/mpegfile.cpp | 6 +- 3rdparty/taglib/toolkit/tdebuglistener.cpp | 2 +- 3rdparty/taglib/xm/xmfile.cpp | 24 ++--- ext/libstrawberry-tagreader/tagreader.cpp | 2 +- src/analyzer/analyzerbase.h | 10 +-- src/analyzer/analyzercontainer.h | 8 +- src/analyzer/blockanalyzer.cpp | 2 - src/analyzer/blockanalyzer.h | 10 +-- src/analyzer/boomanalyzer.h | 6 +- src/analyzer/rainbowanalyzer.h | 8 +- src/collection/collection.h | 2 +- src/collection/collectionbackend.cpp | 2 - src/collection/collectionbackend.h | 54 ++++++----- src/collection/collectiondirectorymodel.cpp | 2 +- src/collection/collectiondirectorymodel.h | 4 +- src/collection/collectionfilterwidget.h | 6 +- src/collection/collectionitemdelegate.h | 4 +- src/collection/collectionmodel.h | 14 +-- src/collection/collectionplaylistitem.h | 18 ++-- src/collection/collectionview.cpp | 2 +- src/collection/collectionview.h | 12 +-- src/collection/collectionviewcontainer.h | 2 +- src/collection/groupbydialog.cpp | 2 +- src/collection/groupbydialog.h | 8 +- src/collection/savedgroupingmanager.h | 2 +- src/context/contextalbum.h | 6 +- src/context/contextalbumsmodel.h | 14 +-- src/context/contextalbumsview.cpp | 2 +- src/context/contextalbumsview.h | 14 +-- src/context/contextview.h | 8 +- src/core/application.h | 2 +- src/core/database.h | 4 +- src/core/dbusscreensaver.h | 4 +- src/core/deletefiles.cpp | 2 +- src/core/deletefiles.h | 2 +- src/core/filesystemmusicstorage.h | 7 +- src/core/filesystemwatcherinterface.h | 4 +- src/core/mainwindow.h | 12 +-- src/core/mergedproxymodel.h | 38 ++++---- src/core/multisortfilterproxy.h | 2 +- src/core/musicstorage.cpp | 2 +- src/core/musicstorage.h | 2 +- src/core/network.h | 20 ++--- src/core/networkproxyfactory.h | 2 +- src/core/networktimeouts.h | 2 +- src/core/player.h | 54 +++++------ src/core/potranslator.h | 2 +- src/core/qtfslistener.h | 7 +- src/core/qtsystemtrayicon.h | 34 +++---- src/core/settingsprovider.h | 16 ++-- src/core/simpletreemodel.h | 18 ++-- src/core/songloader.h | 2 +- src/core/stylesheetloader.h | 2 +- src/core/systemtrayicon.h | 2 +- src/core/thread.h | 2 +- src/core/translations.h | 2 +- src/covermanager/albumcoverchoicecontroller.h | 2 +- src/covermanager/albumcoverexport.h | 2 +- src/covermanager/albumcoverexporter.h | 1 - src/covermanager/albumcoverfetcher.h | 2 +- src/covermanager/albumcoverfetchersearch.h | 2 +- src/covermanager/albumcovermanager.h | 8 +- src/covermanager/albumcovermanagerlist.h | 4 +- src/covermanager/albumcoversearcher.h | 6 +- src/covermanager/coverexportrunnable.h | 5 +- src/covermanager/coverfromurldialog.h | 4 +- src/covermanager/coverproviders.h | 2 +- .../coversearchstatisticsdialog.h | 2 +- src/covermanager/currentalbumcoverloader.h | 2 +- src/covermanager/deezercoverprovider.h | 8 +- src/covermanager/discogscoverprovider.h | 8 +- src/covermanager/lastfmcoverprovider.h | 6 +- src/covermanager/musicbrainzcoverprovider.h | 6 +- src/covermanager/musixmatchcoverprovider.h | 8 +- src/covermanager/qobuzcoverprovider.h | 8 +- src/covermanager/spotifycoverprovider.h | 14 +-- src/covermanager/tidalcoverprovider.h | 12 +-- src/device/cddadevice.cpp | 2 - src/device/cddadevice.h | 13 ++- src/device/cddalister.h | 28 +++--- src/device/cddasongloader.h | 2 +- src/device/connecteddevice.h | 12 +-- src/device/devicedatabasebackend.cpp | 2 - src/device/devicedatabasebackend.h | 1 - src/device/devicelister.h | 2 +- src/device/devicemanager.h | 7 +- src/device/deviceproperties.h | 4 +- src/device/devicestatefiltermodel.h | 4 +- src/device/deviceview.cpp | 2 +- src/device/deviceview.h | 10 +-- src/device/deviceviewcontainer.h | 2 +- src/device/filesystemdevice.h | 6 +- src/device/giolister.h | 32 +++---- src/device/mtpconnection.h | 2 +- src/device/mtpdevice.h | 24 ++--- src/device/mtploader.h | 2 +- src/device/udisks2lister.h | 2 +- src/dialogs/addstreamdialog.h | 4 +- src/dialogs/edittagdialog.h | 10 +-- src/dialogs/errordialog.h | 10 +-- src/dialogs/trackselectiondialog.h | 4 +- src/engine/alsadevicefinder.h | 4 +- src/engine/devicefinders.h | 2 +- src/engine/enginebase.h | 2 +- src/engine/gstengine.h | 52 +++++------ src/engine/gstenginepipeline.h | 4 +- src/engine/gststartup.h | 2 +- src/engine/vlcengine.h | 38 ++++---- src/engine/xineengine.h | 40 ++++----- src/equalizer/equalizer.h | 4 +- src/equalizer/equalizerslider.h | 2 +- src/globalshortcuts/globalshortcut.h | 4 +- .../globalshortcutbackend-gsd.cpp | 2 - .../globalshortcutbackend-gsd.h | 5 +- .../globalshortcutbackend-system.h | 6 +- src/globalshortcuts/globalshortcutbackend.h | 1 - src/globalshortcuts/globalshortcutgrabber.h | 8 +- src/internet/internetcollectionview.h | 10 +-- .../internetcollectionviewcontainer.h | 4 +- src/internet/internetplaylistitem.h | 13 +-- src/internet/internetsearchitemdelegate.h | 2 +- src/internet/internetsearchmodel.h | 2 +- src/internet/internetsearchsortmodel.h | 2 +- src/internet/internetsearchview.h | 8 +- src/internet/internetservice.h | 2 +- src/internet/internetservices.h | 2 +- src/internet/internetsongsview.h | 2 +- src/internet/internettabsview.h | 2 +- src/internet/localredirectserver.h | 4 +- src/lyrics/auddlyricsprovider.h | 8 +- src/lyrics/chartlyricsprovider.cpp | 2 +- src/lyrics/chartlyricsprovider.h | 8 +- src/lyrics/geniuslyricsprovider.h | 14 +-- src/lyrics/jsonlyricsprovider.h | 4 - src/lyrics/lololyricsprovider.h | 8 +- src/lyrics/lyricsfetcher.h | 2 +- src/lyrics/lyricsprovider.h | 7 +- src/lyrics/lyricsproviders.h | 2 +- src/lyrics/musixmatchlyricsprovider.h | 8 +- src/lyrics/ovhlyricsprovider.h | 8 +- src/moodbar/moodbaritemdelegate.h | 2 +- src/moodbar/moodbarloader.h | 2 +- src/moodbar/moodbarpipeline.h | 2 +- src/moodbar/moodbarproxystyle.cpp | 2 - src/moodbar/moodbarproxystyle.h | 7 +- src/musicbrainz/acoustidclient.h | 2 +- src/musicbrainz/chromaprinter.cpp | 2 - src/musicbrainz/chromaprinter.h | 1 - src/musicbrainz/musicbrainzclient.h | 2 +- src/organise/organise.h | 4 +- src/organise/organisedialog.h | 12 +-- src/organise/organiseerrordialog.h | 2 +- src/organise/organiseformat.h | 4 +- src/playlist/playlist.h | 26 +++--- src/playlist/playlistbackend.cpp | 2 - src/playlist/playlistbackend.h | 3 +- src/playlist/playlistcontainer.h | 8 +- src/playlist/playlistdelegates.h | 43 ++++----- src/playlist/playlistfilter.h | 6 +- src/playlist/playlistfilterparser.cpp | 50 +++++------ src/playlist/playlistfilterparser.h | 4 +- src/playlist/playlistheader.h | 4 +- src/playlist/playlistlistcontainer.cpp | 2 +- src/playlist/playlistlistcontainer.h | 10 +-- src/playlist/playlistlistmodel.h | 4 +- src/playlist/playlistlistview.h | 3 +- src/playlist/playlistmanager.h | 76 ++++++++-------- src/playlist/playlistsaveoptionsdialog.h | 4 +- src/playlist/playlistsequence.h | 4 +- src/playlist/playlisttabbar.h | 18 ++-- src/playlist/playlistundocommands.h | 20 ++--- src/playlist/playlistview.h | 58 ++++++------ src/playlist/songloaderinserter.h | 2 +- src/playlist/songplaylistitem.h | 12 +-- src/playlistparsers/asxiniparser.h | 10 +-- src/playlistparsers/asxparser.h | 10 +-- src/playlistparsers/cueparser.h | 12 +-- src/playlistparsers/m3uparser.h | 12 +-- src/playlistparsers/plsparser.h | 12 +-- src/playlistparsers/wplparser.h | 12 +-- src/playlistparsers/xspfparser.h | 10 +-- src/queue/queue.h | 28 +++--- src/queue/queueview.h | 6 +- src/scrobbler/audioscrobbler.cpp | 2 - src/scrobbler/audioscrobbler.h | 1 - src/scrobbler/lastfmscrobbler.h | 6 +- src/scrobbler/librefmscrobbler.h | 6 +- src/scrobbler/listenbrainzscrobbler.h | 26 +++--- src/scrobbler/scrobblercache.h | 2 +- src/scrobbler/scrobblerservices.h | 2 +- src/scrobbler/scrobblingapi20.h | 32 +++---- src/settings/appearancesettingspage.h | 10 +-- src/settings/backendsettingspage.h | 8 +- src/settings/behavioursettingspage.h | 6 +- src/settings/collectionsettingspage.h | 6 +- src/settings/contextsettingspage.h | 6 +- src/settings/coverssettingspage.h | 6 +- src/settings/lyricssettingspage.h | 6 +- src/settings/moodbarsettingspage.h | 8 +- src/settings/networkproxysettingspage.h | 9 +- src/settings/notificationssettingspage.h | 13 +-- src/settings/playlistsettingspage.h | 8 +- src/settings/scrobblersettingspage.h | 6 +- src/settings/settingsdialog.h | 14 +-- src/settings/settingspage.h | 2 +- src/settings/shortcutssettingspage.h | 9 +- src/settings/subsonicsettingspage.h | 8 +- src/settings/tidalsettingspage.h | 10 +-- src/settings/transcodersettingspage.h | 8 +- src/subsonic/subsonicbaserequest.cpp | 2 - src/subsonic/subsonicbaserequest.h | 2 - src/subsonic/subsonicrequest.h | 4 +- src/subsonic/subsonicservice.h | 20 ++--- src/subsonic/subsonicurlhandler.h | 4 +- src/tidal/tidalbaserequest.cpp | 2 - src/tidal/tidalbaserequest.h | 1 - src/tidal/tidalfavoriterequest.h | 6 +- src/tidal/tidalrequest.h | 6 +- src/tidal/tidalservice.h | 46 +++++----- src/tidal/tidalstreamurlrequest.h | 6 +- src/tidal/tidalurlhandler.h | 4 +- src/transcoder/transcodedialog.h | 12 +-- src/transcoder/transcoder.h | 2 +- src/transcoder/transcoderoptionsaac.h | 6 +- src/transcoder/transcoderoptionsasf.h | 6 +- src/transcoder/transcoderoptionsdialog.h | 6 +- src/transcoder/transcoderoptionsflac.h | 6 +- src/transcoder/transcoderoptionsinterface.h | 2 +- src/transcoder/transcoderoptionsmp3.h | 6 +- src/transcoder/transcoderoptionsopus.h | 6 +- src/transcoder/transcoderoptionsspeex.h | 6 +- src/transcoder/transcoderoptionsvorbis.h | 6 +- src/transcoder/transcoderoptionswavpack.h | 6 +- src/widgets/autoexpandingtreeview.h | 20 ++--- src/widgets/busyindicator.h | 6 +- src/widgets/clickablelabel.h | 2 +- src/widgets/fancytabwidget.cpp | 14 ++- src/widgets/fancytabwidget.h | 90 +++++++++---------- src/widgets/favoritewidget.h | 6 +- src/widgets/fileview.h | 11 +-- src/widgets/fileviewlist.h | 4 +- src/widgets/forcescrollperpixel.h | 2 +- src/widgets/freespacebar.h | 4 +- src/widgets/groupediconview.h | 20 ++--- src/widgets/lineedit.h | 48 +++++----- src/widgets/linetextedit.h | 6 +- src/widgets/loginstatewidget.h | 4 +- src/widgets/multiloadingindicator.h | 4 +- src/widgets/osd.h | 2 +- src/widgets/osdpretty.h | 18 ++-- src/widgets/playingwidget.cpp | 2 - src/widgets/playingwidget.h | 15 ++-- src/widgets/qsearchfield.h | 4 +- src/widgets/renametablineedit.h | 4 +- src/widgets/stickyslider.h | 2 +- src/widgets/stretchheaderview.h | 6 +- src/widgets/trackslider.h | 9 +- src/widgets/tracksliderpopup.h | 2 +- src/widgets/tracksliderslider.h | 16 ++-- src/widgets/volumeslider.h | 28 +++--- tests/src/collectionbackend_test.cpp | 4 +- tests/src/collectionmodel_test.cpp | 2 +- tests/src/logging_env.h | 2 +- tests/src/mergedproxymodel_test.cpp | 2 +- tests/src/metatypes_env.h | 2 +- tests/src/mock_networkaccessmanager.cpp | 6 +- tests/src/mock_networkaccessmanager.h | 4 +- tests/src/resources_env.h | 2 +- tests/src/songplaylistitem_test.cpp | 2 +- 271 files changed, 1199 insertions(+), 1231 deletions(-) diff --git a/3rdparty/taglib/asf/asffile.cpp b/3rdparty/taglib/asf/asffile.cpp index a07165fd..fca592da 100644 --- a/3rdparty/taglib/asf/asffile.cpp +++ b/3rdparty/taglib/asf/asffile.cpp @@ -108,65 +108,65 @@ class ASF::File::FilePrivate::UnknownObject : public ASF::File::FilePrivate::Bas public: explicit UnknownObject(const ByteVector &guid); - ByteVector guid() const; + ByteVector guid() const override; }; class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject { public: - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; }; class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject { public: - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; }; class ASF::File::FilePrivate::ContentDescriptionObject : public ASF::File::FilePrivate::BaseObject { public: - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); - ByteVector render(ASF::File *file); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; + ByteVector render(ASF::File *file) override; }; class ASF::File::FilePrivate::ExtendedContentDescriptionObject : public ASF::File::FilePrivate::BaseObject { public: ByteVectorList attributeData; - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); - ByteVector render(ASF::File *file); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; + ByteVector render(ASF::File *file) override; }; class ASF::File::FilePrivate::MetadataObject : public ASF::File::FilePrivate::BaseObject { public: ByteVectorList attributeData; - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); - ByteVector render(ASF::File *file); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; + ByteVector render(ASF::File *file) override; }; class ASF::File::FilePrivate::MetadataLibraryObject : public ASF::File::FilePrivate::BaseObject { public: ByteVectorList attributeData; - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); - ByteVector render(ASF::File *file); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; + ByteVector render(ASF::File *file) override; }; class ASF::File::FilePrivate::HeaderExtensionObject : public ASF::File::FilePrivate::BaseObject { public: List objects; HeaderExtensionObject(); - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); - ByteVector render(ASF::File *file); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; + ByteVector render(ASF::File *file) override; }; class ASF::File::FilePrivate::CodecListObject : public ASF::File::FilePrivate::BaseObject { public: - ByteVector guid() const; - void parse(ASF::File *file, unsigned int size); + ByteVector guid() const override; + void parse(ASF::File *file, unsigned int size) override; private: enum CodecType { diff --git a/3rdparty/taglib/fileref.cpp b/3rdparty/taglib/fileref.cpp index e72e0a79..4abed154 100644 --- a/3rdparty/taglib/fileref.cpp +++ b/3rdparty/taglib/fileref.cpp @@ -276,7 +276,7 @@ class FileRef::FileRefPrivate : public RefCounter { public: FileRefPrivate() : file(nullptr), stream(nullptr) {} - ~FileRefPrivate() { + ~FileRefPrivate() override { delete file; delete stream; } diff --git a/3rdparty/taglib/mpeg/mpegfile.cpp b/3rdparty/taglib/mpeg/mpegfile.cpp index 7091d6a9..ece75b14 100644 --- a/3rdparty/taglib/mpeg/mpegfile.cpp +++ b/3rdparty/taglib/mpeg/mpegfile.cpp @@ -85,9 +85,9 @@ class AdapterFile : public Strawberry_TagLib::TagLib::File { public: explicit AdapterFile(IOStream *stream) : File(stream) {} - Tag *tag() const { return nullptr; } - AudioProperties *audioProperties() const { return nullptr; } - bool save() { return false; } + Tag *tag() const override { return nullptr; } + AudioProperties *audioProperties() const override { return nullptr; } + bool save() override { return false; } }; } // namespace diff --git a/3rdparty/taglib/toolkit/tdebuglistener.cpp b/3rdparty/taglib/toolkit/tdebuglistener.cpp index 8b2af117..0b5e8a4d 100644 --- a/3rdparty/taglib/toolkit/tdebuglistener.cpp +++ b/3rdparty/taglib/toolkit/tdebuglistener.cpp @@ -37,7 +37,7 @@ using namespace Strawberry_TagLib::TagLib; namespace { class DefaultListener : public DebugListener { public: - virtual void printMessage(const String &msg) { + void printMessage(const String &msg) override { #ifdef _WIN32 const wstring wstr = msg.toWString(); diff --git a/3rdparty/taglib/xm/xmfile.cpp b/3rdparty/taglib/xm/xmfile.cpp index 11c7d7ba..4452d6c1 100644 --- a/3rdparty/taglib/xm/xmfile.cpp +++ b/3rdparty/taglib/xm/xmfile.cpp @@ -84,13 +84,13 @@ class SkipReader : public Reader { public: explicit SkipReader(unsigned int size) : m_size(size) {} - unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) { + unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override { unsigned int count = std::min(m_size, limit); file.seek(count, Strawberry_TagLib::TagLib::File::Current); return count; } - unsigned int size() const { + unsigned int size() const override { return m_size; } @@ -111,7 +111,7 @@ class StringReader : public ValueReader { public: StringReader(String &string, unsigned int size) : ValueReader(string), m_size(size) {} - unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) { + unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override { ByteVector data = file.readBlock(std::min(m_size, limit)); unsigned int count = data.size(); @@ -125,7 +125,7 @@ class StringReader : public ValueReader { } - unsigned int size() const { + unsigned int size() const override { return m_size; } @@ -137,7 +137,7 @@ class ByteReader : public ValueReader { public: explicit ByteReader(unsigned char &_byte) : ValueReader(_byte) {} - unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) { + unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override { ByteVector data = file.readBlock(std::min(1U, limit)); if (data.size() > 0) { value = data[0]; @@ -145,7 +145,7 @@ class ByteReader : public ValueReader { return data.size(); } - unsigned int size() const { + unsigned int size() const override { return 1; } }; @@ -165,13 +165,13 @@ class U16Reader : public NumberReader { U16Reader(unsigned short &_value, bool _bigEndian) : NumberReader(_value, _bigEndian) {} - unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) { + unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override { ByteVector data = file.readBlock(std::min(2U, limit)); value = data.toUShort(bigEndian); return data.size(); } - unsigned int size() const { + unsigned int size() const override { return 2; } }; @@ -181,13 +181,13 @@ class U32Reader : public NumberReader { U32Reader(unsigned long &_value, bool _bigEndian = true) : NumberReader(_value, _bigEndian) { } - unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) { + unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override { ByteVector data = file.readBlock(std::min(4U, limit)); value = data.toUInt(bigEndian); return data.size(); } - unsigned int size() const { + unsigned int size() const override { return 4; } }; @@ -276,7 +276,7 @@ class StructReader : public Reader { return u32(number, true); } - unsigned int size() const { + unsigned int size() const override { unsigned int size = 0; for (List::ConstIterator i = m_readers.begin(); i != m_readers.end(); @@ -286,7 +286,7 @@ class StructReader : public Reader { return size; } - unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) { + unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) override { unsigned int sumcount = 0; for (List::ConstIterator i = m_readers.begin(); limit > 0 && i != m_readers.end(); diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp index afa971b8..24673117 100644 --- a/ext/libstrawberry-tagreader/tagreader.cpp +++ b/ext/libstrawberry-tagreader/tagreader.cpp @@ -101,7 +101,7 @@ class FileRefFactory { class TagLibFileRefFactory : public FileRefFactory { public: - virtual TagLib::FileRef *GetFileRef(const QString &filename) { + TagLib::FileRef *GetFileRef(const QString &filename) override { #ifdef Q_OS_WIN32 return new TagLib::FileRef(filename.toStdWString().c_str()); #else diff --git a/src/analyzer/analyzerbase.h b/src/analyzer/analyzerbase.h index 6127a905..233679fc 100644 --- a/src/analyzer/analyzerbase.h +++ b/src/analyzer/analyzerbase.h @@ -55,7 +55,7 @@ class Base : public QWidget { Q_OBJECT public: - ~Base() { delete fht_; } + ~Base() override { delete fht_; } uint timeout() const { return timeout_; } @@ -74,10 +74,10 @@ class Base : public QWidget { protected: explicit Base(QWidget*, uint scopeSize = 7); - void hideEvent(QHideEvent*); - void showEvent(QShowEvent*); - void paintEvent(QPaintEvent*); - void timerEvent(QTimerEvent*); + void hideEvent(QHideEvent*) override; + void showEvent(QShowEvent*) override; + void paintEvent(QPaintEvent*) override; + void timerEvent(QTimerEvent*) override; void polishEvent(); diff --git a/src/analyzer/analyzercontainer.h b/src/analyzer/analyzercontainer.h index e3844105..8dbb27a5 100644 --- a/src/analyzer/analyzercontainer.h +++ b/src/analyzer/analyzercontainer.h @@ -44,7 +44,7 @@ class AnalyzerContainer : public QWidget { Q_OBJECT public: - AnalyzerContainer(QWidget* parent); + explicit AnalyzerContainer(QWidget *parent); void SetEngine(EngineBase *engine); void SetActions(QAction *visualisation); @@ -52,12 +52,12 @@ class AnalyzerContainer : public QWidget { static const char *kSettingsGroup; static const char *kSettingsFramerate; -signals: + signals: void WheelEvent(int delta); protected: - void mouseReleaseEvent(QMouseEvent*); - void wheelEvent(QWheelEvent *e); + void mouseReleaseEvent(QMouseEvent*) override; + void wheelEvent(QWheelEvent *e) override; private slots: void ChangeAnalyzer(int id); diff --git a/src/analyzer/blockanalyzer.cpp b/src/analyzer/blockanalyzer.cpp index 0751b9e4..900c4c4d 100644 --- a/src/analyzer/blockanalyzer.cpp +++ b/src/analyzer/blockanalyzer.cpp @@ -67,8 +67,6 @@ BlockAnalyzer::BlockAnalyzer(QWidget *parent) } -BlockAnalyzer::~BlockAnalyzer() {} - void BlockAnalyzer::resizeEvent(QResizeEvent *e) { QWidget::resizeEvent(e); diff --git a/src/analyzer/blockanalyzer.h b/src/analyzer/blockanalyzer.h index e81c8a23..fba2a456 100644 --- a/src/analyzer/blockanalyzer.h +++ b/src/analyzer/blockanalyzer.h @@ -39,9 +39,9 @@ class QResizeEvent; class BlockAnalyzer : public Analyzer::Base { Q_OBJECT + public: Q_INVOKABLE BlockAnalyzer(QWidget*); - ~BlockAnalyzer(); static const uint kHeight; static const uint kWidth; @@ -53,11 +53,11 @@ class BlockAnalyzer : public Analyzer::Base { static const char *kName; protected: - virtual void transform(Analyzer::Scope&); - virtual void analyze(QPainter &p, const Analyzer::Scope&, bool new_frame); - virtual void resizeEvent(QResizeEvent*); + void transform(Analyzer::Scope&) override; + void analyze(QPainter &p, const Analyzer::Scope&, bool new_frame) override; + void resizeEvent(QResizeEvent*) override; virtual void paletteChange(const QPalette&); - virtual void framerateChanged(); + void framerateChanged() override; void drawBackground(); void determineStep(); diff --git a/src/analyzer/boomanalyzer.h b/src/analyzer/boomanalyzer.h index e4a918d7..19129c1e 100644 --- a/src/analyzer/boomanalyzer.h +++ b/src/analyzer/boomanalyzer.h @@ -44,15 +44,15 @@ class BoomAnalyzer : public Analyzer::Base { static const char* kName; - virtual void transform(Analyzer::Scope& s); - virtual void analyze(QPainter& p, const Analyzer::Scope&, bool new_frame); + void transform(Analyzer::Scope& s) override; + void analyze(QPainter& p, const Analyzer::Scope&, bool new_frame) override; public slots: void changeK_barHeight(int); void changeF_peakSpeed(int); protected: - void resizeEvent(QResizeEvent* e); + void resizeEvent(QResizeEvent* e) override; static const uint kColumnWidth; static const uint kMaxBandCount; diff --git a/src/analyzer/rainbowanalyzer.h b/src/analyzer/rainbowanalyzer.h index a50e658c..d621b9c8 100644 --- a/src/analyzer/rainbowanalyzer.h +++ b/src/analyzer/rainbowanalyzer.h @@ -53,11 +53,11 @@ class RainbowAnalyzer : public Analyzer::Base { RainbowAnalyzer(const RainbowType& rbtype, QWidget* parent); protected: - void transform(Analyzer::Scope&); - void analyze(QPainter& p, const Analyzer::Scope&, bool new_frame); + void transform(Analyzer::Scope&) override; + void analyze(QPainter& p, const Analyzer::Scope&, bool new_frame) override; - void timerEvent(QTimerEvent* e); - void resizeEvent(QResizeEvent* e); + void timerEvent(QTimerEvent* e) override; + void resizeEvent(QResizeEvent* e) override; private: static const int kHeight[]; diff --git a/src/collection/collection.h b/src/collection/collection.h index 18084835..8f7fe3f1 100644 --- a/src/collection/collection.h +++ b/src/collection/collection.h @@ -44,7 +44,7 @@ class SCollection : public QObject { public: explicit SCollection(Application *app, QObject *parent); - ~SCollection(); + ~SCollection() override; static const char *kSongsTable; static const char *kDirsTable; diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp index 37b6cb73..f0cebc2a 100644 --- a/src/collection/collectionbackend.cpp +++ b/src/collection/collectionbackend.cpp @@ -61,8 +61,6 @@ CollectionBackend::CollectionBackend(QObject *parent) : } -CollectionBackend::~CollectionBackend() {} - void CollectionBackend::Init(Database *db, const Song::Source source, const QString &songs_table, const QString &dirs_table, const QString &subdirs_table, const QString &fts_table) { db_ = db; source_ = source; diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h index 3c0a2b45..e8f27a43 100644 --- a/src/collection/collectionbackend.h +++ b/src/collection/collectionbackend.h @@ -46,7 +46,6 @@ class CollectionBackendInterface : public QObject { public: explicit CollectionBackendInterface(QObject *parent = nullptr) : QObject(parent) {} - virtual ~CollectionBackendInterface() {} struct Album { Album() {} @@ -120,8 +119,7 @@ class CollectionBackend : public CollectionBackendInterface { public: static const char *kSettingsGroup; - Q_INVOKABLE CollectionBackend(QObject *parent = nullptr); - ~CollectionBackend(); + Q_INVOKABLE explicit CollectionBackend(QObject *parent = nullptr); void Init(Database *db, const Song::Source source, const QString &songs_table, const QString &dirs_table, const QString &subdirs_table, const QString &fts_table); void Close(); @@ -130,49 +128,49 @@ class CollectionBackend : public CollectionBackendInterface { Database *db() const { return db_; } - QString songs_table() const { return songs_table_; } + QString songs_table() const override { return songs_table_; } QString dirs_table() const { return dirs_table_; } QString subdirs_table() const { return subdirs_table_; } // Get a list of directories in the collection. Emits DirectoriesDiscovered. - void LoadDirectoriesAsync(); + void LoadDirectoriesAsync() override; - void UpdateTotalSongCountAsync(); - void UpdateTotalArtistCountAsync(); - void UpdateTotalAlbumCountAsync(); + void UpdateTotalSongCountAsync() override; + void UpdateTotalArtistCountAsync() override; + void UpdateTotalAlbumCountAsync() override; - SongList FindSongsInDirectory(const int id); - SubdirectoryList SubdirsInDirectory(const int id); - DirectoryList GetAllDirectories(); - void ChangeDirPath(const int id, const QString &old_path, const QString &new_path); + SongList FindSongsInDirectory(const int id) override; + SubdirectoryList SubdirsInDirectory(const int id) override; + DirectoryList GetAllDirectories() override; + void ChangeDirPath(const int id, const QString &old_path, const QString &new_path) override; QStringList GetAll(const QString &column, const QueryOptions &opt = QueryOptions()); - QStringList GetAllArtists(const QueryOptions &opt = QueryOptions()); - QStringList GetAllArtistsWithAlbums(const QueryOptions &opt = QueryOptions()); - SongList GetSongsByAlbum(const QString &album, const QueryOptions &opt = QueryOptions()); - SongList GetSongs(const QString &artist, const QString &album, const QueryOptions &opt = QueryOptions()); + QStringList GetAllArtists(const QueryOptions &opt = QueryOptions()) override; + QStringList GetAllArtistsWithAlbums(const QueryOptions &opt = QueryOptions()) override; + SongList GetSongsByAlbum(const QString &album, const QueryOptions &opt = QueryOptions()) override; + SongList GetSongs(const QString &artist, const QString &album, const QueryOptions &opt = QueryOptions()) override; - SongList GetCompilationSongs(const QString &album, const QueryOptions &opt = QueryOptions()); + SongList GetCompilationSongs(const QString &album, const QueryOptions &opt = QueryOptions()) override; - AlbumList GetAllAlbums(const QueryOptions &opt = QueryOptions()); - AlbumList GetCompilationAlbums(const QueryOptions &opt = QueryOptions()); - AlbumList GetAlbumsByArtist(const QString &artist, const QueryOptions &opt = QueryOptions()); + AlbumList GetAllAlbums(const QueryOptions &opt = QueryOptions()) override; + AlbumList GetCompilationAlbums(const QueryOptions &opt = QueryOptions()) override; + AlbumList GetAlbumsByArtist(const QString &artist, const QueryOptions &opt = QueryOptions()) override; - void UpdateManualAlbumArtAsync(const QString &artist, const QString &albumartist, const QString &album, const QUrl &cover_url); - Album GetAlbumArt(const QString &artist, const QString &albumartist, const QString &album); + void UpdateManualAlbumArtAsync(const QString &artist, const QString &albumartist, const QString &album, const QUrl &cover_url) override; + Album GetAlbumArt(const QString &artist, const QString &albumartist, const QString &album) override; - Song GetSongById(const int id); + Song GetSongById(const int id) override; SongList GetSongsById(const QList &ids); SongList GetSongsById(const QStringList &ids); SongList GetSongsByForeignId(const QStringList &ids, const QString &table, const QString &column); - SongList GetSongsByUrl(const QUrl &url); - Song GetSongByUrl(const QUrl &url, qint64 beginning = 0); + SongList GetSongsByUrl(const QUrl &url) override; + Song GetSongByUrl(const QUrl &url, qint64 beginning = 0) override; - void AddDirectory(const QString &path); - void RemoveDirectory(const Directory &dir); + void AddDirectory(const QString &path) override; + void RemoveDirectory(const Directory &dir) override; - bool ExecQuery(CollectionQuery *q); + bool ExecQuery(CollectionQuery *q) override; SongList ExecCollectionQuery(CollectionQuery *query); void IncrementPlayCountAsync(const int id); diff --git a/src/collection/collectiondirectorymodel.cpp b/src/collection/collectiondirectorymodel.cpp index 6cdc4477..572a2296 100644 --- a/src/collection/collectiondirectorymodel.cpp +++ b/src/collection/collectiondirectorymodel.cpp @@ -45,7 +45,7 @@ CollectionDirectoryModel::CollectionDirectoryModel(CollectionBackend *backend, Q } -CollectionDirectoryModel::~CollectionDirectoryModel() {} +CollectionDirectoryModel::~CollectionDirectoryModel() = default; void CollectionDirectoryModel::DirectoryDiscovered(const Directory &dir) { diff --git a/src/collection/collectiondirectorymodel.h b/src/collection/collectiondirectorymodel.h index 6e16363d..a5d352a5 100644 --- a/src/collection/collectiondirectorymodel.h +++ b/src/collection/collectiondirectorymodel.h @@ -43,13 +43,13 @@ class CollectionDirectoryModel : public QStandardItemModel { public: explicit CollectionDirectoryModel(CollectionBackend* backend, QObject *parent = nullptr); - ~CollectionDirectoryModel(); + ~CollectionDirectoryModel() override; // To be called by GUIs void AddDirectory(const QString &path); void RemoveDirectory(const QModelIndex &index); - QVariant data(const QModelIndex &index, int role) const; + QVariant data(const QModelIndex &index, int role) const override; private slots: // To be called by the backend diff --git a/src/collection/collectionfilterwidget.h b/src/collection/collectionfilterwidget.h index 3894dfc6..fd7b5f73 100644 --- a/src/collection/collectionfilterwidget.h +++ b/src/collection/collectionfilterwidget.h @@ -49,7 +49,7 @@ class CollectionFilterWidget : public QWidget { public: explicit CollectionFilterWidget(QWidget *parent = nullptr); - ~CollectionFilterWidget(); + ~CollectionFilterWidget() override; static const int kFilterDelay = 500; // msec @@ -83,14 +83,14 @@ class CollectionFilterWidget : public QWidget { void SetQueryMode(QueryOptions::QueryMode query_mode); void FocusOnFilter(QKeyEvent *e); -signals: + signals: void UpPressed(); void DownPressed(); void ReturnPressed(); void Filter(const QString &text); protected: - void keyReleaseEvent(QKeyEvent *e); + void keyReleaseEvent(QKeyEvent *e) override; private slots: void GroupingChanged(const CollectionModel::Grouping &g); diff --git a/src/collection/collectionitemdelegate.h b/src/collection/collectionitemdelegate.h index f6b9bda6..168f0746 100644 --- a/src/collection/collectionitemdelegate.h +++ b/src/collection/collectionitemdelegate.h @@ -37,10 +37,10 @@ class CollectionItemDelegate : public QStyledItemDelegate { public: explicit CollectionItemDelegate(QObject *parent); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; public slots: - bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index); + bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) override; }; #endif // COLLECTIONITEMDELEGATE_H diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h index 1023de5e..65d90242 100644 --- a/src/collection/collectionmodel.h +++ b/src/collection/collectionmodel.h @@ -64,7 +64,7 @@ class CollectionModel : public SimpleTreeModel { public: explicit CollectionModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr); - ~CollectionModel(); + ~CollectionModel() override; static const char *kSavedGroupingsSettingsGroup; @@ -146,11 +146,11 @@ class CollectionModel : public SimpleTreeModel { int total_album_count() const { return total_album_count_; } // QAbstractItemModel - QVariant data(const QModelIndex &idx, const int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &idx) const; - QStringList mimeTypes() const; - QMimeData *mimeData(const QModelIndexList &indexes) const; - bool canFetchMore(const QModelIndex &parent) const; + QVariant data(const QModelIndex &idx, const int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &idx) const override; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool canFetchMore(const QModelIndex &parent) const override; // Whether or not to use album cover art, if it exists, in the collection view void set_pretty_covers(const bool use_pretty_covers); @@ -199,7 +199,7 @@ class CollectionModel : public SimpleTreeModel { void ResetAsync(); protected: - void LazyPopulate(CollectionItem *item) { LazyPopulate(item, true); } + void LazyPopulate(CollectionItem *item) override { LazyPopulate(item, true); } void LazyPopulate(CollectionItem *parent, const bool signal); private slots: diff --git a/src/collection/collectionplaylistitem.h b/src/collection/collectionplaylistitem.h index b9c6ac7d..b6064b3e 100644 --- a/src/collection/collectionplaylistitem.h +++ b/src/collection/collectionplaylistitem.h @@ -36,25 +36,25 @@ class CollectionPlaylistItem : public PlaylistItem { explicit CollectionPlaylistItem(); explicit CollectionPlaylistItem(const Song &song); - bool InitFromQuery(const SqlRow &query); - void Reload(); + bool InitFromQuery(const SqlRow &query) override; + void Reload() override; - Song Metadata() const; + Song Metadata() const override; void SetMetadata(const Song &song) { song_ = song; } - QUrl Url() const; + QUrl Url() const override; - bool IsLocalCollectionItem() const { return true; } + bool IsLocalCollectionItem() const override { return true; } - void SetArtManual(const QUrl &cover_url); + void SetArtManual(const QUrl &cover_url) override; protected: - QVariant DatabaseValue(DatabaseColumn column) const; - Song DatabaseSongMetadata() const { return Song(Song::Source_Collection); } + QVariant DatabaseValue(DatabaseColumn column) const override; + Song DatabaseSongMetadata() const override { return Song(Song::Source_Collection); } protected: Song song_; }; -#endif // COLLECTIONPLAYLISTITEM_H +#endif // COLLECTIONPLAYLISTITEM_H diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp index 525b80df..4cbc8155 100644 --- a/src/collection/collectionview.cpp +++ b/src/collection/collectionview.cpp @@ -88,7 +88,7 @@ CollectionView::CollectionView(QWidget *parent) } -CollectionView::~CollectionView() {} +CollectionView::~CollectionView() = default; void CollectionView::SaveFocus() { diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h index f7e27487..24675699 100644 --- a/src/collection/collectionview.h +++ b/src/collection/collectionview.h @@ -52,7 +52,7 @@ class CollectionView : public AutoExpandingTreeView { public: explicit CollectionView(QWidget *parent = nullptr); - ~CollectionView(); + ~CollectionView() override; // Returns Songs currently selected in the collection view. // Please note that the selection is recursive meaning that if for example an album is selected this will return all of it's songs. @@ -62,8 +62,8 @@ class CollectionView : public AutoExpandingTreeView { void SetFilter(CollectionFilterWidget *filter); // QTreeView - void keyboardSearch(const QString &search); - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible); + void keyboardSearch(const QString &search) override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; int TotalSongs(); int TotalArtists(); @@ -92,9 +92,9 @@ class CollectionView : public AutoExpandingTreeView { protected: // QWidget - void paintEvent(QPaintEvent *event); - void mouseReleaseEvent(QMouseEvent *e); - void contextMenuEvent(QContextMenuEvent *e); + void paintEvent(QPaintEvent *event) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; private slots: void Load(); diff --git a/src/collection/collectionviewcontainer.h b/src/collection/collectionviewcontainer.h index 6176a660..866bbf75 100644 --- a/src/collection/collectionviewcontainer.h +++ b/src/collection/collectionviewcontainer.h @@ -35,7 +35,7 @@ class CollectionViewContainer : public QWidget { public: explicit CollectionViewContainer(QWidget *parent = nullptr); - ~CollectionViewContainer(); + ~CollectionViewContainer() override; CollectionFilterWidget *filter() const; CollectionView *view() const; diff --git a/src/collection/groupbydialog.cpp b/src/collection/groupbydialog.cpp index 428cdaea..9f465116 100644 --- a/src/collection/groupbydialog.cpp +++ b/src/collection/groupbydialog.cpp @@ -108,7 +108,7 @@ GroupByDialog::GroupByDialog(QWidget *parent) : QDialog(parent), ui_(new Ui_Grou } -GroupByDialog::~GroupByDialog() {} +GroupByDialog::~GroupByDialog() = default; void GroupByDialog::Reset() { ui_->combobox_first->setCurrentIndex(2); // Album Artist diff --git a/src/collection/groupbydialog.h b/src/collection/groupbydialog.h index 6b57c0eb..3d0bcfdd 100644 --- a/src/collection/groupbydialog.h +++ b/src/collection/groupbydialog.h @@ -30,24 +30,24 @@ #include #include "collectionmodel.h" +#include "ui_groupbydialog.h" class QWidget; class GroupByDialogPrivate; -class Ui_GroupByDialog; class GroupByDialog : public QDialog { Q_OBJECT public: explicit GroupByDialog(QWidget *parent = nullptr); - ~GroupByDialog(); + ~GroupByDialog() override; public slots: void CollectionGroupingChanged(const CollectionModel::Grouping &g); - void accept(); + void accept() override; -signals: + signals: void Accepted(const CollectionModel::Grouping &g); private slots: diff --git a/src/collection/savedgroupingmanager.h b/src/collection/savedgroupingmanager.h index a1fee48d..97379ab1 100644 --- a/src/collection/savedgroupingmanager.h +++ b/src/collection/savedgroupingmanager.h @@ -40,7 +40,7 @@ class SavedGroupingManager : public QDialog { public: explicit SavedGroupingManager(QWidget *parent = nullptr); - ~SavedGroupingManager(); + ~SavedGroupingManager() override; void UpdateModel(); void SetFilter(CollectionFilterWidget* filter) { filter_ = filter; } diff --git a/src/context/contextalbum.h b/src/context/contextalbum.h index 7f4c50d6..37aa6225 100644 --- a/src/context/contextalbum.h +++ b/src/context/contextalbum.h @@ -52,9 +52,9 @@ class ContextAlbum : public QWidget { void SetImage(QImage image = QImage()); protected: - void paintEvent(QPaintEvent*); - void contextMenuEvent(QContextMenuEvent *e); - void mouseDoubleClickEvent(QMouseEvent *e); + void paintEvent(QPaintEvent*) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; private: void DrawImage(QPainter *p); diff --git a/src/context/contextalbumsmodel.h b/src/context/contextalbumsmodel.h index 0e4e7c6e..1d69777f 100644 --- a/src/context/contextalbumsmodel.h +++ b/src/context/contextalbumsmodel.h @@ -58,7 +58,7 @@ class ContextAlbumsModel : public SimpleTreeModel { public: explicit ContextAlbumsModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr); - ~ContextAlbumsModel(); + ~ContextAlbumsModel() override; static const int kPrettyCoverSize; @@ -81,11 +81,11 @@ class ContextAlbumsModel : public SimpleTreeModel { SongList GetChildSongs(const QModelIndex &index) const; SongList GetChildSongs(const QModelIndexList &indexes) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - QStringList mimeTypes() const; - QMimeData *mimeData(const QModelIndexList &indexes) const; - bool canFetchMore(const QModelIndex &parent) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool canFetchMore(const QModelIndex &parent) const override; static QString TextOrUnknown(const QString &text); static QString SortText(QString text); @@ -96,7 +96,7 @@ class ContextAlbumsModel : public SimpleTreeModel { void AddSongs(const SongList &songs); protected: - void LazyPopulate(CollectionItem *item) { LazyPopulate(item, true); } + void LazyPopulate(CollectionItem *item) override { LazyPopulate(item, true); } void LazyPopulate(CollectionItem *parent, const bool signal); private slots: diff --git a/src/context/contextalbumsview.cpp b/src/context/contextalbumsview.cpp index ad8212a1..b7916219 100644 --- a/src/context/contextalbumsview.cpp +++ b/src/context/contextalbumsview.cpp @@ -134,7 +134,7 @@ ContextAlbumsView::ContextAlbumsView(QWidget *parent) } -ContextAlbumsView::~ContextAlbumsView() {} +ContextAlbumsView::~ContextAlbumsView() = default; void ContextAlbumsView::SaveFocus() { diff --git a/src/context/contextalbumsview.h b/src/context/contextalbumsview.h index 27d7cf0a..441f22ca 100644 --- a/src/context/contextalbumsview.h +++ b/src/context/contextalbumsview.h @@ -46,9 +46,9 @@ class QMouseEvent; class QPaintEvent; class Application; +class ContextAlbumsModel; class EditTagDialog; class OrganiseDialog; -class ContextAlbumsModel; class ContextItemDelegate : public QStyledItemDelegate { Q_OBJECT @@ -57,7 +57,7 @@ class ContextItemDelegate : public QStyledItemDelegate { explicit ContextItemDelegate(QObject *parent); public slots: - bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index); + bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) override; }; class ContextAlbumsView : public AutoExpandingTreeView { @@ -65,7 +65,7 @@ class ContextAlbumsView : public AutoExpandingTreeView { public: ContextAlbumsView(QWidget *parent = nullptr); - ~ContextAlbumsView(); + ~ContextAlbumsView() override; // Returns Songs currently selected in the collection view. // Please note that the selection is recursive meaning that if for example an album is selected this will return all of it's songs. @@ -74,7 +74,7 @@ class ContextAlbumsView : public AutoExpandingTreeView { void Init(Application *app); // QTreeView - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible); + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; ContextAlbumsModel *albums_model() { return model_; } @@ -84,9 +84,9 @@ class ContextAlbumsView : public AutoExpandingTreeView { protected: // QWidget - void paintEvent(QPaintEvent *event); - void mouseReleaseEvent(QMouseEvent *e); - void contextMenuEvent(QContextMenuEvent *e); + void paintEvent(QPaintEvent *event) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; private slots: void Load(); diff --git a/src/context/contextview.h b/src/context/contextview.h index 7c598cf4..6335b975 100644 --- a/src/context/contextview.h +++ b/src/context/contextview.h @@ -65,10 +65,10 @@ class ContextView : public QWidget { Song song_playing() const { return song_playing_; } protected: - void resizeEvent(QResizeEvent*); - void contextMenuEvent(QContextMenuEvent*); - void dragEnterEvent(QDragEnterEvent*); - void dropEvent(QDropEvent*); + void resizeEvent(QResizeEvent*) override; + void contextMenuEvent(QContextMenuEvent*) override; + void dragEnterEvent(QDragEnterEvent*) override; + void dropEvent(QDropEvent*) override; private: void AddActions(); diff --git a/src/core/application.h b/src/core/application.h index 040504b6..556ea0e9 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -67,7 +67,7 @@ class Application : public QObject { public: explicit Application(QObject *parent = nullptr); - ~Application(); + ~Application() override; TagReaderClient *tag_reader_client() const; Database *database() const; diff --git a/src/core/database.h b/src/core/database.h index a28acb96..8cd3eb2f 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -43,7 +43,7 @@ class Database : public QObject { public: explicit Database(Application *app, QObject *parent = nullptr, const QString &database_name = QString()); - ~Database(); + ~Database() override; struct AttachedDatabase { AttachedDatabase() {} @@ -131,7 +131,7 @@ class MemoryDatabase : public Database { public: MemoryDatabase(Application *app, QObject *parent = nullptr) : Database(app, parent, ":memory:") {} - ~MemoryDatabase() { + ~MemoryDatabase() override { // Make sure Qt doesn't reuse the same database QSqlDatabase::removeDatabase(Connect().connectionName()); } diff --git a/src/core/dbusscreensaver.h b/src/core/dbusscreensaver.h index 39d1b214..76f92f94 100644 --- a/src/core/dbusscreensaver.h +++ b/src/core/dbusscreensaver.h @@ -32,8 +32,8 @@ class DBusScreensaver : public Screensaver { public: explicit DBusScreensaver(const QString &service, const QString &path, const QString &interface); - void Inhibit(); - void Uninhibit(); + void Inhibit() override; + void Uninhibit() override; private: QString service_; diff --git a/src/core/deletefiles.cpp b/src/core/deletefiles.cpp index f4c2e8f8..cbe3a60e 100644 --- a/src/core/deletefiles.cpp +++ b/src/core/deletefiles.cpp @@ -44,7 +44,7 @@ DeleteFiles::DeleteFiles(TaskManager *task_manager, std::shared_ptr storage); - ~DeleteFiles(); + ~DeleteFiles() override; static const int kBatchSize; diff --git a/src/core/filesystemmusicstorage.h b/src/core/filesystemmusicstorage.h index 95921d30..a6c43e63 100644 --- a/src/core/filesystemmusicstorage.h +++ b/src/core/filesystemmusicstorage.h @@ -31,12 +31,11 @@ class FilesystemMusicStorage : public virtual MusicStorage { public: explicit FilesystemMusicStorage(const QString &root); - ~FilesystemMusicStorage() {} - QString LocalPath() const { return root_; } + QString LocalPath() const override { return root_; } - bool CopyToStorage(const CopyJob &job); - bool DeleteFromStorage(const DeleteJob &job); + bool CopyToStorage(const CopyJob &job) override; + bool DeleteFromStorage(const DeleteJob &job) override; private: QString root_; diff --git a/src/core/filesystemwatcherinterface.h b/src/core/filesystemwatcherinterface.h index b595a2ff..3aa9463d 100644 --- a/src/core/filesystemwatcherinterface.h +++ b/src/core/filesystemwatcherinterface.h @@ -28,8 +28,10 @@ class FileSystemWatcherInterface : public QObject { Q_OBJECT + public: explicit FileSystemWatcherInterface(QObject *parent = nullptr); + virtual void Init() {} virtual void AddPath(const QString &path) = 0; virtual void RemovePath(const QString &path) = 0; @@ -37,7 +39,7 @@ class FileSystemWatcherInterface : public QObject { static FileSystemWatcherInterface *Create(QObject *parent = nullptr); -signals: + signals: void PathChanged(const QString &path); }; diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h index 330e3506..db690eb8 100644 --- a/src/core/mainwindow.h +++ b/src/core/mainwindow.h @@ -101,7 +101,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { public: explicit MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, const CommandlineOptions& options, QWidget *parent = nullptr); - ~MainWindow(); + ~MainWindow() override; static const char *kSettingsGroup; static const char *kAllFilesFilterSpec; @@ -117,13 +117,13 @@ class MainWindow : public QMainWindow, public PlatformInterface { void CommandlineOptionsReceived(const CommandlineOptions& options); protected: - void keyPressEvent(QKeyEvent *event); - void closeEvent(QCloseEvent *event); - bool nativeEvent(const QByteArray &eventType, void *message, long *result); + void keyPressEvent(QKeyEvent *event) override; + void closeEvent(QCloseEvent *event) override; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; // PlatformInterface - void Activate(); - bool LoadUrl(const QString& url); + void Activate() override; + bool LoadUrl(const QString& url) override; signals: void AlbumCoverReady(const Song &song, const QImage &image); diff --git a/src/core/mergedproxymodel.h b/src/core/mergedproxymodel.h index 991424ac..1be8a93a 100644 --- a/src/core/mergedproxymodel.h +++ b/src/core/mergedproxymodel.h @@ -45,7 +45,7 @@ class MergedProxyModel : public QAbstractProxyModel { public: explicit MergedProxyModel(QObject *parent = nullptr); - ~MergedProxyModel(); + ~MergedProxyModel() override; // Make another model appear as a child of the given item in the source model. void AddSubModel(const QModelIndex &source_parent, QAbstractItemModel *submodel); @@ -56,33 +56,33 @@ class MergedProxyModel : public QAbstractProxyModel { QModelIndex FindSourceParent(const QModelIndex &proxy_index) const; // QAbstractItemModel - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &child) const; - int rowCount(const QModelIndex &parent) const; - int columnCount(const QModelIndex &parent) const; - QVariant data(const QModelIndex &proxy_index, int role = Qt::DisplayRole) const; - bool hasChildren(const QModelIndex &parent) const; - QMap itemData(const QModelIndex &proxy_index) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - bool setData(const QModelIndex &index, const QVariant &value, int role); - QStringList mimeTypes() const; - QMimeData *mimeData(const QModelIndexList &indexes) const; - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); - bool canFetchMore(const QModelIndex &parent) const; - void fetchMore(const QModelIndex &parent); + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; + QVariant data(const QModelIndex &proxy_index, int role = Qt::DisplayRole) const override; + bool hasChildren(const QModelIndex &parent) const override; + QMap itemData(const QModelIndex &proxy_index) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role) override; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; + bool canFetchMore(const QModelIndex &parent) const override; + void fetchMore(const QModelIndex &parent) override; // QAbstractProxyModel // Note that these implementations of map{To,From}Source will not always give you an index in sourceModel(), // you might get an index in one of the child models instead. - QModelIndex mapFromSource(const QModelIndex &source_index) const; - QModelIndex mapToSource(const QModelIndex &proxy_index) const; - void setSourceModel(QAbstractItemModel *source_model); + QModelIndex mapFromSource(const QModelIndex &source_index) const override; + QModelIndex mapToSource(const QModelIndex &proxy_index) const override; + void setSourceModel(QAbstractItemModel *source_model) override; // Convenience functions that call map{To,From}Source multiple times. QModelIndexList mapFromSource(const QModelIndexList &source_indexes) const; QModelIndexList mapToSource(const QModelIndexList &proxy_indexes) const; -signals: + signals: void SubModelReset(const QModelIndex &root, QAbstractItemModel *model); private slots: diff --git a/src/core/multisortfilterproxy.h b/src/core/multisortfilterproxy.h index 9d36b92d..5a36b4da 100644 --- a/src/core/multisortfilterproxy.h +++ b/src/core/multisortfilterproxy.h @@ -37,7 +37,7 @@ class MultiSortFilterProxy : public QSortFilterProxyModel { void AddSortSpec(int role, Qt::SortOrder order = Qt::AscendingOrder); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; private: int Compare(const QVariant &left, const QVariant &right) const; diff --git a/src/core/musicstorage.cpp b/src/core/musicstorage.cpp index 16dc284c..dcfd0944 100644 --- a/src/core/musicstorage.cpp +++ b/src/core/musicstorage.cpp @@ -20,4 +20,4 @@ #include "musicstorage.h" -MusicStorage::MusicStorage() {} +MusicStorage::MusicStorage() = default; diff --git a/src/core/musicstorage.h b/src/core/musicstorage.h index 6846c443..d4043803 100644 --- a/src/core/musicstorage.h +++ b/src/core/musicstorage.h @@ -37,7 +37,7 @@ class MusicStorage { public: explicit MusicStorage(); - virtual ~MusicStorage() {} + virtual ~MusicStorage() = default; enum Role { Role_Storage = Qt::UserRole + 100, diff --git a/src/core/network.h b/src/core/network.h index be685ebc..f0ed74fe 100644 --- a/src/core/network.h +++ b/src/core/network.h @@ -44,23 +44,23 @@ class NetworkAccessManager : public QNetworkAccessManager { explicit NetworkAccessManager(QObject *parent = nullptr); protected: - QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData); + QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) override; }; class ThreadSafeNetworkDiskCache : public QAbstractNetworkCache { public: explicit ThreadSafeNetworkDiskCache(QObject *parent); - ~ThreadSafeNetworkDiskCache(); + ~ThreadSafeNetworkDiskCache() override; - qint64 cacheSize() const; - QIODevice *data(const QUrl &url); - void insert(QIODevice *device); - QNetworkCacheMetaData metaData(const QUrl &url); - QIODevice *prepare(const QNetworkCacheMetaData &metaData); - bool remove(const QUrl &url); - void updateMetaData(const QNetworkCacheMetaData &metaData); + qint64 cacheSize() const override; + QIODevice *data(const QUrl &url) override; + void insert(QIODevice *device) override; + QNetworkCacheMetaData metaData(const QUrl &url) override; + QIODevice *prepare(const QNetworkCacheMetaData &metaData) override; + bool remove(const QUrl &url) override; + void updateMetaData(const QNetworkCacheMetaData &metaData) override; - void clear(); + void clear() override; private: static QMutex sMutex; diff --git a/src/core/networkproxyfactory.h b/src/core/networkproxyfactory.h index c3cd3623..437357f6 100644 --- a/src/core/networkproxyfactory.h +++ b/src/core/networkproxyfactory.h @@ -41,7 +41,7 @@ class NetworkProxyFactory : public QNetworkProxyFactory { // These methods are thread-safe void ReloadSettings(); - QList queryProxy(const QNetworkProxyQuery &query); + QList queryProxy(const QNetworkProxyQuery &query) override; private: explicit NetworkProxyFactory(); diff --git a/src/core/networktimeouts.h b/src/core/networktimeouts.h index 584c24ca..740cdead 100644 --- a/src/core/networktimeouts.h +++ b/src/core/networktimeouts.h @@ -40,7 +40,7 @@ class NetworkTimeouts : public QObject { void SetTimeout(int msec) { timeout_msec_ = msec; } protected: - void timerEvent(QTimerEvent *e); + void timerEvent(QTimerEvent *e) override; private slots: void ReplyFinished(); diff --git a/src/core/player.h b/src/core/player.h index 02d59ec8..ae27155a 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -130,23 +130,23 @@ class Player : public PlayerInterface { Q_OBJECT public: - Player(Application *app, QObject *parent); - ~Player(); + explicit Player(Application *app, QObject *parent); + ~Player() override; static const char *kSettingsGroup; Engine::EngineType CreateEngine(Engine::EngineType enginetype); void Init(); - EngineBase *engine() const { return engine_.get(); } - Engine::State GetState() const { return last_state_; } - int GetVolume() const; + EngineBase *engine() const override { return engine_.get(); } + Engine::State GetState() const override{ return last_state_; } + int GetVolume() const override; - PlaylistItemPtr GetCurrentItem() const { return current_item_; } - PlaylistItemPtr GetItemAt(int pos) const; + PlaylistItemPtr GetCurrentItem() const override { return current_item_; } + PlaylistItemPtr GetItemAt(int pos) const override; - void RegisterUrlHandler(UrlHandler *handler); - void UnregisterUrlHandler(UrlHandler *handler); + void RegisterUrlHandler(UrlHandler *handler) override; + void UnregisterUrlHandler(UrlHandler *handler) override; const UrlHandler *HandlerForUrl(const QUrl &url) const; @@ -156,29 +156,29 @@ class Player : public PlayerInterface { void SetEqualizer(Equalizer *equalizer) { equalizer_ = equalizer; } public slots: - void ReloadSettings(); + void ReloadSettings() override; - void PlayAt(int i, Engine::TrackChangeFlags change, bool reshuffle); - void PlayPause(); - void RestartOrPrevious(); - void Next(); - void Previous(); - void SetVolume(int value); - void VolumeUp() { SetVolume(GetVolume() + 5); } - void VolumeDown() { SetVolume(GetVolume() - 5); } - void SeekTo(int seconds); - void SeekForward(); - void SeekBackward(); + void PlayAt(int i, Engine::TrackChangeFlags change, bool reshuffle) override; + void PlayPause() override; + void RestartOrPrevious() override; + void Next() override; + void Previous() override; + void SetVolume(int value) override; + void VolumeUp() override { SetVolume(GetVolume() + 5); } + void VolumeDown() override { SetVolume(GetVolume() - 5); } + void SeekTo(int seconds) override; + void SeekForward() override; + void SeekBackward() override; - void CurrentMetadataChanged(const Song &metadata); + void CurrentMetadataChanged(const Song &metadata) override; - void Mute(); - void Pause(); - void Stop(bool stop_after = false); + void Mute() override; + void Pause() override; + void Stop(bool stop_after = false) override; void StopAfterCurrent(); void IntroPointReached(); - void Play(); - void ShowOSD(); + void Play() override; + void ShowOSD() override; void TogglePrettyOSD(); void HandleAuthentication(); diff --git a/src/core/potranslator.h b/src/core/potranslator.h index e8fa97b5..7298ba95 100644 --- a/src/core/potranslator.h +++ b/src/core/potranslator.h @@ -28,7 +28,7 @@ class PoTranslator : public QTranslator { public: - QString translate(const char *context, const char *source_text, const char *disambiguation = 0, int n = -1) const { + QString translate(const char *context, const char *source_text, const char *disambiguation = 0, int n = -1) const override { Q_UNUSED(n); QString ret = QTranslator::translate(context, source_text, disambiguation); if (!ret.isEmpty()) return ret; diff --git a/src/core/qtfslistener.h b/src/core/qtfslistener.h index e64ac715..15fa12a6 100644 --- a/src/core/qtfslistener.h +++ b/src/core/qtfslistener.h @@ -31,11 +31,12 @@ class QtFSListener : public FileSystemWatcherInterface { Q_OBJECT + public: explicit QtFSListener(QObject *parent); - virtual void AddPath(const QString &path); - virtual void RemovePath(const QString &path); - virtual void Clear(); + void AddPath(const QString &path) override; + void RemovePath(const QString &path) override; + void Clear() override; private: QFileSystemWatcher watcher_; diff --git a/src/core/qtsystemtrayicon.h b/src/core/qtsystemtrayicon.h index fc426c5f..a068ad71 100644 --- a/src/core/qtsystemtrayicon.h +++ b/src/core/qtsystemtrayicon.h @@ -44,32 +44,32 @@ class QtSystemTrayIcon : public SystemTrayIcon { public: QtSystemTrayIcon(QObject *parent = nullptr); - ~QtSystemTrayIcon(); + ~QtSystemTrayIcon() override; - void SetupMenu(QAction *previous, QAction *play, QAction *stop, QAction *stop_after, QAction *next, QAction *mute, QAction *love, QAction *quit); - bool IsVisible() const; - void SetVisible(bool visible); + void SetupMenu(QAction *previous, QAction *play, QAction *stop, QAction *stop_after, QAction *next, QAction *mute, QAction *love, QAction *quit) override; + bool IsVisible() const override; + void SetVisible(bool visible) override; - void ShowPopup(const QString &summary, const QString &message, int timeout); + void ShowPopup(const QString &summary, const QString &message, int timeout) override; - void SetNowPlaying(const Song &song, const QUrl &cover_url); - void ClearNowPlaying(); + void SetNowPlaying(const Song &song, const QUrl &cover_url) override; + void ClearNowPlaying() override; - bool MuteEnabled() { return action_mute_->isVisible(); } - void SetMuteEnabled(bool enabled) { action_mute_->setVisible(enabled); } + bool MuteEnabled() const override { return action_mute_->isVisible(); } + void SetMuteEnabled(bool enabled) override { action_mute_->setVisible(enabled); } protected: // SystemTrayIcon - void UpdateIcon(); - void SetPaused(); - void SetPlaying(bool enable_play_pause = false); - void SetStopped(); - void MuteButtonStateChanged(bool value); - void LoveVisibilityChanged(bool value); - void LoveStateChanged(bool value); + void UpdateIcon() override; + void SetPaused() override; + void SetPlaying(bool enable_play_pause = false) override; + void SetStopped() override; + void MuteButtonStateChanged(bool value) override; + void LoveVisibilityChanged(bool value) override; + void LoveStateChanged(bool value) override; // QObject - bool eventFilter(QObject *, QEvent *); + bool eventFilter(QObject*, QEvent*) override; private slots: void Clicked(QSystemTrayIcon::ActivationReason); diff --git a/src/core/settingsprovider.h b/src/core/settingsprovider.h index 2187b10b..98653888 100644 --- a/src/core/settingsprovider.h +++ b/src/core/settingsprovider.h @@ -46,17 +46,17 @@ class DefaultSettingsProvider : public SettingsProvider { public: DefaultSettingsProvider(); - void set_group(const char* group); + void set_group(const char* group) override; - QVariant value(const QString &key, const QVariant &default_value = QVariant()) const; - void setValue(const QString &key, const QVariant &value); - int beginReadArray(const QString &prefix); - void beginWriteArray(const QString &prefix, int size = -1); - void setArrayIndex(int i); - void endArray(); + QVariant value(const QString &key, const QVariant &default_value = QVariant()) const override; + void setValue(const QString &key, const QVariant &value) override; + int beginReadArray(const QString &prefix) override; + void beginWriteArray(const QString &prefix, int size = -1) override; + void setArrayIndex(int i) override; + void endArray() override; private: QSettings backend_; }; -#endif // SETTINGSPROVIDER_H +#endif // SETTINGSPROVIDER_H diff --git a/src/core/simpletreemodel.h b/src/core/simpletreemodel.h index 002d85ec..f876070d 100644 --- a/src/core/simpletreemodel.h +++ b/src/core/simpletreemodel.h @@ -29,17 +29,17 @@ template class SimpleTreeModel : public QAbstractItemModel { public: - explicit SimpleTreeModel(T *root = 0, QObject *parent = nullptr); - virtual ~SimpleTreeModel() {} + explicit SimpleTreeModel(T *root = nullptr, QObject *parent = nullptr); + ~SimpleTreeModel() override {} // QAbstractItemModel - int columnCount(const QModelIndex &parent) const; - QModelIndex index(int row, int, const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &index) const; - int rowCount(const QModelIndex &parent) const; - bool hasChildren(const QModelIndex &parent) const; - bool canFetchMore(const QModelIndex &parent) const; - void fetchMore(const QModelIndex &parent); + int columnCount(const QModelIndex &parent) const override; + QModelIndex index(int row, int, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent) const override; + bool hasChildren(const QModelIndex &parent) const override; + bool canFetchMore(const QModelIndex &parent) const override; + void fetchMore(const QModelIndex &parent) override; T *IndexToItem(const QModelIndex &index) const; QModelIndex ItemToIndex(T *item) const; diff --git a/src/core/songloader.h b/src/core/songloader.h index fc2313bd..8a8d8d5d 100644 --- a/src/core/songloader.h +++ b/src/core/songloader.h @@ -58,7 +58,7 @@ class SongLoader : public QObject { Q_OBJECT public: explicit SongLoader(CollectionBackendInterface *collection, const Player *player, QObject *parent = nullptr); - ~SongLoader(); + ~SongLoader() override; enum Result { Success, diff --git a/src/core/stylesheetloader.h b/src/core/stylesheetloader.h index cf1eee41..367f6548 100644 --- a/src/core/stylesheetloader.h +++ b/src/core/stylesheetloader.h @@ -46,7 +46,7 @@ class StyleSheetLoader : public QObject { void SetStyleSheet(QWidget *widget, const QString& filename); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: struct StyleSheetData { diff --git a/src/core/systemtrayicon.h b/src/core/systemtrayicon.h index b6ae8279..2976d57b 100644 --- a/src/core/systemtrayicon.h +++ b/src/core/systemtrayicon.h @@ -50,7 +50,7 @@ class SystemTrayIcon : public QObject { virtual void SetNowPlaying(const Song &song, const QUrl &cover_url) { Q_UNUSED(song); Q_UNUSED(cover_url); } virtual void ClearNowPlaying() {} - virtual bool MuteEnabled() { return false; } + virtual bool MuteEnabled() const { return false; } virtual void SetMuteEnabled(bool enabled) { Q_UNUSED(enabled); } static SystemTrayIcon *CreateSystemTrayIcon(QObject *parent = nullptr); diff --git a/src/core/thread.h b/src/core/thread.h index 6bf8cfc5..89ffbf5f 100644 --- a/src/core/thread.h +++ b/src/core/thread.h @@ -34,7 +34,7 @@ class Thread : public QThread { void SetIoPriority(Utilities::IoPriority priority) { io_priority_ = priority; } - virtual void run() override; + void run() override; private: Utilities::IoPriority io_priority_; diff --git a/src/core/translations.h b/src/core/translations.h index d280c369..651c86ab 100644 --- a/src/core/translations.h +++ b/src/core/translations.h @@ -28,7 +28,7 @@ class QTranslator; class Translations : public QObject { public: explicit Translations(); - ~Translations(); + ~Translations() override; void LoadTranslation(const QString &prefix, const QString &path, const QString &language); private: diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h index 8900e59d..e983d8b7 100644 --- a/src/covermanager/albumcoverchoicecontroller.h +++ b/src/covermanager/albumcoverchoicecontroller.h @@ -58,7 +58,7 @@ class AlbumCoverChoiceController : public QWidget { static const char *kAllFilesFilter; explicit AlbumCoverChoiceController(QWidget *parent = nullptr); - ~AlbumCoverChoiceController(); + ~AlbumCoverChoiceController() override; void Init(Application *app); void ReloadSettings(); diff --git a/src/covermanager/albumcoverexport.h b/src/covermanager/albumcoverexport.h index b603a7b1..ef3ada79 100644 --- a/src/covermanager/albumcoverexport.h +++ b/src/covermanager/albumcoverexport.h @@ -36,7 +36,7 @@ class AlbumCoverExport : public QDialog { public: explicit AlbumCoverExport(QWidget *parent = nullptr); - ~AlbumCoverExport(); + ~AlbumCoverExport() override; enum OverwriteMode { OverwriteMode_None = 0, diff --git a/src/covermanager/albumcoverexporter.h b/src/covermanager/albumcoverexporter.h index b4325249..19f53e46 100644 --- a/src/covermanager/albumcoverexporter.h +++ b/src/covermanager/albumcoverexporter.h @@ -38,7 +38,6 @@ class AlbumCoverExporter : public QObject { public: explicit AlbumCoverExporter(QObject *parent = nullptr); - virtual ~AlbumCoverExporter() {} static const int kMaxConcurrentRequests; diff --git a/src/covermanager/albumcoverfetcher.h b/src/covermanager/albumcoverfetcher.h index ae670bf1..85810da1 100644 --- a/src/covermanager/albumcoverfetcher.h +++ b/src/covermanager/albumcoverfetcher.h @@ -89,7 +89,7 @@ class AlbumCoverFetcher : public QObject { public: explicit AlbumCoverFetcher(CoverProviders *cover_providers, QObject *parent = nullptr, QNetworkAccessManager *network = 0); - ~AlbumCoverFetcher(); + ~AlbumCoverFetcher() override; static const int kMaxConcurrentRequests; diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h index e98d451b..560e4797 100644 --- a/src/covermanager/albumcoverfetchersearch.h +++ b/src/covermanager/albumcoverfetchersearch.h @@ -50,7 +50,7 @@ class AlbumCoverFetcherSearch : public QObject { public: explicit AlbumCoverFetcherSearch(const CoverSearchRequest &request, QNetworkAccessManager *network, QObject *parent); - ~AlbumCoverFetcherSearch(); + ~AlbumCoverFetcherSearch() override; void Start(CoverProviders *cover_providers); diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h index 6b9badb6..ac63a3c1 100644 --- a/src/covermanager/albumcovermanager.h +++ b/src/covermanager/albumcovermanager.h @@ -64,7 +64,7 @@ class AlbumCoverManager : public QMainWindow { Q_OBJECT public: explicit AlbumCoverManager(Application *app, CollectionBackend *collection_backend, QMainWindow *mainwindow, QWidget *parent = nullptr); - ~AlbumCoverManager(); + ~AlbumCoverManager() override; static const char *kSettingsGroup; @@ -83,11 +83,11 @@ class AlbumCoverManager : public QMainWindow { SongMimeData *GetMimeDataForAlbums(const QModelIndexList &indexes) const; protected: - void showEvent(QShowEvent*); - void closeEvent(QCloseEvent*); + void showEvent(QShowEvent*) override; + void closeEvent(QCloseEvent*) override; // For the album view context menu events - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: enum ArtistItemType { diff --git a/src/covermanager/albumcovermanagerlist.h b/src/covermanager/albumcovermanagerlist.h index 50ec81a0..1201e156 100644 --- a/src/covermanager/albumcovermanagerlist.h +++ b/src/covermanager/albumcovermanagerlist.h @@ -43,8 +43,8 @@ class AlbumCoverManagerList : public QListWidget { void set_cover_manager(AlbumCoverManager *manager) { manager_ = manager; } protected: - QMimeData *mimeData(const QList items) const; - void dropEvent(QDropEvent *event); + QMimeData *mimeData(const QList items) const override; + void dropEvent(QDropEvent *event) override; private: AlbumCoverManager* manager_; diff --git a/src/covermanager/albumcoversearcher.h b/src/covermanager/albumcoversearcher.h index a959c649..9241c259 100644 --- a/src/covermanager/albumcoversearcher.h +++ b/src/covermanager/albumcoversearcher.h @@ -60,7 +60,7 @@ class SizeOverlayDelegate : public QStyledItemDelegate { explicit SizeOverlayDelegate(QObject *parent = nullptr); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; // This is a dialog that lets the user search for album covers @@ -69,7 +69,7 @@ class AlbumCoverSearcher : public QDialog { public: explicit AlbumCoverSearcher(const QIcon &no_cover_icon, Application *app, QWidget *parent); - ~AlbumCoverSearcher(); + ~AlbumCoverSearcher() override; enum Role { Role_ImageURL = Qt::UserRole + 1, @@ -84,7 +84,7 @@ class AlbumCoverSearcher : public QDialog { QImage Exec(const QString &artist, const QString &album); protected: - void keyPressEvent(QKeyEvent*); + void keyPressEvent(QKeyEvent*) override; private slots: void Search(); diff --git a/src/covermanager/coverexportrunnable.h b/src/covermanager/coverexportrunnable.h index d6a5acc5..d2674f84 100644 --- a/src/covermanager/coverexportrunnable.h +++ b/src/covermanager/coverexportrunnable.h @@ -35,11 +35,10 @@ class CoverExportRunnable : public QObject, public QRunnable { public: explicit CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song); - virtual ~CoverExportRunnable() {} - void run(); + void run() override; -signals: + signals: void CoverExported(); void CoverSkipped(); diff --git a/src/covermanager/coverfromurldialog.h b/src/covermanager/coverfromurldialog.h index c5142e49..79d3d61f 100644 --- a/src/covermanager/coverfromurldialog.h +++ b/src/covermanager/coverfromurldialog.h @@ -39,13 +39,13 @@ class CoverFromURLDialog : public QDialog { public: explicit CoverFromURLDialog(QWidget *parent = nullptr); - ~CoverFromURLDialog(); + ~CoverFromURLDialog() override; // Opens the dialog. This returns an image found at the URL chosen by user or null image if the dialog got rejected. QImage Exec(); private slots: - void accept(); + void accept() override; void LoadCoverFromURLFinished(); private: diff --git a/src/covermanager/coverproviders.h b/src/covermanager/coverproviders.h index 2edb7055..8fde8f3a 100644 --- a/src/covermanager/coverproviders.h +++ b/src/covermanager/coverproviders.h @@ -41,7 +41,7 @@ class CoverProviders : public QObject { public: explicit CoverProviders(QObject *parent = nullptr); - ~CoverProviders(); + ~CoverProviders() override; void ReloadSettings(); diff --git a/src/covermanager/coversearchstatisticsdialog.h b/src/covermanager/coversearchstatisticsdialog.h index 10546934..2b5bf002 100644 --- a/src/covermanager/coversearchstatisticsdialog.h +++ b/src/covermanager/coversearchstatisticsdialog.h @@ -38,7 +38,7 @@ class CoverSearchStatisticsDialog : public QDialog { public: explicit CoverSearchStatisticsDialog(QWidget *parent = nullptr); - ~CoverSearchStatisticsDialog(); + ~CoverSearchStatisticsDialog() override; void Show(const CoverSearchStatistics& statistics); diff --git a/src/covermanager/currentalbumcoverloader.h b/src/covermanager/currentalbumcoverloader.h index eebd6507..6805bb26 100644 --- a/src/covermanager/currentalbumcoverloader.h +++ b/src/covermanager/currentalbumcoverloader.h @@ -43,7 +43,7 @@ class CurrentAlbumCoverLoader : public QObject { public: explicit CurrentAlbumCoverLoader(Application *app, QObject *parent = nullptr); - ~CurrentAlbumCoverLoader(); + ~CurrentAlbumCoverLoader() override; const AlbumCoverLoaderOptions &options() const { return options_; } const Song &last_song() const { return last_song_; } diff --git a/src/covermanager/deezercoverprovider.h b/src/covermanager/deezercoverprovider.h index 2a386dd7..6016ac17 100644 --- a/src/covermanager/deezercoverprovider.h +++ b/src/covermanager/deezercoverprovider.h @@ -41,10 +41,10 @@ class DeezerCoverProvider : public JsonCoverProvider { public: explicit DeezerCoverProvider(Application *app, QObject *parent = nullptr); - ~DeezerCoverProvider(); + ~DeezerCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); - void CancelSearch(const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; + void CancelSearch(const int id) override; private slots: void HandleSearchReply(QNetworkReply *reply, const int id); @@ -52,7 +52,7 @@ class DeezerCoverProvider : public JsonCoverProvider { private: QByteArray GetReplyData(QNetworkReply *reply); QJsonValue ExtractData(const QByteArray &data); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private: static const char *kApiUrl; diff --git a/src/covermanager/discogscoverprovider.h b/src/covermanager/discogscoverprovider.h index b5c60c32..dfb189f1 100644 --- a/src/covermanager/discogscoverprovider.h +++ b/src/covermanager/discogscoverprovider.h @@ -50,10 +50,10 @@ class DiscogsCoverProvider : public JsonCoverProvider { public: explicit DiscogsCoverProvider(Application *app, QObject *parent = nullptr); - ~DiscogsCoverProvider(); + ~DiscogsCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); - void CancelSearch(const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; + void CancelSearch(const int id) override; enum DiscogsCoverType { DiscogsCoverType_Master, @@ -86,7 +86,7 @@ class DiscogsCoverProvider : public JsonCoverProvider { QByteArray GetReplyData(QNetworkReply *reply); void StartReleaseRequest(std::shared_ptr search, const quint64 release_id, const QUrl &url); void EndSearch(std::shared_ptr search, const quint64 release_id = 0); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private slots: void FlushRequests(); diff --git a/src/covermanager/lastfmcoverprovider.h b/src/covermanager/lastfmcoverprovider.h index 60ceff3a..482cf6a7 100644 --- a/src/covermanager/lastfmcoverprovider.h +++ b/src/covermanager/lastfmcoverprovider.h @@ -40,9 +40,9 @@ class LastFmCoverProvider : public JsonCoverProvider { public: explicit LastFmCoverProvider(Application *app, QObject *parent = nullptr); - ~LastFmCoverProvider(); + ~LastFmCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; private slots: void QueryFinished(QNetworkReply *reply, const int id, const QString &type); @@ -58,7 +58,7 @@ class LastFmCoverProvider : public JsonCoverProvider { QByteArray GetReplyData(QNetworkReply *reply); LastFmImageSize ImageSizeFromString(const QString &size); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private: static const char *kUrl; diff --git a/src/covermanager/musicbrainzcoverprovider.h b/src/covermanager/musicbrainzcoverprovider.h index 2aceb8c5..a7fc68e4 100644 --- a/src/covermanager/musicbrainzcoverprovider.h +++ b/src/covermanager/musicbrainzcoverprovider.h @@ -42,9 +42,9 @@ class MusicbrainzCoverProvider : public JsonCoverProvider { public: explicit MusicbrainzCoverProvider(Application *app, QObject *parent = nullptr); - ~MusicbrainzCoverProvider(); + ~MusicbrainzCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; private slots: void FlushRequests(); @@ -60,7 +60,7 @@ class MusicbrainzCoverProvider : public JsonCoverProvider { void SendSearchRequest(const SearchRequest &request); QByteArray GetReplyData(QNetworkReply *reply); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private: static const char *kReleaseSearchUrl; diff --git a/src/covermanager/musixmatchcoverprovider.h b/src/covermanager/musixmatchcoverprovider.h index 8c39cd4b..c75a91fb 100644 --- a/src/covermanager/musixmatchcoverprovider.h +++ b/src/covermanager/musixmatchcoverprovider.h @@ -38,13 +38,13 @@ class MusixmatchCoverProvider : public JsonCoverProvider { public: explicit MusixmatchCoverProvider(Application *app, QObject *parent = nullptr); - ~MusixmatchCoverProvider(); + ~MusixmatchCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); - void CancelSearch(const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; + void CancelSearch(const int id) override; private: - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private slots: void HandleSearchReply(QNetworkReply *reply, const int id, const QString &artist, const QString &album); diff --git a/src/covermanager/qobuzcoverprovider.h b/src/covermanager/qobuzcoverprovider.h index 8232be56..8b7364eb 100644 --- a/src/covermanager/qobuzcoverprovider.h +++ b/src/covermanager/qobuzcoverprovider.h @@ -40,17 +40,17 @@ class QobuzCoverProvider : public JsonCoverProvider { public: explicit QobuzCoverProvider(Application *app, QObject *parent = nullptr); - ~QobuzCoverProvider(); + ~QobuzCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); - void CancelSearch(const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; + void CancelSearch(const int id) override; private slots: void HandleSearchReply(QNetworkReply *reply, const int id); private: QByteArray GetReplyData(QNetworkReply *reply); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private: static const char *kApiUrl; diff --git a/src/covermanager/spotifycoverprovider.h b/src/covermanager/spotifycoverprovider.h index 5f818076..822f1f9a 100644 --- a/src/covermanager/spotifycoverprovider.h +++ b/src/covermanager/spotifycoverprovider.h @@ -46,14 +46,14 @@ class SpotifyCoverProvider : public JsonCoverProvider { public: explicit SpotifyCoverProvider(Application *app, QObject *parent = nullptr); - ~SpotifyCoverProvider(); + ~SpotifyCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); - void CancelSearch(const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; + void CancelSearch(const int id) override; - void Authenticate(); - void Deauthenticate(); - bool IsAuthenticated() const { return !access_token_.isEmpty(); } + void Authenticate() override; + void Deauthenticate() override; + bool IsAuthenticated() const override { return !access_token_.isEmpty(); } private slots: void HandleLoginSSLErrors(QList ssl_errors); @@ -65,7 +65,7 @@ class SpotifyCoverProvider : public JsonCoverProvider { private: QByteArray GetReplyData(QNetworkReply *reply); void AuthError(const QString &error = QString(), const QVariant &debug = QVariant()); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private: typedef QPair Param; diff --git a/src/covermanager/tidalcoverprovider.h b/src/covermanager/tidalcoverprovider.h index bc960c30..b876d683 100644 --- a/src/covermanager/tidalcoverprovider.h +++ b/src/covermanager/tidalcoverprovider.h @@ -44,20 +44,20 @@ class TidalCoverProvider : public JsonCoverProvider { public: explicit TidalCoverProvider(Application *app, QObject *parent = nullptr); - ~TidalCoverProvider(); + ~TidalCoverProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id); - void CancelSearch(const int id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; + void CancelSearch(const int id) override; - bool IsAuthenticated() const { return service_ && service_->authenticated(); } - void Deauthenticate() { if (service_) service_->Logout(); } + bool IsAuthenticated() const override { return service_ && service_->authenticated(); } + void Deauthenticate() override { if (service_) service_->Logout(); } private slots: void HandleSearchReply(QNetworkReply *reply, const int id); private: QByteArray GetReplyData(QNetworkReply *reply); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private: static const char *kApiUrl; diff --git a/src/device/cddadevice.cpp b/src/device/cddadevice.cpp index 9d83e108..3b042257 100644 --- a/src/device/cddadevice.cpp +++ b/src/device/cddadevice.cpp @@ -42,8 +42,6 @@ CddaDevice::CddaDevice(const QUrl &url, DeviceLister *lister, const QString &uni } -CddaDevice::~CddaDevice() {} - bool CddaDevice::Init() { song_count_ = 0; // Reset song count, in case it was already set diff --git a/src/device/cddadevice.h b/src/device/cddadevice.h index 2f3af86d..2cdc5924 100644 --- a/src/device/cddadevice.h +++ b/src/device/cddadevice.h @@ -45,17 +45,16 @@ class CddaDevice : public ConnectedDevice { Q_OBJECT public: - Q_INVOKABLE CddaDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time); - ~CddaDevice(); + Q_INVOKABLE explicit CddaDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time); - bool Init(); - void Refresh(); - bool CopyToStorage(const MusicStorage::CopyJob&) { return false; } - bool DeleteFromStorage(const MusicStorage::DeleteJob&) { return false; } + bool Init() override; + void Refresh() override; + bool CopyToStorage(const MusicStorage::CopyJob&) override { return false; } + bool DeleteFromStorage(const MusicStorage::DeleteJob&) override { return false; } static QStringList url_schemes() { return QStringList() << "cdda"; } -signals: + signals: void SongsDiscovered(const SongList &songs); private slots: diff --git a/src/device/cddalister.h b/src/device/cddalister.h index 4b5452c9..9e302841 100644 --- a/src/device/cddalister.h +++ b/src/device/cddalister.h @@ -39,20 +39,20 @@ class CddaLister : public DeviceLister { public: explicit CddaLister() {} - QStringList DeviceUniqueIDs(); - QVariantList DeviceIcons(const QString &id); - QString DeviceManufacturer(const QString &id); - QString DeviceModel(const QString &id); - quint64 DeviceCapacity(const QString &id); - quint64 DeviceFreeSpace(const QString &id); - QVariantMap DeviceHardwareInfo(const QString &id); - bool AskForScan(const QString&) const { return false; } - QString MakeFriendlyName(const QString&); - QList MakeDeviceUrls(const QString&); - void UnmountDevice(const QString&); - void UpdateDeviceFreeSpace(const QString&); - bool Init(); - bool CopyMusic() { return false; } + QStringList DeviceUniqueIDs() override; + QVariantList DeviceIcons(const QString &id) override; + QString DeviceManufacturer(const QString &id) override; + QString DeviceModel(const QString &id) override; + quint64 DeviceCapacity(const QString &id) override; + quint64 DeviceFreeSpace(const QString &id) override; + QVariantMap DeviceHardwareInfo(const QString &id) override; + bool AskForScan(const QString&) const override { return false; } + QString MakeFriendlyName(const QString&) override; + QList MakeDeviceUrls(const QString&) override; + void UnmountDevice(const QString&) override; + void UpdateDeviceFreeSpace(const QString&) override; + bool Init() override; + bool CopyMusic() override { return false; } private: QStringList devices_list_; diff --git a/src/device/cddasongloader.h b/src/device/cddasongloader.h index 05eb0264..4210b92b 100644 --- a/src/device/cddasongloader.h +++ b/src/device/cddasongloader.h @@ -45,7 +45,7 @@ class CddaSongLoader : public QObject { public: explicit CddaSongLoader(const QUrl &url = QUrl(), QObject *parent = nullptr); - ~CddaSongLoader(); + ~CddaSongLoader() override; // Load songs. Signals declared below will be emitted anytime new information will be available. void LoadSongs(); diff --git a/src/device/connecteddevice.h b/src/device/connecteddevice.h index 8bbf5814..1e187718 100644 --- a/src/device/connecteddevice.h +++ b/src/device/connecteddevice.h @@ -44,7 +44,7 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public std: public: explicit ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time); - ~ConnectedDevice(); + ~ConnectedDevice() override; virtual bool Init() = 0; virtual bool IsLoading() { return false; } @@ -54,8 +54,8 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public std: // we can call this method to refresh device's state virtual void Refresh() {} - virtual TranscodeMode GetTranscodeMode() const; - virtual Song::FileType GetTranscodeFormat() const; + TranscodeMode GetTranscodeMode() const override; + Song::FileType GetTranscodeFormat() const override; DeviceLister *lister() const { return lister_; } QString unique_id() const { return unique_id_; } @@ -63,10 +63,10 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public std: QUrl url() const { return url_; } int song_count() const { return song_count_; } - virtual void FinishCopy(bool success); - virtual void FinishDelete(bool success); + void FinishCopy(bool success) override; + void FinishDelete(bool success) override; - virtual void Eject(); + void Eject() override; virtual void Close(); public slots: diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp index 0dd40904..abcb5663 100644 --- a/src/device/devicedatabasebackend.cpp +++ b/src/device/devicedatabasebackend.cpp @@ -49,8 +49,6 @@ DeviceDatabaseBackend::DeviceDatabaseBackend(QObject *parent) : } -DeviceDatabaseBackend::~DeviceDatabaseBackend() {} - void DeviceDatabaseBackend::Init(Database* db) { db_ = db; } void DeviceDatabaseBackend::Close() { diff --git a/src/device/devicedatabasebackend.h b/src/device/devicedatabasebackend.h index 302ee82c..3c7d745c 100644 --- a/src/device/devicedatabasebackend.h +++ b/src/device/devicedatabasebackend.h @@ -39,7 +39,6 @@ class DeviceDatabaseBackend : public QObject { public: Q_INVOKABLE DeviceDatabaseBackend(QObject *parent = nullptr); - ~DeviceDatabaseBackend(); struct Device { Device() : id_(-1) {} diff --git a/src/device/devicelister.h b/src/device/devicelister.h index 215fd326..ea6341ed 100644 --- a/src/device/devicelister.h +++ b/src/device/devicelister.h @@ -38,7 +38,7 @@ class DeviceLister : public QObject { public: DeviceLister(); - virtual ~DeviceLister(); + ~DeviceLister() override; // Tries to start the thread and initialise the engine. This object will be moved to the new thread. void Start(); diff --git a/src/device/devicemanager.h b/src/device/devicemanager.h index 619c4c88..c0cf8570 100644 --- a/src/device/devicemanager.h +++ b/src/device/devicemanager.h @@ -59,7 +59,7 @@ class DeviceManager : public SimpleTreeModel { public: explicit DeviceManager(Application *app, QObject *parent = nullptr); - ~DeviceManager(); + ~DeviceManager() override; enum Role { Role_State = CollectionModel::LastRole, @@ -113,7 +113,7 @@ class DeviceManager : public SimpleTreeModel { void SetDeviceOptions(QModelIndex idx, const QString &friendly_name, const QString &icon_name, MusicStorage::TranscodeMode mode, Song::FileType format); // QAbstractItemModel - QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override; public slots: void Unmount(QModelIndex idx); @@ -140,11 +140,10 @@ class DeviceManager : public SimpleTreeModel { void DeviceDestroyed(); protected: - void LazyPopulate(DeviceInfo *item) { LazyPopulate(item, true); } + void LazyPopulate(DeviceInfo *item) override { LazyPopulate(item, true); } void LazyPopulate(DeviceInfo *parent, const bool signal); private: - void AddLister(DeviceLister *lister); template void AddDeviceClass(); diff --git a/src/device/deviceproperties.h b/src/device/deviceproperties.h index ccb9c636..3ee488eb 100644 --- a/src/device/deviceproperties.h +++ b/src/device/deviceproperties.h @@ -43,13 +43,13 @@ class DeviceProperties : public QDialog { public: explicit DeviceProperties(QWidget *parent = nullptr); - ~DeviceProperties(); + ~DeviceProperties() override; void SetDeviceManager(DeviceManager *manager); void ShowDevice(QModelIndex idx); public slots: - void accept(); + void accept() override; private: void UpdateHardwareInfo(); diff --git a/src/device/devicestatefiltermodel.h b/src/device/devicestatefiltermodel.h index 3ba05117..89d1de41 100644 --- a/src/device/devicestatefiltermodel.h +++ b/src/device/devicestatefiltermodel.h @@ -38,13 +38,13 @@ class DeviceStateFilterModel : public QSortFilterProxyModel { public: explicit DeviceStateFilterModel(QObject *parent, DeviceManager::State state = DeviceManager::State_Remembered); - void setSourceModel(QAbstractItemModel *sourceModel); + void setSourceModel(QAbstractItemModel *sourceModel) override; signals: void IsEmptyChanged(bool is_empty); protected: - bool filterAcceptsRow(int row, const QModelIndex &parent) const; + bool filterAcceptsRow(int row, const QModelIndex &parent) const override; private slots: void ProxyRowCountChanged(); diff --git a/src/device/deviceview.cpp b/src/device/deviceview.cpp index 9b3bdd5c..47ad224d 100644 --- a/src/device/deviceview.cpp +++ b/src/device/deviceview.cpp @@ -189,7 +189,7 @@ DeviceView::DeviceView(QWidget *parent) setSelectionMode(QAbstractItemView::ExtendedSelection); } -DeviceView::~DeviceView() {} +DeviceView::~DeviceView() = default; void DeviceView::SetApplication(Application *app) { diff --git a/src/device/deviceview.h b/src/device/deviceview.h index 20836bb2..c43b5576 100644 --- a/src/device/deviceview.h +++ b/src/device/deviceview.h @@ -57,7 +57,7 @@ class DeviceItemDelegate : public CollectionItemDelegate { static const int kIconPadding; - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; @@ -66,13 +66,13 @@ class DeviceView : public AutoExpandingTreeView { public: explicit DeviceView(QWidget *parent = nullptr); - ~DeviceView(); + ~DeviceView() override; void SetApplication(Application *app); protected: - void contextMenuEvent(QContextMenuEvent*); - void mouseDoubleClickEvent(QMouseEvent *event); + void contextMenuEvent(QContextMenuEvent*) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; private slots: // Device menu actions @@ -94,7 +94,7 @@ class DeviceView : public AutoExpandingTreeView { void DeleteFinished(const SongList &songs_with_errors); // AutoExpandingTreeView - bool CanRecursivelyExpand(const QModelIndex &idx) const; + bool CanRecursivelyExpand(const QModelIndex &idx) const override; private: QModelIndex MapToDevice(const QModelIndex &merged_model_index) const; diff --git a/src/device/deviceviewcontainer.h b/src/device/deviceviewcontainer.h index af15e1ae..90b11162 100644 --- a/src/device/deviceviewcontainer.h +++ b/src/device/deviceviewcontainer.h @@ -35,7 +35,7 @@ class DeviceViewContainer : public QWidget { public: explicit DeviceViewContainer(QWidget *parent = nullptr); - ~DeviceViewContainer(); + ~DeviceViewContainer() override; DeviceView *view() const; diff --git a/src/device/filesystemdevice.h b/src/device/filesystemdevice.h index 9d21c6b1..e2feb9f5 100644 --- a/src/device/filesystemdevice.h +++ b/src/device/filesystemdevice.h @@ -47,15 +47,15 @@ public: const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time); - ~FilesystemDevice(); + ~FilesystemDevice() override; - bool Init(); + bool Init() override; void CloseAsync(); static QStringList url_schemes() { return QStringList() << "file"; } private slots: - void Close(); + void Close() override; void ExitFinished(); private: diff --git a/src/device/giolister.h b/src/device/giolister.h index 9855aeb7..5cd9a1fb 100644 --- a/src/device/giolister.h +++ b/src/device/giolister.h @@ -50,29 +50,29 @@ class GioLister : public DeviceLister { public: explicit GioLister() {} - ~GioLister(); + ~GioLister() override; - int priority() const { return 50; } + int priority() const override { return 50; } - QStringList DeviceUniqueIDs(); - QVariantList DeviceIcons(const QString &id); - QString DeviceManufacturer(const QString &id); - QString DeviceModel(const QString &id); - quint64 DeviceCapacity(const QString &id); - quint64 DeviceFreeSpace(const QString &id); - QVariantMap DeviceHardwareInfo(const QString &id); - bool DeviceNeedsMount(const QString &id); + QStringList DeviceUniqueIDs() override; + QVariantList DeviceIcons(const QString &id) override; + QString DeviceManufacturer(const QString &id) override; + QString DeviceModel(const QString &id) override; + quint64 DeviceCapacity(const QString &id) override; + quint64 DeviceFreeSpace(const QString &id) override; + QVariantMap DeviceHardwareInfo(const QString &id) override; + bool DeviceNeedsMount(const QString &id) override; - QString MakeFriendlyName(const QString &id); - QList MakeDeviceUrls(const QString &id); + QString MakeFriendlyName(const QString &id) override; + QList MakeDeviceUrls(const QString &id) override; public slots: - void MountDevice(const QString &id, const int request_id); - void UnmountDevice(const QString &id); - void UpdateDeviceFreeSpace(const QString &id); + void MountDevice(const QString &id, const int request_id) override; + void UnmountDevice(const QString &id) override; + void UpdateDeviceFreeSpace(const QString &id) override; protected: - bool Init(); + bool Init() override; private: struct DeviceInfo { diff --git a/src/device/mtpconnection.h b/src/device/mtpconnection.h index 1b3ef5d7..43c07da8 100644 --- a/src/device/mtpconnection.h +++ b/src/device/mtpconnection.h @@ -37,7 +37,7 @@ class MtpConnection : public QObject, public std::enable_shared_from_this { public: explicit MtpConnection(const QUrl &url); - ~MtpConnection(); + ~MtpConnection() override; bool is_valid() const { return device_; } LIBMTP_mtpdevice_t *device() const { return device_; } diff --git a/src/device/mtpdevice.h b/src/device/mtpdevice.h index f93b88c4..ae73624f 100644 --- a/src/device/mtpdevice.h +++ b/src/device/mtpdevice.h @@ -49,26 +49,26 @@ class MtpDevice : public ConnectedDevice { public: Q_INVOKABLE MtpDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time); - ~MtpDevice(); + ~MtpDevice() override; static QStringList url_schemes() { return QStringList() << "mtp"; } - bool Init(); - void ConnectAsync(); - void Close(); - bool IsLoading() { return loader_; } + bool Init() override; + void ConnectAsync() override; + void Close() override; + bool IsLoading() override { return loader_; } - bool GetSupportedFiletypes(QList* ret); + bool GetSupportedFiletypes(QList* ret) override; int GetFreeSpace(); int GetCapacity(); - bool StartCopy(QList* supported_types); - bool CopyToStorage(const CopyJob& job); - void FinishCopy(bool success); + bool StartCopy(QList* supported_types) override; + bool CopyToStorage(const CopyJob& job) override; + void FinishCopy(bool success) override; - void StartDelete(); - bool DeleteFromStorage(const DeleteJob& job); - void FinishDelete(bool success); + void StartDelete() override; + bool DeleteFromStorage(const DeleteJob& job) override; + void FinishDelete(bool success) override; private slots: void LoadFinished(bool success, MtpConnection *connection); diff --git a/src/device/mtploader.h b/src/device/mtploader.h index fe707748..46c52b4e 100644 --- a/src/device/mtploader.h +++ b/src/device/mtploader.h @@ -40,7 +40,7 @@ class MtpLoader : public QObject { public: explicit MtpLoader(const QUrl &url, TaskManager *task_manager, CollectionBackend *backend); - ~MtpLoader(); + ~MtpLoader() override; bool Init(); void Abort() { abort_ = true; } diff --git a/src/device/udisks2lister.h b/src/device/udisks2lister.h index daf0393b..22214f88 100644 --- a/src/device/udisks2lister.h +++ b/src/device/udisks2lister.h @@ -50,7 +50,7 @@ class Udisks2Lister : public DeviceLister { public: explicit Udisks2Lister(); - ~Udisks2Lister(); + ~Udisks2Lister() override; QStringList DeviceUniqueIDs() override; QVariantList DeviceIcons(const QString &id) override; diff --git a/src/dialogs/addstreamdialog.h b/src/dialogs/addstreamdialog.h index c04cbdf1..3ec824ce 100644 --- a/src/dialogs/addstreamdialog.h +++ b/src/dialogs/addstreamdialog.h @@ -32,13 +32,13 @@ class AddStreamDialog : public QDialog { public: AddStreamDialog(QWidget *parent = nullptr); - ~AddStreamDialog(); + ~AddStreamDialog() override; QUrl url() const { return QUrl(ui_->url->text()); } void set_url(const QUrl &url) { ui_->url->setText(url.toString());} protected: - void showEvent(QShowEvent*); + void showEvent(QShowEvent*) override; private slots: void TextChanged(const QString &text); diff --git a/src/dialogs/edittagdialog.h b/src/dialogs/edittagdialog.h index b49810a0..d101d581 100644 --- a/src/dialogs/edittagdialog.h +++ b/src/dialogs/edittagdialog.h @@ -62,7 +62,7 @@ class EditTagDialog : public QDialog { public: explicit EditTagDialog(Application *app, QWidget *parent = nullptr); - ~EditTagDialog(); + ~EditTagDialog() override; static const char *kHintText; static const char *kSettingsGroup; @@ -71,15 +71,15 @@ class EditTagDialog : public QDialog { PlaylistItemList playlist_items() const { return playlist_items_; } - void accept(); + void accept() override; signals: void Error(const QString &message); protected: - bool eventFilter(QObject *o, QEvent *e); - void showEvent(QShowEvent*); - void hideEvent(QHideEvent*); + bool eventFilter(QObject *o, QEvent *e) override; + void showEvent(QShowEvent*) override; + void hideEvent(QHideEvent*) override; private: struct Data { diff --git a/src/dialogs/errordialog.h b/src/dialogs/errordialog.h index e35a379e..31cf3619 100644 --- a/src/dialogs/errordialog.h +++ b/src/dialogs/errordialog.h @@ -37,15 +37,15 @@ class ErrorDialog : public QDialog { public: explicit ErrorDialog(QWidget *parent = nullptr); - ~ErrorDialog(); + ~ErrorDialog() override; -public slots: + public slots: void ShowMessage(const QString &message); -protected: - void hideEvent(QHideEvent *); + protected: + void hideEvent(QHideEvent*) override; -private: + private: void UpdateContent(); Ui_ErrorDialog *ui_; diff --git a/src/dialogs/trackselectiondialog.h b/src/dialogs/trackselectiondialog.h index d8d0a20a..7e4db6d8 100644 --- a/src/dialogs/trackselectiondialog.h +++ b/src/dialogs/trackselectiondialog.h @@ -39,7 +39,7 @@ class TrackSelectionDialog : public QDialog { public: explicit TrackSelectionDialog(QWidget *parent = nullptr); - ~TrackSelectionDialog(); + ~TrackSelectionDialog() override; void set_save_on_close(bool save_on_close) { save_on_close_ = save_on_close; } @@ -50,7 +50,7 @@ class TrackSelectionDialog : public QDialog { void FetchTagFinished(const Song &original_song, const SongList &songs_guessed); // QDialog - void accept(); + void accept() override; signals: void Error(const QString&); diff --git a/src/engine/alsadevicefinder.h b/src/engine/alsadevicefinder.h index f9bf7d34..06fa2d4f 100644 --- a/src/engine/alsadevicefinder.h +++ b/src/engine/alsadevicefinder.h @@ -30,8 +30,8 @@ class AlsaDeviceFinder : public DeviceFinder { public: explicit AlsaDeviceFinder(); - virtual bool Initialise() { return true; } - virtual QList ListDevices(); + bool Initialise() override { return true; } + QList ListDevices() override; }; #endif // ALSADEVICEFINDER_H diff --git a/src/engine/devicefinders.h b/src/engine/devicefinders.h index a938cdfd..eb57e4d2 100644 --- a/src/engine/devicefinders.h +++ b/src/engine/devicefinders.h @@ -33,7 +33,7 @@ class DeviceFinders : public QObject { public: explicit DeviceFinders(QObject *parent = nullptr); - ~DeviceFinders(); + ~DeviceFinders() override; void Init(); QList ListFinders() { return device_finders_; } diff --git a/src/engine/enginebase.h b/src/engine/enginebase.h index c9881266..db296123 100644 --- a/src/engine/enginebase.h +++ b/src/engine/enginebase.h @@ -57,7 +57,7 @@ protected: public: - virtual ~Base(); + ~Base() override; struct OutputDetails { QString name; diff --git a/src/engine/gstengine.h b/src/engine/gstengine.h index 2a4473af..226ca06e 100644 --- a/src/engine/gstengine.h +++ b/src/engine/gstengine.h @@ -58,58 +58,58 @@ class GstEngine : public Engine::Base, public GstBufferConsumer { public: explicit GstEngine(TaskManager *task_manager); - ~GstEngine(); + ~GstEngine() override; - bool Init(); - Engine::State state() const; - void StartPreloading(const QUrl &stream_url, const QUrl &original_url, const bool force_stop_at_end, const qint64 beginning_nanosec, const qint64 end_nanosec); - bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec); - bool Play(const quint64 offset_nanosec); - void Stop(const bool stop_after = false); - void Pause(); - void Unpause(); - void Seek(const quint64 offset_nanosec); + bool Init() override; + Engine::State state() const override; + void StartPreloading(const QUrl &stream_url, const QUrl &original_url, const bool force_stop_at_end, const qint64 beginning_nanosec, const qint64 end_nanosec) override; + bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec) override; + bool Play(const quint64 offset_nanosec) override; + void Stop(const bool stop_after = false) override; + void Pause() override; + void Unpause() override; + void Seek(const quint64 offset_nanosec) override; protected: - void SetVolumeSW(const uint percent); + void SetVolumeSW(const uint percent) override; public: - qint64 position_nanosec() const; - qint64 length_nanosec() const; - const Engine::Scope &scope(const int chunk_length); + qint64 position_nanosec() const override; + qint64 length_nanosec() const override; + const Engine::Scope &scope(const int chunk_length) override; - OutputDetailsList GetOutputsList() const; - bool ValidOutput(const QString &output); - QString DefaultOutput() { return kAutoSink; } - bool CustomDeviceSupport(const QString &output); - bool ALSADeviceSupport(const QString &output); + OutputDetailsList GetOutputsList() const override; + bool ValidOutput(const QString &output) override; + QString DefaultOutput() override { return kAutoSink; } + bool CustomDeviceSupport(const QString &output) override; + bool ALSADeviceSupport(const QString &output) override; void SetStartup(GstStartup *gst_startup) { gst_startup_ = gst_startup; } void EnsureInitialised() { gst_startup_->EnsureInitialised(); } GstElement *CreateElement(const QString &factoryName, GstElement *bin = nullptr, const bool showerror = true); - void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format); + void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format) override; public slots: - void ReloadSettings(); + void ReloadSettings() override; // Set whether stereo balancer is enabled - void SetStereoBalancerEnabled(const bool enabled); + void SetStereoBalancerEnabled(const bool enabled) override; // Set Stereo balance, range -1.0f..1.0f - void SetStereoBalance(const float value); + void SetStereoBalance(const float value) override; // Set whether equalizer is enabled - void SetEqualizerEnabled(const bool); + void SetEqualizerEnabled(const bool) override; // Set equalizer preamp and gains, range -100..100. Gains are 10 values. - void SetEqualizerParameters(const int preamp, const QList &band_gains); + void SetEqualizerParameters(const int preamp, const QList &band_gains) override; void AddBufferConsumer(GstBufferConsumer *consumer); void RemoveBufferConsumer(GstBufferConsumer *consumer); protected: - void timerEvent(QTimerEvent*); + void timerEvent(QTimerEvent *e) override; private slots: void EndOfStreamReached(const int pipeline_id, const bool has_next_track); diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index 918a539e..903920a2 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -59,7 +59,7 @@ class GstEnginePipeline : public QObject { public: explicit GstEnginePipeline(GstEngine *engine); - ~GstEnginePipeline(); + ~GstEnginePipeline() override; // Globally unique across all pipelines. int id() const { return id_; } @@ -132,7 +132,7 @@ class GstEnginePipeline : public QObject { void BufferingFinished(); protected: - void timerEvent(QTimerEvent*); + void timerEvent(QTimerEvent*) override; private: bool InitAudioBin(); diff --git a/src/engine/gststartup.h b/src/engine/gststartup.h index b3e45b11..94023855 100644 --- a/src/engine/gststartup.h +++ b/src/engine/gststartup.h @@ -32,7 +32,7 @@ class GstStartup : public QObject { public: explicit GstStartup(QObject *parent = nullptr); - ~GstStartup(); + ~GstStartup() override; void EnsureInitialised() { initialising_.waitForFinished(); } diff --git a/src/engine/vlcengine.h b/src/engine/vlcengine.h index 4af32774..ec16f20b 100644 --- a/src/engine/vlcengine.h +++ b/src/engine/vlcengine.h @@ -43,27 +43,29 @@ class VLCEngine : public Engine::Base { public: explicit VLCEngine(TaskManager *task_manager); - ~VLCEngine(); + ~VLCEngine() override; + + bool Init() override; + Engine::State state() const override { return state_; } + bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec) override; + bool Play(const quint64 offset_nanosec) override; + void Stop(const bool stop_after = false) override; + void Pause() override; + void Unpause() override; + void Seek(const quint64 offset_nanosec) override; - bool Init(); - Engine::State state() const { return state_; } - bool Load(const QUrl &stream_url, const QUrl &original_url, const Engine::TrackChangeFlags change, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec); - bool Play(const quint64 offset_nanosec); - void Stop(const bool stop_after = false); - void Pause(); - void Unpause(); - void Seek(const quint64 offset_nanosec); protected: - void SetVolumeSW(const uint percent); - public: - virtual qint64 position_nanosec() const; - virtual qint64 length_nanosec() const; + void SetVolumeSW(const uint percent) override; - OutputDetailsList GetOutputsList() const; - bool ValidOutput(const QString &output); - QString DefaultOutput() { return ""; } - bool CustomDeviceSupport(const QString &output); - bool ALSADeviceSupport(const QString &output); + public: + qint64 position_nanosec() const override; + qint64 length_nanosec() const override; + + OutputDetailsList GetOutputsList() const override; + bool ValidOutput(const QString &output) override; + QString DefaultOutput() override { return ""; } + bool CustomDeviceSupport(const QString &output) override; + bool ALSADeviceSupport(const QString &output) override; private: libvlc_instance_t *instance_; diff --git a/src/engine/xineengine.h b/src/engine/xineengine.h index cf03779f..54f07f65 100644 --- a/src/engine/xineengine.h +++ b/src/engine/xineengine.h @@ -47,37 +47,37 @@ class XineEngine : public Engine::Base { public: explicit XineEngine(TaskManager *task_manager); - ~XineEngine(); + ~XineEngine() override; - bool Init(); - Engine::State state() const; - bool Load(const QUrl &stream_url, const QUrl &original_url, Engine::TrackChangeFlags change, bool force_stop_at_end, quint64 beginning_nanosec, qint64 end_nanosec); - bool Play(quint64 offset_nanosec); - void Stop(bool stop_after = false); - void Pause(); - void Unpause(); - void Seek(quint64 offset_nanosec); - void SetVolumeSW(uint ); + bool Init() override; + Engine::State state() const override; + bool Load(const QUrl &stream_url, const QUrl &original_url, Engine::TrackChangeFlags change, bool force_stop_at_end, quint64 beginning_nanosec, qint64 end_nanosec) override; + bool Play(quint64 offset_nanosec) override; + void Stop(bool stop_after = false) override; + void Pause() override; + void Unpause() override; + void Seek(quint64 offset_nanosec) override; + void SetVolumeSW(uint) override; - qint64 position_nanosec() const; - qint64 length_nanosec() const; + qint64 position_nanosec() const override; + qint64 length_nanosec() const override; #ifdef XINE_ANALYZER const Engine::Scope& scope(int chunk_length); #endif - OutputDetailsList GetOutputsList() const; - bool ValidOutput(const QString &output); - QString DefaultOutput() { return "auto"; } - bool CustomDeviceSupport(const QString &output); - bool ALSADeviceSupport(const QString &output); + OutputDetailsList GetOutputsList() const override; + bool ValidOutput(const QString &output) override; + QString DefaultOutput() override { return "auto"; } + bool CustomDeviceSupport(const QString &output) override; + bool ALSADeviceSupport(const QString &output) override; - void ReloadSettings(); + void ReloadSettings() override; bool CanDecode(const QUrl &); - void SetEqualizerEnabled(bool enabled); - void SetEqualizerParameters(int preamp, const QList&); + void SetEqualizerEnabled(bool enabled) override; + void SetEqualizerParameters(int preamp, const QList&) override; // Simple accessors diff --git a/src/equalizer/equalizer.h b/src/equalizer/equalizer.h index 0bcc5520..3b2ef6e8 100644 --- a/src/equalizer/equalizer.h +++ b/src/equalizer/equalizer.h @@ -42,7 +42,7 @@ class Equalizer : public QDialog { public: explicit Equalizer(QWidget *parent = nullptr); - ~Equalizer(); + ~Equalizer() override; static const int kBands = 10; static const char *kGainText[kBands]; @@ -73,7 +73,7 @@ class Equalizer : public QDialog { void EqualizerParametersChanged(const int preamp, const QList &band_gains); protected: - void closeEvent(QCloseEvent*); + void closeEvent(QCloseEvent*) override; private slots: void StereoBalancerEnabledChangedSlot(const bool enabled); diff --git a/src/equalizer/equalizerslider.h b/src/equalizer/equalizerslider.h index 591ec80e..7e139f8c 100644 --- a/src/equalizer/equalizerslider.h +++ b/src/equalizer/equalizerslider.h @@ -36,7 +36,7 @@ class EqualizerSlider : public QWidget { public: explicit EqualizerSlider(const QString &label, QWidget *parent = nullptr); - ~EqualizerSlider(); + ~EqualizerSlider() override; int value() const; void set_value(int value); diff --git a/src/globalshortcuts/globalshortcut.h b/src/globalshortcuts/globalshortcut.h index 85f955ab..ebc8c238 100644 --- a/src/globalshortcuts/globalshortcut.h +++ b/src/globalshortcuts/globalshortcut.h @@ -40,7 +40,7 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter { public: explicit GlobalShortcut(QObject *parent = nullptr); explicit GlobalShortcut(QKeySequence shortcut, GlobalShortcutBackend *backend, QObject *parent = nullptr); - ~GlobalShortcut(); + ~GlobalShortcut() override; GlobalShortcutBackend *backend() const { return backend_; } QKeySequence shortcut() const { return shortcut_; } @@ -61,7 +61,7 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter { bool registerShortcut(quint32 native_key, quint32 native_mods); bool unregisterShortcut(quint32 native_key, quint32 native_mods); - bool nativeEventFilter(const QByteArray &eventtype, void *message, long *result); + bool nativeEventFilter(const QByteArray &eventtype, void *message, long *result) override; static GlobalShortcut *initialized_; static QHash, GlobalShortcut*> internal_shortcuts_; diff --git a/src/globalshortcuts/globalshortcutbackend-gsd.cpp b/src/globalshortcuts/globalshortcutbackend-gsd.cpp index f01792e6..c73f7747 100644 --- a/src/globalshortcuts/globalshortcutbackend-gsd.cpp +++ b/src/globalshortcuts/globalshortcutbackend-gsd.cpp @@ -48,8 +48,6 @@ GlobalShortcutBackendGSD::GlobalShortcutBackendGSD(GlobalShortcuts *parent) interface_(nullptr), is_connected_(false) {} -GlobalShortcutBackendGSD::~GlobalShortcutBackendGSD(){} - bool GlobalShortcutBackendGSD::DoRegister() { qLog(Debug) << "Registering"; diff --git a/src/globalshortcuts/globalshortcutbackend-gsd.h b/src/globalshortcuts/globalshortcutbackend-gsd.h index 03ce8dc9..62c51f1a 100644 --- a/src/globalshortcuts/globalshortcutbackend-gsd.h +++ b/src/globalshortcuts/globalshortcutbackend-gsd.h @@ -37,7 +37,6 @@ class GlobalShortcutBackendGSD : public GlobalShortcutBackend { public: explicit GlobalShortcutBackendGSD(GlobalShortcuts *parent); - ~GlobalShortcutBackendGSD(); static const char *kGsdService; static const char *kGsdService2; @@ -45,8 +44,8 @@ class GlobalShortcutBackendGSD : public GlobalShortcutBackend { protected: bool RegisterInNewThread() const { return true; } - bool DoRegister(); - void DoUnregister(); + bool DoRegister() override; + void DoUnregister() override; private slots: void RegisterFinished(QDBusPendingCallWatcher *watcher); diff --git a/src/globalshortcuts/globalshortcutbackend-system.h b/src/globalshortcuts/globalshortcutbackend-system.h index afd42d8b..8b6be365 100644 --- a/src/globalshortcuts/globalshortcutbackend-system.h +++ b/src/globalshortcuts/globalshortcutbackend-system.h @@ -39,11 +39,11 @@ class GlobalShortcutBackendSystem : public GlobalShortcutBackend { public: explicit GlobalShortcutBackendSystem(GlobalShortcuts *parent = nullptr); - ~GlobalShortcutBackendSystem(); + ~GlobalShortcutBackendSystem() override; protected: - bool DoRegister(); - void DoUnregister(); + bool DoRegister() override; + void DoUnregister() override; private: diff --git a/src/globalshortcuts/globalshortcutbackend.h b/src/globalshortcuts/globalshortcutbackend.h index 8f4ab98c..10be248d 100644 --- a/src/globalshortcuts/globalshortcutbackend.h +++ b/src/globalshortcuts/globalshortcutbackend.h @@ -33,7 +33,6 @@ class GlobalShortcutBackend : public QObject { public: explicit GlobalShortcutBackend(GlobalShortcuts *parent = nullptr); - virtual ~GlobalShortcutBackend() {} bool is_active() const { return active_; } diff --git a/src/globalshortcuts/globalshortcutgrabber.h b/src/globalshortcuts/globalshortcutgrabber.h index d95bfbc7..621eb042 100644 --- a/src/globalshortcuts/globalshortcutgrabber.h +++ b/src/globalshortcuts/globalshortcutgrabber.h @@ -48,14 +48,14 @@ class GlobalShortcutGrabber : public QDialog { public: explicit GlobalShortcutGrabber(QWidget *parent = nullptr); - ~GlobalShortcutGrabber(); + ~GlobalShortcutGrabber() override; QKeySequence GetKey(const QString &name); protected: - bool event(QEvent *); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + bool event(QEvent *e) override; + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; void grabKeyboard(); void releaseKeyboard(); diff --git a/src/internet/internetcollectionview.h b/src/internet/internetcollectionview.h index 1310293d..f6c5ee3a 100644 --- a/src/internet/internetcollectionview.h +++ b/src/internet/internetcollectionview.h @@ -62,8 +62,8 @@ class InternetCollectionView : public AutoExpandingTreeView { void SetFilter(CollectionFilterWidget *filter); // QTreeView - void keyboardSearch(const QString &search); - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible); + void keyboardSearch(const QString &search) override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; int TotalSongs(); int TotalArtists(); @@ -90,9 +90,9 @@ class InternetCollectionView : public AutoExpandingTreeView { protected: // QWidget - void paintEvent(QPaintEvent *event); - void mouseReleaseEvent(QMouseEvent *e); - void contextMenuEvent(QContextMenuEvent *e); + void paintEvent(QPaintEvent *event) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; private slots: void Load(); diff --git a/src/internet/internetcollectionviewcontainer.h b/src/internet/internetcollectionviewcontainer.h index adca0a75..7f9a79a5 100644 --- a/src/internet/internetcollectionviewcontainer.h +++ b/src/internet/internetcollectionviewcontainer.h @@ -43,7 +43,7 @@ class InternetCollectionViewContainer : public QWidget { public: explicit InternetCollectionViewContainer(QWidget *parent = nullptr); - ~InternetCollectionViewContainer(); + ~InternetCollectionViewContainer() override; QStackedWidget *stacked() const { return ui_->stacked; } QWidget *help_page() const { return ui_->help_page; } @@ -58,7 +58,7 @@ class InternetCollectionViewContainer : public QWidget { void ReloadSettings() { view()->ReloadSettings(); } private slots: - void contextMenuEvent(QContextMenuEvent *e); + void contextMenuEvent(QContextMenuEvent *e) override; private: Ui_InternetCollectionViewContainer *ui_; diff --git a/src/internet/internetplaylistitem.h b/src/internet/internetplaylistitem.h index b4a2e7c4..27968545 100644 --- a/src/internet/internetplaylistitem.h +++ b/src/internet/internetplaylistitem.h @@ -37,14 +37,15 @@ class InternetPlaylistItem : public PlaylistItem { public: explicit InternetPlaylistItem(const Song::Source source); explicit InternetPlaylistItem(InternetService *service, const Song &metadata); - bool InitFromQuery(const SqlRow &query); - Song Metadata() const; - QUrl Url() const; - void SetArtManual(const QUrl &cover_url); + + bool InitFromQuery(const SqlRow &query) override; + Song Metadata() const override; + QUrl Url() const override; + void SetArtManual(const QUrl &cover_url) override; protected: - QVariant DatabaseValue(DatabaseColumn) const; - Song DatabaseSongMetadata() const { return metadata_; } + QVariant DatabaseValue(DatabaseColumn) const override; + Song DatabaseSongMetadata() const override { return metadata_; } private: void InitMetadata(); diff --git a/src/internet/internetsearchitemdelegate.h b/src/internet/internetsearchitemdelegate.h index dbd55e4b..64a956b2 100644 --- a/src/internet/internetsearchitemdelegate.h +++ b/src/internet/internetsearchitemdelegate.h @@ -34,7 +34,7 @@ class InternetSearchItemDelegate : public CollectionItemDelegate { public: explicit InternetSearchItemDelegate(InternetSearchView *view); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const override; private: InternetSearchView *view_; diff --git a/src/internet/internetsearchmodel.h b/src/internet/internetsearchmodel.h index fd14b45c..6a6fdac7 100644 --- a/src/internet/internetsearchmodel.h +++ b/src/internet/internetsearchmodel.h @@ -71,7 +71,7 @@ class InternetSearchModel : public QStandardItemModel { InternetSearchView::ResultList GetChildResults(const QModelIndexList &indexes) const; InternetSearchView::ResultList GetChildResults(const QList &items) const; - QMimeData *mimeData(const QModelIndexList &indexes) const; + QMimeData *mimeData(const QModelIndexList &indexes) const override; // Loads tracks for results that were previously emitted by ResultsAvailable. // The implementation creates a SongMimeData with one Song for each Result. diff --git a/src/internet/internetsearchsortmodel.h b/src/internet/internetsearchsortmodel.h index a0083202..788e722c 100644 --- a/src/internet/internetsearchsortmodel.h +++ b/src/internet/internetsearchsortmodel.h @@ -31,7 +31,7 @@ class InternetSearchSortModel : public QSortFilterProxyModel { explicit InternetSearchSortModel(QObject *parent = nullptr); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const; + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; }; #endif // INTERNETSEARCHSORTMODEL_H diff --git a/src/internet/internetsearchview.h b/src/internet/internetsearchview.h index ba8eea8c..c335f6f0 100644 --- a/src/internet/internetsearchview.h +++ b/src/internet/internetsearchview.h @@ -71,7 +71,7 @@ class InternetSearchView : public QWidget { public: explicit InternetSearchView(QWidget *parent = nullptr); - ~InternetSearchView(); + ~InternetSearchView() override; enum SearchType { SearchType_Artists = 1, @@ -104,9 +104,9 @@ class InternetSearchView : public QWidget { } }; - void showEvent(QShowEvent *e); - bool eventFilter(QObject *object, QEvent *e); - void timerEvent(QTimerEvent *e); + void showEvent(QShowEvent *e) override; + bool eventFilter(QObject *object, QEvent *e) override; + void timerEvent(QTimerEvent *e) override; // These functions treat queries in the same way as CollectionQuery. // They're useful for figuring out whether you got a result because it matched in the song title or the artist/album name. diff --git a/src/internet/internetservice.h b/src/internet/internetservice.h index 0e5c50da..c6a78aa6 100644 --- a/src/internet/internetservice.h +++ b/src/internet/internetservice.h @@ -42,7 +42,7 @@ class InternetService : public QObject { public: explicit InternetService(Song::Source source, const QString &name, const QString &url_scheme, const QString &settings_group, SettingsDialog::Page settings_page, Application *app, QObject *parent = nullptr); - virtual ~InternetService() {} + ~InternetService() override {} virtual void Exit() {} virtual Song::Source source() const { return source_; } diff --git a/src/internet/internetservices.h b/src/internet/internetservices.h index 3cc51306..99822ffd 100644 --- a/src/internet/internetservices.h +++ b/src/internet/internetservices.h @@ -38,7 +38,7 @@ class InternetServices : public QObject { public: explicit InternetServices(QObject *parent = nullptr); - ~InternetServices(); + ~InternetServices() override; InternetService *ServiceBySource(const Song::Source &source); template diff --git a/src/internet/internetsongsview.h b/src/internet/internetsongsview.h index a35edc3d..76ddc6a0 100644 --- a/src/internet/internetsongsview.h +++ b/src/internet/internetsongsview.h @@ -41,7 +41,7 @@ class InternetSongsView : public QWidget { public: explicit InternetSongsView(Application *app, InternetService *service, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent = nullptr); - ~InternetSongsView(); + ~InternetSongsView() override; void ReloadSettings(); diff --git a/src/internet/internettabsview.h b/src/internet/internettabsview.h index 0d42a4fd..4bbadf04 100644 --- a/src/internet/internettabsview.h +++ b/src/internet/internettabsview.h @@ -43,7 +43,7 @@ class InternetTabsView : public QWidget { public: explicit InternetTabsView(Application *app, InternetService *service, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent = nullptr); - ~InternetTabsView(); + ~InternetTabsView() override; void ReloadSettings(); diff --git a/src/internet/localredirectserver.h b/src/internet/localredirectserver.h index 23533056..38f3a42f 100644 --- a/src/internet/localredirectserver.h +++ b/src/internet/localredirectserver.h @@ -39,7 +39,7 @@ class LocalRedirectServer : public QTcpServer { public: explicit LocalRedirectServer(QObject *parent = nullptr); - ~LocalRedirectServer(); + ~LocalRedirectServer() override; void set_https(const bool https) { https_ = https; } void set_port(const int port) { port_ = port; } @@ -53,7 +53,7 @@ class LocalRedirectServer : public QTcpServer { public slots: void NewConnection(); - void incomingConnection(qintptr socket_descriptor); + void incomingConnection(qintptr socket_descriptor) override; void SSLErrors(const QList &errors); void Encrypted(); void Connected(); diff --git a/src/lyrics/auddlyricsprovider.h b/src/lyrics/auddlyricsprovider.h index 3b933f71..d55beae4 100644 --- a/src/lyrics/auddlyricsprovider.h +++ b/src/lyrics/auddlyricsprovider.h @@ -40,13 +40,13 @@ class AuddLyricsProvider : public JsonLyricsProvider { public: explicit AuddLyricsProvider(QObject *parent = nullptr); - ~AuddLyricsProvider(); + ~AuddLyricsProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id); - void CancelSearch(const quint64 id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id) override; + void CancelSearch(const quint64 id) override; private: - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; QJsonArray ExtractResult(QNetworkReply *reply, const QString &artist, const QString &title); private slots: diff --git a/src/lyrics/chartlyricsprovider.cpp b/src/lyrics/chartlyricsprovider.cpp index c9974fd2..a0cceedd 100644 --- a/src/lyrics/chartlyricsprovider.cpp +++ b/src/lyrics/chartlyricsprovider.cpp @@ -135,7 +135,7 @@ void ChartLyricsProvider::HandleSearchReply(QNetworkReply *reply, const quint64 } -void ChartLyricsProvider::Error(const QString &error, QVariant debug) { +void ChartLyricsProvider::Error(const QString &error, const QVariant &debug) { qLog(Error) << "ChartLyrics:" << error; if (debug.isValid()) qLog(Debug) << debug; diff --git a/src/lyrics/chartlyricsprovider.h b/src/lyrics/chartlyricsprovider.h index 12e37774..8562d8df 100644 --- a/src/lyrics/chartlyricsprovider.h +++ b/src/lyrics/chartlyricsprovider.h @@ -38,13 +38,13 @@ class ChartLyricsProvider : public LyricsProvider { public: explicit ChartLyricsProvider(QObject *parent = nullptr); - ~ChartLyricsProvider(); + ~ChartLyricsProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id); - void CancelSearch(quint64 id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override; + void CancelSearch(quint64 id) override; private: - void Error(const QString &error, QVariant debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private slots: void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title); diff --git a/src/lyrics/geniuslyricsprovider.h b/src/lyrics/geniuslyricsprovider.h index d0e79abe..5930f8e2 100644 --- a/src/lyrics/geniuslyricsprovider.h +++ b/src/lyrics/geniuslyricsprovider.h @@ -48,14 +48,14 @@ class GeniusLyricsProvider : public JsonLyricsProvider { public: explicit GeniusLyricsProvider(QObject *parent = nullptr); - ~GeniusLyricsProvider(); + ~GeniusLyricsProvider() override; - bool IsAuthenticated() { return !access_token_.isEmpty(); } - void Authenticate(); - void Deauthenticate() { access_token_.clear(); } + bool IsAuthenticated() const override { return !access_token_.isEmpty(); } + void Authenticate() override; + void Deauthenticate() override { access_token_.clear(); } - bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id); - void CancelSearch(const quint64 id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, quint64 id) override; + void CancelSearch(const quint64 id) override; public: struct GeniusLyricsLyricContext { @@ -76,7 +76,7 @@ class GeniusLyricsProvider : public JsonLyricsProvider { private: void RequestAccessToken(const QUrl &url, const QUrl &redirect_url); void AuthError(const QString &error = QString(), const QVariant &debug = QVariant()); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; void EndSearch(std::shared_ptr search, const GeniusLyricsLyricContext lyric = GeniusLyricsLyricContext()); private slots: diff --git a/src/lyrics/jsonlyricsprovider.h b/src/lyrics/jsonlyricsprovider.h index f2cbeef8..f2bd919e 100644 --- a/src/lyrics/jsonlyricsprovider.h +++ b/src/lyrics/jsonlyricsprovider.h @@ -42,10 +42,6 @@ class JsonLyricsProvider : public LyricsProvider { QByteArray ExtractData(QNetworkReply *reply); QJsonObject ExtractJsonObj(const QByteArray &data); QJsonObject ExtractJsonObj(QNetworkReply *reply); - - private: - virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; - }; #endif // JSONLYRICSPROVIDER_H diff --git a/src/lyrics/lololyricsprovider.h b/src/lyrics/lololyricsprovider.h index f00b80c2..6006f8eb 100644 --- a/src/lyrics/lololyricsprovider.h +++ b/src/lyrics/lololyricsprovider.h @@ -38,13 +38,13 @@ class LoloLyricsProvider : public LyricsProvider { public: explicit LoloLyricsProvider(QObject *parent = nullptr); - ~LoloLyricsProvider(); + ~LoloLyricsProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id); - void CancelSearch(const quint64 id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override; + void CancelSearch(const quint64 id) override; private: - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private slots: void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title); diff --git a/src/lyrics/lyricsfetcher.h b/src/lyrics/lyricsfetcher.h index 59a0799c..eec39a0b 100644 --- a/src/lyrics/lyricsfetcher.h +++ b/src/lyrics/lyricsfetcher.h @@ -63,7 +63,7 @@ class LyricsFetcher : public QObject { public: explicit LyricsFetcher(LyricsProviders *lyrics_providers, QObject *parent = nullptr); - virtual ~LyricsFetcher() {} + ~LyricsFetcher() override {} quint64 Search(const QString &artist, const QString &album, const QString &title); void Clear(); diff --git a/src/lyrics/lyricsprovider.h b/src/lyrics/lyricsprovider.h index c181eb45..d42e5d52 100644 --- a/src/lyrics/lyricsprovider.h +++ b/src/lyrics/lyricsprovider.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include "lyricsfetcher.h" @@ -48,11 +49,13 @@ class LyricsProvider : public QObject { virtual bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) = 0; virtual void CancelSearch(const quint64 id) { Q_UNUSED(id); } - virtual bool AuthenticationRequired() { return authentication_required_; } + virtual bool AuthenticationRequired() const { return authentication_required_; } virtual void Authenticate() {} - virtual bool IsAuthenticated() { return !authentication_required_; } + virtual bool IsAuthenticated() const { return !authentication_required_; } virtual void Deauthenticate() {} + virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; + signals: void AuthenticationComplete(bool, QStringList = QStringList()); void AuthenticationSuccess(); diff --git a/src/lyrics/lyricsproviders.h b/src/lyrics/lyricsproviders.h index 39eff5bf..e0d33ae8 100644 --- a/src/lyrics/lyricsproviders.h +++ b/src/lyrics/lyricsproviders.h @@ -37,7 +37,7 @@ class LyricsProviders : public QObject { public: explicit LyricsProviders(QObject *parent = nullptr); - ~LyricsProviders(); + ~LyricsProviders() override; void ReloadSettings(); LyricsProvider *ProviderByName(const QString &name) const; diff --git a/src/lyrics/musixmatchlyricsprovider.h b/src/lyrics/musixmatchlyricsprovider.h index d83dda37..26a4d9e3 100644 --- a/src/lyrics/musixmatchlyricsprovider.h +++ b/src/lyrics/musixmatchlyricsprovider.h @@ -39,13 +39,13 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider { public: explicit MusixmatchLyricsProvider(QObject *parent = nullptr); - ~MusixmatchLyricsProvider(); + ~MusixmatchLyricsProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id); - void CancelSearch(const quint64 id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override; + void CancelSearch(const quint64 id) override; private: - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private slots: void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &album, const QString &title); diff --git a/src/lyrics/ovhlyricsprovider.h b/src/lyrics/ovhlyricsprovider.h index 96cdc9fe..d15e13ca 100644 --- a/src/lyrics/ovhlyricsprovider.h +++ b/src/lyrics/ovhlyricsprovider.h @@ -38,13 +38,13 @@ class OVHLyricsProvider : public JsonLyricsProvider { public: explicit OVHLyricsProvider(QObject *parent = nullptr); - ~OVHLyricsProvider(); + ~OVHLyricsProvider() override; - bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id); - void CancelSearch(const quint64 id); + bool StartSearch(const QString &artist, const QString &album, const QString &title, const quint64 id) override; + void CancelSearch(const quint64 id) override; private: - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; private slots: void HandleSearchReply(QNetworkReply *reply, const quint64 id, const QString &artist, const QString &title); diff --git a/src/moodbar/moodbaritemdelegate.h b/src/moodbar/moodbaritemdelegate.h index b6cf4ca7..e15bd77f 100644 --- a/src/moodbar/moodbaritemdelegate.h +++ b/src/moodbar/moodbaritemdelegate.h @@ -46,7 +46,7 @@ class MoodbarItemDelegate : public QItemDelegate { public: explicit MoodbarItemDelegate(Application* app, PlaylistView* view, QObject* parent = nullptr); - void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; + void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override; private slots: void ReloadSettings(); diff --git a/src/moodbar/moodbarloader.h b/src/moodbar/moodbarloader.h index 7e1b7ee4..f4638311 100644 --- a/src/moodbar/moodbarloader.h +++ b/src/moodbar/moodbarloader.h @@ -37,7 +37,7 @@ class MoodbarLoader : public QObject { public: explicit MoodbarLoader(Application* app, QObject* parent = nullptr); - ~MoodbarLoader(); + ~MoodbarLoader() override; enum Result { // The URL isn't a local file or the moodbar plugin was not available - diff --git a/src/moodbar/moodbarpipeline.h b/src/moodbar/moodbarpipeline.h index 6a59c065..0ef8cfcc 100644 --- a/src/moodbar/moodbarpipeline.h +++ b/src/moodbar/moodbarpipeline.h @@ -37,7 +37,7 @@ class MoodbarPipeline : public QObject { public: explicit MoodbarPipeline(const QUrl& local_filename); - ~MoodbarPipeline(); + ~MoodbarPipeline() override; static bool IsAvailable(); diff --git a/src/moodbar/moodbarproxystyle.cpp b/src/moodbar/moodbarproxystyle.cpp index 68b624bc..10f5db65 100644 --- a/src/moodbar/moodbarproxystyle.cpp +++ b/src/moodbar/moodbarproxystyle.cpp @@ -74,8 +74,6 @@ MoodbarProxyStyle::MoodbarProxyStyle(Application* app, QSlider* slider) } -MoodbarProxyStyle::~MoodbarProxyStyle() {} - void MoodbarProxyStyle::ReloadSettings() { QSettings s; diff --git a/src/moodbar/moodbarproxystyle.h b/src/moodbar/moodbarproxystyle.h index a93ce56f..ab5c0164 100644 --- a/src/moodbar/moodbarproxystyle.h +++ b/src/moodbar/moodbarproxystyle.h @@ -49,14 +49,13 @@ class MoodbarProxyStyle : public QProxyStyle { public: explicit MoodbarProxyStyle(Application* app, QSlider* slider); - ~MoodbarProxyStyle(); // QProxyStyle - void drawComplexControl(ComplexControl control, const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget) const; - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex* opt, SubControl sc, const QWidget* widget) const; + void drawComplexControl(ComplexControl control, const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget) const override; + QRect subControlRect(ComplexControl cc, const QStyleOptionComplex* opt, SubControl sc, const QWidget* widget) const override; // QObject - bool eventFilter(QObject* object, QEvent* event); + bool eventFilter(QObject* object, QEvent* event) override; public slots: // An empty byte array means there's no moodbar, so just show a normal slider. diff --git a/src/musicbrainz/acoustidclient.h b/src/musicbrainz/acoustidclient.h index 47320304..1082d1e2 100644 --- a/src/musicbrainz/acoustidclient.h +++ b/src/musicbrainz/acoustidclient.h @@ -43,7 +43,7 @@ class AcoustidClient : public QObject { public: explicit AcoustidClient(QObject *parent = nullptr); - ~AcoustidClient(); + ~AcoustidClient() override; // Network requests will be aborted after this interval. void SetTimeout(const int msec); diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp index 69d110ca..1e6d1c55 100644 --- a/src/musicbrainz/chromaprinter.cpp +++ b/src/musicbrainz/chromaprinter.cpp @@ -55,8 +55,6 @@ Chromaprinter::Chromaprinter(const QString &filename) : filename_(filename), convert_element_(nullptr) {} -Chromaprinter::~Chromaprinter() {} - GstElement *Chromaprinter::CreateElement(const QString &factory_name, GstElement *bin) { GstElement *ret = gst_element_factory_make( factory_name.toLatin1().constData(), factory_name.toLatin1().constData()); diff --git a/src/musicbrainz/chromaprinter.h b/src/musicbrainz/chromaprinter.h index 32a968d7..93b9490d 100644 --- a/src/musicbrainz/chromaprinter.h +++ b/src/musicbrainz/chromaprinter.h @@ -39,7 +39,6 @@ class Chromaprinter { public: explicit Chromaprinter(const QString &filename); - ~Chromaprinter(); // Creates a fingerprint from the song. // This method is blocking, so you want to call it in another thread. diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h index 1a83fa7b..cac4bc16 100644 --- a/src/musicbrainz/musicbrainzclient.h +++ b/src/musicbrainz/musicbrainzclient.h @@ -51,7 +51,7 @@ class MusicBrainzClient : public QObject { // The second argument allows for specifying a custom network access manager. // It is used in tests. The ownership of network is not transferred. explicit MusicBrainzClient(QObject *parent = nullptr, QNetworkAccessManager *network = nullptr); - ~MusicBrainzClient(); + ~MusicBrainzClient() override; struct Result { Result() : duration_msec_(0), track_(0), year_(-1) {} diff --git a/src/organise/organise.h b/src/organise/organise.h index fde083fd..2a40bfa5 100644 --- a/src/organise/organise.h +++ b/src/organise/organise.h @@ -59,7 +59,7 @@ class Organise : public QObject { typedef QList NewSongInfoList; explicit Organise(TaskManager *task_manager, std::shared_ptr destination, const OrganiseFormat &format, bool copy, bool overwrite, bool mark_as_listened, bool albumcover, const NewSongInfoList &songs, bool eject_after, const QString &playlist = QString()); - ~Organise(); + ~Organise() override; static const int kBatchSize; #ifdef HAVE_GSTREAMER @@ -74,7 +74,7 @@ class Organise : public QObject { void SongPathChanged(const Song &song, const QFileInfo &new_file); protected: - void timerEvent(QTimerEvent *e); + void timerEvent(QTimerEvent *e) override; private slots: void ProcessSomeFiles(); diff --git a/src/organise/organisedialog.h b/src/organise/organisedialog.h index fb98bda5..b74b3885 100644 --- a/src/organise/organisedialog.h +++ b/src/organise/organisedialog.h @@ -57,11 +57,11 @@ class OrganiseDialog : public QDialog { public: explicit OrganiseDialog(TaskManager *task_manager, CollectionBackend *backend = nullptr, QWidget *parentwindow = nullptr, QWidget *parent = nullptr); - ~OrganiseDialog(); + ~OrganiseDialog() override; static const char *kDefaultFormat; - QSize sizeHint() const; + QSize sizeHint() const override; void SetDestinationModel(QAbstractItemModel *model, bool devices = false); @@ -78,8 +78,8 @@ class OrganiseDialog : public QDialog { void SetPlaylist(const QString &playlist); protected: - void showEvent(QShowEvent*); - void closeEvent(QCloseEvent*); + void showEvent(QShowEvent*) override; + void closeEvent(QCloseEvent*) override; private: void LoadGeometry(); @@ -93,8 +93,8 @@ class OrganiseDialog : public QDialog { void FileCopied(int); public slots: - void accept(); - void reject(); + void accept() override; + void reject() override; private slots: void SaveSettings(); diff --git a/src/organise/organiseerrordialog.h b/src/organise/organiseerrordialog.h index 500637e8..286dcbb0 100644 --- a/src/organise/organiseerrordialog.h +++ b/src/organise/organiseerrordialog.h @@ -39,7 +39,7 @@ class OrganiseErrorDialog : public QDialog { public: explicit OrganiseErrorDialog(QWidget *parent = nullptr); - ~OrganiseErrorDialog(); + ~OrganiseErrorDialog() override; enum OperationType { Type_Copy, diff --git a/src/organise/organiseformat.h b/src/organise/organiseformat.h index a14332ef..87aece1f 100644 --- a/src/organise/organiseformat.h +++ b/src/organise/organiseformat.h @@ -70,7 +70,7 @@ class OrganiseFormat { class Validator : public QValidator { public: explicit Validator(QObject *parent = nullptr); - QValidator::State validate(QString &input, int&) const; + QValidator::State validate(QString &input, int&) const override; }; class SyntaxHighlighter : public QSyntaxHighlighter { @@ -85,7 +85,7 @@ class OrganiseFormat { explicit SyntaxHighlighter(QObject *parent = nullptr); explicit SyntaxHighlighter(QTextEdit *parent); explicit SyntaxHighlighter(QTextDocument *parent); - void highlightBlock(const QString &text); + void highlightBlock(const QString &text) override; }; private: diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index 3b5baa01..c5ef6d18 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -94,7 +94,7 @@ class Playlist : public QAbstractListModel { public: explicit Playlist(PlaylistBackend *backend, TaskManager *task_manager, CollectionBackend *collection, int id, const QString &special_type = QString(), bool favorite = false, QObject *parent = nullptr); - ~Playlist(); + ~Playlist() override; void SkipTracks(const QModelIndexList &source_indexes); @@ -263,18 +263,18 @@ class Playlist : public QAbstractListModel { #endif // QAbstractListModel - int rowCount(const QModelIndex& = QModelIndex()) const { return items_.count(); } - int columnCount(const QModelIndex& = QModelIndex()) const { return ColumnCount; } - QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role); - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &index) const; - QStringList mimeTypes() const; - Qt::DropActions supportedDropActions() const; - QMimeData *mimeData(const QModelIndexList &indexes) const; - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); - void sort(int column, Qt::SortOrder order); - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); + int rowCount(const QModelIndex& = QModelIndex()) const override { return items_.count(); } + int columnCount(const QModelIndex& = QModelIndex()) const override { return ColumnCount; } + QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role) override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QStringList mimeTypes() const override; + Qt::DropActions supportedDropActions() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; + void sort(int column, Qt::SortOrder order) override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; static bool ComparePathDepths(Qt::SortOrder, PlaylistItemPtr, PlaylistItemPtr); diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index c600a1d6..bec60579 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -67,8 +67,6 @@ PlaylistBackend::PlaylistBackend(Application *app, QObject *parent) } -PlaylistBackend::~PlaylistBackend() {} - void PlaylistBackend::Close() { if (db_) { diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h index b10abea8..4959b996 100644 --- a/src/playlist/playlistbackend.h +++ b/src/playlist/playlistbackend.h @@ -46,8 +46,7 @@ class PlaylistBackend : public QObject { Q_OBJECT public: - Q_INVOKABLE PlaylistBackend(Application *app, QObject *parent = nullptr); - ~PlaylistBackend(); + Q_INVOKABLE explicit PlaylistBackend(Application *app, QObject *parent = nullptr); struct Playlist { Playlist() : id(-1), favorite(false), last_played(0) {} diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h index ea85e7bb..cb248033 100644 --- a/src/playlist/playlistcontainer.h +++ b/src/playlist/playlistcontainer.h @@ -48,7 +48,7 @@ class PlaylistContainer : public QWidget { public: explicit PlaylistContainer(QWidget *parent = nullptr); - ~PlaylistContainer(); + ~PlaylistContainer() override; static const char *kSettingsGroup; @@ -58,9 +58,9 @@ class PlaylistContainer : public QWidget { PlaylistView *view() const; - bool eventFilter(QObject *objectWatched, QEvent *event); + bool eventFilter(QObject *objectWatched, QEvent *event) override; -signals: + signals: void TabChanged(int id); void Rename(int id, const QString &new_name); @@ -69,7 +69,7 @@ signals: protected: // QWidget - void resizeEvent(QResizeEvent*); + void resizeEvent(QResizeEvent*) override; private slots: void NewPlaylist(); diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h index 102e43ed..e76b6321 100644 --- a/src/playlist/playlistdelegates.h +++ b/src/playlist/playlistdelegates.h @@ -58,12 +58,13 @@ class Player; class QueuedItemDelegate : public QStyledItemDelegate { public: QueuedItemDelegate(QObject *parent, int indicator_column = Playlist::Column_Title); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; void DrawBox(QPainter *painter, const QRect &line_rect, const QFont &font, const QString &text, int width = -1) const; int queue_indicator_size(const QModelIndex &index) const; -private: + private: static const int kQueueBoxBorder; static const int kQueueBoxCornerRadius; static const int kQueueBoxLength; @@ -77,18 +78,20 @@ private: class PlaylistDelegateBase : public QueuedItemDelegate { Q_OBJECT + public: explicit PlaylistDelegateBase(QObject *parent, const QString &suffix = QString()); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QString displayText(const QVariant &value, const QLocale &locale) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QString displayText(const QVariant &value, const QLocale &locale) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; QStyleOptionViewItem Adjusted(const QStyleOptionViewItem &option, const QModelIndex &index) const; static const int kMinHeight; public slots: - bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index); + bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) override; protected: QTreeView *view_; @@ -98,44 +101,44 @@ class PlaylistDelegateBase : public QueuedItemDelegate { class LengthItemDelegate : public PlaylistDelegateBase { public: explicit LengthItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} - QString displayText(const QVariant &value, const QLocale &locale) const; + QString displayText(const QVariant &value, const QLocale &locale) const override; }; class SizeItemDelegate : public PlaylistDelegateBase { public: explicit SizeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} - QString displayText(const QVariant &value, const QLocale &locale) const; + QString displayText(const QVariant &value, const QLocale &locale) const override; }; class DateItemDelegate : public PlaylistDelegateBase { public: explicit DateItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} - QString displayText(const QVariant &value, const QLocale &locale) const; + QString displayText(const QVariant &value, const QLocale &locale) const override; }; class LastPlayedItemDelegate : public PlaylistDelegateBase { -public: + public: LastPlayedItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} - QString displayText(const QVariant &value, const QLocale &locale) const; + QString displayText(const QVariant &value, const QLocale &locale) const override; }; class FileTypeItemDelegate : public PlaylistDelegateBase { public: FileTypeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} - QString displayText(const QVariant &value, const QLocale &locale) const; + QString displayText(const QVariant &value, const QLocale &locale) const override; }; class TextItemDelegate : public PlaylistDelegateBase { public: explicit TextItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &idx) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &idx) const override; }; class TagCompletionModel : public QStringListModel { -public: + public: explicit TagCompletionModel(CollectionBackend *backend, Playlist::Column column); -private: + private: static QString database_column(Playlist::Column column); }; @@ -144,7 +147,7 @@ class TagCompleter : public QCompleter { public: explicit TagCompleter(CollectionBackend *backend, Playlist::Column column, QLineEdit *editor); - ~TagCompleter(); + ~TagCompleter() override; private slots: void ModelReady(QFuture future); @@ -157,7 +160,7 @@ class TagCompletionItemDelegate : public PlaylistDelegateBase { public: explicit TagCompletionItemDelegate(QObject *parent, CollectionBackend *backend, Playlist::Column column) : PlaylistDelegateBase(parent), backend_(backend), column_(column) {}; - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: CollectionBackend *backend_; @@ -167,14 +170,14 @@ class TagCompletionItemDelegate : public PlaylistDelegateBase { class NativeSeparatorsDelegate : public PlaylistDelegateBase { public: explicit NativeSeparatorsDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} - QString displayText(const QVariant &value, const QLocale &locale) const; + QString displayText(const QVariant &value, const QLocale &locale) const override; }; class SongSourceDelegate : public PlaylistDelegateBase { public: explicit SongSourceDelegate(QObject *parent); - QString displayText(const QVariant &value, const QLocale &locale) const; - void paint(QPainter *paint, const QStyleOptionViewItem &option, const QModelIndex &index) const; + QString displayText(const QVariant &value, const QLocale &locale) const override; + void paint(QPainter *paint, const QStyleOptionViewItem &option, const QModelIndex &index) const override; private: QPixmap LookupPixmap(const Song::Source &source, const QSize &size) const; diff --git a/src/playlist/playlistfilter.h b/src/playlist/playlistfilter.h index ede012fb..a9a23d66 100644 --- a/src/playlist/playlistfilter.h +++ b/src/playlist/playlistfilter.h @@ -38,14 +38,14 @@ class PlaylistFilter : public QSortFilterProxyModel { public: explicit PlaylistFilter(QObject *parent = nullptr); - ~PlaylistFilter(); + ~PlaylistFilter() override; // QAbstractItemModel - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; // QSortFilterProxyModel // public so Playlist::NextVirtualIndex and friends can get at it - bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const; + bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; private: // Mutable because they're modified from filterAcceptsRow() const diff --git a/src/playlist/playlistfilterparser.cpp b/src/playlist/playlistfilterparser.cpp index e0af18c2..dd9f794c 100644 --- a/src/playlist/playlistfilterparser.cpp +++ b/src/playlist/playlistfilterparser.cpp @@ -43,7 +43,7 @@ class SearchTermComparator { class DefaultComparator : public SearchTermComparator { public: explicit DefaultComparator(const QString &value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element.contains(search_term_); } private: @@ -53,7 +53,7 @@ class DefaultComparator : public SearchTermComparator { class EqComparator : public SearchTermComparator { public: explicit EqComparator(const QString &value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return search_term_ == element; } private: @@ -63,7 +63,7 @@ class EqComparator : public SearchTermComparator { class NeComparator : public SearchTermComparator { public: explicit NeComparator(const QString &value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return search_term_ != element; } private: @@ -73,7 +73,7 @@ class NeComparator : public SearchTermComparator { class LexicalGtComparator : public SearchTermComparator { public: explicit LexicalGtComparator(const QString &value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element > search_term_; } private: @@ -83,7 +83,7 @@ class LexicalGtComparator : public SearchTermComparator { class LexicalGeComparator : public SearchTermComparator { public: explicit LexicalGeComparator(const QString &value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element >= search_term_; } private: @@ -93,7 +93,7 @@ class LexicalGeComparator : public SearchTermComparator { class LexicalLtComparator : public SearchTermComparator { public: explicit LexicalLtComparator(const QString &value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element < search_term_; } private: @@ -103,7 +103,7 @@ class LexicalLtComparator : public SearchTermComparator { class LexicalLeComparator : public SearchTermComparator { public: explicit LexicalLeComparator(const QString &value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element <= search_term_; } private: @@ -113,7 +113,7 @@ class LexicalLeComparator : public SearchTermComparator { class GtComparator : public SearchTermComparator { public: explicit GtComparator(int value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element.toInt() > search_term_; } private: @@ -123,7 +123,7 @@ class GtComparator : public SearchTermComparator { class GeComparator : public SearchTermComparator { public: explicit GeComparator(int value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element.toInt() >= search_term_; } private: @@ -133,7 +133,7 @@ class GeComparator : public SearchTermComparator { class LtComparator : public SearchTermComparator { public: explicit LtComparator(int value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element.toInt() < search_term_; } private: @@ -143,7 +143,7 @@ class LtComparator : public SearchTermComparator { class LeComparator : public SearchTermComparator { public: explicit LeComparator(int value) : search_term_(value) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return element.toInt() <= search_term_; } private: @@ -157,7 +157,7 @@ class DropTailComparatorDecorator : public SearchTermComparator { public: explicit DropTailComparatorDecorator(SearchTermComparator *cmp) : cmp_(cmp) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { if (element.length() > 9) return cmp_->Matches(element.left(element.length() - 9)); else @@ -170,7 +170,7 @@ class DropTailComparatorDecorator : public SearchTermComparator { class RatingComparatorDecorator : public SearchTermComparator { public: explicit RatingComparatorDecorator(SearchTermComparator *cmp) : cmp_(cmp) {} - virtual bool Matches(const QString &element) const { + bool Matches(const QString &element) const override { return cmp_->Matches( QString::number(static_cast(element.toDouble() * 10.0 + 0.5))); } @@ -183,14 +183,14 @@ class FilterTerm : public FilterTree { public: explicit FilterTerm(SearchTermComparator *comparator, const QList &columns) : cmp_(comparator), columns_(columns) {} - virtual bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const { + bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override { for (int i : columns_) { QModelIndex idx(model->index(row, i, parent)); if (cmp_->Matches(idx.data().toString().toLower())) return true; } return false; } - virtual FilterType type() { return Term; } + FilterType type() override { return Term; } private: QScopedPointer cmp_; QList columns_; @@ -201,11 +201,11 @@ class FilterColumnTerm : public FilterTree { public: FilterColumnTerm(int column, SearchTermComparator *comparator) : col(column), cmp_(comparator) {} - virtual bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const { + bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override { QModelIndex idx(model->index(row, col, parent)); return cmp_->Matches(idx.data().toString().toLower()); } - virtual FilterType type() { return Column; } + FilterType type() override { return Column; } private: int col; QScopedPointer cmp_; @@ -215,40 +215,40 @@ class NotFilter : public FilterTree { public: explicit NotFilter(const FilterTree *inv) : child_(inv) {} - virtual bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const { + bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override { return !child_->accept(row, parent, model); } - virtual FilterType type() { return Not; } + FilterType type() override { return Not; } private: QScopedPointer child_; }; class OrFilter : public FilterTree { public: - ~OrFilter() { qDeleteAll(children_); } + ~OrFilter() override { qDeleteAll(children_); } virtual void add(FilterTree *child) { children_.append(child); } - virtual bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const { + bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override { for (FilterTree *child : children_) { if (child->accept(row, parent, model)) return true; } return false; } - FilterType type() { return Or; } + FilterType type() override { return Or; } private: QList children_; }; class AndFilter : public FilterTree { public: - virtual ~AndFilter() { qDeleteAll(children_); } + ~AndFilter() override { qDeleteAll(children_); } virtual void add(FilterTree *child) { children_.append(child); } - virtual bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const { + bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override { for (FilterTree *child : children_) { if (!child->accept(row, parent, model)) return false; } return true; } - FilterType type() { return And; } + FilterType type() override { return And; } private: QList children_; }; diff --git a/src/playlist/playlistfilterparser.h b/src/playlist/playlistfilterparser.h index ccf26373..64137fd6 100644 --- a/src/playlist/playlistfilterparser.h +++ b/src/playlist/playlistfilterparser.h @@ -49,8 +49,8 @@ class FilterTree { // trivial filter that accepts *anything* class NopFilter : public FilterTree { public: - virtual bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const { Q_UNUSED(row); Q_UNUSED(parent); Q_UNUSED(model); return true; } - virtual FilterType type() { return Nop; } + bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override { Q_UNUSED(row); Q_UNUSED(parent); Q_UNUSED(model); return true; } + FilterType type() override { return Nop; } }; diff --git a/src/playlist/playlistheader.h b/src/playlist/playlistheader.h index b6cd854f..25fd2cac 100644 --- a/src/playlist/playlistheader.h +++ b/src/playlist/playlistheader.h @@ -43,8 +43,8 @@ class PlaylistHeader : public StretchHeaderView { explicit PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, QWidget *parent = nullptr); // QWidget - void contextMenuEvent(QContextMenuEvent *e); - void enterEvent(QEvent *); + void contextMenuEvent(QContextMenuEvent *e) override; + void enterEvent(QEvent *) override; signals: void SectionVisibilityChanged(int logical, bool visible); diff --git a/src/playlist/playlistlistcontainer.cpp b/src/playlist/playlistlistcontainer.cpp index 15d6eeda..8f64f64c 100644 --- a/src/playlist/playlistlistcontainer.cpp +++ b/src/playlist/playlistlistcontainer.cpp @@ -64,7 +64,7 @@ public: : QSortFilterProxyModel(parent) { } - bool lessThan(const QModelIndex &left, const QModelIndex &right) const { + bool lessThan(const QModelIndex &left, const QModelIndex &right) const override { // Compare the display text first. const int ret = left.data().toString().localeAwareCompare(right.data().toString()); if (ret < 0) return true; diff --git a/src/playlist/playlistlistcontainer.h b/src/playlist/playlistlistcontainer.h index 69400878..bf01027c 100644 --- a/src/playlist/playlistlistcontainer.h +++ b/src/playlist/playlistlistcontainer.h @@ -49,15 +49,15 @@ class PlaylistListContainer : public QWidget { public: explicit PlaylistListContainer(QWidget *parent = nullptr); - ~PlaylistListContainer(); + ~PlaylistListContainer() override; void SetApplication(Application *app); -protected: - void showEvent(QShowEvent *e); - void contextMenuEvent(QContextMenuEvent *e); + protected: + void showEvent(QShowEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; -private slots: + private slots: // From the UI void NewFolderClicked(); void DeleteClicked(); diff --git a/src/playlist/playlistlistmodel.h b/src/playlist/playlistlistmodel.h index 1cfeb7ce..4ee8e3d9 100644 --- a/src/playlist/playlistlistmodel.h +++ b/src/playlist/playlistlistmodel.h @@ -49,7 +49,7 @@ class PlaylistListModel : public QStandardItemModel { Role_PlaylistId }; - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; // These icons will be used for newly created playlists and folders. // The caller will need to set these icons on existing items if there are any. @@ -77,7 +77,7 @@ class PlaylistListModel : public QStandardItemModel { QStandardItem *NewPlaylist(const QString &name, int id) const; // QStandardItemModel - bool setData(const QModelIndex &index, const QVariant &value, int role); + bool setData(const QModelIndex &index, const QVariant &value, int role) override; signals: void PlaylistPathChanged(int id, const QString &new_path); diff --git a/src/playlist/playlistlistview.h b/src/playlist/playlistlistview.h index c7eed6b9..c4353c91 100644 --- a/src/playlist/playlistlistview.h +++ b/src/playlist/playlistlistview.h @@ -36,11 +36,10 @@ class PlaylistListView : public AutoExpandingTreeView { public: explicit PlaylistListView(QWidget *parent = nullptr); - ~PlaylistListView() {} protected: // QWidget - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; #endif // PLAYLISTVIEW_H diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h index 97e497f0..d4cc39a8 100644 --- a/src/playlist/playlistmanager.h +++ b/src/playlist/playlistmanager.h @@ -133,72 +133,72 @@ class PlaylistManager : public PlaylistManagerInterface { public: explicit PlaylistManager(Application *app, QObject *parent = nullptr); - ~PlaylistManager(); + ~PlaylistManager() override; - int current_id() const { return current_; } - int active_id() const { return active_; } + int current_id() const override { return current_; } + int active_id() const override { return active_; } - Playlist *playlist(int id) const { return playlists_[id].p; } - Playlist *current() const { return playlist(current_id()); } - Playlist *active() const { return playlist(active_id()); } + Playlist *playlist(int id) const override { return playlists_[id].p; } + Playlist *current() const override { return playlist(current_id()); } + Playlist *active() const override { return playlist(active_id()); } // Returns the collection of playlists managed by this PlaylistManager. - QList GetAllPlaylists() const; + QList GetAllPlaylists() const override; // Grays out and reloads all deleted songs in all playlists. - void InvalidateDeletedSongs(); + void InvalidateDeletedSongs() override; // Removes all deleted songs from all playlists. - void RemoveDeletedSongs(); + void RemoveDeletedSongs() override; // Returns true if the playlist is open bool IsPlaylistOpen(int id); // Returns a pretty automatic name for playlist created from the given list of songs. static QString GetNameForNewPlaylist(const SongList& songs); - QItemSelection selection(int id) const; - QItemSelection current_selection() const { return selection(current_id()); } - QItemSelection active_selection() const { return selection(active_id()); } + QItemSelection selection(int id) const override; + QItemSelection current_selection() const override { return selection(current_id()); } + QItemSelection active_selection() const override { return selection(active_id()); } - QString GetPlaylistName(int index) const { return playlists_[index].name; } + QString GetPlaylistName(int index) const override { return playlists_[index].name; } bool IsPlaylistFavorite(int index) const { return playlists_[index].p->is_favorite(); } void Init(CollectionBackend *collection_backend, PlaylistBackend *playlist_backend, PlaylistSequence *sequence, PlaylistContainer *playlist_container); - CollectionBackend *collection_backend() const { return collection_backend_; } - PlaylistBackend *playlist_backend() const { return playlist_backend_; } - PlaylistSequence *sequence() const { return sequence_; } - PlaylistParser *parser() const { return parser_; } - PlaylistContainer *playlist_container() const { return playlist_container_; } + CollectionBackend *collection_backend() const override { return collection_backend_; } + PlaylistBackend *playlist_backend() const override { return playlist_backend_; } + PlaylistSequence *sequence() const override { return sequence_; } + PlaylistParser *parser() const override { return parser_; } + PlaylistContainer *playlist_container() const override { return playlist_container_; } public slots: - void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString()); - void Load(const QString &filename); - void Save(int id, const QString &filename, Playlist::Path path_type); + void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString()) override; + void Load(const QString &filename) override; + void Save(int id, const QString &filename, Playlist::Path path_type) override; // Display a file dialog to let user choose a file before saving the file void SaveWithUI(int id, const QString &playlist_name); - void Rename(int id, const QString &new_name); + void Rename(int id, const QString &new_name) override; void Favorite(int id, bool favorite); - void Delete(int id); - bool Close(int id); - void Open(int id); - void ChangePlaylistOrder(const QList& ids); + void Delete(int id) override; + bool Close(int id) override; + void Open(int id) override; + void ChangePlaylistOrder(const QList& ids) override; - void SetCurrentPlaylist(int id); - void SetActivePlaylist(int id); - void SetActiveToCurrent(); + void SetCurrentPlaylist(int id) override; + void SetActivePlaylist(int id) override; + void SetActiveToCurrent() override; - void SelectionChanged(const QItemSelection &selection); + void SelectionChanged(const QItemSelection &selection) override; // Makes a playlist current if it's open already, or opens it and makes it current if it is hidden. void SetCurrentOrOpen(int id); // Convenience slots that defer to either current() or active() - void ClearCurrent(); - void ShuffleCurrent(); - void RemoveDuplicatesCurrent(); - void RemoveUnavailableCurrent(); + void ClearCurrent() override; + void ShuffleCurrent() override; + void RemoveDuplicatesCurrent() override; + void RemoveUnavailableCurrent() override; //void SetActiveStreamMetadata(const QUrl& url, const Song& song); - void SongChangeRequestProcessed(const QUrl& url, bool valid); + void SongChangeRequestProcessed(const QUrl& url, bool valid) override; void InsertUrls(int id, const QList& urls, int pos = -1, bool play_now = false, bool enqueue = false); void InsertSongs(int id, const SongList& songs, int pos = -1, bool play_now = false, bool enqueue = false); @@ -208,9 +208,9 @@ class PlaylistManager : public PlaylistManagerInterface { void RemoveCurrentSong(); private slots: - void SetActivePlaying(); - void SetActivePaused(); - void SetActiveStopped(); + void SetActivePlaying() override; + void SetActivePaused() override; + void SetActiveStopped() override; void OneOfPlaylistsChanged(); void UpdateSummaryText(); diff --git a/src/playlist/playlistsaveoptionsdialog.h b/src/playlist/playlistsaveoptionsdialog.h index 15c2a47c..2317e150 100644 --- a/src/playlist/playlistsaveoptionsdialog.h +++ b/src/playlist/playlistsaveoptionsdialog.h @@ -40,9 +40,9 @@ class PlaylistSaveOptionsDialog : public QDialog { public: explicit PlaylistSaveOptionsDialog(QWidget *parent = 0); - ~PlaylistSaveOptionsDialog(); + ~PlaylistSaveOptionsDialog() override; - void accept(); + void accept() override; Playlist::Path path_type() const; private: diff --git a/src/playlist/playlistsequence.h b/src/playlist/playlistsequence.h index ecebfc33..e0e355a9 100644 --- a/src/playlist/playlistsequence.h +++ b/src/playlist/playlistsequence.h @@ -41,8 +41,8 @@ class PlaylistSequence : public QWidget { Q_OBJECT public: - explicit PlaylistSequence(QWidget *parent = nullptr, SettingsProvider *settings = 0); - ~PlaylistSequence(); + explicit PlaylistSequence(QWidget *parent = nullptr, SettingsProvider *settings = nullptr); + ~PlaylistSequence() override; enum RepeatMode { Repeat_Off = 0, diff --git a/src/playlist/playlisttabbar.h b/src/playlist/playlisttabbar.h index 7b33e7b4..a982e58e 100644 --- a/src/playlist/playlisttabbar.h +++ b/src/playlist/playlisttabbar.h @@ -79,15 +79,15 @@ class PlaylistTabBar : public QTabBar { void PlaylistFavorited(int id, bool favorite); protected: - void contextMenuEvent(QContextMenuEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void mouseDoubleClickEvent(QMouseEvent *e); - void dragEnterEvent(QDragEnterEvent *e); - void dragMoveEvent(QDragMoveEvent *e); - void dragLeaveEvent(QDragLeaveEvent *e); - void dropEvent(QDropEvent *e); - void timerEvent(QTimerEvent *e); - bool event(QEvent *e); + void contextMenuEvent(QContextMenuEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; + void dragEnterEvent(QDragEnterEvent *e) override; + void dragMoveEvent(QDragMoveEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dropEvent(QDropEvent *e) override; + void timerEvent(QTimerEvent *e) override; + bool event(QEvent *e) override; private slots: void CurrentIndexChanged(int index); diff --git a/src/playlist/playlistundocommands.h b/src/playlist/playlistundocommands.h index def01664..de44b9d9 100644 --- a/src/playlist/playlistundocommands.h +++ b/src/playlist/playlistundocommands.h @@ -51,8 +51,8 @@ namespace PlaylistUndoCommands { public: explicit InsertItems(Playlist *playlist, const PlaylistItemList &items, int pos, bool enqueue = false, bool enqueue_next = false); - void undo(); - void redo(); + void undo() override; + void redo() override; // When load is async, items have already been pushed, so we need to update them. // This function try to find the equivalent item, and replace it with the new (completely loaded) one. // Return true if the was found (and updated), false otherwise @@ -69,11 +69,11 @@ namespace PlaylistUndoCommands { public: explicit RemoveItems(Playlist *playlist, int pos, int count); - int id() const { return Type_RemoveItems; } + int id() const override { return Type_RemoveItems; } - void undo(); - void redo(); - bool mergeWith(const QUndoCommand *other); + void undo() override; + void redo() override; + bool mergeWith(const QUndoCommand *other) override; private: struct Range { @@ -90,8 +90,8 @@ namespace PlaylistUndoCommands { public: explicit MoveItems(Playlist *playlist, const QList &source_rows, int pos); - void undo(); - void redo(); + void undo() override; + void redo() override; private: QList source_rows_; @@ -102,8 +102,8 @@ namespace PlaylistUndoCommands { public: explicit ReOrderItems(Playlist *playlist, const PlaylistItemList &new_items); - void undo(); - void redo(); + void undo() override; + void redo() override; private: PlaylistItemList old_items_; diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index c05d9f9e..dda95a43 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -82,8 +82,8 @@ class PlaylistProxyStyle : public QProxyStyle { public: explicit PlaylistProxyStyle(); - void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const; - void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const; + void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const override; + void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const override; private: std::unique_ptr common_style_; @@ -91,10 +91,10 @@ class PlaylistProxyStyle : public QProxyStyle { class PlaylistView : public QTreeView { Q_OBJECT - public: + public: explicit PlaylistView(QWidget *parent = nullptr); - ~PlaylistView(); + ~PlaylistView() override; static ColumnAlignmentMap DefaultColumnAlignment(); @@ -109,13 +109,11 @@ class PlaylistView : public QTreeView { AppearanceSettingsPage::BackgroundImageType background_image_type() const { return background_image_type_; } Qt::Alignment column_alignment(int section) const; - // QTreeView - void drawTree(QPainter *painter, const QRegion ®ion) const; - void drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - void setModel(QAbstractItemModel *model); - void ResetColumns(); + // QTreeView + void setModel(QAbstractItemModel *model) override; + public slots: void ReloadSettings(); void SaveGeometry(); @@ -136,29 +134,33 @@ class PlaylistView : public QTreeView { protected: // QWidget - void keyPressEvent(QKeyEvent *event); - void contextMenuEvent(QContextMenuEvent *e); - void hideEvent(QHideEvent *event); - void showEvent(QShowEvent *event); - void timerEvent(QTimerEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void leaveEvent(QEvent*); - void paintEvent(QPaintEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dragEnterEvent(QDragEnterEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); - void dropEvent(QDropEvent *event); - bool eventFilter(QObject *object, QEvent *event); - void focusInEvent(QFocusEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void hideEvent(QHideEvent *event) override; + void showEvent(QShowEvent *event) override; + void timerEvent(QTimerEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void leaveEvent(QEvent*) override; + void paintEvent(QPaintEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; + bool eventFilter(QObject *object, QEvent *event) override; + void focusInEvent(QFocusEvent *event) override; + + // QTreeView + void drawTree(QPainter *painter, const QRegion ®ion) const; + void drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; // QAbstractScrollArea - void scrollContentsBy(int dx, int dy); + void scrollContentsBy(int dx, int dy) override; // QAbstractItemView - void rowsInserted(const QModelIndex &parent, int start, int end); - bool edit(const QModelIndex &index, QAbstractItemView::EditTrigger trigger, QEvent *event); - void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint); + void rowsInserted(const QModelIndex &parent, int start, int end) override; + bool edit(const QModelIndex &index, QAbstractItemView::EditTrigger trigger, QEvent *event) override; + void closeEditor(QWidget *editor, QAbstractItemDelegate::EndEditHint hint) override; private slots: void InhibitAutoscrollTimeout(); diff --git a/src/playlist/songloaderinserter.h b/src/playlist/songloaderinserter.h index 41f44d6c..33fe26a4 100644 --- a/src/playlist/songloaderinserter.h +++ b/src/playlist/songloaderinserter.h @@ -41,7 +41,7 @@ class SongLoaderInserter : public QObject { public: explicit SongLoaderInserter(TaskManager *task_manager, CollectionBackendInterface *collection, const Player *player); - ~SongLoaderInserter(); + ~SongLoaderInserter() override; void Load(Playlist *destination, int row, bool play_now, bool enqueue, bool enqueue_next, const QList &urls); void LoadAudioCD(Playlist *destination, int row, bool play_now, bool enqueue, bool enqueue_next); diff --git a/src/playlist/songplaylistitem.h b/src/playlist/songplaylistitem.h index c9f86374..2c331cd2 100644 --- a/src/playlist/songplaylistitem.h +++ b/src/playlist/songplaylistitem.h @@ -37,15 +37,15 @@ class SongPlaylistItem : public PlaylistItem { // Restores a stream- or file-related playlist item using query row. // If it's a file related playlist item, this will restore it's CUE attributes (if any) but won't parse the CUE! - bool InitFromQuery(const SqlRow& query); - void Reload(); + bool InitFromQuery(const SqlRow& query) override; + void Reload() override; - Song Metadata() const; + Song Metadata() const override; - QUrl Url() const; + QUrl Url() const override; - Song DatabaseSongMetadata() const { return song_; } - void SetArtManual(const QUrl &cover_url); + Song DatabaseSongMetadata() const override { return song_; } + void SetArtManual(const QUrl &cover_url) override; private: Song song_; diff --git a/src/playlistparsers/asxiniparser.h b/src/playlistparsers/asxiniparser.h index f4c1a754..edfb82c8 100644 --- a/src/playlistparsers/asxiniparser.h +++ b/src/playlistparsers/asxiniparser.h @@ -41,13 +41,13 @@ class AsxIniParser : public ParserBase { public: explicit AsxIniParser(CollectionBackendInterface *collection, QObject *parent = nullptr); - QString name() const { return "ASX/INI"; } - QStringList file_extensions() const { return QStringList() << "asxini"; } + QString name() const override { return "ASX/INI"; } + QStringList file_extensions() const override { return QStringList() << "asxini"; } - bool TryMagic(const QByteArray &data) const; + bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const; - void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const; + SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const override; + void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const override; }; #endif // ASXINIPARSER_H diff --git a/src/playlistparsers/asxparser.h b/src/playlistparsers/asxparser.h index 5834a79b..14b6a76e 100644 --- a/src/playlistparsers/asxparser.h +++ b/src/playlistparsers/asxparser.h @@ -43,13 +43,13 @@ class ASXParser : public XMLParser { public: explicit ASXParser(CollectionBackendInterface *collection, QObject *parent = nullptr); - QString name() const { return "ASX"; } - QStringList file_extensions() const { return QStringList() << "asx"; } + QString name() const override { return "ASX"; } + QStringList file_extensions() const override { return QStringList() << "asx"; } - bool TryMagic(const QByteArray &data) const; + bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const; - void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const; + SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const override; + void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const override; private: Song ParseTrack(QXmlStreamReader *reader, const QDir &dir) const; diff --git a/src/playlistparsers/cueparser.h b/src/playlistparsers/cueparser.h index 7811f07d..a22953a7 100644 --- a/src/playlistparsers/cueparser.h +++ b/src/playlistparsers/cueparser.h @@ -60,14 +60,14 @@ class CueParser : public ParserBase { explicit CueParser(CollectionBackendInterface *collection, QObject *parent = nullptr); - QString name() const { return "CUE"; } - QStringList file_extensions() const { return QStringList() << "cue"; } - QString mime_type() const { return "application/x-cue"; } + QString name() const override { return "CUE"; } + QStringList file_extensions() const override { return QStringList() << "cue"; } + QString mime_type() const override { return "application/x-cue"; } - bool TryMagic(const QByteArray &data) const; + bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const; - void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const; + SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const override; + void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const override; private: // A single TRACK entry in .cue file. diff --git a/src/playlistparsers/m3uparser.h b/src/playlistparsers/m3uparser.h index 4180d1be..f0bfa34e 100644 --- a/src/playlistparsers/m3uparser.h +++ b/src/playlistparsers/m3uparser.h @@ -43,14 +43,14 @@ class M3UParser : public ParserBase { public: explicit M3UParser(CollectionBackendInterface *collection, QObject *parent = nullptr); - QString name() const { return "M3U"; } - QStringList file_extensions() const { return QStringList() << "m3u" << "m3u8"; } - QString mime_type() const { return "text/uri-list"; } + QString name() const override { return "M3U"; } + QStringList file_extensions() const override { return QStringList() << "m3u" << "m3u8"; } + QString mime_type() const override { return "text/uri-list"; } - bool TryMagic(const QByteArray &data) const; + bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const; - void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const; + SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const override; + void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const override; private: enum M3UType { diff --git a/src/playlistparsers/plsparser.h b/src/playlistparsers/plsparser.h index 035b8bc9..ef601bd6 100644 --- a/src/playlistparsers/plsparser.h +++ b/src/playlistparsers/plsparser.h @@ -41,14 +41,14 @@ class PLSParser : public ParserBase { public: explicit PLSParser(CollectionBackendInterface *collection, QObject *parent = nullptr); - QString name() const { return "PLS"; } - QStringList file_extensions() const { return QStringList() << "pls"; } - QString mime_type() const { return "audio/x-scpls"; } + QString name() const override { return "PLS"; } + QStringList file_extensions() const override { return QStringList() << "pls"; } + QString mime_type() const override { return "audio/x-scpls"; } - bool TryMagic(const QByteArray &data) const; + bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const; - void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const; + SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const override; + void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const override; }; #endif // PLSPARSER_H diff --git a/src/playlistparsers/wplparser.h b/src/playlistparsers/wplparser.h index 2e305b0d..5157f563 100644 --- a/src/playlistparsers/wplparser.h +++ b/src/playlistparsers/wplparser.h @@ -43,14 +43,14 @@ class WplParser : public XMLParser { public: explicit WplParser(CollectionBackendInterface *collection, QObject *parent = nullptr); - QString name() const { return "WPL"; } - QStringList file_extensions() const { return QStringList() << "wpl"; } - QString mime_type() const { return "application/vnd.ms-wpl"; } + QString name() const override { return "WPL"; } + QStringList file_extensions() const override { return QStringList() << "wpl"; } + QString mime_type() const override { return "application/vnd.ms-wpl"; } - bool TryMagic(const QByteArray &data) const; + bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path, const QDir &dir) const; - void Save(const SongList &songs, QIODevice *device, const QDir &dir, Playlist::Path path_type = Playlist::Path_Automatic) const; + SongList Load(QIODevice *device, const QString &playlist_path, const QDir &dir) const override; + void Save(const SongList &songs, QIODevice *device, const QDir &dir, Playlist::Path path_type = Playlist::Path_Automatic) const override; private: void ParseSeq(const QDir &dir, QXmlStreamReader *reader, SongList *songs) const; diff --git a/src/playlistparsers/xspfparser.h b/src/playlistparsers/xspfparser.h index ab036508..d48a664d 100644 --- a/src/playlistparsers/xspfparser.h +++ b/src/playlistparsers/xspfparser.h @@ -43,13 +43,13 @@ class XSPFParser : public XMLParser { public: explicit XSPFParser(CollectionBackendInterface *collection, QObject *parent = nullptr); - QString name() const { return "XSPF"; } - QStringList file_extensions() const { return QStringList() << "xspf"; } + QString name() const override { return "XSPF"; } + QStringList file_extensions() const override { return QStringList() << "xspf"; } - bool TryMagic(const QByteArray &data) const; + bool TryMagic(const QByteArray &data) const override; - SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const; - void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const; + SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const override; + void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const override; private: Song ParseTrack(QXmlStreamReader *reader, const QDir &dir) const; diff --git a/src/queue/queue.h b/src/queue/queue.h index 5112d115..73c4b0df 100644 --- a/src/queue/queue.h +++ b/src/queue/queue.h @@ -61,22 +61,22 @@ class Queue : public QAbstractProxyModel { void Remove(QList &proxy_rows); // QAbstractProxyModel - void setSourceModel(QAbstractItemModel *source_model); - QModelIndex mapFromSource(const QModelIndex &source_index) const; - QModelIndex mapToSource(const QModelIndex &proxy_index) const; + void setSourceModel(QAbstractItemModel *source_model) override; + QModelIndex mapFromSource(const QModelIndex &source_index) const override; + QModelIndex mapToSource(const QModelIndex &proxy_index) const override; // QAbstractItemModel - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &child) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &proxy_index, int role) const; - QVariant headerData(int section, Qt::Orientation orientation, int role) const; - QStringList mimeTypes() const; - Qt::DropActions supportedDropActions() const; - QMimeData *mimeData(const QModelIndexList &indexes) const; - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); - Qt::ItemFlags flags(const QModelIndex &index) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &proxy_index, int role) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + QStringList mimeTypes() const override; + Qt::DropActions supportedDropActions() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; public slots: void UpdateSummaryText(); diff --git a/src/queue/queueview.h b/src/queue/queueview.h index 8314fbca..b1610c84 100644 --- a/src/queue/queueview.h +++ b/src/queue/queueview.h @@ -36,11 +36,11 @@ class QueueView : public QWidget { public: explicit QueueView(QWidget *parent = nullptr); - ~QueueView(); + ~QueueView() override; void SetPlaylistManager(PlaylistManager *manager); -private slots: + private slots: void CurrentPlaylistChanged(Playlist *playlist); void PlaylistDestroyed(); void UpdateButtonState(); @@ -50,7 +50,7 @@ private slots: void Remove(); void Clear(); -private: + private: Ui_QueueView *ui_; PlaylistManager *playlists_; diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp index e43e5ac6..c5609310 100644 --- a/src/scrobbler/audioscrobbler.cpp +++ b/src/scrobbler/audioscrobbler.cpp @@ -63,8 +63,6 @@ AudioScrobbler::AudioScrobbler(Application *app, QObject *parent) : } -AudioScrobbler::~AudioScrobbler() {} - void AudioScrobbler::ReloadSettings() { QSettings s; diff --git a/src/scrobbler/audioscrobbler.h b/src/scrobbler/audioscrobbler.h index 61453376..89575ac1 100644 --- a/src/scrobbler/audioscrobbler.h +++ b/src/scrobbler/audioscrobbler.h @@ -36,7 +36,6 @@ class AudioScrobbler : public QObject { public: explicit AudioScrobbler(Application *app, QObject *parent = nullptr); - ~AudioScrobbler(); void ReloadSettings(); diff --git a/src/scrobbler/lastfmscrobbler.h b/src/scrobbler/lastfmscrobbler.h index 6a13cde4..afb6a5cc 100644 --- a/src/scrobbler/lastfmscrobbler.h +++ b/src/scrobbler/lastfmscrobbler.h @@ -38,13 +38,13 @@ class LastFMScrobbler : public ScrobblingAPI20 { public: explicit LastFMScrobbler(Application *app, QObject *parent = nullptr); - ~LastFMScrobbler(); + ~LastFMScrobbler() override; static const char *kName; static const char *kSettingsGroup; - NetworkAccessManager *network() { return network_; } - ScrobblerCache *cache() { return cache_; } + NetworkAccessManager *network() const override { return network_; } + ScrobblerCache *cache() const override { return cache_; } private: static const char *kAuthUrl; diff --git a/src/scrobbler/librefmscrobbler.h b/src/scrobbler/librefmscrobbler.h index 7e44f6a3..64a08e4b 100644 --- a/src/scrobbler/librefmscrobbler.h +++ b/src/scrobbler/librefmscrobbler.h @@ -38,13 +38,13 @@ class LibreFMScrobbler : public ScrobblingAPI20 { public: explicit LibreFMScrobbler(Application *app, QObject *parent = nullptr); - ~LibreFMScrobbler(); + ~LibreFMScrobbler() override; static const char *kName; static const char *kSettingsGroup; - NetworkAccessManager *network() { return network_; } - ScrobblerCache *cache() { return cache_; } + NetworkAccessManager *network() const override { return network_; } + ScrobblerCache *cache() const override { return cache_; } private: static const char *kAuthUrl; diff --git a/src/scrobbler/listenbrainzscrobbler.h b/src/scrobbler/listenbrainzscrobbler.h index 85534f50..9709c6d8 100644 --- a/src/scrobbler/listenbrainzscrobbler.h +++ b/src/scrobbler/listenbrainzscrobbler.h @@ -47,33 +47,33 @@ class ListenBrainzScrobbler : public ScrobblerService { public: explicit ListenBrainzScrobbler(Application *app, QObject *parent = nullptr); - ~ListenBrainzScrobbler(); + ~ListenBrainzScrobbler() override; static const char *kName; static const char *kSettingsGroup; - void ReloadSettings(); + void ReloadSettings() override; void LoadSession(); - bool IsEnabled() const { return enabled_; } - bool IsAuthenticated() const { return !access_token_.isEmpty() && !user_token_.isEmpty(); } - bool IsSubmitted() const { return submitted_; } - void Submitted() { submitted_ = true; } + bool IsEnabled() const override { return enabled_; } + bool IsAuthenticated() const override { return !access_token_.isEmpty() && !user_token_.isEmpty(); } + bool IsSubmitted() const override { return submitted_; } + void Submitted() override { submitted_ = true; } QString user_token() const { return user_token_; } void Authenticate(const bool https = false); void Logout(); void ShowConfig(); - void Submit(); - void UpdateNowPlaying(const Song &song); - void ClearPlaying(); - void Scrobble(const Song &song); + void Submit() override; + void UpdateNowPlaying(const Song &song) override; + void ClearPlaying() override; + void Scrobble(const Song &song) override; signals: void AuthenticationComplete(bool success, QString error = QString()); public slots: - void WriteCache() { cache_->WriteCache(); } + void WriteCache() override { cache_->WriteCache(); } private slots: void RedirectArrived(); @@ -87,8 +87,8 @@ class ListenBrainzScrobbler : public ScrobblerService { QByteArray GetReplyData(QNetworkReply *reply); void AuthError(const QString &error); - void Error(const QString &error, const QVariant &debug = QVariant()); - void DoSubmit(); + void Error(const QString &error, const QVariant &debug = QVariant()) override; + void DoSubmit() override; void CheckScrobblePrevSong(); static const char *kOAuthAuthorizeUrl; diff --git a/src/scrobbler/scrobblercache.h b/src/scrobbler/scrobblercache.h index 3a9b790f..5121212d 100644 --- a/src/scrobbler/scrobblercache.h +++ b/src/scrobbler/scrobblercache.h @@ -39,7 +39,7 @@ class ScrobblerCache : public QObject { public: explicit ScrobblerCache(const QString &filename, QObject *parent); - ~ScrobblerCache(); + ~ScrobblerCache() override; void ReadCache(); diff --git a/src/scrobbler/scrobblerservices.h b/src/scrobbler/scrobblerservices.h index 8b4cce7a..b7dcddb1 100644 --- a/src/scrobbler/scrobblerservices.h +++ b/src/scrobbler/scrobblerservices.h @@ -37,7 +37,7 @@ class ScrobblerServices : public QObject { public: explicit ScrobblerServices(QObject *parent = nullptr); - ~ScrobblerServices(); + ~ScrobblerServices() override; void AddService(ScrobblerService *service); void RemoveService(ScrobblerService *service); diff --git a/src/scrobbler/scrobblingapi20.h b/src/scrobbler/scrobblingapi20.h index 936e70b5..546a358f 100644 --- a/src/scrobbler/scrobblingapi20.h +++ b/src/scrobbler/scrobblingapi20.h @@ -45,37 +45,37 @@ class ScrobblingAPI20 : public ScrobblerService { public: explicit ScrobblingAPI20(const QString &name, const QString &settings_group, const QString &auth_url, const QString &api_url, const bool batch, Application *app, QObject *parent = nullptr); - ~ScrobblingAPI20(); + ~ScrobblingAPI20() override; static const char *kRedirectUrl; - void ReloadSettings(); + void ReloadSettings() override; void LoadSession(); - virtual NetworkAccessManager *network() = 0; - virtual ScrobblerCache *cache() = 0; + virtual NetworkAccessManager *network() const = 0; + virtual ScrobblerCache *cache() const = 0; - bool IsEnabled() const { return enabled_; } + bool IsEnabled() const override { return enabled_; } bool IsUseHTTPS() const { return https_; } - bool IsAuthenticated() const { return !username_.isEmpty() && !session_key_.isEmpty(); } + bool IsAuthenticated() const override { return !username_.isEmpty() && !session_key_.isEmpty(); } bool IsSubscriber() const { return subscriber_; } - bool IsSubmitted() const { return submitted_; } - void Submitted() { submitted_ = true; } + bool IsSubmitted() const override { return submitted_; } + void Submitted() override { submitted_ = true; } QString username() const { return username_; } void Authenticate(const bool https = false); void Logout(); - void UpdateNowPlaying(const Song &song); - void ClearPlaying(); - void Scrobble(const Song &song); - void Submit(); - void Love(); + void UpdateNowPlaying(const Song &song) override; + void ClearPlaying() override; + void Scrobble(const Song &song) override; + void Submit() override; + void Love() override; signals: void AuthenticationComplete(bool success, QString error = QString()); public slots: - void WriteCache() { cache()->WriteCache(); } + void WriteCache() override { cache()->WriteCache(); } private slots: void RedirectArrived(); @@ -130,9 +130,9 @@ class ScrobblingAPI20 : public ScrobblerService { void RequestSession(const QString &token); void AuthError(const QString &error); void SendSingleScrobble(ScrobblerCacheItemPtr item); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; QString ErrorString(const ScrobbleErrorCode error) const; - void DoSubmit(); + void DoSubmit() override; void CheckScrobblePrevSong(); QString name_; diff --git a/src/settings/appearancesettingspage.h b/src/settings/appearancesettingspage.h index c9727bdc..058ffe3f 100644 --- a/src/settings/appearancesettingspage.h +++ b/src/settings/appearancesettingspage.h @@ -38,9 +38,9 @@ class Ui_AppearanceSettingsPage; class AppearanceSettingsPage : public SettingsPage { Q_OBJECT -public: + public: explicit AppearanceSettingsPage(SettingsDialog *dialog); - ~AppearanceSettingsPage(); + ~AppearanceSettingsPage() override; static const char *kSettingsGroup; @@ -83,9 +83,9 @@ public: BackgroundImagePosition_BottomRight = 5 }; - void Load(); - void Save(); - void Cancel(); + void Load() override; + void Save() override; + void Cancel() override; private slots: void SelectForegroundColor(); diff --git a/src/settings/backendsettingspage.h b/src/settings/backendsettingspage.h index 5d42dfe5..049c7367 100644 --- a/src/settings/backendsettingspage.h +++ b/src/settings/backendsettingspage.h @@ -43,13 +43,13 @@ class BackendSettingsPage : public SettingsPage { public: explicit BackendSettingsPage(SettingsDialog *dialog); - ~BackendSettingsPage(); + ~BackendSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); - void Cancel(); + void Load() override; + void Save() override; + void Cancel() override; EngineBase *engine() const { return dialog()->app()->player()->engine(); } diff --git a/src/settings/behavioursettingspage.h b/src/settings/behavioursettingspage.h index 177a6b4f..5ec3045b 100644 --- a/src/settings/behavioursettingspage.h +++ b/src/settings/behavioursettingspage.h @@ -37,7 +37,7 @@ class BehaviourSettingsPage : public SettingsPage { public: explicit BehaviourSettingsPage(SettingsDialog *dialog); - ~BehaviourSettingsPage(); + ~BehaviourSettingsPage() override; static const char *kSettingsGroup; @@ -64,8 +64,8 @@ public: PlaylistAddBehaviour_Enqueue = 2, }; - void Load(); - void Save(); + void Load() override; + void Save() override; private slots: void ShowTrayIconToggled(bool on); diff --git a/src/settings/collectionsettingspage.h b/src/settings/collectionsettingspage.h index 0259fc53..1f31955b 100644 --- a/src/settings/collectionsettingspage.h +++ b/src/settings/collectionsettingspage.h @@ -39,7 +39,7 @@ class CollectionSettingsPage : public SettingsPage { public: explicit CollectionSettingsPage(SettingsDialog *dialog); - ~CollectionSettingsPage(); + ~CollectionSettingsPage() override; static const char *kSettingsGroup; static const char *kSettingsCacheSize; @@ -62,8 +62,8 @@ class CollectionSettingsPage : public SettingsPage { SaveCover_Pattern = 2 }; - void Load(); - void Save(); + void Load() override; + void Save() override; private slots: void Add(); diff --git a/src/settings/contextsettingspage.h b/src/settings/contextsettingspage.h index 51d55f87..ef306aea 100644 --- a/src/settings/contextsettingspage.h +++ b/src/settings/contextsettingspage.h @@ -40,7 +40,7 @@ class ContextSettingsPage : public SettingsPage { public: explicit ContextSettingsPage(SettingsDialog *dialog); - ~ContextSettingsPage(); + ~ContextSettingsPage() override; enum ContextSettingsOrder { ALBUM, @@ -59,8 +59,8 @@ public: static const char *kSettingsGroupEnable[ContextSettingsOrder::NELEMS]; static const qreal kDefaultFontSizeHeadline; - void Load(); - void Save(); + void Load() override; + void Save() override; private slots: void InsertVariableFirstLine(QAction *action); diff --git a/src/settings/coverssettingspage.h b/src/settings/coverssettingspage.h index 0d7339e0..0954d073 100644 --- a/src/settings/coverssettingspage.h +++ b/src/settings/coverssettingspage.h @@ -39,12 +39,12 @@ class CoversSettingsPage : public SettingsPage { public: explicit CoversSettingsPage(SettingsDialog *parent = nullptr); - ~CoversSettingsPage(); + ~CoversSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; private: void NoProviderSelected(); diff --git a/src/settings/lyricssettingspage.h b/src/settings/lyricssettingspage.h index 6813ce42..0f591c60 100644 --- a/src/settings/lyricssettingspage.h +++ b/src/settings/lyricssettingspage.h @@ -39,12 +39,12 @@ class LyricsSettingsPage : public SettingsPage { public: explicit LyricsSettingsPage(SettingsDialog *parent = nullptr); - ~LyricsSettingsPage(); + ~LyricsSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; private: void NoProviderSelected(); diff --git a/src/settings/moodbarsettingspage.h b/src/settings/moodbarsettingspage.h index f976bd2a..04f34d44 100644 --- a/src/settings/moodbarsettingspage.h +++ b/src/settings/moodbarsettingspage.h @@ -34,13 +34,13 @@ class MoodbarSettingsPage : public SettingsPage { public: explicit MoodbarSettingsPage(SettingsDialog* dialog); - ~MoodbarSettingsPage(); + ~MoodbarSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); - void Cancel(); + void Load() override; + void Save() override; + void Cancel() override; private: static const int kMoodbarPreviewWidth; diff --git a/src/settings/networkproxysettingspage.h b/src/settings/networkproxysettingspage.h index abb48023..43408dd6 100644 --- a/src/settings/networkproxysettingspage.h +++ b/src/settings/networkproxysettingspage.h @@ -36,14 +36,15 @@ class NetworkProxySettingsPage : public SettingsPage { public: explicit NetworkProxySettingsPage(SettingsDialog* dialog); - ~NetworkProxySettingsPage(); + ~NetworkProxySettingsPage() override; + static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; private: Ui_NetworkProxySettingsPage* ui_; }; -#endif // NETWORKPROXYSETTINGSPAGE_H +#endif // NETWORKPROXYSETTINGSPAGE_H diff --git a/src/settings/notificationssettingspage.h b/src/settings/notificationssettingspage.h index 7378023d..34da4e35 100644 --- a/src/settings/notificationssettingspage.h +++ b/src/settings/notificationssettingspage.h @@ -41,15 +41,16 @@ class NotificationsSettingsPage : public SettingsPage { public: explicit NotificationsSettingsPage(SettingsDialog *dialog); - ~NotificationsSettingsPage(); + ~NotificationsSettingsPage() override; + static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; protected: - void hideEvent(QHideEvent*); - void showEvent(QShowEvent*); + void hideEvent(QHideEvent*) override; + void showEvent(QShowEvent*) override; private slots: void NotificationTypeChanged(); @@ -74,4 +75,4 @@ class NotificationsSettingsPage : public SettingsPage { OSDPretty *pretty_popup_; }; -#endif // NOTIFICATIONSSETTINGSPAGE_H +#endif // NOTIFICATIONSSETTINGSPAGE_H diff --git a/src/settings/playlistsettingspage.h b/src/settings/playlistsettingspage.h index 72d42554..221928f9 100644 --- a/src/settings/playlistsettingspage.h +++ b/src/settings/playlistsettingspage.h @@ -36,15 +36,15 @@ class PlaylistSettingsPage : public SettingsPage { public: explicit PlaylistSettingsPage(SettingsDialog* dialog); - ~PlaylistSettingsPage(); + ~PlaylistSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; private: Ui_PlaylistSettingsPage* ui_; }; -#endif // PLAYLISTSETTINGSPAGE_H +#endif // PLAYLISTSETTINGSPAGE_H diff --git a/src/settings/scrobblersettingspage.h b/src/settings/scrobblersettingspage.h index b1b4b698..96e6e3a2 100644 --- a/src/settings/scrobblersettingspage.h +++ b/src/settings/scrobblersettingspage.h @@ -37,12 +37,12 @@ class ScrobblerSettingsPage : public SettingsPage { public: explicit ScrobblerSettingsPage(SettingsDialog *parent); - ~ScrobblerSettingsPage(); + ~ScrobblerSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; private slots: void LastFM_Login(); diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h index 5e398aa4..438fe093 100644 --- a/src/settings/settingsdialog.h +++ b/src/settings/settingsdialog.h @@ -60,8 +60,8 @@ class Ui_SettingsDialog; class SettingsItemDelegate : public QStyledItemDelegate { public: explicit SettingsItemDelegate(QObject *parent); - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; @@ -70,7 +70,7 @@ class SettingsDialog : public QDialog { public: explicit SettingsDialog(Application *app, QMainWindow *mainwindow, QWidget *parent = nullptr); - ~SettingsDialog(); + ~SettingsDialog() override; enum Page { Page_Behaviour, @@ -113,8 +113,8 @@ class SettingsDialog : public QDialog { void ComboBoxLoadFromSettings(const QSettings &s, QComboBox *combobox, const QString &setting, const int default_value); protected: - void showEvent(QShowEvent *e); - void closeEvent(QCloseEvent*); + void showEvent(QShowEvent *e) override; + void closeEvent(QCloseEvent*) override; private: struct PageData { @@ -124,8 +124,8 @@ class SettingsDialog : public QDialog { }; // QDialog - void accept(); - void reject(); + void accept() override; + void reject() override; void LoadGeometry(); void SaveGeometry(); diff --git a/src/settings/settingspage.h b/src/settings/settingspage.h index 1db3557d..a9e95966 100644 --- a/src/settings/settingspage.h +++ b/src/settings/settingspage.h @@ -65,7 +65,7 @@ class SettingsPage : public QWidget { void set_changed() { changed_ = true; } protected: - virtual void showEvent(QShowEvent *e); + void showEvent(QShowEvent *e) override; private: virtual void Save() = 0; diff --git a/src/settings/shortcutssettingspage.h b/src/settings/shortcutssettingspage.h index 5e508461..3ff5340f 100644 --- a/src/settings/shortcutssettingspage.h +++ b/src/settings/shortcutssettingspage.h @@ -45,13 +45,14 @@ class GlobalShortcutsSettingsPage : public SettingsPage { public: explicit GlobalShortcutsSettingsPage(SettingsDialog *dialog); - ~GlobalShortcutsSettingsPage(); + ~GlobalShortcutsSettingsPage() override; + static const char *kSettingsGroup; - bool IsEnabled() const; + bool IsEnabled() const override; - void Load(); - void Save(); + void Load() override; + void Save() override; private slots: diff --git a/src/settings/subsonicsettingspage.h b/src/settings/subsonicsettingspage.h index 519c01f0..5e2abd00 100644 --- a/src/settings/subsonicsettingspage.h +++ b/src/settings/subsonicsettingspage.h @@ -38,14 +38,14 @@ class SubsonicSettingsPage : public SettingsPage { public: explicit SubsonicSettingsPage(SettingsDialog* parent = nullptr); - ~SubsonicSettingsPage(); + ~SubsonicSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; signals: void Test(); diff --git a/src/settings/tidalsettingspage.h b/src/settings/tidalsettingspage.h index f61a1417..1d9e1df1 100644 --- a/src/settings/tidalsettingspage.h +++ b/src/settings/tidalsettingspage.h @@ -37,7 +37,7 @@ class TidalSettingsPage : public SettingsPage { public: explicit TidalSettingsPage(SettingsDialog* parent = nullptr); - ~TidalSettingsPage(); + ~TidalSettingsPage() override; static const char *kSettingsGroup; @@ -47,10 +47,10 @@ class TidalSettingsPage : public SettingsPage { StreamUrlMethod_PlaybackInfoPostPaywall, }; - void Load(); - void Save(); + void Load() override; + void Save() override; - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; signals: void Authorize(QString client_id); @@ -68,4 +68,4 @@ class TidalSettingsPage : public SettingsPage { TidalService *service_; }; -#endif +#endif // TIDALSETTINGSPAGE_H diff --git a/src/settings/transcodersettingspage.h b/src/settings/transcodersettingspage.h index a389f1fd..9d974124 100644 --- a/src/settings/transcodersettingspage.h +++ b/src/settings/transcodersettingspage.h @@ -36,15 +36,15 @@ class TranscoderSettingsPage : public SettingsPage { public: explicit TranscoderSettingsPage(SettingsDialog* dialog); - ~TranscoderSettingsPage(); + ~TranscoderSettingsPage() override; static const char *kSettingsGroup; - void Load(); - void Save(); + void Load() override; + void Save() override; protected: - void showEvent(QShowEvent *e); + void showEvent(QShowEvent *e) override; private: Ui_TranscoderSettingsPage* ui_; diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp index d34ee987..07b3482f 100644 --- a/src/subsonic/subsonicbaserequest.cpp +++ b/src/subsonic/subsonicbaserequest.cpp @@ -53,8 +53,6 @@ SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *pare } -SubsonicBaseRequest::~SubsonicBaseRequest() {} - QUrl SubsonicBaseRequest::CreateUrl(const QString &ressource_name, const QList ¶ms_provided) { ParamList params = ParamList() << params_provided diff --git a/src/subsonic/subsonicbaserequest.h b/src/subsonic/subsonicbaserequest.h index 6a9af462..a7840622 100644 --- a/src/subsonic/subsonicbaserequest.h +++ b/src/subsonic/subsonicbaserequest.h @@ -45,9 +45,7 @@ class SubsonicBaseRequest : public QObject { Q_OBJECT public: - explicit SubsonicBaseRequest(SubsonicService *service, QObject *parent); - ~SubsonicBaseRequest(); typedef QPair Param; typedef QList ParamList; diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h index e033e689..6cb59415 100644 --- a/src/subsonic/subsonicrequest.h +++ b/src/subsonic/subsonicrequest.h @@ -53,7 +53,7 @@ class SubsonicRequest : public SubsonicBaseRequest { public: explicit SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *url_handler, Application *app, QObject *parent); - ~SubsonicRequest(); + ~SubsonicRequest() override; void ReloadSettings(); @@ -109,7 +109,7 @@ class SubsonicRequest : public SubsonicBaseRequest { void FinishCheck(); void Warn(const QString &error, const QVariant &debug = QVariant()); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; static const int kMaxConcurrentAlbumsRequests; static const int kMaxConcurrentArtistAlbumsRequests; diff --git a/src/subsonic/subsonicservice.h b/src/subsonic/subsonicservice.h index 5fb3a93d..695d36eb 100644 --- a/src/subsonic/subsonicservice.h +++ b/src/subsonic/subsonicservice.h @@ -33,13 +33,13 @@ #include #include #include +#include #include #include "core/song.h" #include "internet/internetservice.h" class QSortFilterProxyModel; -class QNetworkAccessManager; class QNetworkReply; class Application; @@ -53,12 +53,12 @@ class SubsonicService : public InternetService { public: explicit SubsonicService(Application *app, QObject *parent); - ~SubsonicService(); + ~SubsonicService() override; static const Song::Source kSource; - void ReloadSettings(); - void Exit(); + void ReloadSettings() override; + void Exit() override; Application *app() { return app_; } @@ -74,18 +74,18 @@ class SubsonicService : public InternetService { CollectionModel *collection_model() { return collection_model_; } QSortFilterProxyModel *collection_sort_model() { return collection_sort_model_; } - CollectionBackend *songs_collection_backend() { return collection_backend_; } - CollectionModel *songs_collection_model() { return collection_model_; } - QSortFilterProxyModel *songs_collection_sort_model() { return collection_sort_model_; } + CollectionBackend *songs_collection_backend() override { return collection_backend_; } + CollectionModel *songs_collection_model() override { return collection_model_; } + QSortFilterProxyModel *songs_collection_sort_model() override { return collection_sort_model_; } void CheckConfiguration(); public slots: - void ShowConfig(); + void ShowConfig() override; void SendPing(); void SendPing(QUrl url, const QString &username, const QString &password, const bool redirect = false); - void GetSongs(); - void ResetSongsRequest(); + void GetSongs() override; + void ResetSongsRequest() override; private slots: void HandlePingSSLErrors(QList ssl_errors); diff --git a/src/subsonic/subsonicurlhandler.h b/src/subsonic/subsonicurlhandler.h index 2e3bd39d..9e503dfa 100644 --- a/src/subsonic/subsonicurlhandler.h +++ b/src/subsonic/subsonicurlhandler.h @@ -41,12 +41,12 @@ class SubsonicUrlHandler : public UrlHandler { public: explicit SubsonicUrlHandler(Application *app, SubsonicService *service); - QString scheme() const { return service_->url_scheme(); } + QString scheme() const override { return service_->url_scheme(); } QUrl server_url() const { return service_->server_url(); } QString username() const { return service_->username(); } QString password() const { return service_->password(); } - LoadResult StartLoading(const QUrl &url); + LoadResult StartLoading(const QUrl &url) override; private: typedef QPair Param; diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp index b64045fa..a82c4078 100644 --- a/src/tidal/tidalbaserequest.cpp +++ b/src/tidal/tidalbaserequest.cpp @@ -48,8 +48,6 @@ TidalBaseRequest::TidalBaseRequest(TidalService *service, NetworkAccessManager * network_(network) {} -TidalBaseRequest::~TidalBaseRequest() {} - QNetworkReply *TidalBaseRequest::CreateRequest(const QString &ressource_name, const QList ¶ms_provided) { ParamList params = ParamList() << params_provided diff --git a/src/tidal/tidalbaserequest.h b/src/tidal/tidalbaserequest.h index 3e855c35..48e1f230 100644 --- a/src/tidal/tidalbaserequest.h +++ b/src/tidal/tidalbaserequest.h @@ -58,7 +58,6 @@ class TidalBaseRequest : public QObject { }; TidalBaseRequest(TidalService *service, NetworkAccessManager *network, QObject *parent); - ~TidalBaseRequest(); typedef QPair Param; typedef QList ParamList; diff --git a/src/tidal/tidalfavoriterequest.h b/src/tidal/tidalfavoriterequest.h index c19a49b8..fa0378b3 100644 --- a/src/tidal/tidalfavoriterequest.h +++ b/src/tidal/tidalfavoriterequest.h @@ -39,7 +39,7 @@ class TidalFavoriteRequest : public TidalBaseRequest { public: TidalFavoriteRequest(TidalService *service, NetworkAccessManager *network, QObject *parent); - ~TidalFavoriteRequest(); + ~TidalFavoriteRequest() override; enum FavoriteType { FavoriteType_Artists, @@ -49,7 +49,7 @@ class TidalFavoriteRequest : public TidalBaseRequest { bool need_login() { return need_login_; } - void NeedLogin() { need_login_ = true; } + void NeedLogin() override { need_login_ = true; } signals: void ArtistsAdded(const SongList &songs); @@ -72,7 +72,7 @@ class TidalFavoriteRequest : public TidalBaseRequest { void RemoveFavoritesReply(QNetworkReply *reply, const FavoriteType type, const SongList &songs); private: - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; QString FavoriteText(const FavoriteType type); void AddFavorites(const FavoriteType type, const SongList &songs); void RemoveFavorites(const FavoriteType type, const SongList songs); diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h index 022ba280..69b6d901 100644 --- a/src/tidal/tidalrequest.h +++ b/src/tidal/tidalrequest.h @@ -52,12 +52,12 @@ class TidalRequest : public TidalBaseRequest { public: TidalRequest(TidalService *service, TidalUrlHandler *url_handler, Application *app, NetworkAccessManager *network, QueryType type, QObject *parent); - ~TidalRequest(); + ~TidalRequest() override; void ReloadSettings(); void Process(); - void NeedLogin() { need_login_ = true; } + void NeedLogin() override { need_login_ = true; } void Search(const int query_id, const QString &search_text); signals: @@ -142,7 +142,7 @@ class TidalRequest : public TidalBaseRequest { void FinishCheck(); void Warn(const QString &error, const QVariant &debug = QVariant()); - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; static const char *kResourcesUrl; static const int kMaxConcurrentArtistsRequests; diff --git a/src/tidal/tidalservice.h b/src/tidal/tidalservice.h index bc2050a5..ea9a3807 100644 --- a/src/tidal/tidalservice.h +++ b/src/tidal/tidalservice.h @@ -60,22 +60,22 @@ class TidalService : public InternetService { public: TidalService(Application *app, QObject *parent); - ~TidalService(); + ~TidalService() override; static const Song::Source kSource; - void Exit(); - void ReloadSettings(); + void Exit() override; + void ReloadSettings() override; void Logout(); - int Search(const QString &text, InternetSearchView::SearchType type); - void CancelSearch(); + int Search(const QString &text, InternetSearchView::SearchType type) override; + void CancelSearch() override; int max_login_attempts() { return kLoginAttempts; } Application *app() { return app_; } - bool oauth() { return oauth_; } + bool oauth() override { return oauth_; } QString client_id() { return client_id_; } QString api_token() { return api_token_; } quint64 user_id() { return user_id_; } @@ -94,23 +94,23 @@ class TidalService : public InternetService { QString access_token() { return access_token_; } QString session_id() { return session_id_; } - bool authenticated() { return (!access_token_.isEmpty() || !session_id_.isEmpty()); } + bool authenticated() override { return (!access_token_.isEmpty() || !session_id_.isEmpty()); } bool login_sent() { return login_sent_; } bool login_attempts() { return login_attempts_; } void GetStreamURL(const QUrl &url); - CollectionBackend *artists_collection_backend() { return artists_collection_backend_; } - CollectionBackend *albums_collection_backend() { return albums_collection_backend_; } - CollectionBackend *songs_collection_backend() { return songs_collection_backend_; } + CollectionBackend *artists_collection_backend() override { return artists_collection_backend_; } + CollectionBackend *albums_collection_backend() override { return albums_collection_backend_; } + CollectionBackend *songs_collection_backend() override { return songs_collection_backend_; } - CollectionModel *artists_collection_model() { return artists_collection_model_; } - CollectionModel *albums_collection_model() { return albums_collection_model_; } - CollectionModel *songs_collection_model() { return songs_collection_model_; } + CollectionModel *artists_collection_model() override { return artists_collection_model_; } + CollectionModel *albums_collection_model() override { return albums_collection_model_; } + CollectionModel *songs_collection_model() override { return songs_collection_model_; } - QSortFilterProxyModel *artists_collection_sort_model() { return artists_collection_sort_model_; } - QSortFilterProxyModel *albums_collection_sort_model() { return albums_collection_sort_model_; } - QSortFilterProxyModel *songs_collection_sort_model() { return songs_collection_sort_model_; } + QSortFilterProxyModel *artists_collection_sort_model() override { return artists_collection_sort_model_; } + QSortFilterProxyModel *albums_collection_sort_model() override { return albums_collection_sort_model_; } + QSortFilterProxyModel *songs_collection_sort_model() override { return songs_collection_sort_model_; } enum QueryType { QueryType_Artists, @@ -124,15 +124,15 @@ class TidalService : public InternetService { signals: public slots: - void ShowConfig(); + void ShowConfig() override; void TryLogin(); void SendLogin(const QString &api_token, const QString &username, const QString &password); - void GetArtists(); - void GetAlbums(); - void GetSongs(); - void ResetArtistsRequest(); - void ResetAlbumsRequest(); - void ResetSongsRequest(); + void GetArtists() override; + void GetAlbums() override; + void GetSongs() override; + void ResetArtistsRequest() override; + void ResetAlbumsRequest() override; + void ResetSongsRequest() override; private slots: void ExitReceived(); diff --git a/src/tidal/tidalstreamurlrequest.h b/src/tidal/tidalstreamurlrequest.h index aacb86f0..22239872 100644 --- a/src/tidal/tidalstreamurlrequest.h +++ b/src/tidal/tidalstreamurlrequest.h @@ -42,11 +42,11 @@ class TidalStreamURLRequest : public TidalBaseRequest { public: TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &original_url, QObject *parent); - ~TidalStreamURLRequest(); + ~TidalStreamURLRequest() override; void GetStreamURL(); void Process(); - void NeedLogin() { need_login_ = true; } + void NeedLogin() override { need_login_ = true; } void Cancel(); bool oauth() { return service_->oauth(); } @@ -64,7 +64,7 @@ class TidalStreamURLRequest : public TidalBaseRequest { void StreamURLReceived(); private: - void Error(const QString &error, const QVariant &debug = QVariant()); + void Error(const QString &error, const QVariant &debug = QVariant()) override; TidalService *service_; QNetworkReply *reply_; diff --git a/src/tidal/tidalurlhandler.h b/src/tidal/tidalurlhandler.h index 519510a6..6ddf9bf9 100644 --- a/src/tidal/tidalurlhandler.h +++ b/src/tidal/tidalurlhandler.h @@ -39,8 +39,8 @@ class TidalUrlHandler : public UrlHandler { public: TidalUrlHandler(Application *app, TidalService *service); - QString scheme() const { return service_->url_scheme(); } - LoadResult StartLoading(const QUrl &url); + QString scheme() const override { return service_->url_scheme(); } + LoadResult StartLoading(const QUrl &url) override; void CancelTask(); diff --git a/src/transcoder/transcodedialog.h b/src/transcoder/transcodedialog.h index 45cf0fec..e0b7241f 100644 --- a/src/transcoder/transcodedialog.h +++ b/src/transcoder/transcodedialog.h @@ -45,7 +45,7 @@ class TranscodeDialog : public QDialog { public: explicit TranscodeDialog(QMainWindow *mainwindow, QWidget *parent = nullptr); - ~TranscodeDialog(); + ~TranscodeDialog() override; static const char *kSettingsGroup; static const int kProgressInterval; @@ -54,9 +54,9 @@ class TranscodeDialog : public QDialog { void SetFilenames(const QStringList &filenames); protected: - void showEvent(QShowEvent*); - void closeEvent(QCloseEvent*); - void timerEvent(QTimerEvent *e); + void showEvent(QShowEvent*) override; + void closeEvent(QCloseEvent*) override; + void timerEvent(QTimerEvent *e) override; private: void LoadGeometry(); @@ -78,8 +78,8 @@ class TranscodeDialog : public QDialog { void LogLine(const QString message); void Options(); void AddDestination(); - void accept(); - void reject(); + void accept() override; + void reject() override; private: QMainWindow *mainwindow_; diff --git a/src/transcoder/transcoder.h b/src/transcoder/transcoder.h index 07d35d51..4d99a4eb 100644 --- a/src/transcoder/transcoder.h +++ b/src/transcoder/transcoder.h @@ -80,7 +80,7 @@ class Transcoder : public QObject { void AllJobsComplete(); protected: - bool event(QEvent *e); + bool event(QEvent *e) override; private: // The description of a file to transcode - lives in the main thread. diff --git a/src/transcoder/transcoderoptionsaac.h b/src/transcoder/transcoderoptionsaac.h index 15f9876f..2af61aa9 100644 --- a/src/transcoder/transcoderoptionsaac.h +++ b/src/transcoder/transcoderoptionsaac.h @@ -32,10 +32,10 @@ class Ui_TranscoderOptionsAAC; class TranscoderOptionsAAC : public TranscoderOptionsInterface { public: explicit TranscoderOptionsAAC(QWidget *parent = nullptr); - ~TranscoderOptionsAAC(); + ~TranscoderOptionsAAC() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private: static const char *kSettingsGroup; diff --git a/src/transcoder/transcoderoptionsasf.h b/src/transcoder/transcoderoptionsasf.h index e8e0514b..3fbb287e 100644 --- a/src/transcoder/transcoderoptionsasf.h +++ b/src/transcoder/transcoderoptionsasf.h @@ -32,10 +32,10 @@ class Ui_TranscoderOptionsASF; class TranscoderOptionsASF : public TranscoderOptionsInterface { public: explicit TranscoderOptionsASF(QWidget *parent = nullptr); - ~TranscoderOptionsASF(); + ~TranscoderOptionsASF() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private: static const char *kSettingsGroup; diff --git a/src/transcoder/transcoderoptionsdialog.h b/src/transcoder/transcoderoptionsdialog.h index 26f707df..4ec71121 100644 --- a/src/transcoder/transcoderoptionsdialog.h +++ b/src/transcoder/transcoderoptionsdialog.h @@ -40,16 +40,16 @@ class TranscoderOptionsDialog : public QDialog { public: explicit TranscoderOptionsDialog(Song::FileType type, QWidget *parent = nullptr); - ~TranscoderOptionsDialog(); + ~TranscoderOptionsDialog() override; bool is_valid() const { return options_; } - void accept(); + void accept() override; void set_settings_postfix(const QString &settings_postfix); protected: - void showEvent(QShowEvent *e); + void showEvent(QShowEvent *e) override; private: Ui_TranscoderOptionsDialog *ui_; diff --git a/src/transcoder/transcoderoptionsflac.h b/src/transcoder/transcoderoptionsflac.h index 4b58f638..9956db6a 100644 --- a/src/transcoder/transcoderoptionsflac.h +++ b/src/transcoder/transcoderoptionsflac.h @@ -32,10 +32,10 @@ class Ui_TranscoderOptionsFLAC; class TranscoderOptionsFLAC : public TranscoderOptionsInterface { public: explicit TranscoderOptionsFLAC(QWidget *parent = nullptr); - ~TranscoderOptionsFLAC(); + ~TranscoderOptionsFLAC() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private: static const char *kSettingsGroup; diff --git a/src/transcoder/transcoderoptionsinterface.h b/src/transcoder/transcoderoptionsinterface.h index 34ab3e66..385b913e 100644 --- a/src/transcoder/transcoderoptionsinterface.h +++ b/src/transcoder/transcoderoptionsinterface.h @@ -29,7 +29,7 @@ class TranscoderOptionsInterface : public QWidget { public: explicit TranscoderOptionsInterface(QWidget *parent) : QWidget(parent) {} - virtual ~TranscoderOptionsInterface() {} + ~TranscoderOptionsInterface() override {} virtual void Load() = 0; virtual void Save() = 0; diff --git a/src/transcoder/transcoderoptionsmp3.h b/src/transcoder/transcoderoptionsmp3.h index c610406f..58082a76 100644 --- a/src/transcoder/transcoderoptionsmp3.h +++ b/src/transcoder/transcoderoptionsmp3.h @@ -36,10 +36,10 @@ class TranscoderOptionsMP3 : public TranscoderOptionsInterface { public: explicit TranscoderOptionsMP3(QWidget *parent = nullptr); - ~TranscoderOptionsMP3(); + ~TranscoderOptionsMP3() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private slots: void QualitySliderChanged(int value); diff --git a/src/transcoder/transcoderoptionsopus.h b/src/transcoder/transcoderoptionsopus.h index 4e5c923b..7051a4ee 100644 --- a/src/transcoder/transcoderoptionsopus.h +++ b/src/transcoder/transcoderoptionsopus.h @@ -32,10 +32,10 @@ class Ui_TranscoderOptionsOpus; class TranscoderOptionsOpus : public TranscoderOptionsInterface { public: explicit TranscoderOptionsOpus(QWidget *parent = nullptr); - ~TranscoderOptionsOpus(); + ~TranscoderOptionsOpus() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private: static const char* kSettingsGroup; diff --git a/src/transcoder/transcoderoptionsspeex.h b/src/transcoder/transcoderoptionsspeex.h index 94183b8b..f6bee8d9 100644 --- a/src/transcoder/transcoderoptionsspeex.h +++ b/src/transcoder/transcoderoptionsspeex.h @@ -32,10 +32,10 @@ class Ui_TranscoderOptionsSpeex; class TranscoderOptionsSpeex : public TranscoderOptionsInterface { public: explicit TranscoderOptionsSpeex(QWidget *parent = nullptr); - ~TranscoderOptionsSpeex(); + ~TranscoderOptionsSpeex() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private: static const char *kSettingsGroup; diff --git a/src/transcoder/transcoderoptionsvorbis.h b/src/transcoder/transcoderoptionsvorbis.h index 052bd471..ebdb8a34 100644 --- a/src/transcoder/transcoderoptionsvorbis.h +++ b/src/transcoder/transcoderoptionsvorbis.h @@ -32,10 +32,10 @@ class Ui_TranscoderOptionsVorbis; class TranscoderOptionsVorbis : public TranscoderOptionsInterface { public: explicit TranscoderOptionsVorbis(QWidget* parent = nullptr); - ~TranscoderOptionsVorbis(); + ~TranscoderOptionsVorbis() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private: static const char *kSettingsGroup; diff --git a/src/transcoder/transcoderoptionswavpack.h b/src/transcoder/transcoderoptionswavpack.h index 126ef208..df70055a 100644 --- a/src/transcoder/transcoderoptionswavpack.h +++ b/src/transcoder/transcoderoptionswavpack.h @@ -31,10 +31,10 @@ class Ui_TranscoderOptionsWavPack; class TranscoderOptionsWavPack : public TranscoderOptionsInterface { public: explicit TranscoderOptionsWavPack(QWidget *parent = nullptr); - ~TranscoderOptionsWavPack(); + ~TranscoderOptionsWavPack() override; - void Load(); - void Save(); + void Load() override; + void Save() override; private: static const char *kSettingsGroup; diff --git a/src/widgets/autoexpandingtreeview.h b/src/widgets/autoexpandingtreeview.h index d87a11e7..8f62977a 100644 --- a/src/widgets/autoexpandingtreeview.h +++ b/src/widgets/autoexpandingtreeview.h @@ -46,35 +46,35 @@ class AutoExpandingTreeView : public QTreeView { void SetExpandOnReset(bool v) { expand_on_reset_ = v; } void SetAddOnDoubleClick(bool v) { add_on_double_click_ = v; } -public slots: + public slots: void RecursivelyExpand(const QModelIndex &idx); void UpAndFocus(); void DownAndFocus(); -signals: + signals: void AddToPlaylistSignal(QMimeData *data); void FocusOnFilterSignal(QKeyEvent *event); -protected: + protected: // QAbstractItemView - void reset(); + void reset() override; // QWidget - void mousePressEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void keyPressEvent(QKeyEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; virtual bool CanRecursivelyExpand(const QModelIndex &idx) const { Q_UNUSED(idx); return true; } -private slots: + private slots: void ItemExpanded(const QModelIndex &idx); void ItemClicked(const QModelIndex &idx); void ItemDoubleClicked(const QModelIndex &idx); -private: + private: bool RecursivelyExpand(const QModelIndex &idx, int *count); -private: + private: bool auto_open_; bool expand_on_reset_; bool add_on_double_click_; diff --git a/src/widgets/busyindicator.h b/src/widgets/busyindicator.h index cb852599..a7cfdc86 100644 --- a/src/widgets/busyindicator.h +++ b/src/widgets/busyindicator.h @@ -40,14 +40,14 @@ class BusyIndicator : public QWidget { public: explicit BusyIndicator(const QString &text, QWidget *parent = nullptr); explicit BusyIndicator(QWidget *parent = nullptr); - ~BusyIndicator(); + ~BusyIndicator() override; QString text() const; void set_text(const QString &text); protected: - void showEvent(QShowEvent *event); - void hideEvent(QHideEvent *event); + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; private: void Init(const QString &text); diff --git a/src/widgets/clickablelabel.h b/src/widgets/clickablelabel.h index 3cd20942..97b82764 100644 --- a/src/widgets/clickablelabel.h +++ b/src/widgets/clickablelabel.h @@ -37,7 +37,7 @@ class ClickableLabel : public QLabel { void Clicked(); protected: - void mousePressEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; }; #endif // CLICKABLELABEL_H diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp index 35562ebe..bdab28cf 100644 --- a/src/widgets/fancytabwidget.cpp +++ b/src/widgets/fancytabwidget.cpp @@ -72,7 +72,7 @@ class FancyTabBar: public QTabBar { setMouseTracking(true); } - QSize sizeHint() const { + QSize sizeHint() const override { QSize size(QTabBar::sizeHint()); @@ -93,7 +93,7 @@ class FancyTabBar: public QTabBar { } protected: - QSize tabSizeHint(int index) const { + QSize tabSizeHint(int index) const override { FancyTabWidget *tabWidget = qobject_cast(parentWidget()); QSize size = FancyTabWidget::TabSize_LargeSidebar; @@ -107,13 +107,13 @@ class FancyTabBar: public QTabBar { } - void leaveEvent(QEvent *event) { + void leaveEvent(QEvent *event) override { Q_UNUSED(event); mouseHoverTabIndex = -1; update(); } - void mouseMoveEvent(QMouseEvent *event) { + void mouseMoveEvent(QMouseEvent *event) override { QPoint pos = event->pos(); @@ -124,7 +124,7 @@ class FancyTabBar: public QTabBar { } - void paintEvent(QPaintEvent *pe) { + void paintEvent(QPaintEvent *pe) override { FancyTabWidget *tabWidget = qobject_cast(parentWidget()); @@ -309,7 +309,7 @@ class TabData : public QObject { layout->addWidget(widget_view_); page_->setLayout(layout); } - ~TabData() { + ~TabData() override { //delete page_; } @@ -330,8 +330,6 @@ class TabData : public QObject { }; -FancyTabWidget::~FancyTabWidget() {} - // Spacers are just disabled pages void FancyTabWidget::addSpacer() { diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h index 87b60901..e17189c5 100644 --- a/src/widgets/fancytabwidget.h +++ b/src/widgets/fancytabwidget.h @@ -45,70 +45,70 @@ namespace Internal { class FancyTabWidget : public QTabWidget { Q_OBJECT - ~FancyTabWidget(); + public: + explicit FancyTabWidget(QWidget *parent = nullptr); - public: - explicit FancyTabWidget(QWidget *parent = nullptr); - void AddTab(QWidget *widget_view, const QString &name, const QIcon &icon, const QString &label); - bool EnableTab(QWidget *widget_view); - bool DisableTab(QWidget *widget_view); - int insertTab(const int idx, QWidget *page, const QIcon &icon, const QString &label); - void addBottomWidget(QWidget* widget_view); + void AddTab(QWidget *widget_view, const QString &name, const QIcon &icon, const QString &label); + bool EnableTab(QWidget *widget_view); + bool DisableTab(QWidget *widget_view); + int insertTab(const int idx, QWidget *page, const QIcon &icon, const QString &label); + void addBottomWidget(QWidget* widget_view); - void setBackgroundPixmap(const QPixmap& pixmap); - void addSpacer(); + void setBackgroundPixmap(const QPixmap& pixmap); + void addSpacer(); - void Load(const QString &kSettingsGroup); - void SaveSettings(const QString &kSettingsGroup); - void ReloadSettings(); + void Load(const QString &kSettingsGroup); + void SaveSettings(const QString &kSettingsGroup); + void ReloadSettings(); - // Values are persisted - only add to the end - enum Mode { - Mode_None = 0, - Mode_LargeSidebar, - Mode_SmallSidebar, - Mode_Tabs, - Mode_IconOnlyTabs, - Mode_PlainSidebar, - }; + // Values are persisted - only add to the end + enum Mode { + Mode_None = 0, + Mode_LargeSidebar, + Mode_SmallSidebar, + Mode_Tabs, + Mode_IconOnlyTabs, + Mode_PlainSidebar, + }; - static const QSize TabSize_LargeSidebar; + static const QSize TabSize_LargeSidebar; - static const QSize IconSize_LargeSidebar; - static const QSize IconSize_SmallSidebar; + static const QSize IconSize_LargeSidebar; + static const QSize IconSize_SmallSidebar; - Mode mode() { return mode_; } + Mode mode() { return mode_; } signals: - void ModeChanged(FancyTabWidget::Mode mode); - void CurrentChanged(int); + void ModeChanged(FancyTabWidget::Mode mode); + void CurrentChanged(int); public slots: - void setCurrentIndex(int idx); - void SetMode(Mode mode); - // Mapper mapped signal needs this convenience function - void SetMode(int mode) { SetMode(Mode(mode)); } + void setCurrentIndex(int idx); + void SetMode(Mode mode); + // Mapper mapped signal needs this convenience function + void SetMode(int mode) { SetMode(Mode(mode)); } private slots: - void tabBarUpdateGeometry(); - void currentTabChanged(int); + void tabBarUpdateGeometry(); + void currentTabChanged(int); protected: - void paintEvent(QPaintEvent *); - void contextMenuEvent(QContextMenuEvent* e); + void paintEvent(QPaintEvent*) override; + void contextMenuEvent(QContextMenuEvent* e) override; + private: - void addMenuItem(QActionGroup* group, const QString& text, Mode mode); + void addMenuItem(QActionGroup* group, const QString& text, Mode mode); - QPixmap background_pixmap_; - QMenu* menu_; - Mode mode_; - QWidget *bottom_widget_; + QPixmap background_pixmap_; + QMenu* menu_; + Mode mode_; + QWidget *bottom_widget_; - QMap tabs_; + QMap tabs_; - bool bg_color_system_; - bool bg_gradient_; - QColor bg_color_; + bool bg_color_system_; + bool bg_gradient_; + QColor bg_color_; }; diff --git a/src/widgets/favoritewidget.h b/src/widgets/favoritewidget.h index 537c1dfe..5fd6e425 100644 --- a/src/widgets/favoritewidget.h +++ b/src/widgets/favoritewidget.h @@ -39,14 +39,14 @@ class FavoriteWidget : public QWidget { // Change the value if different from the current one and then update display and emit FavoriteStateChanged signal void SetFavorite(bool favorite); - QSize sizeHint() const; + QSize sizeHint() const override; signals: void FavoriteStateChanged(int, bool); protected: - void paintEvent(QPaintEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void paintEvent(QPaintEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; private: static const int kStarSize; diff --git a/src/widgets/fileview.h b/src/widgets/fileview.h index be94ae96..946f12cc 100644 --- a/src/widgets/fileview.h +++ b/src/widgets/fileview.h @@ -51,15 +51,16 @@ class FileView : public QWidget { public: explicit FileView(QWidget *parent = nullptr); - ~FileView(); + ~FileView() override; static const char *kFileFilter; void SetPath(const QString &path); void SetTaskManager(TaskManager *task_manager); - void showEvent(QShowEvent*); - void keyPressEvent(QKeyEvent *e); + protected: + void showEvent(QShowEvent*) override; + void keyPressEvent(QKeyEvent *e) override; signals: void PathChanged(const QString &path); @@ -90,8 +91,8 @@ class FileView : public QWidget { QString undo_path() const { return old_state_.path; } - void undo(); - void redo(); + void undo() override; + void redo() override; private: struct State { diff --git a/src/widgets/fileviewlist.h b/src/widgets/fileviewlist.h index 9ee40764..1965dcd5 100644 --- a/src/widgets/fileviewlist.h +++ b/src/widgets/fileviewlist.h @@ -45,7 +45,7 @@ class FileViewList : public QListView { public: explicit FileViewList(QWidget *parent = nullptr); - void mousePressEvent(QMouseEvent *e); + void mousePressEvent(QMouseEvent *e) override; signals: void AddToPlaylist(QMimeData *data); @@ -58,7 +58,7 @@ class FileViewList : public QListView { void Forward(); protected: - void contextMenuEvent(QContextMenuEvent *e); + void contextMenuEvent(QContextMenuEvent *e) override; private slots: void LoadSlot(); diff --git a/src/widgets/forcescrollperpixel.h b/src/widgets/forcescrollperpixel.h index b8c3b292..33ef335c 100644 --- a/src/widgets/forcescrollperpixel.h +++ b/src/widgets/forcescrollperpixel.h @@ -35,7 +35,7 @@ class ForceScrollPerPixel : public QObject { explicit ForceScrollPerPixel(QAbstractItemView *item_view, QObject *parent = nullptr); protected: - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; private: QAbstractItemView *item_view_; diff --git a/src/widgets/freespacebar.h b/src/widgets/freespacebar.h index 1085ee5f..84640aa2 100644 --- a/src/widgets/freespacebar.h +++ b/src/widgets/freespacebar.h @@ -64,10 +64,10 @@ class FreeSpaceBar : public QWidget { void set_additional_text(const QString& text) { additional_text_ = text; update(); } void set_used_text(const QString& text) { used_text_ = text; update(); } - QSize sizeHint() const; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent*); + void paintEvent(QPaintEvent*) override; private: struct Label { diff --git a/src/widgets/groupediconview.h b/src/widgets/groupediconview.h index 055a62a9..99a95dab 100644 --- a/src/widgets/groupediconview.h +++ b/src/widgets/groupediconview.h @@ -78,8 +78,8 @@ class GroupedIconView : public QListView { void set_header_text(const QString &value) { header_text_ = value; } // QAbstractItemView - QModelIndex moveCursor(CursorAction action, Qt::KeyboardModifiers modifiers); - void setModel(QAbstractItemModel *model); + QModelIndex moveCursor(CursorAction action, Qt::KeyboardModifiers modifiers) override; + void setModel(QAbstractItemModel *model) override; static void DrawHeader(QPainter *painter, const QRect &rect, const QFont &font, const QPalette &palette, const QString &text); @@ -87,16 +87,16 @@ class GroupedIconView : public QListView { virtual int header_height() const; // QWidget - void paintEvent(QPaintEvent *e); - void resizeEvent(QResizeEvent *e); + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; // QAbstractItemView - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector& = QVector()); - QModelIndex indexAt(const QPoint &p) const; - void rowsInserted(const QModelIndex &parent, int start, int end); - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command); - QRect visualRect(const QModelIndex &index) const; - QRegion visualRegionForSelection(const QItemSelection &selection) const; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector& = QVector()) override; + QModelIndex indexAt(const QPoint &p) const override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; + QRect visualRect(const QModelIndex &index) const override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; private slots: void LayoutItems(); diff --git a/src/widgets/lineedit.h b/src/widgets/lineedit.h index 32b53930..83470c3d 100644 --- a/src/widgets/lineedit.h +++ b/src/widgets/lineedit.h @@ -62,13 +62,13 @@ class LineEditInterface { class ExtendedEditor : public LineEditInterface { public: explicit ExtendedEditor(QWidget *widget, int extra_right_padding = 0, bool draw_hint = true); - virtual ~ExtendedEditor() {} + ~ExtendedEditor() override {} virtual bool is_empty() const { return text().isEmpty(); } - QString hint() const { return hint_; } - void set_hint(const QString& hint); - void clear_hint() { set_hint(QString()); } + QString hint() const override { return hint_; } + void set_hint(const QString& hint) override; + void clear_hint() override { set_hint(QString()); } bool has_clear_button() const { return has_clear_button_; } void set_clear_button(bool visible); @@ -111,14 +111,14 @@ class LineEdit : public QLineEdit, public ExtendedEditor { explicit LineEdit(QWidget *parent = nullptr); // ExtendedEditor - void set_focus() { QLineEdit::setFocus(); } - QString text() const { return QLineEdit::text(); } - void set_text(const QString& text) { QLineEdit::setText(text); } - void set_enabled(bool enabled) { QLineEdit::setEnabled(enabled); } + void set_focus() override { QLineEdit::setFocus(); } + QString text() const override { return QLineEdit::text(); } + void set_text(const QString& text) override { QLineEdit::setText(text); } + void set_enabled(bool enabled) override { QLineEdit::setEnabled(enabled); } protected: - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); + void paintEvent(QPaintEvent*) override; + void resizeEvent(QResizeEvent*) override; private: bool is_rtl() const { return is_rtl_; } @@ -141,14 +141,14 @@ class TextEdit : public QPlainTextEdit, public ExtendedEditor { explicit TextEdit(QWidget *parent = nullptr); // ExtendedEditor - void set_focus() { QPlainTextEdit::setFocus(); } - QString text() const { return QPlainTextEdit::toPlainText(); } - void set_text(const QString& text) { QPlainTextEdit::setPlainText(text); } - void set_enabled(bool enabled) { QPlainTextEdit::setEnabled(enabled); } + void set_focus() override { QPlainTextEdit::setFocus(); } + QString text() const override { return QPlainTextEdit::toPlainText(); } + void set_text(const QString& text) override { QPlainTextEdit::setPlainText(text); } + void set_enabled(bool enabled) override { QPlainTextEdit::setEnabled(enabled); } protected: - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); + void paintEvent(QPaintEvent*) override; + void resizeEvent(QResizeEvent*) override; signals: void Reset(); @@ -164,18 +164,18 @@ class SpinBox : public QSpinBox, public ExtendedEditor { explicit SpinBox(QWidget *parent = nullptr); // QSpinBox - QString textFromValue(int val) const; + QString textFromValue(int val) const override; // ExtendedEditor - bool is_empty() const { return text().isEmpty() || text() == "0"; } - void set_focus() { QSpinBox::setFocus(); } - QString text() const { return QSpinBox::text(); } - void set_text(const QString& text) { QSpinBox::setValue(text.toInt()); } - void set_enabled(bool enabled) { QSpinBox::setEnabled(enabled); } + bool is_empty() const override { return text().isEmpty() || text() == "0"; } + void set_focus() override { QSpinBox::setFocus(); } + QString text() const override { return QSpinBox::text(); } + void set_text(const QString& text) override { QSpinBox::setValue(text.toInt()); } + void set_enabled(bool enabled) override { QSpinBox::setEnabled(enabled); } protected: - void paintEvent(QPaintEvent*); - void resizeEvent(QResizeEvent*); + void paintEvent(QPaintEvent*) override; + void resizeEvent(QResizeEvent*) override; signals: void Reset(); diff --git a/src/widgets/linetextedit.h b/src/widgets/linetextedit.h index f9cd8f15..aa26dba1 100644 --- a/src/widgets/linetextedit.h +++ b/src/widgets/linetextedit.h @@ -37,11 +37,11 @@ class LineTextEdit : public QTextEdit { public: explicit LineTextEdit(QWidget *parent = nullptr); - QSize sizeHint() const; - QSize minimumSizeHint() const; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; protected: - void keyPressEvent(QKeyEvent *e); + void keyPressEvent(QKeyEvent *e) override; }; #endif // LINETEXTEDIT_H diff --git a/src/widgets/loginstatewidget.h b/src/widgets/loginstatewidget.h index 842a2adf..4aef629a 100644 --- a/src/widgets/loginstatewidget.h +++ b/src/widgets/loginstatewidget.h @@ -37,7 +37,7 @@ class LoginStateWidget : public QWidget { public: explicit LoginStateWidget(QWidget *parent = nullptr); - ~LoginStateWidget(); + ~LoginStateWidget() override; enum State { LoggedIn, LoginInProgress, LoggedOut }; @@ -49,7 +49,7 @@ class LoginStateWidget : public QWidget { void AddCredentialGroup(QWidget *widget); // QObject - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; public slots: // Changes the "You are logged in/out" label, shows/hides any QGroupBoxes added with AddCredentialGroup. diff --git a/src/widgets/multiloadingindicator.h b/src/widgets/multiloadingindicator.h index 03e5ba5a..af546a87 100644 --- a/src/widgets/multiloadingindicator.h +++ b/src/widgets/multiloadingindicator.h @@ -45,13 +45,13 @@ class MultiLoadingIndicator : public QWidget { void SetTaskManager(TaskManager* task_manager); - QSize sizeHint() const; + QSize sizeHint() const override; signals: void TaskCountChange(int tasks); protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; private slots: void UpdateText(); diff --git a/src/widgets/osd.h b/src/widgets/osd.h index a643f799..63f727bf 100644 --- a/src/widgets/osd.h +++ b/src/widgets/osd.h @@ -51,7 +51,7 @@ class OSD : public QObject { public: explicit OSD(SystemTrayIcon *tray_icon, Application *app, QObject *parent = nullptr); - ~OSD(); + ~OSD() override; static const char *kSettingsGroup; diff --git a/src/widgets/osdpretty.h b/src/widgets/osdpretty.h index 60ec1f55..5e13b002 100644 --- a/src/widgets/osdpretty.h +++ b/src/widgets/osdpretty.h @@ -57,7 +57,7 @@ class OSDPretty : public QWidget { }; explicit OSDPretty(Mode mode, QWidget *parent = nullptr); - ~OSDPretty(); + ~OSDPretty() override; static const char *kSettingsGroup; @@ -102,7 +102,7 @@ class OSDPretty : public QWidget { QPoint current_pos() const; // QWidget - void setVisible(bool visible); + void setVisible(bool visible) override; bool toggle_mode() const { return toggle_mode_; } void set_toggle_mode(bool toggle_mode) { toggle_mode_ = toggle_mode; } @@ -114,13 +114,13 @@ class OSDPretty : public QWidget { void ReloadSettings(); protected: - void paintEvent(QPaintEvent *e); - void enterEvent(QEvent *e); - void leaveEvent(QEvent *e); - void mousePressEvent(QMouseEvent *e); - void showEvent(QShowEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void paintEvent(QPaintEvent *e) override; + void enterEvent(QEvent *e) override; + void leaveEvent(QEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void showEvent(QShowEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; private: void Reposition(); diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp index 75194605..efd4ea1f 100644 --- a/src/widgets/playingwidget.cpp +++ b/src/widgets/playingwidget.cpp @@ -125,8 +125,6 @@ PlayingWidget::PlayingWidget(QWidget *parent) } -PlayingWidget::~PlayingWidget() {} - void PlayingWidget::Init(Application *app, AlbumCoverChoiceController *album_cover_choice_controller) { app_ = app; diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h index 03b19f2b..f77fed99 100644 --- a/src/widgets/playingwidget.h +++ b/src/widgets/playingwidget.h @@ -60,7 +60,6 @@ class PlayingWidget : public QWidget { public: explicit PlayingWidget(QWidget *parent = nullptr); - ~PlayingWidget(); void Init(Application *app, AlbumCoverChoiceController *album_cover_choice_controller); bool IsEnabled() { return enabled_; } @@ -68,7 +67,7 @@ class PlayingWidget : public QWidget { void SetEnabled(); void SetDisabled(); void set_ideal_height(int height); - QSize sizeHint() const; + QSize sizeHint() const override; bool show_above_status_bar() const { return above_statusbar_action_->isChecked(); } signals: @@ -82,12 +81,12 @@ class PlayingWidget : public QWidget { void SearchCoverInProgress(); protected: - void paintEvent(QPaintEvent *e); - void resizeEvent(QResizeEvent*); - void contextMenuEvent(QContextMenuEvent *e); - void mouseDoubleClickEvent(QMouseEvent*); - void dragEnterEvent(QDragEnterEvent *e); - void dropEvent(QDropEvent *e); + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent*) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent*) override; + void dragEnterEvent(QDragEnterEvent *e) override; + void dropEvent(QDropEvent *e) override; private slots: void SetMode(int mode); diff --git a/src/widgets/qsearchfield.h b/src/widgets/qsearchfield.h index 1a04910e..28ceba4a 100644 --- a/src/widgets/qsearchfield.h +++ b/src/widgets/qsearchfield.h @@ -32,8 +32,8 @@ signals: void returnPressed(); protected: - void resizeEvent(QResizeEvent*); - bool eventFilter(QObject*, QEvent*); + void resizeEvent(QResizeEvent*) override; + bool eventFilter(QObject*, QEvent*) override; private: friend class QSearchFieldPrivate; diff --git a/src/widgets/renametablineedit.h b/src/widgets/renametablineedit.h index 576ed541..66c54dbd 100644 --- a/src/widgets/renametablineedit.h +++ b/src/widgets/renametablineedit.h @@ -43,8 +43,8 @@ class RenameTabLineEdit : public QLineEdit { public slots: protected: - void focusOutEvent(QFocusEvent* e); - void keyPressEvent(QKeyEvent* e); + void focusOutEvent(QFocusEvent* e) override; + void keyPressEvent(QKeyEvent* e) override; }; #endif // RENAMETABLINEEDIT_H diff --git a/src/widgets/stickyslider.h b/src/widgets/stickyslider.h index 41433885..b8761e2d 100644 --- a/src/widgets/stickyslider.h +++ b/src/widgets/stickyslider.h @@ -44,7 +44,7 @@ class StickySlider : public QSlider { void set_sticky_threshold(int threshold) { sticky_threshold_ = threshold; } protected: - void mouseMoveEvent(QMouseEvent* e); + void mouseMoveEvent(QMouseEvent* e) override; private: int sticky_center_; diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h index 52149c9d..bd202bb3 100644 --- a/src/widgets/stretchheaderview.h +++ b/src/widgets/stretchheaderview.h @@ -46,7 +46,7 @@ class StretchHeaderView : public QHeaderView { static const int kMinimumColumnWidth; static const int kMagicNumber; - void setModel(QAbstractItemModel *model); + void setModel(QAbstractItemModel *model) override; // Serialises the proportional and actual column widths. // Use these instead of QHeaderView::restoreState and QHeaderView::saveState to persist the proportional values directly and avoid floating point errors over time. @@ -80,8 +80,8 @@ class StretchHeaderView : public QHeaderView { protected: // QWidget - void mouseMoveEvent(QMouseEvent *e); - void resizeEvent(QResizeEvent *event); + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *event) override; private: // Scales column_widths_ values so the total is 1.0. diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h index 5502814a..dbfde9f9 100644 --- a/src/widgets/trackslider.h +++ b/src/widgets/trackslider.h @@ -42,22 +42,21 @@ class TrackSlider : public QWidget { public: explicit TrackSlider(QWidget* parent = nullptr); - ~TrackSlider(); + ~TrackSlider() override; void SetApplication(Application* app); // QWidget - QSize sizeHint() const; + QSize sizeHint() const override; // QObject - bool event(QEvent *); + bool event(QEvent*) override; #ifdef HAVE_MOODBAR MoodbarProxyStyle *moodbar_style() const { return moodbar_style_; } #endif - - static const char* kSettingsGroup; + static const char *kSettingsGroup; public slots: void SetValue(int elapsed, int total); diff --git a/src/widgets/tracksliderpopup.h b/src/widgets/tracksliderpopup.h index a33f5fea..ebbe2c74 100644 --- a/src/widgets/tracksliderpopup.h +++ b/src/widgets/tracksliderpopup.h @@ -47,7 +47,7 @@ public: void SetPopupPosition(const QPoint& pos); protected: - void paintEvent(QPaintEvent*); + void paintEvent(QPaintEvent*) override; private: static const int kTextMargin; diff --git a/src/widgets/tracksliderslider.h b/src/widgets/tracksliderslider.h index 303b8f69..8ef04471 100644 --- a/src/widgets/tracksliderslider.h +++ b/src/widgets/tracksliderslider.h @@ -41,7 +41,7 @@ class TrackSliderSlider : public QSlider { Q_OBJECT public: - explicit TrackSliderSlider(QWidget* parent = nullptr); + explicit TrackSliderSlider(QWidget *parent = nullptr); signals: void SeekForward(); @@ -50,13 +50,13 @@ class TrackSliderSlider : public QSlider { void Next(); protected: - void mousePressEvent(QMouseEvent* e); - void mouseReleaseEvent(QMouseEvent* e); - void mouseMoveEvent(QMouseEvent* e); - void wheelEvent(QWheelEvent *e); - void enterEvent(QEvent*); - void leaveEvent(QEvent*); - void keyPressEvent(QKeyEvent* event); + void mousePressEvent(QMouseEvent* e) override; + void mouseReleaseEvent(QMouseEvent* e) override; + void mouseMoveEvent(QMouseEvent* e) override; + void wheelEvent(QWheelEvent *e) override; + void enterEvent(QEvent*) override; + void leaveEvent(QEvent*) override; + void keyPressEvent(QKeyEvent* event) override; private slots: void UpdateDeltaTime(); diff --git a/src/widgets/volumeslider.h b/src/widgets/volumeslider.h index 92be10d0..16925688 100644 --- a/src/widgets/volumeslider.h +++ b/src/widgets/volumeslider.h @@ -50,15 +50,15 @@ class SliderSlider : public QSlider { // WARNING non-virtual - and thus only really intended for internal use this is a major flaw in the class presently, however it suits our current needs fine int value() const { return adjustValue(QSlider::value()); } -signals: + signals: // we emit this when the user has specifically changed the slider so connect to it if valueChanged() is too generic Qt also emits valueChanged(int) void sliderReleased(int); protected: - virtual void wheelEvent(QWheelEvent*); - virtual void mouseMoveEvent(QMouseEvent*); - virtual void mouseReleaseEvent(QMouseEvent*); - virtual void mousePressEvent(QMouseEvent*); + void wheelEvent(QWheelEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mousePressEvent(QMouseEvent*) override; virtual void slideEvent(QMouseEvent*); bool m_sliding; @@ -89,8 +89,8 @@ class PrettySlider : public SliderSlider { explicit PrettySlider(Qt::Orientation orientation, SliderMode mode, QWidget* parent, uint max = 0); protected: - virtual void slideEvent(QMouseEvent*); - virtual void mousePressEvent(QMouseEvent*); + void slideEvent(QMouseEvent*) override; + void mousePressEvent(QMouseEvent*) override; private: PrettySlider(const PrettySlider&); // undefined @@ -107,14 +107,14 @@ class VolumeSlider : public SliderSlider { void SetEnabled(const bool enabled); protected: - virtual void paintEvent(QPaintEvent*); - virtual void enterEvent(QEvent*); - virtual void leaveEvent(QEvent*); + void paintEvent(QPaintEvent*) override; + void enterEvent(QEvent*) override; + void leaveEvent(QEvent*) override; virtual void paletteChange(const QPalette&); - virtual void slideEvent(QMouseEvent*); - virtual void mousePressEvent(QMouseEvent*); - virtual void contextMenuEvent(QContextMenuEvent*); - virtual void wheelEvent(QWheelEvent* e); + void slideEvent(QMouseEvent*) override; + void mousePressEvent(QMouseEvent*) override; + void contextMenuEvent(QContextMenuEvent*) override; + void wheelEvent(QWheelEvent* e) override; private slots: virtual void slotAnimTimer(); diff --git a/tests/src/collectionbackend_test.cpp b/tests/src/collectionbackend_test.cpp index a3461870..cd8eddeb 100644 --- a/tests/src/collectionbackend_test.cpp +++ b/tests/src/collectionbackend_test.cpp @@ -41,7 +41,7 @@ namespace { class CollectionBackendTest : public ::testing::Test { protected: - virtual void SetUp() { + void SetUp() override { database_.reset(new MemoryDatabase(nullptr)); backend_.reset(new CollectionBackend); backend_->Init(database_.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); @@ -146,7 +146,7 @@ TEST_F(CollectionBackendTest, GetAlbumArtNonExistent) { // Test adding a single song to the database, then getting various information back about it. class SingleSong : public CollectionBackendTest { protected: - virtual void SetUp() { + void SetUp() override { CollectionBackendTest::SetUp(); // Add a directory - this will get ID 1 diff --git a/tests/src/collectionmodel_test.cpp b/tests/src/collectionmodel_test.cpp index c02adb93..99ea91ae 100644 --- a/tests/src/collectionmodel_test.cpp +++ b/tests/src/collectionmodel_test.cpp @@ -41,7 +41,7 @@ namespace { class CollectionModelTest : public ::testing::Test { protected: - void SetUp() { + void SetUp() override { database_.reset(new MemoryDatabase(nullptr)); backend_.reset(new CollectionBackend); backend_->Init(database_.get(), Song::Source_Collection, SCollection::kSongsTable, SCollection::kDirsTable, SCollection::kSubdirsTable, SCollection::kFtsTable); diff --git a/tests/src/logging_env.h b/tests/src/logging_env.h index a663f849..0d14ef81 100644 --- a/tests/src/logging_env.h +++ b/tests/src/logging_env.h @@ -27,7 +27,7 @@ class LoggingEnvironment : public ::testing::Environment { public: - void SetUp() { + void SetUp() override { logging::Init(); logging::SetLevels("*:4"); } diff --git a/tests/src/mergedproxymodel_test.cpp b/tests/src/mergedproxymodel_test.cpp index fb175ea3..5c9fa717 100644 --- a/tests/src/mergedproxymodel_test.cpp +++ b/tests/src/mergedproxymodel_test.cpp @@ -28,7 +28,7 @@ class MergedProxyModelTest : public ::testing::Test { protected: - void SetUp() { + void SetUp() override { merged_.setSourceModel(&source_); } diff --git a/tests/src/metatypes_env.h b/tests/src/metatypes_env.h index 0a7d3219..8981a4fe 100644 --- a/tests/src/metatypes_env.h +++ b/tests/src/metatypes_env.h @@ -32,7 +32,7 @@ class MetatypesEnvironment : public ::testing::Environment { public: - void SetUp() { + void SetUp() override { qRegisterMetaType("Directory"); qRegisterMetaType("DirectoryList"); qRegisterMetaType("Subdirectory"); diff --git a/tests/src/mock_networkaccessmanager.cpp b/tests/src/mock_networkaccessmanager.cpp index a3dee251..19814e1d 100644 --- a/tests/src/mock_networkaccessmanager.cpp +++ b/tests/src/mock_networkaccessmanager.cpp @@ -44,7 +44,7 @@ class RequestForUrlMatcher : public MatcherInterface { RequestForUrlMatcher(const QString& contains, const QMap& expected_params) : contains_(contains), expected_params_(expected_params) {} - virtual ~RequestForUrlMatcher() {} + ~RequestForUrlMatcher() override {} virtual bool Matches(const QNetworkRequest& req) const { const QUrl& url = req.url(); @@ -62,12 +62,12 @@ class RequestForUrlMatcher : public MatcherInterface { return true; } - virtual bool MatchAndExplain(const QNetworkRequest& req, MatchResultListener* listener) const { + bool MatchAndExplain(const QNetworkRequest& req, MatchResultListener* listener) const override { *listener << "which is " << req.url().toString().toUtf8().constData(); return Matches(req); } - virtual void DescribeTo(::std::ostream* os) const { + void DescribeTo(::std::ostream* os) const override { *os << "matches url"; } diff --git a/tests/src/mock_networkaccessmanager.h b/tests/src/mock_networkaccessmanager.h index 8f2df95e..2721b7a7 100644 --- a/tests/src/mock_networkaccessmanager.h +++ b/tests/src/mock_networkaccessmanager.h @@ -51,8 +51,8 @@ class MockNetworkReply : public QNetworkReply { protected: MOCK_METHOD0(abort, void()); - virtual qint64 readData(char* data, qint64); - virtual qint64 writeData(const char* data, qint64); + qint64 readData(char* data, qint64) override; + qint64 writeData(const char* data, qint64) override; QByteArray data_; qint64 pos_; diff --git a/tests/src/resources_env.h b/tests/src/resources_env.h index ccfaef02..9eb28dfc 100644 --- a/tests/src/resources_env.h +++ b/tests/src/resources_env.h @@ -27,7 +27,7 @@ class ResourcesEnvironment : public ::testing::Environment { public: - void SetUp() { + void SetUp() override { Q_INIT_RESOURCE(data); Q_INIT_RESOURCE(translations); Q_INIT_RESOURCE(testdata); diff --git a/tests/src/songplaylistitem_test.cpp b/tests/src/songplaylistitem_test.cpp index ce96cd17..0c3e9e8d 100644 --- a/tests/src/songplaylistitem_test.cpp +++ b/tests/src/songplaylistitem_test.cpp @@ -38,7 +38,7 @@ class SongPlaylistItemTest : public ::testing::TestWithParam { protected: SongPlaylistItemTest() : temp_file_(GetParam()) {} - void SetUp() { + void SetUp() override { // SongPlaylistItem::Url() checks if the file exists, so we need a real file temp_file_.open();