From 21b2193cd0f5ae1f438b5d532c935fd26bce48b1 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 7 Apr 2020 16:49:15 +0200 Subject: [PATCH] Add explicit --- src/collection/collection.h | 2 +- src/collection/collectionbackend.h | 2 +- src/collection/collectiondirectorymodel.h | 2 +- src/collection/collectionfilterwidget.h | 2 +- src/collection/collectionitem.h | 4 ++-- src/collection/collectionitemdelegate.h | 2 +- src/collection/collectionmodel.h | 2 +- src/collection/collectionplaylistitem.h | 4 ++-- src/collection/collectionquery.h | 2 +- src/collection/collectionview.h | 2 +- src/collection/collectionviewcontainer.h | 2 +- src/collection/collectionwatcher.h | 4 ++-- src/collection/groupbydialog.h | 2 +- src/collection/savedgroupingmanager.h | 2 +- src/context/contextalbum.h | 2 +- src/context/contextalbumsmodel.h | 2 +- src/context/contextalbumsview.h | 2 +- src/context/contextview.h | 2 +- src/core/database.h | 2 +- src/core/dbusscreensaver.h | 2 +- src/core/deletefiles.h | 2 +- src/core/filesystemmusicstorage.h | 4 ++-- src/core/iconloader.h | 2 +- src/core/iconmapper.h | 2 +- src/core/macscreensaver.h | 2 +- src/core/macsystemtrayicon.h | 2 +- src/core/mainwindow.h | 2 +- src/core/mpris2.h | 2 +- src/core/multisortfilterproxy.h | 2 +- src/core/musicstorage.h | 2 +- src/core/networkproxyfactory.h | 2 +- src/core/scopedtransaction.h | 2 +- src/core/settingsprovider.h | 2 +- src/core/simpletreeitem.h | 4 ++-- src/core/song.cpp | 2 +- src/core/song.h | 2 +- src/core/standarditemiconloader.h | 2 +- src/core/systemtrayicon.h | 2 +- src/core/thread.h | 3 +-- src/core/translations.h | 2 +- src/core/windows7thumbbar.h | 2 +- src/covermanager/albumcoverchoicecontroller.h | 2 +- src/covermanager/albumcoverexport.h | 2 +- src/covermanager/albumcoverfetcher.h | 6 +++--- src/covermanager/albumcoverfetchersearch.h | 2 +- src/covermanager/albumcoverloader.h | 4 ++-- src/covermanager/albumcoverloaderoptions.h | 2 +- src/covermanager/albumcovermanagerlist.h | 7 ++++--- src/covermanager/albumcoversearcher.h | 14 ++++++------- src/covermanager/coverexportrunnable.h | 2 +- src/covermanager/coverfromurldialog.h | 2 +- src/covermanager/coversearchstatistics.h | 2 +- src/covermanager/discogscoverprovider.h | 4 ++-- src/device/afcfile.h | 6 +++--- src/device/afctransfer.h | 12 +++++------ src/device/cddalister.cpp | 2 +- src/device/cddalister.h | 2 +- src/device/connecteddevice.h | 2 +- src/device/deviceinfo.h | 6 +++--- src/device/devicemanager.h | 2 +- src/device/deviceproperties.h | 2 +- src/device/devicestatefiltermodel.h | 12 +++++------ src/device/deviceview.h | 4 ++-- src/device/giolister.h | 2 +- src/device/gpodloader.h | 2 +- src/device/ilister.h | 2 +- src/device/imobiledeviceconnection.h | 2 +- src/device/macosdevicelister.h | 2 +- src/device/mtpconnection.h | 2 +- src/device/mtploader.h | 2 +- src/device/udisks2lister.h | 2 +- src/dialogs/about.h | 2 +- src/dialogs/console.h | 3 ++- src/dialogs/edittagdialog.h | 2 +- src/dialogs/errordialog.h | 2 +- src/dialogs/trackselectiondialog.h | 2 +- src/engine/alsadevicefinder.h | 2 +- src/engine/directsounddevicefinder.h | 2 +- src/engine/gstelementdeleter.h | 2 +- src/engine/gstengine.h | 2 +- src/engine/gstenginepipeline.h | 2 +- src/engine/macosdevicefinder.h | 2 +- src/engine/mmdevicefinder.h | 3 ++- src/engine/phononengine.h | 2 +- src/engine/pulsedevicefinder.h | 2 +- src/engine/vlcengine.h | 2 +- src/engine/vlcscopedref.h | 4 ++-- src/engine/xineengine.h | 2 +- src/equalizer/equalizer.h | 2 +- src/equalizer/equalizerslider.h | 2 +- src/globalshortcuts/globalshortcutgrabber.h | 4 ++-- src/internet/internetcollectionview.h | 2 +- .../internetcollectionviewcontainer.h | 2 +- src/internet/internetsearch.h | 2 +- src/internet/internetsearchitemdelegate.h | 2 +- src/internet/internetsearchmodel.h | 2 +- src/internet/internetsearchsortmodel.h | 2 +- src/internet/internetsearchview.h | 2 +- src/internet/internetservice.h | 2 +- src/internet/internetsongsview.h | 2 +- src/internet/internettabsview.h | 2 +- src/lyrics/lyricsfetcher.h | 6 +++--- src/lyrics/lyricsfetchersearch.h | 2 +- src/moodbar/moodbarbuilder.h | 2 +- src/moodbar/moodbarcontroller.h | 2 +- src/moodbar/moodbaritemdelegate.h | 2 +- src/moodbar/moodbarloader.h | 2 +- src/moodbar/moodbarpipeline.h | 2 +- src/moodbar/moodbarproxystyle.h | 2 +- src/moodbar/moodbarrenderer.h | 4 ++-- src/musicbrainz/acoustidclient.h | 3 +-- src/musicbrainz/chromaprinter.h | 2 +- src/musicbrainz/musicbrainzclient.h | 2 +- src/musicbrainz/tagfetcher.h | 2 +- src/organise/organise.h | 4 ++-- src/organise/organisedialog.h | 2 +- src/organise/organiseerrordialog.h | 2 +- src/playlist/playlist.h | 2 +- src/playlist/playlistcontainer.h | 2 +- src/playlist/playlistdelegates.h | 20 +++++++++---------- src/playlist/playlistfilter.h | 2 +- src/playlist/playlistfilterparser.h | 5 +---- src/playlist/playlistheader.h | 2 +- src/playlist/playlistitem.h | 2 +- src/playlist/playlistitemmimedata.h | 6 +++--- src/playlist/playlistlistcontainer.h | 2 +- src/playlist/playlistlistmodel.h | 2 +- src/playlist/playlistlistview.h | 2 +- src/playlist/playlistmanager.h | 10 +++++----- src/playlist/playlistsequence.h | 2 +- src/playlist/playlisttabbar.h | 10 +++++----- src/playlist/playlistundocommands.h | 14 ++++++------- src/playlist/playlistview.h | 4 ++-- src/playlist/songmimedata.h | 2 +- src/playlist/songplaylistitem.h | 4 ++-- src/playlistparsers/asxiniparser.h | 2 +- src/playlistparsers/asxparser.h | 2 +- src/playlistparsers/cueparser.h | 2 +- src/playlistparsers/m3uparser.h | 2 +- src/playlistparsers/parserbase.h | 6 +++--- src/playlistparsers/playlistparser.h | 2 +- src/playlistparsers/plsparser.h | 2 +- src/playlistparsers/wplparser.h | 3 ++- src/playlistparsers/xmlparser.h | 3 ++- src/playlistparsers/xspfparser.h | 2 +- src/queue/queue.h | 2 +- src/queue/queueview.h | 2 +- src/settings/appearancesettingspage.h | 2 +- src/settings/backendsettingspage.h | 2 +- src/settings/behavioursettingspage.h | 2 +- src/settings/collectionsettingspage.h | 8 ++++---- src/settings/contextsettingspage.h | 2 +- src/settings/moodbarsettingspage.h | 2 +- src/settings/networkproxysettingspage.h | 6 +++--- src/settings/notificationssettingspage.h | 10 +++++----- src/settings/playlistsettingspage.h | 8 +++----- src/settings/settingsdialog.h | 6 +++--- src/settings/settingspage.h | 8 ++++---- src/settings/shortcutssettingspage.h | 2 +- src/settings/transcodersettingspage.h | 6 +++--- src/subsonic/subsonicbaserequest.h | 2 +- src/subsonic/subsonicrequest.h | 3 +-- src/subsonic/subsonicservice.h | 4 +--- src/subsonic/subsonicurlhandler.h | 2 +- src/transcoder/transcodedialog.h | 2 +- src/transcoder/transcoder.h | 8 ++++---- src/transcoder/transcoderoptionsaac.h | 2 +- src/transcoder/transcoderoptionsasf.h | 2 +- src/transcoder/transcoderoptionsdialog.h | 4 ++-- src/transcoder/transcoderoptionsflac.h | 2 +- src/transcoder/transcoderoptionsinterface.h | 4 ++-- src/transcoder/transcoderoptionsmp3.h | 6 +++--- src/transcoder/transcoderoptionsopus.h | 4 ++-- src/transcoder/transcoderoptionsspeex.h | 4 ++-- src/transcoder/transcoderoptionsvorbis.h | 4 ++-- src/transcoder/transcoderoptionswavpack.h | 4 ++-- src/widgets/autoexpandingtreeview.h | 2 +- src/widgets/clickablelabel.h | 6 +++--- src/widgets/fancytabwidget.h | 2 +- src/widgets/favoritewidget.h | 4 ++-- src/widgets/fileview.h | 2 +- src/widgets/fileviewlist.h | 2 +- src/widgets/forcescrollperpixel.h | 6 +++--- src/widgets/freespacebar.h | 10 +++++----- src/widgets/groupediconview.h | 8 ++++---- src/widgets/lineedit.h | 12 +++++------ src/widgets/linetextedit.h | 4 ++-- src/widgets/loginstatewidget.h | 4 ++-- src/widgets/multiloadingindicator.h | 10 +++++----- src/widgets/osd.h | 2 +- src/widgets/osdpretty.h | 2 +- src/widgets/playingwidget.h | 2 +- src/widgets/renametablineedit.h | 8 ++++---- src/widgets/stickyslider.h | 2 +- src/widgets/stretchheaderview.h | 12 +++++------ src/widgets/trackslider.h | 2 +- src/widgets/tracksliderpopup.h | 10 +++++----- src/widgets/tracksliderslider.h | 2 +- src/widgets/volumeslider.h | 6 +++--- 199 files changed, 337 insertions(+), 342 deletions(-) diff --git a/src/collection/collection.h b/src/collection/collection.h index 25a940395..180848356 100644 --- a/src/collection/collection.h +++ b/src/collection/collection.h @@ -43,7 +43,7 @@ class SCollection : public QObject { Q_OBJECT public: - SCollection(Application *app, QObject *parent); + explicit SCollection(Application *app, QObject *parent); ~SCollection(); static const char *kSongsTable; diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h index 7b47b0e46..ddec52969 100644 --- a/src/collection/collectionbackend.h +++ b/src/collection/collectionbackend.h @@ -45,7 +45,7 @@ class CollectionBackendInterface : public QObject { Q_OBJECT public: - CollectionBackendInterface(QObject *parent = nullptr) : QObject(parent) {} + explicit CollectionBackendInterface(QObject *parent = nullptr) : QObject(parent) {} virtual ~CollectionBackendInterface() {} struct Album { diff --git a/src/collection/collectiondirectorymodel.h b/src/collection/collectiondirectorymodel.h index f43f8d6bf..6e16363d7 100644 --- a/src/collection/collectiondirectorymodel.h +++ b/src/collection/collectiondirectorymodel.h @@ -42,7 +42,7 @@ class CollectionDirectoryModel : public QStandardItemModel { Q_OBJECT public: - CollectionDirectoryModel(CollectionBackend* backend, QObject *parent = nullptr); + explicit CollectionDirectoryModel(CollectionBackend* backend, QObject *parent = nullptr); ~CollectionDirectoryModel(); // To be called by GUIs diff --git a/src/collection/collectionfilterwidget.h b/src/collection/collectionfilterwidget.h index 66c9f60b2..40be542b5 100644 --- a/src/collection/collectionfilterwidget.h +++ b/src/collection/collectionfilterwidget.h @@ -48,7 +48,7 @@ class CollectionFilterWidget : public QWidget { Q_OBJECT public: - CollectionFilterWidget(QWidget *parent = nullptr); + explicit CollectionFilterWidget(QWidget *parent = nullptr); ~CollectionFilterWidget(); static const int kFilterDelay = 500; // msec diff --git a/src/collection/collectionitem.h b/src/collection/collectionitem.h index b59386ff9..ef3404350 100644 --- a/src/collection/collectionitem.h +++ b/src/collection/collectionitem.h @@ -37,12 +37,12 @@ class CollectionItem : public SimpleTreeItem { Type_LoadingIndicator, }; - CollectionItem(SimpleTreeModel *model) + explicit CollectionItem(SimpleTreeModel *model) : SimpleTreeItem(Type_Root, model), container_level(-1), compilation_artist_node_(nullptr) {} - CollectionItem(Type type, CollectionItem *parent = nullptr) + explicit CollectionItem(Type type, CollectionItem *parent = nullptr) : SimpleTreeItem(type, parent), container_level(-1), compilation_artist_node_(nullptr) {} diff --git a/src/collection/collectionitemdelegate.h b/src/collection/collectionitemdelegate.h index 916847ad7..f6b9bda63 100644 --- a/src/collection/collectionitemdelegate.h +++ b/src/collection/collectionitemdelegate.h @@ -36,7 +36,7 @@ class CollectionItemDelegate : public QStyledItemDelegate { Q_OBJECT public: - CollectionItemDelegate(QObject *parent); + explicit CollectionItemDelegate(QObject *parent); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; public slots: diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h index 5d73f218f..e8b8b9112 100644 --- a/src/collection/collectionmodel.h +++ b/src/collection/collectionmodel.h @@ -62,7 +62,7 @@ class CollectionModel : public SimpleTreeModel { Q_ENUMS(GroupBy) public: - CollectionModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr); + explicit CollectionModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr); ~CollectionModel(); static const char *kSavedGroupingsSettingsGroup; diff --git a/src/collection/collectionplaylistitem.h b/src/collection/collectionplaylistitem.h index f50d49375..965c69de1 100644 --- a/src/collection/collectionplaylistitem.h +++ b/src/collection/collectionplaylistitem.h @@ -33,8 +33,8 @@ class SqlRow; class CollectionPlaylistItem : public PlaylistItem { public: - CollectionPlaylistItem(); - CollectionPlaylistItem(const Song &song); + explicit CollectionPlaylistItem(); + explicit CollectionPlaylistItem(const Song &song); bool InitFromQuery(const SqlRow &query); void Reload(); diff --git a/src/collection/collectionquery.h b/src/collection/collectionquery.h index 4cb11de55..1276f4496 100644 --- a/src/collection/collectionquery.h +++ b/src/collection/collectionquery.h @@ -72,7 +72,7 @@ struct QueryOptions { class CollectionQuery { public: - CollectionQuery(const QueryOptions &options = QueryOptions()); + explicit CollectionQuery(const QueryOptions &options = QueryOptions()); // Sets contents of SELECT clause on the query (list of columns to get). void SetColumnSpec(const QString &spec) { column_spec_ = spec; } diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h index 0de3df269..e4ee1afc0 100644 --- a/src/collection/collectionview.h +++ b/src/collection/collectionview.h @@ -53,7 +53,7 @@ class CollectionView : public AutoExpandingTreeView { Q_OBJECT public: - CollectionView(QWidget *parent = nullptr); + explicit CollectionView(QWidget *parent = nullptr); ~CollectionView(); // Returns Songs currently selected in the collection view. diff --git a/src/collection/collectionviewcontainer.h b/src/collection/collectionviewcontainer.h index f9243d1e7..6176a660f 100644 --- a/src/collection/collectionviewcontainer.h +++ b/src/collection/collectionviewcontainer.h @@ -34,7 +34,7 @@ class CollectionViewContainer : public QWidget { Q_OBJECT public: - CollectionViewContainer(QWidget *parent = nullptr); + explicit CollectionViewContainer(QWidget *parent = nullptr); ~CollectionViewContainer(); CollectionFilterWidget *filter() const; diff --git a/src/collection/collectionwatcher.h b/src/collection/collectionwatcher.h index 7ce9d19be..5f7226f83 100644 --- a/src/collection/collectionwatcher.h +++ b/src/collection/collectionwatcher.h @@ -48,7 +48,7 @@ class CollectionWatcher : public QObject { Q_OBJECT public: - CollectionWatcher(Song::Source source, QObject *parent = nullptr); + explicit CollectionWatcher(Song::Source source, QObject *parent = nullptr); void set_backend(CollectionBackend *backend) { backend_ = backend; } void set_task_manager(TaskManager *task_manager) { task_manager_ = task_manager; } @@ -64,7 +64,7 @@ class CollectionWatcher : public QObject { void ExitAsync(); -signals: + signals: void NewOrUpdatedSongs(const SongList &songs); void SongsMTimeUpdated(const SongList &songs); void SongsDeleted(const SongList &songs); diff --git a/src/collection/groupbydialog.h b/src/collection/groupbydialog.h index 68ec68d78..6b57c0eb6 100644 --- a/src/collection/groupbydialog.h +++ b/src/collection/groupbydialog.h @@ -40,7 +40,7 @@ class GroupByDialog : public QDialog { Q_OBJECT public: - GroupByDialog(QWidget *parent = nullptr); + explicit GroupByDialog(QWidget *parent = nullptr); ~GroupByDialog(); public slots: diff --git a/src/collection/savedgroupingmanager.h b/src/collection/savedgroupingmanager.h index fafe7223c..a1fee48d3 100644 --- a/src/collection/savedgroupingmanager.h +++ b/src/collection/savedgroupingmanager.h @@ -39,7 +39,7 @@ class SavedGroupingManager : public QDialog { Q_OBJECT public: - SavedGroupingManager(QWidget *parent = nullptr); + explicit SavedGroupingManager(QWidget *parent = nullptr); ~SavedGroupingManager(); void UpdateModel(); diff --git a/src/context/contextalbum.h b/src/context/contextalbum.h index 43c51e6df..07fb64b86 100644 --- a/src/context/contextalbum.h +++ b/src/context/contextalbum.h @@ -44,7 +44,7 @@ class ContextAlbum : public QWidget { Q_OBJECT public: - ContextAlbum(QWidget *parent = nullptr); + explicit ContextAlbum(QWidget *parent = nullptr); void Init(AlbumCoverChoiceController *album_cover_choice_controller); void SetImage(QImage image = QImage()); diff --git a/src/context/contextalbumsmodel.h b/src/context/contextalbumsmodel.h index 1db28ee91..9eb1bc3aa 100644 --- a/src/context/contextalbumsmodel.h +++ b/src/context/contextalbumsmodel.h @@ -56,7 +56,7 @@ class ContextAlbumsModel : public SimpleTreeModel { Q_OBJECT public: - ContextAlbumsModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr); + explicit ContextAlbumsModel(CollectionBackend *backend, Application *app, QObject *parent = nullptr); ~ContextAlbumsModel(); static const int kPrettyCoverSize; diff --git a/src/context/contextalbumsview.h b/src/context/contextalbumsview.h index fbd6eef16..27d7cf0ae 100644 --- a/src/context/contextalbumsview.h +++ b/src/context/contextalbumsview.h @@ -54,7 +54,7 @@ class ContextItemDelegate : public QStyledItemDelegate { Q_OBJECT public: - ContextItemDelegate(QObject *parent); + explicit ContextItemDelegate(QObject *parent); public slots: bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index); diff --git a/src/context/contextview.h b/src/context/contextview.h index 9718682e0..9ee4706b9 100644 --- a/src/context/contextview.h +++ b/src/context/contextview.h @@ -54,7 +54,7 @@ class ContextView : public QWidget { Q_OBJECT public: - ContextView(QWidget *parent = nullptr); + explicit ContextView(QWidget *parent = nullptr); void Init(Application *app, CollectionView *collectionview, AlbumCoverChoiceController *album_cover_choice_controller); diff --git a/src/core/database.h b/src/core/database.h index 5e4bf6685..a28acb965 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -42,7 +42,7 @@ class Database : public QObject { Q_OBJECT public: - Database(Application *app, QObject *parent = nullptr, const QString &database_name = QString()); + explicit Database(Application *app, QObject *parent = nullptr, const QString &database_name = QString()); ~Database(); struct AttachedDatabase { diff --git a/src/core/dbusscreensaver.h b/src/core/dbusscreensaver.h index 80074e81e..39d1b2141 100644 --- a/src/core/dbusscreensaver.h +++ b/src/core/dbusscreensaver.h @@ -30,7 +30,7 @@ class DBusScreensaver : public Screensaver { public: - DBusScreensaver(const QString &service, const QString &path, const QString &interface); + explicit DBusScreensaver(const QString &service, const QString &path, const QString &interface); void Inhibit(); void Uninhibit(); diff --git a/src/core/deletefiles.h b/src/core/deletefiles.h index 3b5306cf4..67e6ce755 100644 --- a/src/core/deletefiles.h +++ b/src/core/deletefiles.h @@ -38,7 +38,7 @@ class DeleteFiles : public QObject { Q_OBJECT public: - DeleteFiles(TaskManager *task_manager, std::shared_ptr storage); + explicit DeleteFiles(TaskManager *task_manager, std::shared_ptr storage); ~DeleteFiles(); static const int kBatchSize; diff --git a/src/core/filesystemmusicstorage.h b/src/core/filesystemmusicstorage.h index c9fd253df..95921d301 100644 --- a/src/core/filesystemmusicstorage.h +++ b/src/core/filesystemmusicstorage.h @@ -29,7 +29,7 @@ #include "musicstorage.h" class FilesystemMusicStorage : public virtual MusicStorage { -public: + public: explicit FilesystemMusicStorage(const QString &root); ~FilesystemMusicStorage() {} @@ -38,7 +38,7 @@ public: bool CopyToStorage(const CopyJob &job); bool DeleteFromStorage(const DeleteJob &job); -private: + private: QString root_; }; diff --git a/src/core/iconloader.h b/src/core/iconloader.h index 68f198c47..8aa80d134 100644 --- a/src/core/iconloader.h +++ b/src/core/iconloader.h @@ -28,7 +28,7 @@ class IconLoader { static void Init(); static QIcon Load(const QString &name, const int size = 0); private: - IconLoader() {} + explicit IconLoader() {} static bool system_icons_; static bool custom_icons_; }; diff --git a/src/core/iconmapper.h b/src/core/iconmapper.h index 313770768..f111c8df3 100644 --- a/src/core/iconmapper.h +++ b/src/core/iconmapper.h @@ -25,7 +25,7 @@ namespace IconMapper { struct IconProperties { - IconProperties() : min_size(0), max_size(0) {} + explicit IconProperties() : min_size(0), max_size(0) {} IconProperties(const QStringList &_names, const int _min_size, const int _max_size) : names(_names), min_size(_min_size), max_size(_max_size) {} QStringList names; int min_size; diff --git a/src/core/macscreensaver.h b/src/core/macscreensaver.h index 101d390c4..26255c4c5 100644 --- a/src/core/macscreensaver.h +++ b/src/core/macscreensaver.h @@ -29,7 +29,7 @@ class MacScreensaver : public Screensaver { public: - MacScreensaver(); + explicit MacScreensaver(); void Inhibit(); void Uninhibit(); diff --git a/src/core/macsystemtrayicon.h b/src/core/macsystemtrayicon.h index 8eb1988aa..1e66278d6 100644 --- a/src/core/macsystemtrayicon.h +++ b/src/core/macsystemtrayicon.h @@ -38,7 +38,7 @@ class MacSystemTrayIcon : public SystemTrayIcon { Q_OBJECT public: - MacSystemTrayIcon(QObject *parent = nullptr); + explicit MacSystemTrayIcon(QObject *parent = nullptr); ~MacSystemTrayIcon(); void SetupMenu(QAction *previous, QAction *play, QAction *stop, QAction *stop_after, QAction *next, QAction *mute, QAction *love, QAction *quit); diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h index d970fd962..257b88859 100644 --- a/src/core/mainwindow.h +++ b/src/core/mainwindow.h @@ -100,7 +100,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { Q_OBJECT public: - MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, const CommandlineOptions& options, QWidget *parent = nullptr); + explicit MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, const CommandlineOptions& options, QWidget *parent = nullptr); ~MainWindow(); static const char *kSettingsGroup; diff --git a/src/core/mpris2.h b/src/core/mpris2.h index 490adaf44..244fa9bd8 100644 --- a/src/core/mpris2.h +++ b/src/core/mpris2.h @@ -78,7 +78,7 @@ class Mpris2 : public QObject { Q_OBJECT public: - Mpris2(Application *app, QObject *parent = nullptr); + explicit Mpris2(Application *app, QObject *parent = nullptr); // org.mpris.MediaPlayer2 MPRIS 2.0 Root interface Q_PROPERTY(bool CanQuit READ CanQuit) diff --git a/src/core/multisortfilterproxy.h b/src/core/multisortfilterproxy.h index 2410c3c94..9d36b92d3 100644 --- a/src/core/multisortfilterproxy.h +++ b/src/core/multisortfilterproxy.h @@ -32,7 +32,7 @@ class QObject; class MultiSortFilterProxy : public QSortFilterProxyModel { public: - MultiSortFilterProxy(QObject *parent = nullptr); + explicit MultiSortFilterProxy(QObject *parent = nullptr); void AddSortSpec(int role, Qt::SortOrder order = Qt::AscendingOrder); diff --git a/src/core/musicstorage.h b/src/core/musicstorage.h index ec6f1faa5..6846c443f 100644 --- a/src/core/musicstorage.h +++ b/src/core/musicstorage.h @@ -36,7 +36,7 @@ class MusicStorage { public: - MusicStorage(); + explicit MusicStorage(); virtual ~MusicStorage() {} enum Role { diff --git a/src/core/networkproxyfactory.h b/src/core/networkproxyfactory.h index 3b35554a5..c3cd36232 100644 --- a/src/core/networkproxyfactory.h +++ b/src/core/networkproxyfactory.h @@ -44,7 +44,7 @@ class NetworkProxyFactory : public QNetworkProxyFactory { QList queryProxy(const QNetworkProxyQuery &query); private: - NetworkProxyFactory(); + explicit NetworkProxyFactory(); static NetworkProxyFactory *sInstance; diff --git a/src/core/scopedtransaction.h b/src/core/scopedtransaction.h index 9b679f41a..e8422e602 100644 --- a/src/core/scopedtransaction.h +++ b/src/core/scopedtransaction.h @@ -31,7 +31,7 @@ class QSqlDatabase; // Rolls back the transaction if the object goes out of scope before Commit() is called. class ScopedTransaction : boost::noncopyable { public: - ScopedTransaction(QSqlDatabase *db); + explicit ScopedTransaction(QSqlDatabase *db); ~ScopedTransaction(); void Commit(); diff --git a/src/core/settingsprovider.h b/src/core/settingsprovider.h index 490294a07..2187b10bc 100644 --- a/src/core/settingsprovider.h +++ b/src/core/settingsprovider.h @@ -29,7 +29,7 @@ class SettingsProvider { public: - SettingsProvider(); + explicit SettingsProvider(); virtual ~SettingsProvider() {} virtual void set_group(const char *group) = 0; diff --git a/src/core/simpletreeitem.h b/src/core/simpletreeitem.h index c702b3ea0..bd44f7221 100644 --- a/src/core/simpletreeitem.h +++ b/src/core/simpletreeitem.h @@ -32,8 +32,8 @@ template class SimpleTreeItem { public: - SimpleTreeItem(int _type, SimpleTreeModel* _model); // For the root item - SimpleTreeItem(int _type, const QString& _key, T* _parent = nullptr); + explicit SimpleTreeItem(int _type, SimpleTreeModel* _model); // For the root item + explicit SimpleTreeItem(int _type, const QString& _key, T* _parent = nullptr); explicit SimpleTreeItem(int _type, T* _parent = nullptr); virtual ~SimpleTreeItem(); diff --git a/src/core/song.cpp b/src/core/song.cpp index 69cde36b0..91a75a0c1 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -156,7 +156,7 @@ const QStringList Song::kArticles = QStringList() << "the " << "a " << "an "; struct Song::Private : public QSharedData { - Private(Source source = Source_Unknown); + explicit Private(Source source = Source_Unknown); bool valid_; int id_; diff --git a/src/core/song.h b/src/core/song.h index 655403ee9..137906606 100644 --- a/src/core/song.h +++ b/src/core/song.h @@ -103,7 +103,7 @@ class Song { FileType_Stream = 91, }; - Song(Song::Source source = Song::Source_Unknown); + explicit Song(Song::Source source = Song::Source_Unknown); Song(const Song &other); ~Song(); diff --git a/src/core/standarditemiconloader.h b/src/core/standarditemiconloader.h index dbf701a7d..11569aaee 100644 --- a/src/core/standarditemiconloader.h +++ b/src/core/standarditemiconloader.h @@ -43,7 +43,7 @@ class StandardItemIconLoader : public QObject { Q_OBJECT public: - StandardItemIconLoader(AlbumCoverLoader *cover_loader, QObject *parent = nullptr); + explicit StandardItemIconLoader(AlbumCoverLoader *cover_loader, QObject *parent = nullptr); AlbumCoverLoaderOptions *options() { return &cover_options_; } diff --git a/src/core/systemtrayicon.h b/src/core/systemtrayicon.h index a19a49237..b6ae82795 100644 --- a/src/core/systemtrayicon.h +++ b/src/core/systemtrayicon.h @@ -36,7 +36,7 @@ class SystemTrayIcon : public QObject { Q_OBJECT public: - SystemTrayIcon(QObject *parent = nullptr); + explicit SystemTrayIcon(QObject *parent = nullptr); // Called once to create the icon's context menu virtual void SetupMenu(QAction *previous, QAction *play, QAction *stop, QAction *stop_after, QAction *next, QAction *mute, QAction *love, QAction *quit) = 0; diff --git a/src/core/thread.h b/src/core/thread.h index 796d4a95c..6bf8cfc52 100644 --- a/src/core/thread.h +++ b/src/core/thread.h @@ -29,8 +29,7 @@ class QObject; // Improve QThread by adding a SetIoPriority function class Thread : public QThread { public: - Thread(QObject* parent = nullptr) - : QThread(parent), io_priority_(Utilities::IOPRIO_CLASS_NONE) {} + explicit Thread(QObject* parent = nullptr) : QThread(parent), io_priority_(Utilities::IOPRIO_CLASS_NONE) {} void SetIoPriority(Utilities::IoPriority priority) { io_priority_ = priority; diff --git a/src/core/translations.h b/src/core/translations.h index b81703a93..d280c3697 100644 --- a/src/core/translations.h +++ b/src/core/translations.h @@ -27,7 +27,7 @@ class QTranslator; class Translations : public QObject { public: - Translations(); + explicit Translations(); ~Translations(); void LoadTranslation(const QString &prefix, const QString &path, const QString &language); diff --git a/src/core/windows7thumbbar.h b/src/core/windows7thumbbar.h index 24d7452c8..e8cd47f1b 100644 --- a/src/core/windows7thumbbar.h +++ b/src/core/windows7thumbbar.h @@ -38,7 +38,7 @@ class Windows7ThumbBar : public QObject { public: // Creates a list of buttons in the taskbar icon for this window. Does nothing and is safe to use on other operating systems too. - Windows7ThumbBar(QWidget *widget = 0); + explicit Windows7ThumbBar(QWidget *widget = 0); static const int kIconSize; static const int kMaxButtonCount; diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h index 5bb34531d..47f30731e 100644 --- a/src/covermanager/albumcoverchoicecontroller.h +++ b/src/covermanager/albumcoverchoicecontroller.h @@ -57,7 +57,7 @@ class AlbumCoverChoiceController : public QWidget { static const char *kSaveImageFileFilter; static const char *kAllFilesFilter; - AlbumCoverChoiceController(QWidget *parent = nullptr); + explicit AlbumCoverChoiceController(QWidget *parent = nullptr); ~AlbumCoverChoiceController(); void Init(Application *app); diff --git a/src/covermanager/albumcoverexport.h b/src/covermanager/albumcoverexport.h index 6385eeb26..b603a7b19 100644 --- a/src/covermanager/albumcoverexport.h +++ b/src/covermanager/albumcoverexport.h @@ -35,7 +35,7 @@ class AlbumCoverExport : public QDialog { Q_OBJECT public: - AlbumCoverExport(QWidget *parent = nullptr); + explicit AlbumCoverExport(QWidget *parent = nullptr); ~AlbumCoverExport(); enum OverwriteMode { diff --git a/src/covermanager/albumcoverfetcher.h b/src/covermanager/albumcoverfetcher.h index 0cb6fb508..d25b58477 100644 --- a/src/covermanager/albumcoverfetcher.h +++ b/src/covermanager/albumcoverfetcher.h @@ -42,7 +42,7 @@ struct CoverSearchStatistics; // This class represents a single search-for-cover request. It identifies and describes the request. struct CoverSearchRequest { - CoverSearchRequest() : id(-1), search(false), fetchall(false) {} + explicit CoverSearchRequest() : id(-1), search(false), fetchall(false) {} // An unique (for one AlbumCoverFetcher) request identifier quint64 id; @@ -60,7 +60,7 @@ struct CoverSearchRequest { // This structure represents a single result of some album's cover search request. struct CoverSearchResult { - CoverSearchResult() : score(0.0) {} + explicit CoverSearchResult() : score(0.0) {} // Used for grouping in the user interface. QString provider; @@ -87,7 +87,7 @@ class AlbumCoverFetcher : public QObject { Q_OBJECT public: - AlbumCoverFetcher(CoverProviders *cover_providers, QObject *parent = nullptr, QNetworkAccessManager *network = 0); + explicit AlbumCoverFetcher(CoverProviders *cover_providers, QObject *parent = nullptr, QNetworkAccessManager *network = 0); virtual ~AlbumCoverFetcher() {} static const int kMaxConcurrentRequests; diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h index f359b2039..98622c552 100644 --- a/src/covermanager/albumcoverfetchersearch.h +++ b/src/covermanager/albumcoverfetchersearch.h @@ -47,7 +47,7 @@ class AlbumCoverFetcherSearch : public QObject { Q_OBJECT public: - AlbumCoverFetcherSearch(const CoverSearchRequest &request, QNetworkAccessManager *network, QObject *parent); + explicit AlbumCoverFetcherSearch(const CoverSearchRequest &request, QNetworkAccessManager *network, QObject *parent); void Start(CoverProviders *cover_providers); diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h index 59e29beb5..e01b7d0f4 100644 --- a/src/covermanager/albumcoverloader.h +++ b/src/covermanager/albumcoverloader.h @@ -84,7 +84,7 @@ class AlbumCoverLoader : public QObject { }; struct Task { - Task() : redirects(0) {} + explicit Task() : redirects(0) {} AlbumCoverLoaderOptions options; @@ -98,7 +98,7 @@ class AlbumCoverLoader : public QObject { }; struct TryLoadResult { - TryLoadResult(bool async, bool success, const QUrl &_cover_url, const QImage &_image) : started_async(async), loaded_success(success), cover_url(_cover_url), image(_image) {} + explicit TryLoadResult(bool async, bool success, const QUrl &_cover_url, const QImage &_image) : started_async(async), loaded_success(success), cover_url(_cover_url), image(_image) {} bool started_async; bool loaded_success; diff --git a/src/covermanager/albumcoverloaderoptions.h b/src/covermanager/albumcoverloaderoptions.h index 62de80ae7..41cdef7b7 100644 --- a/src/covermanager/albumcoverloaderoptions.h +++ b/src/covermanager/albumcoverloaderoptions.h @@ -26,7 +26,7 @@ #include struct AlbumCoverLoaderOptions { - AlbumCoverLoaderOptions() + explicit AlbumCoverLoaderOptions() : desired_height_(120), scale_output_image_(true), pad_output_image_(true) {} diff --git a/src/covermanager/albumcovermanagerlist.h b/src/covermanager/albumcovermanagerlist.h index 36e5b6f69..50ec81a0a 100644 --- a/src/covermanager/albumcovermanagerlist.h +++ b/src/covermanager/albumcovermanagerlist.h @@ -36,16 +36,17 @@ class AlbumCoverManager; class AlbumCoverManagerList : public QListWidget { Q_OBJECT + public: - AlbumCoverManagerList(QWidget *parent = nullptr); + explicit AlbumCoverManagerList(QWidget *parent = nullptr); void set_cover_manager(AlbumCoverManager *manager) { manager_ = manager; } -protected: + protected: QMimeData *mimeData(const QList items) const; void dropEvent(QDropEvent *event); -private: + private: AlbumCoverManager* manager_; }; diff --git a/src/covermanager/albumcoversearcher.h b/src/covermanager/albumcoversearcher.h index 7353dcf12..87432cd0b 100644 --- a/src/covermanager/albumcoversearcher.h +++ b/src/covermanager/albumcoversearcher.h @@ -48,7 +48,7 @@ class Application; class Ui_AlbumCoverSearcher; class SizeOverlayDelegate : public QStyledItemDelegate { -public: + public: static const int kMargin; static const int kPaddingX; static const int kPaddingY; @@ -57,7 +57,7 @@ public: static const int kBorderAlpha; static const int kBackgroundAlpha; - SizeOverlayDelegate(QObject *parent = nullptr); + explicit SizeOverlayDelegate(QObject *parent = nullptr); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; }; @@ -66,8 +66,8 @@ public: class AlbumCoverSearcher : public QDialog { Q_OBJECT -public: - AlbumCoverSearcher(const QIcon &no_cover_icon, Application *app, QWidget *parent); + public: + explicit AlbumCoverSearcher(const QIcon &no_cover_icon, Application *app, QWidget *parent); ~AlbumCoverSearcher(); enum Role { @@ -82,17 +82,17 @@ public: QImage Exec(const QString &artist, const QString &album); -protected: + protected: void keyPressEvent(QKeyEvent*); -private slots: + private slots: void Search(); void SearchFinished(const quint64 id, const CoverSearchResults &results); void ImageLoaded(const quint64 id, const QUrl &cover_url, const QImage &image); void CoverDoubleClicked(const QModelIndex &index); -private: + private: Ui_AlbumCoverSearcher *ui_; Application *app_; diff --git a/src/covermanager/coverexportrunnable.h b/src/covermanager/coverexportrunnable.h index 1f458b3a0..d6a5acc51 100644 --- a/src/covermanager/coverexportrunnable.h +++ b/src/covermanager/coverexportrunnable.h @@ -34,7 +34,7 @@ class CoverExportRunnable : public QObject, public QRunnable { Q_OBJECT public: - CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song); + explicit CoverExportRunnable(const AlbumCoverExport::DialogResult &dialog_result, const Song &song); virtual ~CoverExportRunnable() {} void run(); diff --git a/src/covermanager/coverfromurldialog.h b/src/covermanager/coverfromurldialog.h index 06831d4ce..c5142e498 100644 --- a/src/covermanager/coverfromurldialog.h +++ b/src/covermanager/coverfromurldialog.h @@ -38,7 +38,7 @@ class CoverFromURLDialog : public QDialog { Q_OBJECT public: - CoverFromURLDialog(QWidget *parent = nullptr); + explicit CoverFromURLDialog(QWidget *parent = nullptr); ~CoverFromURLDialog(); // Opens the dialog. This returns an image found at the URL chosen by user or null image if the dialog got rejected. diff --git a/src/covermanager/coversearchstatistics.h b/src/covermanager/coversearchstatistics.h index ff0662aad..aef0d2a1c 100644 --- a/src/covermanager/coversearchstatistics.h +++ b/src/covermanager/coversearchstatistics.h @@ -30,7 +30,7 @@ struct CoverSearchStatistics { - CoverSearchStatistics(); + explicit CoverSearchStatistics(); CoverSearchStatistics& operator +=(const CoverSearchStatistics &other); diff --git a/src/covermanager/discogscoverprovider.h b/src/covermanager/discogscoverprovider.h index 83e07b5bb..8c429c9c0 100644 --- a/src/covermanager/discogscoverprovider.h +++ b/src/covermanager/discogscoverprovider.h @@ -42,7 +42,7 @@ class Application; // This struct represents a single search-for-cover request. It identifies and describes the request. struct DiscogsCoverSearchContext { - DiscogsCoverSearchContext() : id(-1), r_count(0) {} + explicit DiscogsCoverSearchContext() : id(-1), r_count(0) {} // The unique request identifier int id; @@ -58,7 +58,7 @@ Q_DECLARE_METATYPE(DiscogsCoverSearchContext) // This struct represents a single release request. It identifies and describes the request. struct DiscogsCoverReleaseContext { - DiscogsCoverReleaseContext() : id(-1) {} + explicit DiscogsCoverReleaseContext() : id(-1) {} int id; // The unique request identifier int s_id; // The search request identifier diff --git a/src/device/afcfile.h b/src/device/afcfile.h index 6c4dec52d..dd41c88e1 100644 --- a/src/device/afcfile.h +++ b/src/device/afcfile.h @@ -16,8 +16,8 @@ class iMobileDeviceConnection; class AfcFile : public QIODevice { Q_OBJECT -public: - AfcFile(iMobileDeviceConnection* connection, const QString &path, QObject *parent = 0); + public: + explicit AfcFile(iMobileDeviceConnection* connection, const QString &path, QObject *parent = 0); ~AfcFile(); // QIODevice @@ -26,7 +26,7 @@ public: bool seek(qint64 pos); qint64 size() const; -private: + private: // QIODevice qint64 readData(char *data, qint64 max_size); qint64 writeData(const char *data, qint64 max_size); diff --git a/src/device/afctransfer.h b/src/device/afctransfer.h index 4cb4ed95c..1b70c9ae4 100644 --- a/src/device/afctransfer.h +++ b/src/device/afctransfer.h @@ -38,26 +38,26 @@ class iMobileDeviceConnection; class AfcTransfer : public QObject { Q_OBJECT -public: - AfcTransfer(const QString &uuid, const QString &local_destination, TaskManager *task_manager, std::shared_ptr device); + public: + explicit AfcTransfer(const QString &uuid, const QString &local_destination, TaskManager *task_manager, std::shared_ptr device); ~AfcTransfer(); bool CopyToDevice(iMobileDeviceConnection *connection); -public slots: + public slots: void CopyFromDevice(); -signals: + signals: void TaskStarted(int task_id); void CopyFinished(bool success); -private: + private: bool CopyDirFromDevice(iMobileDeviceConnection *c, const QString &path); bool CopyDirToDevice(iMobileDeviceConnection *c, const QString &path); bool CopyFileFromDevice(iMobileDeviceConnection *c, const QString &path); bool CopyFileToDevice(iMobileDeviceConnection *c, const QString &path); -private: + private: QThread *original_thread_; std::shared_ptr device_; TaskManager *task_manager_; diff --git a/src/device/cddalister.cpp b/src/device/cddalister.cpp index 949b73cf8..446d0e964 100644 --- a/src/device/cddalister.cpp +++ b/src/device/cddalister.cpp @@ -107,7 +107,7 @@ bool CddaLister::Init() { cdio_init(); #ifdef Q_OS_MACOS if (!cdio_have_driver(DRIVER_OSX)) { - qLog(Error) << "libcdio was compiled without support for OS X!"; + qLog(Error) << "libcdio was compiled without support for macOS!"; } #endif char** devices = cdio_get_devices(DRIVER_DEVICE); diff --git a/src/device/cddalister.h b/src/device/cddalister.h index a6364f5af..4b5452c9c 100644 --- a/src/device/cddalister.h +++ b/src/device/cddalister.h @@ -37,7 +37,7 @@ class CddaLister : public DeviceLister { Q_OBJECT public: - CddaLister() {} + explicit CddaLister() {} QStringList DeviceUniqueIDs(); QVariantList DeviceIcons(const QString &id); diff --git a/src/device/connecteddevice.h b/src/device/connecteddevice.h index 028a4c796..43aefaf47 100644 --- a/src/device/connecteddevice.h +++ b/src/device/connecteddevice.h @@ -43,7 +43,7 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public std: Q_OBJECT public: - ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time); + explicit ConnectedDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time); ~ConnectedDevice(); virtual bool Init() = 0; diff --git a/src/device/deviceinfo.h b/src/device/deviceinfo.h index 70f7518ad..3f890b4a8 100644 --- a/src/device/deviceinfo.h +++ b/src/device/deviceinfo.h @@ -60,7 +60,7 @@ class DeviceInfo : public SimpleTreeItem { Type_Device, }; - DeviceInfo(SimpleTreeModel *model) + explicit DeviceInfo(SimpleTreeModel *model) : SimpleTreeItem(Type_Root, model), database_id_(-1), size_(0), @@ -70,7 +70,7 @@ class DeviceInfo : public SimpleTreeItem { unmount_(false), forget_(false) {} - DeviceInfo(Type type, DeviceInfo *parent = nullptr) + explicit DeviceInfo(Type type, DeviceInfo *parent = nullptr) : SimpleTreeItem(type, parent), database_id_(-1), size_(0), @@ -83,7 +83,7 @@ class DeviceInfo : public SimpleTreeItem { // A device can be discovered in different ways (udisks2, gio, etc.) // Sometimes the same device is discovered more than once. In this case the device will have multiple "backends". struct Backend { - Backend(DeviceLister *lister = nullptr, const QString &id = QString()) + explicit Backend(DeviceLister *lister = nullptr, const QString &id = QString()) : lister_(lister), unique_id_(id) diff --git a/src/device/devicemanager.h b/src/device/devicemanager.h index 73f641c11..78f5c9db0 100644 --- a/src/device/devicemanager.h +++ b/src/device/devicemanager.h @@ -58,7 +58,7 @@ class DeviceManager : public SimpleTreeModel { Q_OBJECT public: - DeviceManager(Application *app, QObject *parent = nullptr); + explicit DeviceManager(Application *app, QObject *parent = nullptr); ~DeviceManager(); enum Role { diff --git a/src/device/deviceproperties.h b/src/device/deviceproperties.h index 2b2b2c97d..ccb9c6363 100644 --- a/src/device/deviceproperties.h +++ b/src/device/deviceproperties.h @@ -42,7 +42,7 @@ class DeviceProperties : public QDialog { Q_OBJECT public: - DeviceProperties(QWidget *parent = nullptr); + explicit DeviceProperties(QWidget *parent = nullptr); ~DeviceProperties(); void SetDeviceManager(DeviceManager *manager); diff --git a/src/device/devicestatefiltermodel.h b/src/device/devicestatefiltermodel.h index 7f9c3b01e..3ba051177 100644 --- a/src/device/devicestatefiltermodel.h +++ b/src/device/devicestatefiltermodel.h @@ -35,22 +35,22 @@ class QModelIndex; class DeviceStateFilterModel : public QSortFilterProxyModel { Q_OBJECT -public: - DeviceStateFilterModel(QObject *parent, DeviceManager::State state = DeviceManager::State_Remembered); + public: + explicit DeviceStateFilterModel(QObject *parent, DeviceManager::State state = DeviceManager::State_Remembered); void setSourceModel(QAbstractItemModel *sourceModel); -signals: + signals: void IsEmptyChanged(bool is_empty); -protected: + protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const; -private slots: + private slots: void ProxyRowCountChanged(); void ProxyRowCountChanged(QModelIndex index, int first, int last); -private: + private: DeviceManager::State state_; }; diff --git a/src/device/deviceview.h b/src/device/deviceview.h index c4fdaf09b..20836bb25 100644 --- a/src/device/deviceview.h +++ b/src/device/deviceview.h @@ -53,7 +53,7 @@ class DeviceItemDelegate : public CollectionItemDelegate { Q_OBJECT public: - DeviceItemDelegate(QObject *parent); + explicit DeviceItemDelegate(QObject *parent); static const int kIconPadding; @@ -65,7 +65,7 @@ class DeviceView : public AutoExpandingTreeView { Q_OBJECT public: - DeviceView(QWidget *parent = nullptr); + explicit DeviceView(QWidget *parent = nullptr); ~DeviceView(); void SetApplication(Application *app); diff --git a/src/device/giolister.h b/src/device/giolister.h index f459231a7..de7c208df 100644 --- a/src/device/giolister.h +++ b/src/device/giolister.h @@ -49,7 +49,7 @@ class GioLister : public DeviceLister { Q_OBJECT public: - GioLister() {} + explicit GioLister() {} ~GioLister(); int priority() const { return 50; } diff --git a/src/device/gpodloader.h b/src/device/gpodloader.h index 8d1236483..af89c82fa 100644 --- a/src/device/gpodloader.h +++ b/src/device/gpodloader.h @@ -40,7 +40,7 @@ class GPodLoader : public QObject { Q_OBJECT public: - GPodLoader(const QString &mount_point, TaskManager *task_manager, CollectionBackend *backend, std::shared_ptr device); + explicit GPodLoader(const QString &mount_point, TaskManager *task_manager, CollectionBackend *backend, std::shared_ptr device); ~GPodLoader(); void set_music_path_prefix(const QString &prefix) { path_prefix_ = prefix; } diff --git a/src/device/ilister.h b/src/device/ilister.h index 78f833421..17eb55a3c 100644 --- a/src/device/ilister.h +++ b/src/device/ilister.h @@ -38,7 +38,7 @@ class iLister : public DeviceLister { Q_OBJECT public: - iLister(); + explicit iLister(); ~iLister(); int priority() const { return 120; } diff --git a/src/device/imobiledeviceconnection.h b/src/device/imobiledeviceconnection.h index 765dd4237..9959775bd 100644 --- a/src/device/imobiledeviceconnection.h +++ b/src/device/imobiledeviceconnection.h @@ -38,7 +38,7 @@ class iMobileDeviceConnection { public: - iMobileDeviceConnection(const QString &uuid); + explicit iMobileDeviceConnection(const QString &uuid); ~iMobileDeviceConnection(); afc_client_t afc() { return afc_; } diff --git a/src/device/macosdevicelister.h b/src/device/macosdevicelister.h index 87ac236b5..a9fcbeae3 100644 --- a/src/device/macosdevicelister.h +++ b/src/device/macosdevicelister.h @@ -42,7 +42,7 @@ class MacOsDeviceLister : public DeviceLister { Q_OBJECT public: - MacOsDeviceLister(); + explicit MacOsDeviceLister(); ~MacOsDeviceLister(); QStringList DeviceUniqueIDs(); diff --git a/src/device/mtpconnection.h b/src/device/mtpconnection.h index 5695c557e..1b3ef5d73 100644 --- a/src/device/mtpconnection.h +++ b/src/device/mtpconnection.h @@ -36,7 +36,7 @@ class MtpConnection : public QObject, public std::enable_shared_from_this { public: - MtpConnection(const QUrl &url); + explicit MtpConnection(const QUrl &url); ~MtpConnection(); bool is_valid() const { return device_; } diff --git a/src/device/mtploader.h b/src/device/mtploader.h index 18a400d92..fe707748b 100644 --- a/src/device/mtploader.h +++ b/src/device/mtploader.h @@ -39,7 +39,7 @@ class MtpLoader : public QObject { Q_OBJECT public: - MtpLoader(const QUrl &url, TaskManager *task_manager, CollectionBackend *backend); + explicit MtpLoader(const QUrl &url, TaskManager *task_manager, CollectionBackend *backend); ~MtpLoader(); bool Init(); diff --git a/src/device/udisks2lister.h b/src/device/udisks2lister.h index ed6ee007d..71795de13 100644 --- a/src/device/udisks2lister.h +++ b/src/device/udisks2lister.h @@ -49,7 +49,7 @@ class Udisks2Lister : public DeviceLister { Q_OBJECT public: - Udisks2Lister(); + explicit Udisks2Lister(); ~Udisks2Lister(); QStringList DeviceUniqueIDs() override; diff --git a/src/dialogs/about.h b/src/dialogs/about.h index 52544d0bf..65f10da20 100644 --- a/src/dialogs/about.h +++ b/src/dialogs/about.h @@ -37,7 +37,7 @@ class About : public QDialog { Q_OBJECT public: - About(QWidget *parent = nullptr); + explicit About(QWidget *parent = nullptr); struct Person { Person(const QString &n, const QString &e = QString()) : name(n), email(e) {} diff --git a/src/dialogs/console.h b/src/dialogs/console.h index e7a97ef17..ada6a93ce 100644 --- a/src/dialogs/console.h +++ b/src/dialogs/console.h @@ -34,8 +34,9 @@ class Application; class Console : public QDialog { Q_OBJECT + public: - Console(Application *app, QWidget *parent = nullptr); + explicit Console(Application *app, QWidget *parent = nullptr); private slots: void RunQuery(); diff --git a/src/dialogs/edittagdialog.h b/src/dialogs/edittagdialog.h index f4ed83627..7b2ced00f 100644 --- a/src/dialogs/edittagdialog.h +++ b/src/dialogs/edittagdialog.h @@ -60,7 +60,7 @@ class EditTagDialog : public QDialog { Q_OBJECT public: - EditTagDialog(Application *app, QWidget *parent = nullptr); + explicit EditTagDialog(Application *app, QWidget *parent = nullptr); ~EditTagDialog(); static const char *kHintText; diff --git a/src/dialogs/errordialog.h b/src/dialogs/errordialog.h index 7546e8bab..e35a379e8 100644 --- a/src/dialogs/errordialog.h +++ b/src/dialogs/errordialog.h @@ -36,7 +36,7 @@ class ErrorDialog : public QDialog { Q_OBJECT public: - ErrorDialog(QWidget *parent = nullptr); + explicit ErrorDialog(QWidget *parent = nullptr); ~ErrorDialog(); public slots: diff --git a/src/dialogs/trackselectiondialog.h b/src/dialogs/trackselectiondialog.h index 94c8ff1a7..d8d0a20a6 100644 --- a/src/dialogs/trackselectiondialog.h +++ b/src/dialogs/trackselectiondialog.h @@ -38,7 +38,7 @@ class TrackSelectionDialog : public QDialog { Q_OBJECT public: - TrackSelectionDialog(QWidget *parent = nullptr); + explicit TrackSelectionDialog(QWidget *parent = nullptr); ~TrackSelectionDialog(); void set_save_on_close(bool save_on_close) { save_on_close_ = save_on_close; } diff --git a/src/engine/alsadevicefinder.h b/src/engine/alsadevicefinder.h index 9d8c56794..f9bf7d34f 100644 --- a/src/engine/alsadevicefinder.h +++ b/src/engine/alsadevicefinder.h @@ -28,7 +28,7 @@ class AlsaDeviceFinder : public DeviceFinder { public: - AlsaDeviceFinder(); + explicit AlsaDeviceFinder(); virtual bool Initialise() { return true; } virtual QList ListDevices(); diff --git a/src/engine/directsounddevicefinder.h b/src/engine/directsounddevicefinder.h index f7c7a9e89..4b03f4e13 100644 --- a/src/engine/directsounddevicefinder.h +++ b/src/engine/directsounddevicefinder.h @@ -29,7 +29,7 @@ class DirectSoundDeviceFinder : public DeviceFinder { public: - DirectSoundDeviceFinder(); + explicit DirectSoundDeviceFinder(); virtual bool Initialise() { return true; } virtual QList ListDevices(); diff --git a/src/engine/gstelementdeleter.h b/src/engine/gstelementdeleter.h index bec5c1e1a..3067d575a 100644 --- a/src/engine/gstelementdeleter.h +++ b/src/engine/gstelementdeleter.h @@ -32,7 +32,7 @@ class GstElementDeleter : public QObject { Q_OBJECT public: - GstElementDeleter(QObject *parent = nullptr); + explicit GstElementDeleter(QObject *parent = nullptr); // If you call this function with any gstreamer element, the element will get deleted in the main thread. // This is useful if you need to delete an element from its own callback. diff --git a/src/engine/gstengine.h b/src/engine/gstengine.h index 733cb6854..b6b997d79 100644 --- a/src/engine/gstengine.h +++ b/src/engine/gstengine.h @@ -57,7 +57,7 @@ class GstEngine : public Engine::Base, public GstBufferConsumer { Q_OBJECT public: - GstEngine(TaskManager *task_manager); + explicit GstEngine(TaskManager *task_manager); ~GstEngine(); bool Init(); diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index 71ea28664..e4404e14b 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -60,7 +60,7 @@ class GstEnginePipeline : public QObject { Q_OBJECT public: - GstEnginePipeline(GstEngine *engine); + explicit GstEnginePipeline(GstEngine *engine); ~GstEnginePipeline(); // Globally unique across all pipelines. diff --git a/src/engine/macosdevicefinder.h b/src/engine/macosdevicefinder.h index cc606e76a..b4c070787 100644 --- a/src/engine/macosdevicefinder.h +++ b/src/engine/macosdevicefinder.h @@ -29,7 +29,7 @@ class MacOsDeviceFinder : public DeviceFinder { public: - MacOsDeviceFinder(); + explicit MacOsDeviceFinder(); virtual bool Initialise() { return true; } virtual QList ListDevices(); diff --git a/src/engine/mmdevicefinder.h b/src/engine/mmdevicefinder.h index 39ea682b8..e773f8402 100644 --- a/src/engine/mmdevicefinder.h +++ b/src/engine/mmdevicefinder.h @@ -26,7 +26,8 @@ class MMDeviceFinder : public DeviceFinder { public: - MMDeviceFinder(); + explicit MMDeviceFinder(); + virtual bool Initialise() { return true; } virtual QList ListDevices(); }; diff --git a/src/engine/phononengine.h b/src/engine/phononengine.h index b8279e79b..06e43ad8e 100644 --- a/src/engine/phononengine.h +++ b/src/engine/phononengine.h @@ -40,7 +40,7 @@ class PhononEngine : public Engine::Base { Q_OBJECT public: - PhononEngine(TaskManager *task_manager); + explicit PhononEngine(TaskManager *task_manager); ~PhononEngine(); bool Init(); diff --git a/src/engine/pulsedevicefinder.h b/src/engine/pulsedevicefinder.h index e9a86fe12..5602269a3 100644 --- a/src/engine/pulsedevicefinder.h +++ b/src/engine/pulsedevicefinder.h @@ -33,7 +33,7 @@ class PulseDeviceFinder : public DeviceFinder { public: - PulseDeviceFinder(); + explicit PulseDeviceFinder(); ~PulseDeviceFinder(); virtual bool Initialise(); diff --git a/src/engine/vlcengine.h b/src/engine/vlcengine.h index 9caf6f787..4af327741 100644 --- a/src/engine/vlcengine.h +++ b/src/engine/vlcengine.h @@ -42,7 +42,7 @@ class VLCEngine : public Engine::Base { Q_OBJECT public: - VLCEngine(TaskManager *task_manager); + explicit VLCEngine(TaskManager *task_manager); ~VLCEngine(); bool Init(); diff --git a/src/engine/vlcscopedref.h b/src/engine/vlcscopedref.h index 89d6eec8a..12e1b2b74 100644 --- a/src/engine/vlcscopedref.h +++ b/src/engine/vlcscopedref.h @@ -28,7 +28,7 @@ template class VlcScopedRef { public: - VlcScopedRef(T* ptr); + explicit VlcScopedRef(T* ptr); ~VlcScopedRef(); operator T* () const { return ptr_; } @@ -36,7 +36,7 @@ class VlcScopedRef { T* operator ->() const { return ptr_; } private: - VlcScopedRef(VlcScopedRef&) {} + explicit VlcScopedRef(VlcScopedRef&) {} VlcScopedRef& operator =(const VlcScopedRef&) { return *this; } T* ptr_; diff --git a/src/engine/xineengine.h b/src/engine/xineengine.h index 53c37277f..70e3c840e 100644 --- a/src/engine/xineengine.h +++ b/src/engine/xineengine.h @@ -48,7 +48,7 @@ class XineEngine : public Engine::Base { Q_OBJECT public: - XineEngine(TaskManager *task_manager); + explicit XineEngine(TaskManager *task_manager); ~XineEngine(); bool Init(); diff --git a/src/equalizer/equalizer.h b/src/equalizer/equalizer.h index b65f6591e..0bcc5520e 100644 --- a/src/equalizer/equalizer.h +++ b/src/equalizer/equalizer.h @@ -41,7 +41,7 @@ class Equalizer : public QDialog { Q_OBJECT public: - Equalizer(QWidget *parent = nullptr); + explicit Equalizer(QWidget *parent = nullptr); ~Equalizer(); static const int kBands = 10; diff --git a/src/equalizer/equalizerslider.h b/src/equalizer/equalizerslider.h index 0a8500a8b..591ec80e6 100644 --- a/src/equalizer/equalizerslider.h +++ b/src/equalizer/equalizerslider.h @@ -35,7 +35,7 @@ class EqualizerSlider : public QWidget { Q_OBJECT public: - EqualizerSlider(const QString &label, QWidget *parent = nullptr); + explicit EqualizerSlider(const QString &label, QWidget *parent = nullptr); ~EqualizerSlider(); int value() const; diff --git a/src/globalshortcuts/globalshortcutgrabber.h b/src/globalshortcuts/globalshortcutgrabber.h index 9c14dbbc0..d95bfbc74 100644 --- a/src/globalshortcuts/globalshortcutgrabber.h +++ b/src/globalshortcuts/globalshortcutgrabber.h @@ -47,7 +47,7 @@ class GlobalShortcutGrabber : public QDialog { Q_OBJECT public: - GlobalShortcutGrabber(QWidget *parent = nullptr); + explicit GlobalShortcutGrabber(QWidget *parent = nullptr); ~GlobalShortcutGrabber(); QKeySequence GetKey(const QString &name); @@ -59,7 +59,7 @@ class GlobalShortcutGrabber : public QDialog { void grabKeyboard(); void releaseKeyboard(); -private slots: + private slots: void Accepted(); void Rejected(); diff --git a/src/internet/internetcollectionview.h b/src/internet/internetcollectionview.h index d9429b5ed..10017de96 100644 --- a/src/internet/internetcollectionview.h +++ b/src/internet/internetcollectionview.h @@ -50,7 +50,7 @@ class InternetCollectionView : public AutoExpandingTreeView { Q_OBJECT public: - InternetCollectionView(QWidget *parent = nullptr); + explicit InternetCollectionView(QWidget *parent = nullptr); ~InternetCollectionView(); void Init(Application *app, CollectionBackend *backend, CollectionModel *model, const bool favorite = false); diff --git a/src/internet/internetcollectionviewcontainer.h b/src/internet/internetcollectionviewcontainer.h index 9a8a3fbba..adca0a75b 100644 --- a/src/internet/internetcollectionviewcontainer.h +++ b/src/internet/internetcollectionviewcontainer.h @@ -42,7 +42,7 @@ class InternetCollectionViewContainer : public QWidget { Q_OBJECT public: - InternetCollectionViewContainer(QWidget *parent = nullptr); + explicit InternetCollectionViewContainer(QWidget *parent = nullptr); ~InternetCollectionViewContainer(); QStackedWidget *stacked() const { return ui_->stacked; } diff --git a/src/internet/internetsearch.h b/src/internet/internetsearch.h index e70293b5a..4b2874c05 100644 --- a/src/internet/internetsearch.h +++ b/src/internet/internetsearch.h @@ -50,7 +50,7 @@ class InternetSearch : public QObject { Q_OBJECT public: - InternetSearch(Application *app, Song::Source source, QObject *parent = nullptr); + explicit InternetSearch(Application *app, Song::Source source, QObject *parent = nullptr); ~InternetSearch(); enum SearchType { diff --git a/src/internet/internetsearchitemdelegate.h b/src/internet/internetsearchitemdelegate.h index 9416151a4..cc64feac3 100644 --- a/src/internet/internetsearchitemdelegate.h +++ b/src/internet/internetsearchitemdelegate.h @@ -32,7 +32,7 @@ class InternetSearchView; class InternetSearchItemDelegate : public CollectionItemDelegate { public: - InternetSearchItemDelegate(InternetSearchView *view); + explicit InternetSearchItemDelegate(InternetSearchView *view); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; diff --git a/src/internet/internetsearchmodel.h b/src/internet/internetsearchmodel.h index 397c06f54..0628a434b 100644 --- a/src/internet/internetsearchmodel.h +++ b/src/internet/internetsearchmodel.h @@ -46,7 +46,7 @@ class InternetSearchModel : public QStandardItemModel { Q_OBJECT public: - InternetSearchModel(InternetSearch *engine, QObject *parent = nullptr); + explicit InternetSearchModel(InternetSearch *engine, QObject *parent = nullptr); enum Role { Role_Result = CollectionModel::LastRole, diff --git a/src/internet/internetsearchsortmodel.h b/src/internet/internetsearchsortmodel.h index 6969d5449..a00832023 100644 --- a/src/internet/internetsearchsortmodel.h +++ b/src/internet/internetsearchsortmodel.h @@ -28,7 +28,7 @@ class QModelIndex; class InternetSearchSortModel : public QSortFilterProxyModel { public: - InternetSearchSortModel(QObject *parent = nullptr); + explicit InternetSearchSortModel(QObject *parent = nullptr); protected: bool lessThan(const QModelIndex &left, const QModelIndex &right) const; diff --git a/src/internet/internetsearchview.h b/src/internet/internetsearchview.h index 00d1c8dfc..a43a9b4a9 100644 --- a/src/internet/internetsearchview.h +++ b/src/internet/internetsearchview.h @@ -60,7 +60,7 @@ class InternetSearchView : public QWidget { Q_OBJECT public: - InternetSearchView(QWidget *parent = nullptr); + explicit InternetSearchView(QWidget *parent = nullptr); ~InternetSearchView(); void Init(Application *app, InternetSearch *engine, const QString &settings_group, const SettingsDialog::Page settings_page, const bool artists = false, const bool albums = false, const bool songs = false); diff --git a/src/internet/internetservice.h b/src/internet/internetservice.h index df2ae7ab9..abb6a146b 100644 --- a/src/internet/internetservice.h +++ b/src/internet/internetservice.h @@ -39,7 +39,7 @@ class InternetService : public QObject { Q_OBJECT public: - InternetService(Song::Source source, const QString &name, const QString &url_scheme, Application *app, QObject *parent = nullptr); + explicit InternetService(Song::Source source, const QString &name, const QString &url_scheme, Application *app, QObject *parent = nullptr); virtual ~InternetService() {} virtual void Exit() {} diff --git a/src/internet/internetsongsview.h b/src/internet/internetsongsview.h index 95c765730..2d8fd33be 100644 --- a/src/internet/internetsongsview.h +++ b/src/internet/internetsongsview.h @@ -40,7 +40,7 @@ class InternetSongsView : public QWidget { Q_OBJECT public: - InternetSongsView(Application *app, InternetService *service, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent = nullptr); + explicit InternetSongsView(Application *app, InternetService *service, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent = nullptr); ~InternetSongsView(); void ReloadSettings(); diff --git a/src/internet/internettabsview.h b/src/internet/internettabsview.h index 97675e05c..045178cf2 100644 --- a/src/internet/internettabsview.h +++ b/src/internet/internettabsview.h @@ -43,7 +43,7 @@ class InternetTabsView : public QWidget { Q_OBJECT public: - InternetTabsView(Application *app, InternetService *service, InternetSearch *engine, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent = nullptr); + explicit InternetTabsView(Application *app, InternetService *service, InternetSearch *engine, const QString &settings_group, const SettingsDialog::Page settings_page, QWidget *parent = nullptr); ~InternetTabsView(); void ReloadSettings(); diff --git a/src/lyrics/lyricsfetcher.h b/src/lyrics/lyricsfetcher.h index 3f36f8447..79744a6ad 100644 --- a/src/lyrics/lyricsfetcher.h +++ b/src/lyrics/lyricsfetcher.h @@ -37,7 +37,7 @@ class LyricsProviders; class LyricsFetcherSearch; struct LyricsSearchRequest { - LyricsSearchRequest() : id(-1) {} + explicit LyricsSearchRequest() : id(-1) {} quint64 id; QString artist; QString album; @@ -45,7 +45,7 @@ struct LyricsSearchRequest { }; struct LyricsSearchResult { - LyricsSearchResult() : score(0.0) {} + explicit LyricsSearchResult() : score(0.0) {} QString provider; QString artist; QString album; @@ -62,7 +62,7 @@ class LyricsFetcher : public QObject { Q_OBJECT public: - LyricsFetcher(LyricsProviders *lyrics_providers, QObject *parent = nullptr); + explicit LyricsFetcher(LyricsProviders *lyrics_providers, QObject *parent = nullptr); virtual ~LyricsFetcher() {} static const int kMaxConcurrentRequests; diff --git a/src/lyrics/lyricsfetchersearch.h b/src/lyrics/lyricsfetchersearch.h index 671175ca3..f2f551bd0 100644 --- a/src/lyrics/lyricsfetchersearch.h +++ b/src/lyrics/lyricsfetchersearch.h @@ -36,7 +36,7 @@ class LyricsFetcherSearch : public QObject { Q_OBJECT public: - LyricsFetcherSearch(const LyricsSearchRequest &request, QObject *parent); + explicit LyricsFetcherSearch(const LyricsSearchRequest &request, QObject *parent); void Start(LyricsProviders *cover_providers); void Cancel(); diff --git a/src/moodbar/moodbarbuilder.h b/src/moodbar/moodbarbuilder.h index 96eb01e0d..5bf437c04 100644 --- a/src/moodbar/moodbarbuilder.h +++ b/src/moodbar/moodbarbuilder.h @@ -24,7 +24,7 @@ class MoodbarBuilder { public: - MoodbarBuilder(); + explicit MoodbarBuilder(); void Init(int bands, int rate_hz); void AddFrame(const double* magnitudes, int size); diff --git a/src/moodbar/moodbarcontroller.h b/src/moodbar/moodbarcontroller.h index 47966cd63..445e02df3 100644 --- a/src/moodbar/moodbarcontroller.h +++ b/src/moodbar/moodbarcontroller.h @@ -31,7 +31,7 @@ class MoodbarController : public QObject { Q_OBJECT public: - MoodbarController(Application* app, QObject* parent = nullptr); + explicit MoodbarController(Application* app, QObject* parent = nullptr); signals: void CurrentMoodbarDataChanged(const QByteArray& data); diff --git a/src/moodbar/moodbaritemdelegate.h b/src/moodbar/moodbaritemdelegate.h index 30d4e4756..b6cf4ca76 100644 --- a/src/moodbar/moodbaritemdelegate.h +++ b/src/moodbar/moodbaritemdelegate.h @@ -44,7 +44,7 @@ class MoodbarItemDelegate : public QItemDelegate { Q_OBJECT public: - MoodbarItemDelegate(Application* app, PlaylistView* view, QObject* parent = nullptr); + explicit MoodbarItemDelegate(Application* app, PlaylistView* view, QObject* parent = nullptr); void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; diff --git a/src/moodbar/moodbarloader.h b/src/moodbar/moodbarloader.h index 3c4a30f17..407bfa251 100644 --- a/src/moodbar/moodbarloader.h +++ b/src/moodbar/moodbarloader.h @@ -36,7 +36,7 @@ class MoodbarLoader : public QObject { Q_OBJECT public: - MoodbarLoader(Application* app, QObject* parent = nullptr); + explicit MoodbarLoader(Application* app, QObject* parent = nullptr); ~MoodbarLoader(); enum Result { diff --git a/src/moodbar/moodbarpipeline.h b/src/moodbar/moodbarpipeline.h index 8c629c7cd..cfca42531 100644 --- a/src/moodbar/moodbarpipeline.h +++ b/src/moodbar/moodbarpipeline.h @@ -36,7 +36,7 @@ class MoodbarPipeline : public QObject { Q_OBJECT public: - MoodbarPipeline(const QUrl& local_filename); + explicit MoodbarPipeline(const QUrl& local_filename); ~MoodbarPipeline(); static bool IsAvailable(); diff --git a/src/moodbar/moodbarproxystyle.h b/src/moodbar/moodbarproxystyle.h index 69b2e0527..a93ce56fe 100644 --- a/src/moodbar/moodbarproxystyle.h +++ b/src/moodbar/moodbarproxystyle.h @@ -48,7 +48,7 @@ class MoodbarProxyStyle : public QProxyStyle { Q_OBJECT public: - MoodbarProxyStyle(Application* app, QSlider* slider); + explicit MoodbarProxyStyle(Application* app, QSlider* slider); ~MoodbarProxyStyle(); // QProxyStyle diff --git a/src/moodbar/moodbarrenderer.h b/src/moodbar/moodbarrenderer.h index 0b146a056..4a782fbeb 100644 --- a/src/moodbar/moodbarrenderer.h +++ b/src/moodbar/moodbarrenderer.h @@ -54,10 +54,10 @@ class MoodbarRenderer { static QImage RenderToImage(const ColorVector& colors, const QSize& size); private: - MoodbarRenderer(); + explicit MoodbarRenderer(); struct StyleProperties { - StyleProperties(int threshold = 0, int range_start = 0, int range_delta = 0, int sat = 0, int val = 0) + explicit StyleProperties(int threshold = 0, int range_start = 0, int range_delta = 0, int sat = 0, int val = 0) : threshold_(threshold), range_start_(range_start), range_delta_(range_delta), diff --git a/src/musicbrainz/acoustidclient.h b/src/musicbrainz/acoustidclient.h index f81f43347..6a6496f4e 100644 --- a/src/musicbrainz/acoustidclient.h +++ b/src/musicbrainz/acoustidclient.h @@ -33,7 +33,6 @@ class QNetworkReply; class NetworkTimeouts; class AcoustidClient : public QObject { - Q_OBJECT // Gets a MBID from a Chromaprint fingerprint. @@ -43,7 +42,7 @@ class AcoustidClient : public QObject { // IDs are provided by the caller when a request is started and included in the Finished signal - they have no meaning to AcoustidClient. public: - AcoustidClient(QObject *parent = nullptr); + explicit AcoustidClient(QObject *parent = nullptr); // Network requests will be aborted after this interval. void SetTimeout(const int msec); diff --git a/src/musicbrainz/chromaprinter.h b/src/musicbrainz/chromaprinter.h index d07f23804..32a968d7e 100644 --- a/src/musicbrainz/chromaprinter.h +++ b/src/musicbrainz/chromaprinter.h @@ -38,7 +38,7 @@ class Chromaprinter { // This class works well with QtConcurrentMap. public: - Chromaprinter(const QString &filename); + explicit Chromaprinter(const QString &filename); ~Chromaprinter(); // Creates a fingerprint from the song. diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h index 0152d74a1..f0dcb5694 100644 --- a/src/musicbrainz/musicbrainzclient.h +++ b/src/musicbrainz/musicbrainzclient.h @@ -50,7 +50,7 @@ class MusicBrainzClient : public QObject { public: // The second argument allows for specifying a custom network access manager. // It is used in tests. The ownership of network is not transferred. - MusicBrainzClient(QObject *parent = nullptr, QNetworkAccessManager *network = nullptr); + explicit MusicBrainzClient(QObject *parent = nullptr, QNetworkAccessManager *network = nullptr); struct Result { Result() : duration_msec_(0), track_(0), year_(-1) {} diff --git a/src/musicbrainz/tagfetcher.h b/src/musicbrainz/tagfetcher.h index 6d25838d1..c3ce63508 100644 --- a/src/musicbrainz/tagfetcher.h +++ b/src/musicbrainz/tagfetcher.h @@ -39,7 +39,7 @@ class TagFetcher : public QObject { // High level interface to Fingerprinter, AcoustidClient and MusicBrainzClient. public: - TagFetcher(QObject *parent = nullptr); + explicit TagFetcher(QObject *parent = nullptr); void StartFetch(const SongList &songs); diff --git a/src/organise/organise.h b/src/organise/organise.h index 20b8a47ab..fde083fd5 100644 --- a/src/organise/organise.h +++ b/src/organise/organise.h @@ -52,13 +52,13 @@ class Organise : public QObject { public: struct NewSongInfo { - NewSongInfo(const Song &song = Song(), const QString &new_filename = QString()) : song_(song), new_filename_(new_filename) {} + explicit NewSongInfo(const Song &song = Song(), const QString &new_filename = QString()) : song_(song), new_filename_(new_filename) {} Song song_; QString new_filename_; }; typedef QList NewSongInfoList; - 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()); + 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(); static const int kBatchSize; diff --git a/src/organise/organisedialog.h b/src/organise/organisedialog.h index 9585eafeb..be6d1a741 100644 --- a/src/organise/organisedialog.h +++ b/src/organise/organisedialog.h @@ -56,7 +56,7 @@ class OrganiseDialog : public QDialog { Q_OBJECT public: - OrganiseDialog(TaskManager *task_manager, CollectionBackend *backend = nullptr, QWidget *parentwindow = nullptr, QWidget *parent = nullptr); + explicit OrganiseDialog(TaskManager *task_manager, CollectionBackend *backend = nullptr, QWidget *parentwindow = nullptr, QWidget *parent = nullptr); ~OrganiseDialog(); static const char *kDefaultFormat; diff --git a/src/organise/organiseerrordialog.h b/src/organise/organiseerrordialog.h index 5448811f3..500637e83 100644 --- a/src/organise/organiseerrordialog.h +++ b/src/organise/organiseerrordialog.h @@ -38,7 +38,7 @@ class OrganiseErrorDialog : public QDialog { Q_OBJECT public: - OrganiseErrorDialog(QWidget *parent = nullptr); + explicit OrganiseErrorDialog(QWidget *parent = nullptr); ~OrganiseErrorDialog(); enum OperationType { diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index 6e684467b..01c7c061f 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -91,7 +91,7 @@ class Playlist : public QAbstractListModel { friend class PlaylistUndoCommands::ReOrderItems; public: - Playlist(PlaylistBackend *backend, TaskManager *task_manager, CollectionBackend *collection, int id, const QString &special_type = QString(), bool favorite = false, QObject *parent = nullptr); + explicit Playlist(PlaylistBackend *backend, TaskManager *task_manager, CollectionBackend *collection, int id, const QString &special_type = QString(), bool favorite = false, QObject *parent = nullptr); ~Playlist(); void SkipTracks(const QModelIndexList &source_indexes); diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h index 83a8f89b0..ea85e7bb1 100644 --- a/src/playlist/playlistcontainer.h +++ b/src/playlist/playlistcontainer.h @@ -47,7 +47,7 @@ class PlaylistContainer : public QWidget { Q_OBJECT public: - PlaylistContainer(QWidget *parent = nullptr); + explicit PlaylistContainer(QWidget *parent = nullptr); ~PlaylistContainer(); static const char *kSettingsGroup; diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h index 14ff4e745..e9e1c1d57 100644 --- a/src/playlist/playlistdelegates.h +++ b/src/playlist/playlistdelegates.h @@ -78,7 +78,7 @@ private: class PlaylistDelegateBase : public QueuedItemDelegate { Q_OBJECT public: - PlaylistDelegateBase(QObject *parent, const QString &suffix = QString()); + 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; @@ -97,19 +97,19 @@ class PlaylistDelegateBase : public QueuedItemDelegate { class LengthItemDelegate : public PlaylistDelegateBase { public: - LengthItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} + explicit LengthItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} QString displayText(const QVariant &value, const QLocale &locale) const; }; class SizeItemDelegate : public PlaylistDelegateBase { public: - SizeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} + explicit SizeItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} QString displayText(const QVariant &value, const QLocale &locale) const; }; class DateItemDelegate : public PlaylistDelegateBase { public: - DateItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} + explicit DateItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} QString displayText(const QVariant &value, const QLocale &locale) const; }; @@ -127,13 +127,13 @@ class FileTypeItemDelegate : public PlaylistDelegateBase { class TextItemDelegate : public PlaylistDelegateBase { public: - TextItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} + explicit TextItemDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; }; class TagCompletionModel : public QStringListModel { public: - TagCompletionModel(CollectionBackend *backend, Playlist::Column column); + explicit TagCompletionModel(CollectionBackend *backend, Playlist::Column column); private: static QString database_column(Playlist::Column column); @@ -143,7 +143,7 @@ class TagCompleter : public QCompleter { Q_OBJECT public: - TagCompleter(CollectionBackend *backend, Playlist::Column column, QLineEdit *editor); + explicit TagCompleter(CollectionBackend *backend, Playlist::Column column, QLineEdit *editor); ~TagCompleter(); private slots: @@ -155,7 +155,7 @@ private: class TagCompletionItemDelegate : public PlaylistDelegateBase { public: - TagCompletionItemDelegate(QObject *parent, CollectionBackend *backend, Playlist::Column column) : PlaylistDelegateBase(parent), backend_(backend), column_(column) {}; + 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; @@ -166,13 +166,13 @@ class TagCompletionItemDelegate : public PlaylistDelegateBase { class NativeSeparatorsDelegate : public PlaylistDelegateBase { public: - NativeSeparatorsDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} + explicit NativeSeparatorsDelegate(QObject *parent) : PlaylistDelegateBase(parent) {} QString displayText(const QVariant &value, const QLocale &locale) const; }; class SongSourceDelegate : public PlaylistDelegateBase { public: - SongSourceDelegate(QObject *parent); + explicit SongSourceDelegate(QObject *parent); QString displayText(const QVariant &value, const QLocale &locale) const; void paint(QPainter *paint, const QStyleOptionViewItem &option, const QModelIndex &index) const; diff --git a/src/playlist/playlistfilter.h b/src/playlist/playlistfilter.h index cb8004157..ede012fb6 100644 --- a/src/playlist/playlistfilter.h +++ b/src/playlist/playlistfilter.h @@ -37,7 +37,7 @@ class PlaylistFilter : public QSortFilterProxyModel { Q_OBJECT public: - PlaylistFilter(QObject *parent = nullptr); + explicit PlaylistFilter(QObject *parent = nullptr); ~PlaylistFilter(); // QAbstractItemModel diff --git a/src/playlist/playlistfilterparser.h b/src/playlist/playlistfilterparser.h index fd051407c..ccf26373e 100644 --- a/src/playlist/playlistfilterparser.h +++ b/src/playlist/playlistfilterparser.h @@ -69,10 +69,7 @@ class NopFilter : public FilterTree { // col ::= "title" | "artist" | ... class FilterParser { public: - FilterParser( - const QString &filter, - const QMap &columns, - const QSet &numerical_cols); + explicit FilterParser(const QString &filter, const QMap &columns, const QSet &numerical_cols); FilterTree *parse(); diff --git a/src/playlist/playlistheader.h b/src/playlist/playlistheader.h index cfbfd94b3..b6cd854f8 100644 --- a/src/playlist/playlistheader.h +++ b/src/playlist/playlistheader.h @@ -40,7 +40,7 @@ class PlaylistHeader : public StretchHeaderView { Q_OBJECT public: - PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, QWidget *parent = nullptr); + explicit PlaylistHeader(Qt::Orientation orientation, PlaylistView *view, QWidget *parent = nullptr); // QWidget void contextMenuEvent(QContextMenuEvent *e); diff --git a/src/playlist/playlistitem.h b/src/playlist/playlistitem.h index 598308592..9feebc1c1 100644 --- a/src/playlist/playlistitem.h +++ b/src/playlist/playlistitem.h @@ -45,7 +45,7 @@ class SqlRow; class PlaylistItem : public std::enable_shared_from_this { public: - PlaylistItem(const Song::Source &source) : should_skip_(false), source_(source) {} + explicit PlaylistItem(const Song::Source &source) : should_skip_(false), source_(source) {} virtual ~PlaylistItem(); static PlaylistItem *NewFromSource(const Song::Source &source); diff --git a/src/playlist/playlistitemmimedata.h b/src/playlist/playlistitemmimedata.h index 1a185c064..ab1eed950 100644 --- a/src/playlist/playlistitemmimedata.h +++ b/src/playlist/playlistitemmimedata.h @@ -31,9 +31,9 @@ class PlaylistItemMimeData : public MimeData { Q_OBJECT -public: - PlaylistItemMimeData(const PlaylistItemPtr &item) : items_(PlaylistItemList() << item) {} - PlaylistItemMimeData(const PlaylistItemList &items) : items_(items) {} + public: + explicit PlaylistItemMimeData(const PlaylistItemPtr &item) : items_(PlaylistItemList() << item) {} + explicit PlaylistItemMimeData(const PlaylistItemList &items) : items_(items) {} PlaylistItemList items_; }; diff --git a/src/playlist/playlistlistcontainer.h b/src/playlist/playlistlistcontainer.h index 33cf5cc64..69400878a 100644 --- a/src/playlist/playlistlistcontainer.h +++ b/src/playlist/playlistlistcontainer.h @@ -48,7 +48,7 @@ class PlaylistListContainer : public QWidget { Q_OBJECT public: - PlaylistListContainer(QWidget *parent = nullptr); + explicit PlaylistListContainer(QWidget *parent = nullptr); ~PlaylistListContainer(); void SetApplication(Application *app); diff --git a/src/playlist/playlistlistmodel.h b/src/playlist/playlistlistmodel.h index 34daeb2cb..1cfeb7ce8 100644 --- a/src/playlist/playlistlistmodel.h +++ b/src/playlist/playlistlistmodel.h @@ -37,7 +37,7 @@ class PlaylistListModel : public QStandardItemModel { Q_OBJECT public: - PlaylistListModel(QObject *parent = nullptr); + explicit PlaylistListModel(QObject *parent = nullptr); enum Types { Type_Folder, diff --git a/src/playlist/playlistlistview.h b/src/playlist/playlistlistview.h index d26e9bdd6..c7eed6b92 100644 --- a/src/playlist/playlistlistview.h +++ b/src/playlist/playlistlistview.h @@ -35,7 +35,7 @@ class PlaylistListView : public AutoExpandingTreeView { Q_OBJECT public: - PlaylistListView(QWidget *parent = nullptr); + explicit PlaylistListView(QWidget *parent = nullptr); ~PlaylistListView() {} protected: diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h index 68f91453a..97e497f0a 100644 --- a/src/playlist/playlistmanager.h +++ b/src/playlist/playlistmanager.h @@ -47,8 +47,8 @@ class PlaylistSequence; class PlaylistManagerInterface : public QObject { Q_OBJECT -public: - PlaylistManagerInterface(Application *app, QObject *parent) : QObject(parent) { Q_UNUSED(app); } + public: + explicit PlaylistManagerInterface(Application *app, QObject *parent) : QObject(parent) { Q_UNUSED(app); } virtual int current_id() const = 0; virtual int active_id() const = 0; @@ -76,7 +76,7 @@ public: virtual PlaylistParser *parser() const = 0; virtual PlaylistContainer *playlist_container() const = 0; -public slots: + public slots: virtual void New(const QString &name, const SongList& songs = SongList(), const QString &special_type = QString()) = 0; virtual void Load(const QString &filename) = 0; virtual void Save(int id, const QString &filename, Playlist::Path path_type) = 0; @@ -132,7 +132,7 @@ class PlaylistManager : public PlaylistManagerInterface { Q_OBJECT public: - PlaylistManager(Application *app, QObject *parent = nullptr); + explicit PlaylistManager(Application *app, QObject *parent = nullptr); ~PlaylistManager(); int current_id() const { return current_; } @@ -223,7 +223,7 @@ class PlaylistManager : public PlaylistManagerInterface { private: struct Data { - Data(Playlist *_p = nullptr, const QString& _name = QString()) : p(_p), name(_name) {} + explicit Data(Playlist *_p = nullptr, const QString& _name = QString()) : p(_p), name(_name) {} Playlist *p; QString name; QItemSelection selection; diff --git a/src/playlist/playlistsequence.h b/src/playlist/playlistsequence.h index 246999cd4..ecebfc330 100644 --- a/src/playlist/playlistsequence.h +++ b/src/playlist/playlistsequence.h @@ -41,7 +41,7 @@ class PlaylistSequence : public QWidget { Q_OBJECT public: - PlaylistSequence(QWidget *parent = nullptr, SettingsProvider *settings = 0); + explicit PlaylistSequence(QWidget *parent = nullptr, SettingsProvider *settings = 0); ~PlaylistSequence(); enum RepeatMode { diff --git a/src/playlist/playlisttabbar.h b/src/playlist/playlisttabbar.h index d2158ea88..7b33e7b4b 100644 --- a/src/playlist/playlisttabbar.h +++ b/src/playlist/playlisttabbar.h @@ -49,7 +49,7 @@ class PlaylistTabBar : public QTabBar { Q_OBJECT public: - PlaylistTabBar(QWidget *parent = nullptr); + explicit PlaylistTabBar(QWidget *parent = nullptr); static const int kDragHoverTimeout = 500; static const char *kSettingsGroup; @@ -70,7 +70,7 @@ class PlaylistTabBar : public QTabBar { void RemoveTab(int id); void InsertTab(int id, int index, const QString &text, bool favorite); -signals: + signals: void CurrentIdChanged(int id); void Rename(int id, const QString &name); void Close(int id); @@ -78,7 +78,7 @@ signals: void PlaylistOrderChanged(const QList &ids); void PlaylistFavorited(int id, bool favorite); -protected: + protected: void contextMenuEvent(QContextMenuEvent *e); void mouseReleaseEvent(QMouseEvent *e); void mouseDoubleClickEvent(QMouseEvent *e); @@ -89,7 +89,7 @@ protected: void timerEvent(QTimerEvent *e); bool event(QEvent *e); -private slots: + private slots: void CurrentIndexChanged(int index); void Rename(); void RenameInline(); @@ -103,7 +103,7 @@ private slots: void TabMoved(); void Save(); -private: + private: PlaylistManager *manager_; QMenu *menu_; diff --git a/src/playlist/playlistundocommands.h b/src/playlist/playlistundocommands.h index 536adb36d..def01664b 100644 --- a/src/playlist/playlistundocommands.h +++ b/src/playlist/playlistundocommands.h @@ -41,7 +41,7 @@ namespace PlaylistUndoCommands { Q_DECLARE_TR_FUNCTIONS(PlaylistUndoCommands) public: - Base(Playlist *playlist); + explicit Base(Playlist *playlist); protected: Playlist *playlist_; @@ -49,7 +49,7 @@ namespace PlaylistUndoCommands { class InsertItems : public Base { public: - InsertItems(Playlist *playlist, const PlaylistItemList &items, int pos, bool enqueue = false, bool enqueue_next = false); + explicit InsertItems(Playlist *playlist, const PlaylistItemList &items, int pos, bool enqueue = false, bool enqueue_next = false); void undo(); void redo(); @@ -67,7 +67,7 @@ namespace PlaylistUndoCommands { class RemoveItems : public Base { public: - RemoveItems(Playlist *playlist, int pos, int count); + explicit RemoveItems(Playlist *playlist, int pos, int count); int id() const { return Type_RemoveItems; } @@ -88,7 +88,7 @@ namespace PlaylistUndoCommands { class MoveItems : public Base { public: - MoveItems(Playlist *playlist, const QList &source_rows, int pos); + explicit MoveItems(Playlist *playlist, const QList &source_rows, int pos); void undo(); void redo(); @@ -100,7 +100,7 @@ namespace PlaylistUndoCommands { class ReOrderItems : public Base { public: - ReOrderItems(Playlist *playlist, const PlaylistItemList &new_items); + explicit ReOrderItems(Playlist *playlist, const PlaylistItemList &new_items); void undo(); void redo(); @@ -112,13 +112,13 @@ namespace PlaylistUndoCommands { class SortItems : public ReOrderItems { public: - SortItems(Playlist *playlist, int column, Qt::SortOrder order, const PlaylistItemList &new_items); + explicit SortItems(Playlist *playlist, int column, Qt::SortOrder order, const PlaylistItemList &new_items); }; class ShuffleItems : public ReOrderItems { public: - ShuffleItems(Playlist *playlist, const PlaylistItemList &new_items); + explicit ShuffleItems(Playlist *playlist, const PlaylistItemList &new_items); }; } //namespace diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index 0ee86852a..79a7aa7ca 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -79,7 +79,7 @@ class PlaylistHeader; // This class is used by internet search view as well. class PlaylistProxyStyle : public QProxyStyle { public: - PlaylistProxyStyle(); + 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; @@ -92,7 +92,7 @@ class PlaylistView : public QTreeView { Q_OBJECT public: - PlaylistView(QWidget *parent = nullptr); + explicit PlaylistView(QWidget *parent = nullptr); ~PlaylistView(); static ColumnAlignmentMap DefaultColumnAlignment(); diff --git a/src/playlist/songmimedata.h b/src/playlist/songmimedata.h index 5134b5b73..26e31f377 100644 --- a/src/playlist/songmimedata.h +++ b/src/playlist/songmimedata.h @@ -35,7 +35,7 @@ class SongMimeData : public MimeData { Q_OBJECT public: - SongMimeData() : backend(nullptr) {} + explicit SongMimeData() : backend(nullptr) {} CollectionBackendInterface *backend; SongList songs; diff --git a/src/playlist/songplaylistitem.h b/src/playlist/songplaylistitem.h index 466649924..9260f1151 100644 --- a/src/playlist/songplaylistitem.h +++ b/src/playlist/songplaylistitem.h @@ -32,8 +32,8 @@ class SongPlaylistItem : public PlaylistItem { public: - SongPlaylistItem(const Song::Source &source); - SongPlaylistItem(const Song &song); + explicit SongPlaylistItem(const Song::Source &source); + explicit SongPlaylistItem(const Song &song); // 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! diff --git a/src/playlistparsers/asxiniparser.h b/src/playlistparsers/asxiniparser.h index 9914af845..f4c1a7543 100644 --- a/src/playlistparsers/asxiniparser.h +++ b/src/playlistparsers/asxiniparser.h @@ -39,7 +39,7 @@ class AsxIniParser : public ParserBase { Q_OBJECT public: - AsxIniParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit AsxIniParser(CollectionBackendInterface *collection, QObject *parent = nullptr); QString name() const { return "ASX/INI"; } QStringList file_extensions() const { return QStringList() << "asxini"; } diff --git a/src/playlistparsers/asxparser.h b/src/playlistparsers/asxparser.h index 49a3ab9dc..5834a79b7 100644 --- a/src/playlistparsers/asxparser.h +++ b/src/playlistparsers/asxparser.h @@ -41,7 +41,7 @@ class ASXParser : public XMLParser { Q_OBJECT public: - ASXParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit ASXParser(CollectionBackendInterface *collection, QObject *parent = nullptr); QString name() const { return "ASX"; } QStringList file_extensions() const { return QStringList() << "asx"; } diff --git a/src/playlistparsers/cueparser.h b/src/playlistparsers/cueparser.h index f321a5ba4..abb9d9464 100644 --- a/src/playlistparsers/cueparser.h +++ b/src/playlistparsers/cueparser.h @@ -58,7 +58,7 @@ class CueParser : public ParserBase { static const char *kDate; static const char *kDisc; - CueParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit CueParser(CollectionBackendInterface *collection, QObject *parent = nullptr); QString name() const { return "CUE"; } QStringList file_extensions() const { return QStringList() << "cue"; } diff --git a/src/playlistparsers/m3uparser.h b/src/playlistparsers/m3uparser.h index 1a87526f7..4180d1be9 100644 --- a/src/playlistparsers/m3uparser.h +++ b/src/playlistparsers/m3uparser.h @@ -41,7 +41,7 @@ class M3UParser : public ParserBase { Q_OBJECT public: - M3UParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit M3UParser(CollectionBackendInterface *collection, QObject *parent = nullptr); QString name() const { return "M3U"; } QStringList file_extensions() const { return QStringList() << "m3u" << "m3u8"; } diff --git a/src/playlistparsers/parserbase.h b/src/playlistparsers/parserbase.h index f0cb5691d..ff3489ed0 100644 --- a/src/playlistparsers/parserbase.h +++ b/src/playlistparsers/parserbase.h @@ -40,7 +40,7 @@ class ParserBase : public QObject { Q_OBJECT public: - ParserBase(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit ParserBase(CollectionBackendInterface *collection, QObject *parent = nullptr); virtual QString name() const = 0; virtual QStringList file_extensions() const = 0; @@ -56,7 +56,7 @@ class ParserBase : public QObject { virtual SongList Load(QIODevice *device, const QString &playlist_path = "", const QDir &dir = QDir()) const = 0; virtual void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), Playlist::Path path_type = Playlist::Path_Automatic) const = 0; -protected: + protected: // Loads a song. If filename_or_url is a URL (with a scheme other than "file") then it is set on the song and the song marked as a stream. // If it is a filename or a file:// URL then it is made absolute and canonical and set as a file:// url on the song. // Also sets the song's metadata by searching in the Collection, or loading from the file as a fallback. @@ -68,7 +68,7 @@ protected: // Otherwise returns the URL as is. This function should always be used when saving a playlist. QString URLOrFilename(const QUrl &url, const QDir &dir, Playlist::Path path_type) const; -private: + private: CollectionBackendInterface *collection_; }; diff --git a/src/playlistparsers/playlistparser.h b/src/playlistparsers/playlistparser.h index 9a8aad05f..82bf23f64 100644 --- a/src/playlistparsers/playlistparser.h +++ b/src/playlistparsers/playlistparser.h @@ -40,7 +40,7 @@ class PlaylistParser : public QObject { Q_OBJECT public: - PlaylistParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit PlaylistParser(CollectionBackendInterface *collection, QObject *parent = nullptr); static const int kMagicSize; diff --git a/src/playlistparsers/plsparser.h b/src/playlistparsers/plsparser.h index b200a5473..035b8bc99 100644 --- a/src/playlistparsers/plsparser.h +++ b/src/playlistparsers/plsparser.h @@ -39,7 +39,7 @@ class PLSParser : public ParserBase { Q_OBJECT public: - PLSParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit PLSParser(CollectionBackendInterface *collection, QObject *parent = nullptr); QString name() const { return "PLS"; } QStringList file_extensions() const { return QStringList() << "pls"; } diff --git a/src/playlistparsers/wplparser.h b/src/playlistparsers/wplparser.h index 75433b339..2e305b0d2 100644 --- a/src/playlistparsers/wplparser.h +++ b/src/playlistparsers/wplparser.h @@ -39,8 +39,9 @@ class QXmlStreamWriter; class CollectionBackendInterface; class WplParser : public XMLParser { + public: - WplParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit WplParser(CollectionBackendInterface *collection, QObject *parent = nullptr); QString name() const { return "WPL"; } QStringList file_extensions() const { return QStringList() << "wpl"; } diff --git a/src/playlistparsers/xmlparser.h b/src/playlistparsers/xmlparser.h index 06e070811..2b3f2163b 100644 --- a/src/playlistparsers/xmlparser.h +++ b/src/playlistparsers/xmlparser.h @@ -33,8 +33,9 @@ class CollectionBackendInterface; class XMLParser : public ParserBase { + protected: - XMLParser(CollectionBackendInterface *collection, QObject *parent); + explicit XMLParser(CollectionBackendInterface *collection, QObject *parent); class StreamElement { public: diff --git a/src/playlistparsers/xspfparser.h b/src/playlistparsers/xspfparser.h index dcd648f9f..ab0365089 100644 --- a/src/playlistparsers/xspfparser.h +++ b/src/playlistparsers/xspfparser.h @@ -41,7 +41,7 @@ class XSPFParser : public XMLParser { Q_OBJECT public: - XSPFParser(CollectionBackendInterface *collection, QObject *parent = nullptr); + explicit XSPFParser(CollectionBackendInterface *collection, QObject *parent = nullptr); QString name() const { return "XSPF"; } QStringList file_extensions() const { return QStringList() << "xspf"; } diff --git a/src/queue/queue.h b/src/queue/queue.h index c57a30055..5112d1154 100644 --- a/src/queue/queue.h +++ b/src/queue/queue.h @@ -38,7 +38,7 @@ class Queue : public QAbstractProxyModel { Q_OBJECT public: - Queue(Playlist *parent = nullptr); + explicit Queue(Playlist *parent = nullptr); static const char *kRowsMimetype; diff --git a/src/queue/queueview.h b/src/queue/queueview.h index cca892010..8314fbca3 100644 --- a/src/queue/queueview.h +++ b/src/queue/queueview.h @@ -35,7 +35,7 @@ class QueueView : public QWidget { Q_OBJECT public: - QueueView(QWidget *parent = nullptr); + explicit QueueView(QWidget *parent = nullptr); ~QueueView(); void SetPlaylistManager(PlaylistManager *manager); diff --git a/src/settings/appearancesettingspage.h b/src/settings/appearancesettingspage.h index a44b3b6c4..c9727bdc3 100644 --- a/src/settings/appearancesettingspage.h +++ b/src/settings/appearancesettingspage.h @@ -39,7 +39,7 @@ class AppearanceSettingsPage : public SettingsPage { Q_OBJECT public: - AppearanceSettingsPage(SettingsDialog *dialog); + explicit AppearanceSettingsPage(SettingsDialog *dialog); ~AppearanceSettingsPage(); static const char *kSettingsGroup; diff --git a/src/settings/backendsettingspage.h b/src/settings/backendsettingspage.h index c5d98132e..5d42dfe55 100644 --- a/src/settings/backendsettingspage.h +++ b/src/settings/backendsettingspage.h @@ -42,7 +42,7 @@ class BackendSettingsPage : public SettingsPage { Q_OBJECT public: - BackendSettingsPage(SettingsDialog *dialog); + explicit BackendSettingsPage(SettingsDialog *dialog); ~BackendSettingsPage(); static const char *kSettingsGroup; diff --git a/src/settings/behavioursettingspage.h b/src/settings/behavioursettingspage.h index 7abc77b4a..177a6b4fa 100644 --- a/src/settings/behavioursettingspage.h +++ b/src/settings/behavioursettingspage.h @@ -36,7 +36,7 @@ class BehaviourSettingsPage : public SettingsPage { Q_OBJECT public: - BehaviourSettingsPage(SettingsDialog *dialog); + explicit BehaviourSettingsPage(SettingsDialog *dialog); ~BehaviourSettingsPage(); static const char *kSettingsGroup; diff --git a/src/settings/collectionsettingspage.h b/src/settings/collectionsettingspage.h index 27e89b664..c008dc3c6 100644 --- a/src/settings/collectionsettingspage.h +++ b/src/settings/collectionsettingspage.h @@ -37,8 +37,8 @@ class Ui_CollectionSettingsPage; class CollectionSettingsPage : public SettingsPage { Q_OBJECT -public: - CollectionSettingsPage(SettingsDialog *dialog); + public: + explicit CollectionSettingsPage(SettingsDialog *dialog); ~CollectionSettingsPage(); static const char *kSettingsGroup; @@ -63,7 +63,7 @@ public: void Load(); void Save(); -private slots: + private slots: void Add(); void Remove(); @@ -71,7 +71,7 @@ private slots: void DiskCacheEnable(int state); void CoverSaveInAlbumDirChanged(); -private: + private: Ui_CollectionSettingsPage *ui_; bool initialised_model_; diff --git a/src/settings/contextsettingspage.h b/src/settings/contextsettingspage.h index 49444db70..164cf68fe 100644 --- a/src/settings/contextsettingspage.h +++ b/src/settings/contextsettingspage.h @@ -39,7 +39,7 @@ class ContextSettingsPage : public SettingsPage { Q_OBJECT public: - ContextSettingsPage(SettingsDialog *dialog); + explicit ContextSettingsPage(SettingsDialog *dialog); ~ContextSettingsPage(); enum ContextSettingsOrder { diff --git a/src/settings/moodbarsettingspage.h b/src/settings/moodbarsettingspage.h index ed5da9248..f976bd2ab 100644 --- a/src/settings/moodbarsettingspage.h +++ b/src/settings/moodbarsettingspage.h @@ -33,7 +33,7 @@ class MoodbarSettingsPage : public SettingsPage { Q_OBJECT public: - MoodbarSettingsPage(SettingsDialog* dialog); + explicit MoodbarSettingsPage(SettingsDialog* dialog); ~MoodbarSettingsPage(); static const char *kSettingsGroup; diff --git a/src/settings/networkproxysettingspage.h b/src/settings/networkproxysettingspage.h index e4c1340e2..abb480236 100644 --- a/src/settings/networkproxysettingspage.h +++ b/src/settings/networkproxysettingspage.h @@ -34,15 +34,15 @@ class Ui_NetworkProxySettingsPage; class NetworkProxySettingsPage : public SettingsPage { Q_OBJECT -public: - NetworkProxySettingsPage(SettingsDialog* dialog); + public: + explicit NetworkProxySettingsPage(SettingsDialog* dialog); ~NetworkProxySettingsPage(); static const char *kSettingsGroup; void Load(); void Save(); -private: + private: Ui_NetworkProxySettingsPage* ui_; }; diff --git a/src/settings/notificationssettingspage.h b/src/settings/notificationssettingspage.h index fc8d0e97c..7a208ca84 100644 --- a/src/settings/notificationssettingspage.h +++ b/src/settings/notificationssettingspage.h @@ -39,19 +39,19 @@ class Ui_NotificationsSettingsPage; class NotificationsSettingsPage : public SettingsPage { Q_OBJECT -public: - NotificationsSettingsPage(SettingsDialog *dialog); + public: + explicit NotificationsSettingsPage(SettingsDialog *dialog); ~NotificationsSettingsPage(); static const char *kSettingsGroup; void Load(); void Save(); -protected: + protected: void hideEvent(QHideEvent*); void showEvent(QShowEvent*); -private slots: + private slots: void NotificationTypeChanged(); void NotificationCustomTextChanged(bool enabled); void PrepareNotificationPreview(); @@ -67,7 +67,7 @@ private slots: void UpdatePopupVisible(); -private: + private: Ui_NotificationsSettingsPage *ui_; OSDPretty *pretty_popup_; }; diff --git a/src/settings/playlistsettingspage.h b/src/settings/playlistsettingspage.h index 1fefecc9c..72d425544 100644 --- a/src/settings/playlistsettingspage.h +++ b/src/settings/playlistsettingspage.h @@ -34,17 +34,15 @@ class Ui_PlaylistSettingsPage; class PlaylistSettingsPage : public SettingsPage { Q_OBJECT -public: - PlaylistSettingsPage(SettingsDialog* dialog); + public: + explicit PlaylistSettingsPage(SettingsDialog* dialog); ~PlaylistSettingsPage(); static const char *kSettingsGroup; void Load(); void Save(); -private slots: - -private: + private: Ui_PlaylistSettingsPage* ui_; }; diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h index 2f4fdabe7..4d2dc2435 100644 --- a/src/settings/settingsdialog.h +++ b/src/settings/settingsdialog.h @@ -58,8 +58,8 @@ class Ui_SettingsDialog; class SettingsItemDelegate : public QStyledItemDelegate { -public: - SettingsItemDelegate(QObject *parent); + 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; }; @@ -69,7 +69,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(Application *app, QMainWindow *mainwindow, QWidget *parent = nullptr); + explicit SettingsDialog(Application *app, QMainWindow *mainwindow, QWidget *parent = nullptr); ~SettingsDialog(); enum Page { diff --git a/src/settings/settingspage.h b/src/settings/settingspage.h index 8f78a95f4..56904273d 100644 --- a/src/settings/settingspage.h +++ b/src/settings/settingspage.h @@ -34,8 +34,8 @@ class SettingsDialog; class SettingsPage : public QWidget { Q_OBJECT -public: - SettingsPage(SettingsDialog *dialog); + public: + explicit SettingsPage(SettingsDialog *dialog); // Return false to grey out the page's item in the list. virtual bool IsEnabled() const { return true; } @@ -49,10 +49,10 @@ public: // The dialog that this page belongs to. SettingsDialog *dialog() const { return dialog_; } -signals: + signals: void NotificationPreview(OSD::Behaviour, QString, QString); -private: + private: SettingsDialog *dialog_; }; diff --git a/src/settings/shortcutssettingspage.h b/src/settings/shortcutssettingspage.h index 0d8ed6966..5e5084615 100644 --- a/src/settings/shortcutssettingspage.h +++ b/src/settings/shortcutssettingspage.h @@ -44,7 +44,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage { Q_OBJECT public: - GlobalShortcutsSettingsPage(SettingsDialog *dialog); + explicit GlobalShortcutsSettingsPage(SettingsDialog *dialog); ~GlobalShortcutsSettingsPage(); static const char *kSettingsGroup; diff --git a/src/settings/transcodersettingspage.h b/src/settings/transcodersettingspage.h index 8460c0d7a..e90eb9b8f 100644 --- a/src/settings/transcodersettingspage.h +++ b/src/settings/transcodersettingspage.h @@ -34,8 +34,8 @@ class Ui_TranscoderSettingsPage; class TranscoderSettingsPage : public SettingsPage { Q_OBJECT -public: - TranscoderSettingsPage(SettingsDialog* dialog); + public: + explicit TranscoderSettingsPage(SettingsDialog* dialog); ~TranscoderSettingsPage(); static const char *kSettingsGroup; @@ -43,7 +43,7 @@ public: void Load(); void Save(); -private: + private: Ui_TranscoderSettingsPage* ui_; }; diff --git a/src/subsonic/subsonicbaserequest.h b/src/subsonic/subsonicbaserequest.h index 7ba9e7d56..6a9af462a 100644 --- a/src/subsonic/subsonicbaserequest.h +++ b/src/subsonic/subsonicbaserequest.h @@ -46,7 +46,7 @@ class SubsonicBaseRequest : public QObject { public: - SubsonicBaseRequest(SubsonicService *service, QObject *parent); + explicit SubsonicBaseRequest(SubsonicService *service, QObject *parent); ~SubsonicBaseRequest(); typedef QPair Param; diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h index b557d9d6c..ad35b1285 100644 --- a/src/subsonic/subsonicrequest.h +++ b/src/subsonic/subsonicrequest.h @@ -52,8 +52,7 @@ class SubsonicRequest : public SubsonicBaseRequest { Q_OBJECT public: - - SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *url_handler, Application *app, QObject *parent); + explicit SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *url_handler, Application *app, QObject *parent); ~SubsonicRequest(); void ReloadSettings(); diff --git a/src/subsonic/subsonicservice.h b/src/subsonic/subsonicservice.h index 2cf107ab9..8c98fe610 100644 --- a/src/subsonic/subsonicservice.h +++ b/src/subsonic/subsonicservice.h @@ -54,7 +54,7 @@ class SubsonicService : public InternetService { Q_OBJECT public: - SubsonicService(Application *app, QObject *parent); + explicit SubsonicService(Application *app, QObject *parent); ~SubsonicService(); static const Song::Source kSource; @@ -82,8 +82,6 @@ class SubsonicService : public InternetService { void CheckConfiguration(); - signals: - public slots: void ShowConfig(); void SendPing(); diff --git a/src/subsonic/subsonicurlhandler.h b/src/subsonic/subsonicurlhandler.h index 6e0acedf2..2e3bd39d1 100644 --- a/src/subsonic/subsonicurlhandler.h +++ b/src/subsonic/subsonicurlhandler.h @@ -39,7 +39,7 @@ class SubsonicUrlHandler : public UrlHandler { Q_OBJECT public: - SubsonicUrlHandler(Application *app, SubsonicService *service); + explicit SubsonicUrlHandler(Application *app, SubsonicService *service); QString scheme() const { return service_->url_scheme(); } QUrl server_url() const { return service_->server_url(); } diff --git a/src/transcoder/transcodedialog.h b/src/transcoder/transcodedialog.h index d6640cda2..45cf0fec6 100644 --- a/src/transcoder/transcodedialog.h +++ b/src/transcoder/transcodedialog.h @@ -44,7 +44,7 @@ class TranscodeDialog : public QDialog { Q_OBJECT public: - TranscodeDialog(QMainWindow *mainwindow, QWidget *parent = nullptr); + explicit TranscodeDialog(QMainWindow *mainwindow, QWidget *parent = nullptr); ~TranscodeDialog(); static const char *kSettingsGroup; diff --git a/src/transcoder/transcoder.h b/src/transcoder/transcoder.h index eca2e0ead..356b2d0f8 100644 --- a/src/transcoder/transcoder.h +++ b/src/transcoder/transcoder.h @@ -40,7 +40,7 @@ #include "core/song.h" struct TranscoderPreset { - TranscoderPreset() : type_(Song::FileType_Unknown) {} + explicit TranscoderPreset() : type_(Song::FileType_Unknown) {} TranscoderPreset(Song::FileType type, const QString &name, const QString &extension, const QString &codec_mimetype, const QString &muxer_mimetype_ = QString()); Song::FileType type_; @@ -55,7 +55,7 @@ class Transcoder : public QObject { Q_OBJECT public: - Transcoder(QObject *parent = nullptr, const QString &settings_postfix = ""); + explicit Transcoder(QObject *parent = nullptr, const QString &settings_postfix = ""); static TranscoderPreset PresetForFileType(Song::FileType type); static QList GetAllPresets(); @@ -92,7 +92,7 @@ class Transcoder : public QObject { // State held by a job and shared across gstreamer callbacks - lives in the job's thread. struct JobState { - JobState(const Job &job, Transcoder *parent) + explicit JobState(const Job &job, Transcoder *parent) : job_(job), parent_(parent), pipeline_(nullptr), @@ -110,7 +110,7 @@ class Transcoder : public QObject { // Event passed from a GStreamer callback to the Transcoder when a job finishes. struct JobFinishedEvent : public QEvent { - JobFinishedEvent(JobState *state, bool success); + explicit JobFinishedEvent(JobState *state, bool success); static int sEventType; diff --git a/src/transcoder/transcoderoptionsaac.h b/src/transcoder/transcoderoptionsaac.h index 43c50cb44..15f9876f9 100644 --- a/src/transcoder/transcoderoptionsaac.h +++ b/src/transcoder/transcoderoptionsaac.h @@ -31,7 +31,7 @@ class Ui_TranscoderOptionsAAC; class TranscoderOptionsAAC : public TranscoderOptionsInterface { public: - TranscoderOptionsAAC(QWidget *parent = nullptr); + explicit TranscoderOptionsAAC(QWidget *parent = nullptr); ~TranscoderOptionsAAC(); void Load(); diff --git a/src/transcoder/transcoderoptionsasf.h b/src/transcoder/transcoderoptionsasf.h index f1faa648a..e8e0514b3 100644 --- a/src/transcoder/transcoderoptionsasf.h +++ b/src/transcoder/transcoderoptionsasf.h @@ -31,7 +31,7 @@ class Ui_TranscoderOptionsASF; class TranscoderOptionsASF : public TranscoderOptionsInterface { public: - TranscoderOptionsASF(QWidget *parent = nullptr); + explicit TranscoderOptionsASF(QWidget *parent = nullptr); ~TranscoderOptionsASF(); void Load(); diff --git a/src/transcoder/transcoderoptionsdialog.h b/src/transcoder/transcoderoptionsdialog.h index c3ba257b4..26f707dfa 100644 --- a/src/transcoder/transcoderoptionsdialog.h +++ b/src/transcoder/transcoderoptionsdialog.h @@ -39,7 +39,7 @@ class TranscoderOptionsDialog : public QDialog { Q_OBJECT public: - TranscoderOptionsDialog(Song::FileType type, QWidget *parent = nullptr); + explicit TranscoderOptionsDialog(Song::FileType type, QWidget *parent = nullptr); ~TranscoderOptionsDialog(); bool is_valid() const { return options_; } @@ -51,7 +51,7 @@ class TranscoderOptionsDialog : public QDialog { protected: void showEvent(QShowEvent *e); -private: + private: Ui_TranscoderOptionsDialog *ui_; TranscoderOptionsInterface *options_; }; diff --git a/src/transcoder/transcoderoptionsflac.h b/src/transcoder/transcoderoptionsflac.h index ee2cdbba5..4b58f6382 100644 --- a/src/transcoder/transcoderoptionsflac.h +++ b/src/transcoder/transcoderoptionsflac.h @@ -31,7 +31,7 @@ class Ui_TranscoderOptionsFLAC; class TranscoderOptionsFLAC : public TranscoderOptionsInterface { public: - TranscoderOptionsFLAC(QWidget *parent = nullptr); + explicit TranscoderOptionsFLAC(QWidget *parent = nullptr); ~TranscoderOptionsFLAC(); void Load(); diff --git a/src/transcoder/transcoderoptionsinterface.h b/src/transcoder/transcoderoptionsinterface.h index 341c5de51..34ab3e66b 100644 --- a/src/transcoder/transcoderoptionsinterface.h +++ b/src/transcoder/transcoderoptionsinterface.h @@ -27,8 +27,8 @@ #include class TranscoderOptionsInterface : public QWidget { -public: - TranscoderOptionsInterface(QWidget *parent) : QWidget(parent) {} + public: + explicit TranscoderOptionsInterface(QWidget *parent) : QWidget(parent) {} virtual ~TranscoderOptionsInterface() {} virtual void Load() = 0; diff --git a/src/transcoder/transcoderoptionsmp3.h b/src/transcoder/transcoderoptionsmp3.h index 25f6cf710..c610406ff 100644 --- a/src/transcoder/transcoderoptionsmp3.h +++ b/src/transcoder/transcoderoptionsmp3.h @@ -35,17 +35,17 @@ class TranscoderOptionsMP3 : public TranscoderOptionsInterface { Q_OBJECT public: - TranscoderOptionsMP3(QWidget *parent = nullptr); + explicit TranscoderOptionsMP3(QWidget *parent = nullptr); ~TranscoderOptionsMP3(); void Load(); void Save(); -private slots: + private slots: void QualitySliderChanged(int value); void QualitySpinboxChanged(double value); -private: + private: static const char* kSettingsGroup; Ui_TranscoderOptionsMP3 *ui_; diff --git a/src/transcoder/transcoderoptionsopus.h b/src/transcoder/transcoderoptionsopus.h index 7b46b1e75..4e5c923bd 100644 --- a/src/transcoder/transcoderoptionsopus.h +++ b/src/transcoder/transcoderoptionsopus.h @@ -31,13 +31,13 @@ class Ui_TranscoderOptionsOpus; class TranscoderOptionsOpus : public TranscoderOptionsInterface { public: - TranscoderOptionsOpus(QWidget *parent = nullptr); + explicit TranscoderOptionsOpus(QWidget *parent = nullptr); ~TranscoderOptionsOpus(); void Load(); void Save(); -private: + private: static const char* kSettingsGroup; Ui_TranscoderOptionsOpus* ui_; diff --git a/src/transcoder/transcoderoptionsspeex.h b/src/transcoder/transcoderoptionsspeex.h index b85da181b..94183b8be 100644 --- a/src/transcoder/transcoderoptionsspeex.h +++ b/src/transcoder/transcoderoptionsspeex.h @@ -31,13 +31,13 @@ class Ui_TranscoderOptionsSpeex; class TranscoderOptionsSpeex : public TranscoderOptionsInterface { public: - TranscoderOptionsSpeex(QWidget *parent = nullptr); + explicit TranscoderOptionsSpeex(QWidget *parent = nullptr); ~TranscoderOptionsSpeex(); void Load(); void Save(); -private: + private: static const char *kSettingsGroup; Ui_TranscoderOptionsSpeex *ui_; diff --git a/src/transcoder/transcoderoptionsvorbis.h b/src/transcoder/transcoderoptionsvorbis.h index b9fed4578..052bd4713 100644 --- a/src/transcoder/transcoderoptionsvorbis.h +++ b/src/transcoder/transcoderoptionsvorbis.h @@ -31,13 +31,13 @@ class Ui_TranscoderOptionsVorbis; class TranscoderOptionsVorbis : public TranscoderOptionsInterface { public: - TranscoderOptionsVorbis(QWidget* parent = nullptr); + explicit TranscoderOptionsVorbis(QWidget* parent = nullptr); ~TranscoderOptionsVorbis(); void Load(); void Save(); -private: + private: static const char *kSettingsGroup; Ui_TranscoderOptionsVorbis *ui_; diff --git a/src/transcoder/transcoderoptionswavpack.h b/src/transcoder/transcoderoptionswavpack.h index 5afbba401..126ef208e 100644 --- a/src/transcoder/transcoderoptionswavpack.h +++ b/src/transcoder/transcoderoptionswavpack.h @@ -30,13 +30,13 @@ class Ui_TranscoderOptionsWavPack; class TranscoderOptionsWavPack : public TranscoderOptionsInterface { public: - TranscoderOptionsWavPack(QWidget *parent = nullptr); + explicit TranscoderOptionsWavPack(QWidget *parent = nullptr); ~TranscoderOptionsWavPack(); void Load(); void Save(); -private: + private: static const char *kSettingsGroup; Ui_TranscoderOptionsWavPack *ui_; diff --git a/src/widgets/autoexpandingtreeview.h b/src/widgets/autoexpandingtreeview.h index 2c7bdf4df..d87a11e7e 100644 --- a/src/widgets/autoexpandingtreeview.h +++ b/src/widgets/autoexpandingtreeview.h @@ -38,7 +38,7 @@ class AutoExpandingTreeView : public QTreeView { Q_OBJECT public: - AutoExpandingTreeView(QWidget *parent = nullptr); + explicit AutoExpandingTreeView(QWidget *parent = nullptr); static const int kRowsToShow; diff --git a/src/widgets/clickablelabel.h b/src/widgets/clickablelabel.h index b5da3c85c..3cd209425 100644 --- a/src/widgets/clickablelabel.h +++ b/src/widgets/clickablelabel.h @@ -31,12 +31,12 @@ class ClickableLabel : public QLabel { Q_OBJECT public: - ClickableLabel(QWidget *parent = nullptr); + explicit ClickableLabel(QWidget *parent = nullptr); -signals: + signals: void Clicked(); -protected: + protected: void mousePressEvent(QMouseEvent *event); }; diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h index 3bc1da404..0ada0e8e6 100644 --- a/src/widgets/fancytabwidget.h +++ b/src/widgets/fancytabwidget.h @@ -48,7 +48,7 @@ class FancyTabWidget : public QTabWidget { ~FancyTabWidget(); public: - FancyTabWidget(QWidget* parent = 0); + 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); diff --git a/src/widgets/favoritewidget.h b/src/widgets/favoritewidget.h index 94f69d53f..456f484b0 100644 --- a/src/widgets/favoritewidget.h +++ b/src/widgets/favoritewidget.h @@ -34,14 +34,14 @@ class FavoriteWidget : public QWidget { Q_OBJECT public: - FavoriteWidget(int tab_id, bool favorite = false, QWidget *parent = nullptr); + explicit FavoriteWidget(int tab_id, bool favorite = false, QWidget *parent = nullptr); // Change the value if different from the current one and then update display and emit FavoriteStateChanged signal void SetFavorite(bool favorite); QSize sizeHint() const; -signals: + signals: void FavoriteStateChanged(int, bool); protected: diff --git a/src/widgets/fileview.h b/src/widgets/fileview.h index 0a57d83f5..75fc15b93 100644 --- a/src/widgets/fileview.h +++ b/src/widgets/fileview.h @@ -50,7 +50,7 @@ class FileView : public QWidget { Q_OBJECT public: - FileView(QWidget *parent = nullptr); + explicit FileView(QWidget *parent = nullptr); ~FileView(); static const char *kFileFilter; diff --git a/src/widgets/fileviewlist.h b/src/widgets/fileviewlist.h index 6d07b16ba..9ee407646 100644 --- a/src/widgets/fileviewlist.h +++ b/src/widgets/fileviewlist.h @@ -43,7 +43,7 @@ class FileViewList : public QListView { Q_OBJECT public: - FileViewList(QWidget *parent = nullptr); + explicit FileViewList(QWidget *parent = nullptr); void mousePressEvent(QMouseEvent *e); diff --git a/src/widgets/forcescrollperpixel.h b/src/widgets/forcescrollperpixel.h index 018c80607..b8c3b292c 100644 --- a/src/widgets/forcescrollperpixel.h +++ b/src/widgets/forcescrollperpixel.h @@ -32,12 +32,12 @@ class QEvent; // This helper class forces the mode back to ScrollPerPixel. class ForceScrollPerPixel : public QObject { public: - ForceScrollPerPixel(QAbstractItemView *item_view, QObject *parent = nullptr); + explicit ForceScrollPerPixel(QAbstractItemView *item_view, QObject *parent = nullptr); -protected: + protected: bool eventFilter(QObject *object, QEvent *event); -private: + private: QAbstractItemView *item_view_; }; diff --git a/src/widgets/freespacebar.h b/src/widgets/freespacebar.h index 0a37ee4ac..1085ee5f7 100644 --- a/src/widgets/freespacebar.h +++ b/src/widgets/freespacebar.h @@ -39,7 +39,7 @@ class FreeSpaceBar : public QWidget { Q_OBJECT public: - FreeSpaceBar(QWidget *parent = nullptr); + explicit FreeSpaceBar(QWidget *parent = nullptr); static const int kBarHeight; static const int kBarBorderRadius; @@ -66,12 +66,12 @@ class FreeSpaceBar : public QWidget { QSize sizeHint() const; -protected: + protected: void paintEvent(QPaintEvent*); -private: + private: struct Label { - Label(const QString &t, const QColor &c) : text(t), color(c) {} + explicit Label(const QString &t, const QColor &c) : text(t), color(c) {} QString text; QColor color; @@ -82,7 +82,7 @@ private: void DrawBar(QPainter *p, const QRect &r); void DrawText(QPainter *p, const QRect &r); -private: + private: qint64 free_; qint64 additional_; qint64 total_; diff --git a/src/widgets/groupediconview.h b/src/widgets/groupediconview.h index 488a930c3..055a62a99 100644 --- a/src/widgets/groupediconview.h +++ b/src/widgets/groupediconview.h @@ -59,7 +59,7 @@ class GroupedIconView : public QListView { Q_PROPERTY(QString header_text READ header_text WRITE set_header_text) public: - GroupedIconView(QWidget *parent = nullptr); + explicit GroupedIconView(QWidget *parent = nullptr); enum Role { Role_Group = 1158300, @@ -83,7 +83,7 @@ class GroupedIconView : public QListView { static void DrawHeader(QPainter *painter, const QRect &rect, const QFont &font, const QPalette &palette, const QString &text); -protected: + protected: virtual int header_height() const; // QWidget @@ -98,10 +98,10 @@ protected: QRect visualRect(const QModelIndex &index) const; QRegion visualRegionForSelection(const QItemSelection &selection) const; -private slots: + private slots: void LayoutItems(); -private: + private: static const int kBarThickness; static const int kBarMarginTop; diff --git a/src/widgets/lineedit.h b/src/widgets/lineedit.h index 08c2b9156..32b53930e 100644 --- a/src/widgets/lineedit.h +++ b/src/widgets/lineedit.h @@ -38,7 +38,7 @@ class QResizeEvent; class LineEditInterface { public: - LineEditInterface(QWidget *widget) : widget_(widget) {} + explicit LineEditInterface(QWidget *widget) : widget_(widget) {} QWidget *widget() const { return widget_; } @@ -55,13 +55,13 @@ class LineEditInterface { virtual void set_enabled(bool enabled) = 0; -protected: + protected: QWidget *widget_; }; class ExtendedEditor : public LineEditInterface { public: - ExtendedEditor(QWidget *widget, int extra_right_padding = 0, bool draw_hint = true); + explicit ExtendedEditor(QWidget *widget, int extra_right_padding = 0, bool draw_hint = true); virtual ~ExtendedEditor() {} virtual bool is_empty() const { return text().isEmpty(); } @@ -108,7 +108,7 @@ class LineEdit : public QLineEdit, public ExtendedEditor { Q_PROPERTY(bool has_reset_button READ has_reset_button WRITE set_reset_button) public: - LineEdit(QWidget *parent = nullptr); + explicit LineEdit(QWidget *parent = nullptr); // ExtendedEditor void set_focus() { QLineEdit::setFocus(); } @@ -138,7 +138,7 @@ class TextEdit : public QPlainTextEdit, public ExtendedEditor { Q_PROPERTY(bool has_reset_button READ has_reset_button WRITE set_reset_button) public: - TextEdit(QWidget *parent = nullptr); + explicit TextEdit(QWidget *parent = nullptr); // ExtendedEditor void set_focus() { QPlainTextEdit::setFocus(); } @@ -161,7 +161,7 @@ class SpinBox : public QSpinBox, public ExtendedEditor { Q_PROPERTY(bool has_reset_button READ has_reset_button WRITE set_reset_button) public: - SpinBox(QWidget *parent = nullptr); + explicit SpinBox(QWidget *parent = nullptr); // QSpinBox QString textFromValue(int val) const; diff --git a/src/widgets/linetextedit.h b/src/widgets/linetextedit.h index 893e932fa..f9cd8f150 100644 --- a/src/widgets/linetextedit.h +++ b/src/widgets/linetextedit.h @@ -35,12 +35,12 @@ class LineTextEdit : public QTextEdit { Q_OBJECT public: - LineTextEdit(QWidget *parent = nullptr); + explicit LineTextEdit(QWidget *parent = nullptr); QSize sizeHint() const; QSize minimumSizeHint() const; -protected: + protected: void keyPressEvent(QKeyEvent *e); }; diff --git a/src/widgets/loginstatewidget.h b/src/widgets/loginstatewidget.h index fd4d2d93b..9844f4d26 100644 --- a/src/widgets/loginstatewidget.h +++ b/src/widgets/loginstatewidget.h @@ -36,7 +36,7 @@ class LoginStateWidget : public QWidget { Q_OBJECT public: - LoginStateWidget(QWidget *parent = nullptr); + explicit LoginStateWidget(QWidget *parent = nullptr); ~LoginStateWidget(); enum State { LoggedIn, LoginInProgress, LoggedOut }; @@ -63,7 +63,7 @@ class LoginStateWidget : public QWidget { void SetExpires(const QDate &expires); -signals: + signals: void LogoutClicked(); void LoginClicked(); diff --git a/src/widgets/multiloadingindicator.h b/src/widgets/multiloadingindicator.h index 5cace5df1..03e5ba5a3 100644 --- a/src/widgets/multiloadingindicator.h +++ b/src/widgets/multiloadingindicator.h @@ -37,7 +37,7 @@ class MultiLoadingIndicator : public QWidget { Q_OBJECT public: - MultiLoadingIndicator(QWidget *parent = nullptr); + explicit MultiLoadingIndicator(QWidget *parent = nullptr); static const int kVerticalPadding; static const int kHorizontalPadding; @@ -47,16 +47,16 @@ class MultiLoadingIndicator : public QWidget { QSize sizeHint() const; -signals: + signals: void TaskCountChange(int tasks); -protected: + protected: void paintEvent(QPaintEvent *); -private slots: + private slots: void UpdateText(); -private: + private: TaskManager *task_manager_; BusyIndicator *spinner_; diff --git a/src/widgets/osd.h b/src/widgets/osd.h index 0fcb7ad22..5f2de75dd 100644 --- a/src/widgets/osd.h +++ b/src/widgets/osd.h @@ -55,7 +55,7 @@ class OSD : public QObject { Q_OBJECT public: - OSD(SystemTrayIcon *tray_icon, Application *app, QObject *parent = nullptr); + explicit OSD(SystemTrayIcon *tray_icon, Application *app, QObject *parent = nullptr); ~OSD(); static const char *kSettingsGroup; diff --git a/src/widgets/osdpretty.h b/src/widgets/osdpretty.h index b8a761e22..aee726d75 100644 --- a/src/widgets/osdpretty.h +++ b/src/widgets/osdpretty.h @@ -56,7 +56,7 @@ class OSDPretty : public QWidget { Mode_Draggable, }; - OSDPretty(Mode mode, QWidget *parent = nullptr); + explicit OSDPretty(Mode mode, QWidget *parent = nullptr); ~OSDPretty(); static const char *kSettingsGroup; diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h index 41f0756a2..f0d5b28d4 100644 --- a/src/widgets/playingwidget.h +++ b/src/widgets/playingwidget.h @@ -61,7 +61,7 @@ class PlayingWidget : public QWidget { Q_OBJECT public: - PlayingWidget(QWidget *parent = nullptr); + explicit PlayingWidget(QWidget *parent = nullptr); ~PlayingWidget(); void Init(Application *app, AlbumCoverChoiceController *album_cover_choice_controller); diff --git a/src/widgets/renametablineedit.h b/src/widgets/renametablineedit.h index d2edbfb09..576ed5413 100644 --- a/src/widgets/renametablineedit.h +++ b/src/widgets/renametablineedit.h @@ -35,14 +35,14 @@ class RenameTabLineEdit : public QLineEdit { Q_OBJECT public: - RenameTabLineEdit(QWidget* parent = nullptr); + explicit RenameTabLineEdit(QWidget* parent = nullptr); -signals: + signals: void EditingCanceled(); -public slots: + public slots: -protected: + protected: void focusOutEvent(QFocusEvent* e); void keyPressEvent(QKeyEvent* e); }; diff --git a/src/widgets/stickyslider.h b/src/widgets/stickyslider.h index a59a4d6ae..414338854 100644 --- a/src/widgets/stickyslider.h +++ b/src/widgets/stickyslider.h @@ -36,7 +36,7 @@ class StickySlider : public QSlider { Q_PROPERTY(int sticky_threshold READ sticky_threshold WRITE set_sticky_threshold) public: - StickySlider(QWidget* parent = nullptr); + explicit StickySlider(QWidget* parent = nullptr); int sticky_center() const { return sticky_center_; } int sticky_threshold() const { return sticky_threshold_; } diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h index a22d3e384..d2289839d 100644 --- a/src/widgets/stretchheaderview.h +++ b/src/widgets/stretchheaderview.h @@ -39,7 +39,7 @@ class StretchHeaderView : public QHeaderView { Q_OBJECT public: - StretchHeaderView(Qt::Orientation orientation, QWidget* parent = nullptr); + explicit StretchHeaderView(Qt::Orientation orientation, QWidget* parent = nullptr); typedef double ColumnWidthType; @@ -68,17 +68,17 @@ class StretchHeaderView : public QHeaderView { bool is_stretch_enabled() const { return stretch_enabled_; } -public slots: + public slots: // Changes the stretch mode. Enabling stretch mode will initialise the // proportional column widths from the current state of the header. void ToggleStretchEnabled(); void SetStretchEnabled(bool enabled); -signals: + signals: // Emitted when the stretch mode is changed. void StretchEnabledChanged(bool enabled); -protected: + protected: // QWidget void mouseMoveEvent(QMouseEvent* e); void resizeEvent(QResizeEvent* event); @@ -90,10 +90,10 @@ protected: // Resizes the actual columns to make them match the proportional values in column_widths_. void UpdateWidths(const QList& sections = QList()); -private slots: + private slots: void SectionResized(int logical, int old_size, int new_size); -private: + private: bool stretch_enabled_; QVector column_widths_; diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h index eea038bf3..5502814af 100644 --- a/src/widgets/trackslider.h +++ b/src/widgets/trackslider.h @@ -41,7 +41,7 @@ class TrackSlider : public QWidget { Q_OBJECT public: - TrackSlider(QWidget* parent = nullptr); + explicit TrackSlider(QWidget* parent = nullptr); ~TrackSlider(); void SetApplication(Application* app); diff --git a/src/widgets/tracksliderpopup.h b/src/widgets/tracksliderpopup.h index 1413bacf6..a33f5fea6 100644 --- a/src/widgets/tracksliderpopup.h +++ b/src/widgets/tracksliderpopup.h @@ -39,17 +39,17 @@ class TrackSliderPopup : public QWidget { Q_OBJECT public: - TrackSliderPopup(QWidget* parent); + explicit TrackSliderPopup(QWidget *parent); -public slots: + public slots: void SetText(const QString& text); void SetSmallText(const QString& small_text); void SetPopupPosition(const QPoint& pos); -protected: + protected: void paintEvent(QPaintEvent*); -private: + private: static const int kTextMargin; static const int kPointLength; static const int kPointWidth; @@ -60,7 +60,7 @@ private: void UpdatePosition(); void SendMouseEventToParent(QMouseEvent* e); -private: + private: QString text_; QString small_text_; QPoint pos_; diff --git a/src/widgets/tracksliderslider.h b/src/widgets/tracksliderslider.h index e69169365..303b8f698 100644 --- a/src/widgets/tracksliderslider.h +++ b/src/widgets/tracksliderslider.h @@ -41,7 +41,7 @@ class TrackSliderSlider : public QSlider { Q_OBJECT public: - TrackSliderSlider(QWidget* parent = nullptr); + explicit TrackSliderSlider(QWidget* parent = nullptr); signals: void SeekForward(); diff --git a/src/widgets/volumeslider.h b/src/widgets/volumeslider.h index e3f89b76e..92be10d08 100644 --- a/src/widgets/volumeslider.h +++ b/src/widgets/volumeslider.h @@ -43,7 +43,7 @@ class SliderSlider : public QSlider { Q_OBJECT public: - SliderSlider(Qt::Orientation, QWidget*, uint max = 0); + explicit SliderSlider(Qt::Orientation, QWidget*, uint max = 0); virtual void setValue(int); @@ -86,7 +86,7 @@ class PrettySlider : public SliderSlider { Pretty } SliderMode; - PrettySlider(Qt::Orientation orientation, SliderMode mode, QWidget* parent, uint max = 0); + explicit PrettySlider(Qt::Orientation orientation, SliderMode mode, QWidget* parent, uint max = 0); protected: virtual void slideEvent(QMouseEvent*); @@ -103,7 +103,7 @@ class VolumeSlider : public SliderSlider { Q_OBJECT public: - VolumeSlider(QWidget* parent, uint max = 0); + explicit VolumeSlider(QWidget *parent, uint max = 0); void SetEnabled(const bool enabled); protected: