From cbce9892d53930d062e476b7fcc6d01a9e6f4eb5 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 12 Aug 2024 01:06:15 +0200 Subject: [PATCH] Replace slots with Q_SLOTS --- ext/libstrawberry-common/core/messagehandler.h | 2 +- ext/libstrawberry-common/core/workerpool.h | 2 +- src/analyzer/analyzercontainer.h | 2 +- src/analyzer/boomanalyzer.h | 2 +- src/collection/collection.h | 4 ++-- src/collection/collectionbackend.h | 2 +- src/collection/collectiondirectorymodel.h | 2 +- src/collection/collectionfilterwidget.h | 4 ++-- src/collection/collectionitemdelegate.h | 2 +- src/collection/collectionmodel.h | 4 ++-- src/collection/collectionview.h | 4 ++-- src/collection/collectionwatcher.h | 4 ++-- src/collection/groupbydialog.h | 4 ++-- src/collection/savedgroupingmanager.h | 2 +- src/context/contextalbum.h | 4 ++-- src/context/contextview.h | 4 ++-- src/core/application.h | 4 ++-- src/core/database.h | 4 ++-- src/core/deletefiles.h | 2 +- src/core/localredirectserver.h | 2 +- src/core/macfslistener.h | 2 +- src/core/macsystemtrayicon.h | 2 +- src/core/mainwindow.h | 4 ++-- src/core/mergedproxymodel.h | 2 +- src/core/mpris2.h | 2 +- src/core/networktimeouts.h | 2 +- src/core/player.h | 6 +++--- src/core/qtsystemtrayicon.h | 2 +- src/core/songloader.h | 2 +- src/core/standarditemiconloader.h | 2 +- src/core/tagreaderclient.h | 4 ++-- src/core/threadsafenetworkdiskcache.h | 2 +- src/core/windows7thumbbar.h | 2 +- src/covermanager/albumcoverchoicecontroller.h | 4 ++-- src/covermanager/albumcoverexport.h | 2 +- src/covermanager/albumcoverexporter.h | 2 +- src/covermanager/albumcoverfetcher.h | 2 +- src/covermanager/albumcoverfetchersearch.h | 2 +- src/covermanager/albumcoverloader.h | 2 +- src/covermanager/albumcovermanager.h | 2 +- src/covermanager/albumcoversearcher.h | 2 +- src/covermanager/coverfromurldialog.h | 2 +- src/covermanager/coverproviders.h | 2 +- src/covermanager/currentalbumcoverloader.h | 4 ++-- src/covermanager/deezercoverprovider.h | 2 +- src/covermanager/discogscoverprovider.h | 2 +- src/covermanager/lastfmcoverprovider.h | 2 +- src/covermanager/musicbrainzcoverprovider.h | 2 +- src/covermanager/musixmatchcoverprovider.h | 2 +- src/covermanager/opentidalcoverprovider.h | 2 +- src/covermanager/qobuzcoverprovider.h | 2 +- src/covermanager/spotifycoverprovider.h | 2 +- src/covermanager/tidalcoverprovider.h | 2 +- src/device/cddadevice.h | 2 +- src/device/cddasongloader.h | 2 +- src/device/connecteddevice.h | 4 ++-- src/device/devicedatabasebackend.h | 2 +- src/device/devicelister.h | 4 ++-- src/device/devicemanager.h | 4 ++-- src/device/deviceproperties.h | 4 ++-- src/device/devicestatefiltermodel.h | 2 +- src/device/deviceview.h | 2 +- src/device/filesystemdevice.h | 2 +- src/device/giolister.h | 2 +- src/device/gpoddevice.h | 2 +- src/device/gpodloader.h | 2 +- src/device/macosdevicelister.h | 2 +- src/device/mtpdevice.h | 2 +- src/device/mtploader.h | 2 +- src/device/udisks2lister.h | 4 ++-- src/dialogs/addstreamdialog.h | 2 +- src/dialogs/console.h | 2 +- src/dialogs/deleteconfirmationdialog.h | 2 +- src/dialogs/edittagdialog.h | 2 +- src/dialogs/errordialog.h | 2 +- src/dialogs/lastfmimportdialog.h | 4 ++-- src/dialogs/messagedialog.h | 2 +- src/dialogs/saveplaylistsdialog.h | 2 +- src/dialogs/trackselectiondialog.h | 4 ++-- src/engine/enginebase.h | 4 ++-- src/engine/gstengine.h | 4 ++-- src/engine/gstenginepipeline.h | 4 ++-- src/equalizer/equalizer.h | 2 +- src/equalizer/equalizerslider.h | 2 +- src/globalshortcuts/globalshortcutgrabber.h | 2 +- src/globalshortcuts/globalshortcutsbackend-gnome.h | 2 +- src/globalshortcuts/globalshortcutsbackend-kde.h | 2 +- src/globalshortcuts/globalshortcutsbackend-mate.h | 2 +- src/globalshortcuts/globalshortcutsmanager.h | 2 +- src/lyrics/chartlyricsprovider.h | 2 +- src/lyrics/geniuslyricsprovider.h | 2 +- src/lyrics/htmllyricsprovider.h | 2 +- src/lyrics/lololyricsprovider.h | 2 +- src/lyrics/lyricsfetcher.h | 2 +- src/lyrics/lyricsfetchersearch.h | 2 +- src/lyrics/lyricsproviders.h | 2 +- src/lyrics/musixmatchlyricsprovider.h | 2 +- src/lyrics/ovhlyricsprovider.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 | 4 ++-- src/musicbrainz/acoustidclient.h | 2 +- src/musicbrainz/musicbrainzclient.h | 2 +- src/musicbrainz/tagfetcher.h | 4 ++-- src/organize/organize.h | 2 +- src/organize/organizedialog.h | 4 ++-- src/osd/osdbase.h | 4 ++-- src/osd/osddbus.h | 2 +- src/osd/osdpretty.h | 4 ++-- src/playlist/playlist.h | 4 ++-- src/playlist/playlistbackend.h | 2 +- src/playlist/playlistcontainer.h | 4 ++-- src/playlist/playlistdelegates.h | 4 ++-- src/playlist/playlistheader.h | 2 +- src/playlist/playlistlistcontainer.h | 2 +- src/playlist/playlistlistmodel.h | 2 +- src/playlist/playlistmanager.h | 6 +++--- src/playlist/playlistsequence.h | 4 ++-- src/playlist/playlisttabbar.h | 2 +- src/playlist/playlistview.h | 4 ++-- src/playlist/songloaderinserter.h | 2 +- src/qobuz/qobuzbaserequest.h | 2 +- src/qobuz/qobuzfavoriterequest.h | 4 ++-- src/qobuz/qobuzrequest.h | 2 +- src/qobuz/qobuzservice.h | 4 ++-- src/qobuz/qobuzstreamurlrequest.h | 4 ++-- src/qobuz/qobuzurlhandler.h | 2 +- src/queue/queue.h | 4 ++-- src/queue/queueview.h | 2 +- src/radios/radiobackend.h | 4 ++-- src/radios/radiomodel.h | 2 +- src/radios/radioparadiseservice.h | 4 ++-- src/radios/radioservice.h | 2 +- src/radios/radioservices.h | 4 ++-- src/radios/radioview.h | 2 +- src/radios/somafmservice.h | 4 ++-- src/scrobbler/audioscrobbler.h | 2 +- src/scrobbler/lastfmimport.h | 2 +- src/scrobbler/listenbrainzscrobbler.h | 4 ++-- src/scrobbler/scrobblercache.h | 2 +- src/scrobbler/scrobblerservice.h | 2 +- src/scrobbler/scrobblersettings.h | 2 +- src/scrobbler/scrobblingapi20.h | 4 ++-- src/scrobbler/subsonicscrobbler.h | 2 +- src/settings/appearancesettingspage.h | 2 +- src/settings/backendsettingspage.h | 2 +- src/settings/behavioursettingspage.h | 2 +- src/settings/collectionsettingspage.h | 2 +- src/settings/contextsettingspage.h | 2 +- src/settings/coverssettingspage.h | 2 +- src/settings/globalshortcutssettingspage.h | 2 +- src/settings/lyricssettingspage.h | 2 +- src/settings/notificationssettingspage.h | 2 +- src/settings/qobuzsettingspage.h | 2 +- src/settings/scrobblersettingspage.h | 2 +- src/settings/settingsdialog.h | 2 +- src/settings/spotifysettingspage.h | 2 +- src/settings/subsonicsettingspage.h | 2 +- src/settings/tidalsettingspage.h | 2 +- src/smartplaylists/playlistgeneratorinserter.h | 2 +- src/smartplaylists/smartplaylistquerywizardplugin.h | 2 +- src/smartplaylists/smartplaylistsearchpreview.h | 2 +- src/smartplaylists/smartplaylistsearchtermwidget.h | 2 +- src/smartplaylists/smartplaylistsviewcontainer.h | 2 +- src/smartplaylists/smartplaylistwizard.h | 2 +- src/spotify/spotifybaserequest.h | 2 +- src/spotify/spotifyfavoriterequest.h | 4 ++-- src/spotify/spotifyrequest.h | 2 +- src/spotify/spotifyservice.h | 4 ++-- src/streaming/streamingcollectionview.h | 4 ++-- src/streaming/streamingcollectionviewcontainer.h | 2 +- src/streaming/streamingsearchmodel.h | 2 +- src/streaming/streamingsearchview.h | 4 ++-- src/streaming/streamingservice.h | 2 +- src/streaming/streamingservices.h | 2 +- src/streaming/streamingsongsview.h | 2 +- src/streaming/streamingtabsview.h | 2 +- src/subsonic/subsonicbaserequest.h | 2 +- src/subsonic/subsonicrequest.h | 2 +- src/subsonic/subsonicscrobblerequest.h | 2 +- src/subsonic/subsonicservice.h | 4 ++-- src/tidal/tidalbaserequest.h | 2 +- src/tidal/tidalfavoriterequest.h | 4 ++-- src/tidal/tidalrequest.h | 4 ++-- src/tidal/tidalservice.h | 4 ++-- src/tidal/tidalstreamurlrequest.h | 4 ++-- src/tidal/tidalurlhandler.h | 2 +- src/transcoder/transcodedialog.h | 2 +- src/transcoder/transcoder.h | 2 +- src/transcoder/transcoderoptionsmp3.h | 2 +- src/widgets/autoexpandingtreeview.h | 4 ++-- src/widgets/fancytabwidget.h | 4 ++-- src/widgets/fileview.h | 2 +- src/widgets/fileviewlist.h | 2 +- src/widgets/groupediconview.h | 2 +- src/widgets/lineedit.h | 12 ++++++------ src/widgets/loginstatewidget.h | 4 ++-- src/widgets/multiloadingindicator.h | 2 +- src/widgets/playingwidget.h | 4 ++-- src/widgets/qsearchfield.h | 2 +- src/widgets/stretchheaderview.h | 4 ++-- src/widgets/trackslider.h | 4 ++-- src/widgets/tracksliderpopup.h | 2 +- src/widgets/tracksliderslider.h | 2 +- src/widgets/volumeslider.h | 2 +- tests/src/test_utils.h | 2 +- tests/src/testobjectdecorators.h | 2 +- 209 files changed, 277 insertions(+), 277 deletions(-) diff --git a/ext/libstrawberry-common/core/messagehandler.h b/ext/libstrawberry-common/core/messagehandler.h index e0bc3e2b6..92989afa1 100644 --- a/ext/libstrawberry-common/core/messagehandler.h +++ b/ext/libstrawberry-common/core/messagehandler.h @@ -50,7 +50,7 @@ class _MessageHandlerBase : public QObject { // After this is true, messages cannot be sent to the handler any more. bool is_device_closed() const { return is_device_closed_; } - protected slots: + protected Q_SLOTS: void WriteMessage(const QByteArray &data); void DeviceReadyRead(); virtual void DeviceClosed(); diff --git a/ext/libstrawberry-common/core/workerpool.h b/ext/libstrawberry-common/core/workerpool.h index bf9ed3c37..ee60a04a3 100644 --- a/ext/libstrawberry-common/core/workerpool.h +++ b/ext/libstrawberry-common/core/workerpool.h @@ -56,7 +56,7 @@ class _WorkerPoolBase : public QObject { // Emitted when a worker failed to start. This usually happens when the worker wasn't found, or couldn't be executed. void WorkerFailedToStart(); - protected slots: + protected Q_SLOTS: virtual void DoStart() {} virtual void NewConnection() {} virtual void ProcessReadyReadStandardOutput() {} diff --git a/src/analyzer/analyzercontainer.h b/src/analyzer/analyzercontainer.h index 2586f0c9a..94ddaa70c 100644 --- a/src/analyzer/analyzercontainer.h +++ b/src/analyzer/analyzercontainer.h @@ -57,7 +57,7 @@ class AnalyzerContainer : public QWidget { void mouseReleaseEvent(QMouseEvent *e) override; void wheelEvent(QWheelEvent *e) override; - private slots: + private Q_SLOTS: void ChangeAnalyzer(const int id); void ChangeFramerate(int new_framerate); void DisableAnalyzer(); diff --git a/src/analyzer/boomanalyzer.h b/src/analyzer/boomanalyzer.h index 240a4b4d7..ac5105c86 100644 --- a/src/analyzer/boomanalyzer.h +++ b/src/analyzer/boomanalyzer.h @@ -47,7 +47,7 @@ class BoomAnalyzer : public AnalyzerBase { void transform(Scope &s) override; void analyze(QPainter &p, const Scope &scope, const bool new_frame) override; - public slots: + public Q_SLOTS: void changeK_barHeight(int); void changeF_peakSpeed(int); diff --git a/src/collection/collection.h b/src/collection/collection.h index 8e0206f66..52e975c61 100644 --- a/src/collection/collection.h +++ b/src/collection/collection.h @@ -64,7 +64,7 @@ class SCollection : public QObject { private: void SyncPlaycountAndRatingToFiles(); - public slots: + public Q_SLOTS: void ReloadSettings(); void PauseWatcher(); @@ -76,7 +76,7 @@ class SCollection : public QObject { void IncrementalScan(); - private slots: + private Q_SLOTS: void ExitReceived(); void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false); void SongsRatingChanged(const SongList &songs, const bool save_tags = false); diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h index c36610d1f..eeaa159ac 100644 --- a/src/collection/collectionbackend.h +++ b/src/collection/collectionbackend.h @@ -236,7 +236,7 @@ class CollectionBackend : public CollectionBackendInterface { void UpdateSongRatingAsync(const int id, const float rating, const bool save_tags = false); void UpdateSongsRatingAsync(const QList &ids, const float rating, const bool save_tags = false); - public slots: + public Q_SLOTS: void Exit(); void GetAllSongs(const int id); void LoadDirectories(); diff --git a/src/collection/collectiondirectorymodel.h b/src/collection/collectiondirectorymodel.h index c70c89a5c..dae601fc1 100644 --- a/src/collection/collectiondirectorymodel.h +++ b/src/collection/collectiondirectorymodel.h @@ -54,7 +54,7 @@ class CollectionDirectoryModel : public QStandardItemModel { QMap directories() const { return directories_; } QStringList paths() const { return paths_; } - private slots: + private Q_SLOTS: void AddDirectory(const CollectionDirectory &directory); void RemoveDirectory(const CollectionDirectory &directory); diff --git a/src/collection/collectionfilterwidget.h b/src/collection/collectionfilterwidget.h index f7f980979..173b57640 100644 --- a/src/collection/collectionfilterwidget.h +++ b/src/collection/collectionfilterwidget.h @@ -86,7 +86,7 @@ class CollectionFilterWidget : public QWidget { bool SearchFieldHasFocus() const; void FocusSearchField(); - public slots: + public Q_SLOTS: void UpdateGroupByActions(); void SetFilterMode(CollectionFilterOptions::FilterMode filter_mode); void FocusOnFilter(QKeyEvent *e); @@ -99,7 +99,7 @@ class CollectionFilterWidget : public QWidget { protected: void keyReleaseEvent(QKeyEvent *e) override; - private slots: + private Q_SLOTS: void GroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping); void GroupByClicked(QAction *action); void SaveGroupBy(); diff --git a/src/collection/collectionitemdelegate.h b/src/collection/collectionitemdelegate.h index a38009612..ac3ee2c68 100644 --- a/src/collection/collectionitemdelegate.h +++ b/src/collection/collectionitemdelegate.h @@ -40,7 +40,7 @@ class CollectionItemDelegate : public QStyledItemDelegate { explicit CollectionItemDelegate(QObject *parent); void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const override; - public slots: + public Q_SLOTS: bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &idx) override; }; diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h index 10afac9df..a6c6edd0f 100644 --- a/src/collection/collectionmodel.h +++ b/src/collection/collectionmodel.h @@ -209,7 +209,7 @@ class CollectionModel : public SimpleTreeModel { void SongsAdded(const SongList &songs); void SongsRemoved(const SongList &songs); - public slots: + public Q_SLOTS: void SetFilterMode(const CollectionFilterOptions::FilterMode filter_mode); void SetFilterMaxAge(const int filter_max_age); @@ -253,7 +253,7 @@ class CollectionModel : public SimpleTreeModel { void ClearItemPixmapCache(CollectionItem *item); static qint64 MaximumCacheSize(Settings *s, const char *size_id, const char *size_unit_id, const qint64 cache_size_default); - private slots: + private Q_SLOTS: void Reload(); void ScheduleReset(); void ProcessUpdate(); diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h index 61d787841..3aaf1ad33 100644 --- a/src/collection/collectionview.h +++ b/src/collection/collectionview.h @@ -69,7 +69,7 @@ class CollectionView : public AutoExpandingTreeView { int TotalArtists() const; int TotalAlbums() const; - public slots: + public Q_SLOTS: void TotalSongCountUpdated(const int count); void TotalArtistCountUpdated(const int count); void TotalAlbumCountUpdated(const int count); @@ -97,7 +97,7 @@ class CollectionView : public AutoExpandingTreeView { void mouseReleaseEvent(QMouseEvent *e) override; void contextMenuEvent(QContextMenuEvent *e) override; - private slots: + private Q_SLOTS: void Load(); void AddToPlaylist(); void AddToPlaylistEnqueue(); diff --git a/src/collection/collectionwatcher.h b/src/collection/collectionwatcher.h index d10bd7831..d276456f1 100644 --- a/src/collection/collectionwatcher.h +++ b/src/collection/collectionwatcher.h @@ -85,7 +85,7 @@ class CollectionWatcher : public QObject { void ScanStarted(const int task_id); - public slots: + public Q_SLOTS: void AddDirectory(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdirs); void RemoveDirectory(const CollectionDirectory &dir); void SetRescanPaused(bool pause); @@ -166,7 +166,7 @@ class CollectionWatcher : public QObject { bool known_subdirs_dirty_; }; - private slots: + private Q_SLOTS: void ReloadSettings(); void Exit(); void DirectoryChanged(const QString &subdir); diff --git a/src/collection/groupbydialog.h b/src/collection/groupbydialog.h index 3c2313d3d..1f5987885 100644 --- a/src/collection/groupbydialog.h +++ b/src/collection/groupbydialog.h @@ -43,14 +43,14 @@ class GroupByDialog : public QDialog { explicit GroupByDialog(QWidget *parent = nullptr); ~GroupByDialog() override; - public slots: + public Q_SLOTS: void CollectionGroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping); void accept() override; Q_SIGNALS: void Accepted(const CollectionModel::Grouping g, const bool separate_albums_by_grouping); - private slots: + private Q_SLOTS: void Reset(); private: diff --git a/src/collection/savedgroupingmanager.h b/src/collection/savedgroupingmanager.h index e93e7473b..ac6ac7351 100644 --- a/src/collection/savedgroupingmanager.h +++ b/src/collection/savedgroupingmanager.h @@ -54,7 +54,7 @@ class SavedGroupingManager : public QDialog { Q_SIGNALS: void UpdateGroupByActions(); - private slots: + private Q_SLOTS: void UpdateButtonState(); void Remove(); diff --git a/src/context/contextalbum.h b/src/context/contextalbum.h index 64a45f7d6..1b4e67ac3 100644 --- a/src/context/contextalbum.h +++ b/src/context/contextalbum.h @@ -81,7 +81,7 @@ class ContextAlbum : public QWidget { Q_SIGNALS: void FadeStopFinished(); - private slots: + private Q_SLOTS: void Update() { update(); } void AutomaticCoverSearchDone(); void FadeCurrentCover(const qreal value); @@ -89,7 +89,7 @@ class ContextAlbum : public QWidget { void FadePreviousCover(SharedPtr previous_cover); void FadePreviousCoverFinished(SharedPtr previous_cover); - public slots: + public Q_SLOTS: void SearchCoverInProgress(); private: diff --git a/src/context/contextview.h b/src/context/contextview.h index 7c977c23e..ff5a0f379 100644 --- a/src/context/contextview.h +++ b/src/context/contextview.h @@ -83,7 +83,7 @@ class ContextView : public QWidget { Q_SIGNALS: void AlbumEnabledChanged(); - private slots: + private Q_SLOTS: void ActionShowAlbum(); void ActionShowData(); void ActionShowLyrics(); @@ -92,7 +92,7 @@ class ContextView : public QWidget { void FadeStopFinished(); void UpdateLyrics(const quint64 id, const QString &provider, const QString &lyrics); - public slots: + public Q_SLOTS: void ReloadSettings(); void Playing(); void Stopped(); diff --git a/src/core/application.h b/src/core/application.h index dbe93ecdc..901adf29a 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -112,10 +112,10 @@ class Application : public QObject { QThread *MoveToNewThread(QObject *object); static void MoveToThread(QObject *object, QThread *thread); - private slots: + private Q_SLOTS: void ExitReceived(); - public slots: + public Q_SLOTS: void AddError(const QString &message); void ReloadSettings(); void OpenSettingsDialogAtPage(SettingsDialog::Page page); diff --git a/src/core/database.h b/src/core/database.h index 3f9fdac16..b4535e576 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -88,10 +88,10 @@ class Database : public QObject { void Error(const QString &error); void Errors(const QStringList &errors); - private slots: + private Q_SLOTS: void Exit(); - public slots: + public Q_SLOTS: void DoBackup(); private: diff --git a/src/core/deletefiles.h b/src/core/deletefiles.h index f6a59dd84..f817ca763 100644 --- a/src/core/deletefiles.h +++ b/src/core/deletefiles.h @@ -47,7 +47,7 @@ class DeleteFiles : public QObject { Q_SIGNALS: void Finished(const SongList &songs_with_errors); - private slots: + private Q_SLOTS: void ProcessSomeFiles(); private: diff --git a/src/core/localredirectserver.h b/src/core/localredirectserver.h index f3ee00c5f..80a841607 100644 --- a/src/core/localredirectserver.h +++ b/src/core/localredirectserver.h @@ -48,7 +48,7 @@ class LocalRedirectServer : public QTcpServer { Q_SIGNALS: void Finished(); - public slots: + public Q_SLOTS: void NewConnection(); void incomingConnection(qintptr socket_descriptor) override; void Encrypted(); diff --git a/src/core/macfslistener.h b/src/core/macfslistener.h index aec3b9add..66a36a7d8 100644 --- a/src/core/macfslistener.h +++ b/src/core/macfslistener.h @@ -47,7 +47,7 @@ class MacFSListener : public FileSystemWatcherInterface { Q_SIGNALS: void PathChanged(const QString &path); - private slots: + private Q_SLOTS: void UpdateStream(); private: diff --git a/src/core/macsystemtrayicon.h b/src/core/macsystemtrayicon.h index c2e95a65f..d956bd14a 100644 --- a/src/core/macsystemtrayicon.h +++ b/src/core/macsystemtrayicon.h @@ -71,7 +71,7 @@ class SystemTrayIcon : public QObject { QPixmap CreateIcon(const QPixmap &icon, const QPixmap &grey_icon); void UpdateIcon(); - private slots: + private Q_SLOTS: void ActionChanged(); Q_SIGNALS: diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h index 4ba035108..5ae6f9dcd 100644 --- a/src/core/mainwindow.h +++ b/src/core/mainwindow.h @@ -139,7 +139,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { void AuthorizationUrlReceived(const QUrl &url); - private slots: + private Q_SLOTS: void FilePathChanged(const QString &path); void EngineChanged(const EngineBase::Type enginetype); @@ -274,7 +274,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { void DeleteFilesFinished(const SongList &songs_with_errors); - public slots: + public Q_SLOTS: void CommandlineOptionsReceived(const QByteArray &string_options); void Raise(); diff --git a/src/core/mergedproxymodel.h b/src/core/mergedproxymodel.h index 1dd27a5a3..8f89a5aed 100644 --- a/src/core/mergedproxymodel.h +++ b/src/core/mergedproxymodel.h @@ -88,7 +88,7 @@ class MergedProxyModel : public QAbstractProxyModel { Q_SIGNALS: void SubModelReset(const QModelIndex root, QAbstractItemModel *model); - private slots: + private Q_SLOTS: void SourceModelReset(); void SubModelAboutToBeReset(); void SubModelResetSlot(); diff --git a/src/core/mpris2.h b/src/core/mpris2.h index 215eb45e6..fd74a7f6c 100644 --- a/src/core/mpris2.h +++ b/src/core/mpris2.h @@ -206,7 +206,7 @@ class Mpris2 : public QObject { // Playlist void PlaylistChanged(const MprisPlaylist &playlist); - private slots: + private Q_SLOTS: void AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &result = AlbumCoverLoaderResult()); void EngineStateChanged(EngineBase::State newState); void VolumeChanged(); diff --git a/src/core/networktimeouts.h b/src/core/networktimeouts.h index 4ebd40ff1..c55d0f5d2 100644 --- a/src/core/networktimeouts.h +++ b/src/core/networktimeouts.h @@ -42,7 +42,7 @@ class NetworkTimeouts : public QObject { protected: void timerEvent(QTimerEvent *e) override; - private slots: + private Q_SLOTS: void ReplyFinished(); private: diff --git a/src/core/player.h b/src/core/player.h index 93fbeb00d..1dfbeb3ea 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -64,7 +64,7 @@ class PlayerInterface : public QObject { virtual void RegisterUrlHandler(UrlHandler *handler) = 0; virtual void UnregisterUrlHandler(UrlHandler *handler) = 0; - public slots: + public Q_SLOTS: virtual void ReloadSettings() = 0; virtual void LoadVolume() = 0; virtual void SaveVolume() = 0; @@ -155,7 +155,7 @@ class Player : public PlayerInterface { void SetAnalyzer(AnalyzerContainer *analyzer) { analyzer_ = analyzer; } void SetEqualizer(SharedPtr equalizer) { equalizer_ = equalizer; } - public slots: + public Q_SLOTS: void ReloadSettings() override; void LoadVolume() override; void SaveVolume() override; @@ -193,7 +193,7 @@ class Player : public PlayerInterface { Q_SIGNALS: void EngineChanged(const EngineBase::Type Type); - private slots: + private Q_SLOTS: void EngineStateChanged(const EngineBase::State); void EngineMetadataReceived(const EngineMetadata &engine_metadata); void TrackAboutToEnd(); diff --git a/src/core/qtsystemtrayicon.h b/src/core/qtsystemtrayicon.h index 37d9d1984..3479a436b 100644 --- a/src/core/qtsystemtrayicon.h +++ b/src/core/qtsystemtrayicon.h @@ -77,7 +77,7 @@ class SystemTrayIcon : public QSystemTrayIcon { void ShowHide(); void PlayPause(); - private slots: + private Q_SLOTS: void Clicked(const QSystemTrayIcon::ActivationReason); private: diff --git a/src/core/songloader.h b/src/core/songloader.h index 65d619c25..fc6cd1a95 100644 --- a/src/core/songloader.h +++ b/src/core/songloader.h @@ -91,7 +91,7 @@ class SongLoader : public QObject { void LoadAudioCDFinished(const bool success); void LoadRemoteFinished(); - private slots: + private Q_SLOTS: void ScheduleTimeout(); void Timeout(); void StopTypefind(); diff --git a/src/core/standarditemiconloader.h b/src/core/standarditemiconloader.h index e9cffa6a9..80bb3a445 100644 --- a/src/core/standarditemiconloader.h +++ b/src/core/standarditemiconloader.h @@ -49,7 +49,7 @@ class StandardItemIconLoader : public QObject { void LoadIcon(const QUrl &art_automatic, const QUrl &art_manual, QStandardItem *for_item); void LoadIcon(const Song &song, QStandardItem *for_item); - private slots: + private Q_SLOTS: void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result); void RowsAboutToBeRemoved(const QModelIndex &parent, int begin, int end); void ModelReset(); diff --git a/src/core/tagreaderclient.h b/src/core/tagreaderclient.h index db8547656..7bd75eabf 100644 --- a/src/core/tagreaderclient.h +++ b/src/core/tagreaderclient.h @@ -116,11 +116,11 @@ class TagReaderClient : public QObject { Q_SIGNALS: void ExitFinished(); - private slots: + private Q_SLOTS: void Exit(); void WorkerFailedToStart(); - public slots: + public Q_SLOTS: void SaveSongsPlaycount(const SongList &songs); void SaveSongsRating(const SongList &songs); diff --git a/src/core/threadsafenetworkdiskcache.h b/src/core/threadsafenetworkdiskcache.h index 299479113..b8175c512 100644 --- a/src/core/threadsafenetworkdiskcache.h +++ b/src/core/threadsafenetworkdiskcache.h @@ -49,7 +49,7 @@ class ThreadSafeNetworkDiskCache : public QAbstractNetworkCache { bool remove(const QUrl &url) override; void updateMetaData(const QNetworkCacheMetaData &metaData) override; - public slots: + public Q_SLOTS: void clear() override; private: diff --git a/src/core/windows7thumbbar.h b/src/core/windows7thumbbar.h index 078709c0d..d75f66621 100644 --- a/src/core/windows7thumbbar.h +++ b/src/core/windows7thumbbar.h @@ -49,7 +49,7 @@ class Windows7ThumbBar : public QObject { ITaskbarList3 *CreateTaskbarList(); void SetupButton(const QAction *action, THUMBBUTTON *button); - private slots: + private Q_SLOTS: void ActionChangedTriggered(); void ActionChanged(); diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h index 79fb0f96e..6936be7f8 100644 --- a/src/covermanager/albumcoverchoicecontroller.h +++ b/src/covermanager/albumcoverchoicecontroller.h @@ -155,10 +155,10 @@ class AlbumCoverChoiceController : public QWidget { static bool CanAcceptDrag(const QDragEnterEvent *e); - public slots: + public Q_SLOTS: void set_save_embedded_cover_override(const bool value) { save_embedded_cover_override_ = value; } - private slots: + private Q_SLOTS: void AlbumCoverFetched(const quint64 id, const AlbumCoverImageResult &result, const CoverSearchStatistics &statistics); void SaveEmbeddedCoverFinished(TagReaderReply *reply, Song song, const bool art_embedded); diff --git a/src/covermanager/albumcoverexport.h b/src/covermanager/albumcoverexport.h index 28712ad56..324fd3fcb 100644 --- a/src/covermanager/albumcoverexport.h +++ b/src/covermanager/albumcoverexport.h @@ -69,7 +69,7 @@ class AlbumCoverExport : public QDialog { DialogResult Exec(); - private slots: + private Q_SLOTS: #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) void ForceSizeToggled(Qt::CheckState state); #else diff --git a/src/covermanager/albumcoverexporter.h b/src/covermanager/albumcoverexporter.h index d7a2287db..c77eb3af3 100644 --- a/src/covermanager/albumcoverexporter.h +++ b/src/covermanager/albumcoverexporter.h @@ -51,7 +51,7 @@ class AlbumCoverExporter : public QObject { Q_SIGNALS: void AlbumCoversExportUpdate(const int exported, const int skipped, const int all); - private slots: + private Q_SLOTS: void CoverExported(); void CoverSkipped(); diff --git a/src/covermanager/albumcoverfetcher.h b/src/covermanager/albumcoverfetcher.h index c3921d175..ece2d46c3 100644 --- a/src/covermanager/albumcoverfetcher.h +++ b/src/covermanager/albumcoverfetcher.h @@ -121,7 +121,7 @@ class AlbumCoverFetcher : public QObject { void AlbumCoverFetched(const quint64 request_id, const AlbumCoverImageResult &result, const CoverSearchStatistics &statistics); void SearchFinished(const quint64 request_id, const CoverProviderSearchResults &results, const CoverSearchStatistics &statistics); - private slots: + private Q_SLOTS: void SingleSearchFinished(const quint64 id, const CoverProviderSearchResults &results); void SingleCoverFetched(const quint64 id, const AlbumCoverImageResult &result); void StartRequests(); diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h index 0c29671e6..99eb54b60 100644 --- a/src/covermanager/albumcoverfetchersearch.h +++ b/src/covermanager/albumcoverfetchersearch.h @@ -72,7 +72,7 @@ class AlbumCoverFetcherSearch : public QObject { // It's the end of search and we've fetched a cover. void AlbumCoverFetched(const quint64 id, const AlbumCoverImageResult &result); - private slots: + private Q_SLOTS: void ProviderSearchResults(const int id, const CoverProviderSearchResults &results); void ProviderSearchFinished(const int id, const CoverProviderSearchResults &results); void ProviderCoverFetchFinished(QNetworkReply *reply); diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h index 723e90d6e..cda6d847c 100644 --- a/src/covermanager/albumcoverloader.h +++ b/src/covermanager/albumcoverloader.h @@ -117,7 +117,7 @@ class AlbumCoverLoader : public QObject { LoadImageResult LoadRemoteUrlImage(TaskPtr task, const AlbumCoverLoaderResult::Type result_type, const QUrl &cover_url); void FinishTask(TaskPtr task, const AlbumCoverLoaderResult::Type result_type); - private slots: + private Q_SLOTS: void Exit(); void ProcessTasks(); void LoadRemoteImageFinished(QNetworkReply *reply, AlbumCoverLoader::TaskPtr task, const AlbumCoverLoaderResult::Type result_type, const QUrl &cover_url); diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h index 67ef5bd14..bbacc4282 100644 --- a/src/covermanager/albumcovermanager.h +++ b/src/covermanager/albumcovermanager.h @@ -153,7 +153,7 @@ class AlbumCoverManager : public QMainWindow { void Error(const QString &error); void AddToPlaylist(QMimeData *data); - private slots: + private Q_SLOTS: void ArtistChanged(QListWidgetItem *current); void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result); void UpdateFilter(); diff --git a/src/covermanager/albumcoversearcher.h b/src/covermanager/albumcoversearcher.h index 30d26b816..c6dec1beb 100644 --- a/src/covermanager/albumcoversearcher.h +++ b/src/covermanager/albumcoversearcher.h @@ -85,7 +85,7 @@ class AlbumCoverSearcher : public QDialog { protected: void keyPressEvent(QKeyEvent*) override; - private slots: + private Q_SLOTS: void Search(); void SearchFinished(const quint64 id, const CoverProviderSearchResults &results); void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result); diff --git a/src/covermanager/coverfromurldialog.h b/src/covermanager/coverfromurldialog.h index ebd80bc45..61678d039 100644 --- a/src/covermanager/coverfromurldialog.h +++ b/src/covermanager/coverfromurldialog.h @@ -47,7 +47,7 @@ class CoverFromURLDialog : public QDialog { // Opens the dialog. This returns an image found at the URL chosen by user or null image if the dialog got rejected. AlbumCoverImageResult Exec(); - private slots: + private Q_SLOTS: void accept() override; void LoadCoverFromURLFinished(); diff --git a/src/covermanager/coverproviders.h b/src/covermanager/coverproviders.h index 56b106910..234d4920a 100644 --- a/src/covermanager/coverproviders.h +++ b/src/covermanager/coverproviders.h @@ -59,7 +59,7 @@ class CoverProviders : public QObject { int NextId(); - private slots: + private Q_SLOTS: void ProviderDestroyed(); private: diff --git a/src/covermanager/currentalbumcoverloader.h b/src/covermanager/currentalbumcoverloader.h index bb8d82f20..a9d5f1cac 100644 --- a/src/covermanager/currentalbumcoverloader.h +++ b/src/covermanager/currentalbumcoverloader.h @@ -49,7 +49,7 @@ class CurrentAlbumCoverLoader : public QObject { void ReloadSettingsAsync(); - public slots: + public Q_SLOTS: void ReloadSettings(); void LoadAlbumCover(const Song &song); @@ -57,7 +57,7 @@ class CurrentAlbumCoverLoader : public QObject { void AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &result); void ThumbnailLoaded(const Song &song, const QUrl &thumbnail_uri, const QImage &image); - private slots: + private Q_SLOTS: void AlbumCoverReady(const quint64 id, AlbumCoverLoaderResult result); private: diff --git a/src/covermanager/deezercoverprovider.h b/src/covermanager/deezercoverprovider.h index d6c53ebe4..b84860896 100644 --- a/src/covermanager/deezercoverprovider.h +++ b/src/covermanager/deezercoverprovider.h @@ -46,7 +46,7 @@ class DeezerCoverProvider : public JsonCoverProvider { bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; void CancelSearch(const int id) override; - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id); private: diff --git a/src/covermanager/discogscoverprovider.h b/src/covermanager/discogscoverprovider.h index 41dbb721c..47f7667cf 100644 --- a/src/covermanager/discogscoverprovider.h +++ b/src/covermanager/discogscoverprovider.h @@ -84,7 +84,7 @@ class DiscogsCoverProvider : public JsonCoverProvider { void EndSearch(SharedPtr search, const quint64 release_id = 0); void Error(const QString &error, const QVariant &debug = QVariant()) override; - private slots: + private Q_SLOTS: void FlushRequests(); void HandleSearchReply(QNetworkReply *reply, const int id); void HandleReleaseReply(QNetworkReply *reply, const int search_id, const quint64 release_id); diff --git a/src/covermanager/lastfmcoverprovider.h b/src/covermanager/lastfmcoverprovider.h index 2a7f1b844..231fdb9ed 100644 --- a/src/covermanager/lastfmcoverprovider.h +++ b/src/covermanager/lastfmcoverprovider.h @@ -45,7 +45,7 @@ class LastFmCoverProvider : public JsonCoverProvider { bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; - private slots: + private Q_SLOTS: void QueryFinished(QNetworkReply *reply, const int id, const QString &type); private: diff --git a/src/covermanager/musicbrainzcoverprovider.h b/src/covermanager/musicbrainzcoverprovider.h index bc2a1ac70..2ceacbf47 100644 --- a/src/covermanager/musicbrainzcoverprovider.h +++ b/src/covermanager/musicbrainzcoverprovider.h @@ -47,7 +47,7 @@ class MusicbrainzCoverProvider : public JsonCoverProvider { bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id) override; - private slots: + private Q_SLOTS: void FlushRequests(); void HandleSearchReply(QNetworkReply *reply, const int search_id); diff --git a/src/covermanager/musixmatchcoverprovider.h b/src/covermanager/musixmatchcoverprovider.h index 140f3ff69..6ded62130 100644 --- a/src/covermanager/musixmatchcoverprovider.h +++ b/src/covermanager/musixmatchcoverprovider.h @@ -48,7 +48,7 @@ class MusixmatchCoverProvider : public JsonCoverProvider, MusixmatchProvider { private: void Error(const QString &error, const QVariant &debug = QVariant()) override; - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id, const QString &artist, const QString &album); private: diff --git a/src/covermanager/opentidalcoverprovider.h b/src/covermanager/opentidalcoverprovider.h index e0f315e3c..b4b377144 100644 --- a/src/covermanager/opentidalcoverprovider.h +++ b/src/covermanager/opentidalcoverprovider.h @@ -70,7 +70,7 @@ class OpenTidalCoverProvider : public JsonCoverProvider { void FinishAllSearches(); void Error(const QString &error, const QVariant &debug = QVariant()) override; - private slots: + private Q_SLOTS: void FlushRequests(); void LoginFinished(QNetworkReply *reply); void HandleLoginSSLErrors(const QList &ssl_errors); diff --git a/src/covermanager/qobuzcoverprovider.h b/src/covermanager/qobuzcoverprovider.h index 7f25e7f3c..6368d2481 100644 --- a/src/covermanager/qobuzcoverprovider.h +++ b/src/covermanager/qobuzcoverprovider.h @@ -51,7 +51,7 @@ class QobuzCoverProvider : public JsonCoverProvider { bool IsAuthenticated() const override { return service_ && service_->authenticated(); } void Deauthenticate() override { if (service_) service_->Logout(); } - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id); private: diff --git a/src/covermanager/spotifycoverprovider.h b/src/covermanager/spotifycoverprovider.h index d797a1e0f..99df10f0b 100644 --- a/src/covermanager/spotifycoverprovider.h +++ b/src/covermanager/spotifycoverprovider.h @@ -57,7 +57,7 @@ class SpotifyCoverProvider : public JsonCoverProvider { if (service_) service_->Deauthenticate(); } - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id, const QString &extract); private: diff --git a/src/covermanager/tidalcoverprovider.h b/src/covermanager/tidalcoverprovider.h index 19a7f7772..351d51eef 100644 --- a/src/covermanager/tidalcoverprovider.h +++ b/src/covermanager/tidalcoverprovider.h @@ -55,7 +55,7 @@ class TidalCoverProvider : public JsonCoverProvider { if (service_) service_->Logout(); } - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id); private: diff --git a/src/device/cddadevice.h b/src/device/cddadevice.h index f2a81d75b..283b1e35d 100644 --- a/src/device/cddadevice.h +++ b/src/device/cddadevice.h @@ -59,7 +59,7 @@ class CddaDevice : public ConnectedDevice { Q_SIGNALS: void SongsDiscovered(const SongList &songs); - private slots: + private Q_SLOTS: void SongsLoaded(const SongList &songs); private: diff --git a/src/device/cddasongloader.h b/src/device/cddasongloader.h index a964d9d80..10d16d159 100644 --- a/src/device/cddasongloader.h +++ b/src/device/cddasongloader.h @@ -65,7 +65,7 @@ class CddaSongLoader : public QObject { void SongsDurationLoaded(const SongList &songs, const QString &error = QString()); void SongsMetadataLoaded(const SongList &songs); - private slots: + private Q_SLOTS: #ifdef HAVE_MUSICBRAINZ void AudioCDTagsLoaded(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results); #endif diff --git a/src/device/connecteddevice.h b/src/device/connecteddevice.h index e146b4863..724ade506 100644 --- a/src/device/connecteddevice.h +++ b/src/device/connecteddevice.h @@ -73,7 +73,7 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public enab void Eject() override; virtual void Close(); - public slots: + public Q_SLOTS: void BackendCloseFinished(); Q_SIGNALS: @@ -100,7 +100,7 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public enab qint64 song_count_; - private slots: + private Q_SLOTS: void BackendTotalSongCountUpdated(int count); }; diff --git a/src/device/devicedatabasebackend.h b/src/device/devicedatabasebackend.h index b8922f15d..0b26c6400 100644 --- a/src/device/devicedatabasebackend.h +++ b/src/device/devicedatabasebackend.h @@ -68,7 +68,7 @@ class DeviceDatabaseBackend : public QObject { void SetDeviceOptions(const int id, const QString &friendly_name, const QString &icon_name, const MusicStorage::TranscodeMode mode, const Song::FileType format); - private slots: + private Q_SLOTS: void Exit(); Q_SIGNALS: diff --git a/src/device/devicelister.h b/src/device/devicelister.h index 39c647442..0bc1f6d31 100644 --- a/src/device/devicelister.h +++ b/src/device/devicelister.h @@ -74,7 +74,7 @@ class DeviceLister : public QObject { virtual bool CopyMusic() { return true; } - public slots: + public Q_SLOTS: virtual void UpdateDeviceFreeSpace(const QString &id) = 0; virtual void ShutDown() {} virtual void MountDevice(const QString &id, const int request_id); @@ -101,7 +101,7 @@ class DeviceLister : public QObject { QThread *original_thread_; int next_mount_request_id_; - private slots: + private Q_SLOTS: void ThreadStarted(); private: diff --git a/src/device/devicemanager.h b/src/device/devicemanager.h index d25a7447f..8fd2a82a3 100644 --- a/src/device/devicemanager.h +++ b/src/device/devicemanager.h @@ -115,7 +115,7 @@ class DeviceManager : public SimpleTreeModel { // QAbstractItemModel QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override; - public slots: + public Q_SLOTS: void Unmount(const QModelIndex &idx); Q_SIGNALS: @@ -124,7 +124,7 @@ class DeviceManager : public SimpleTreeModel { void DeviceDisconnected(const QModelIndex idx); void DeviceCreatedFromDB(DeviceInfo *info); - private slots: + private Q_SLOTS: void PhysicalDeviceAdded(const QString &id); void PhysicalDeviceRemoved(const QString &id); void PhysicalDeviceChanged(const QString &id); diff --git a/src/device/deviceproperties.h b/src/device/deviceproperties.h index a34566c28..74bf5286e 100644 --- a/src/device/deviceproperties.h +++ b/src/device/deviceproperties.h @@ -51,7 +51,7 @@ class DeviceProperties : public QDialog { void SetDeviceManager(SharedPtr manager); void ShowDevice(const QModelIndex &idx); - public slots: + public Q_SLOTS: void accept() override; private: @@ -59,7 +59,7 @@ class DeviceProperties : public QDialog { void AddHardwareInfo(const int row, const QString &key, const QString &value); void UpdateFormats(); - private slots: + private Q_SLOTS: void ModelChanged(); void OpenDevice(); void UpdateFormatsFinished(); diff --git a/src/device/devicestatefiltermodel.h b/src/device/devicestatefiltermodel.h index 044d1291e..10c7aec95 100644 --- a/src/device/devicestatefiltermodel.h +++ b/src/device/devicestatefiltermodel.h @@ -47,7 +47,7 @@ class DeviceStateFilterModel : public QSortFilterProxyModel { protected: bool filterAcceptsRow(int row, const QModelIndex &parent) const override; - private slots: + private Q_SLOTS: void ProxyReset(); void ProxyRowCountChanged(const QModelIndex &idx, const int first, const int last); diff --git a/src/device/deviceview.h b/src/device/deviceview.h index 77d36dbef..d8cbceced 100644 --- a/src/device/deviceview.h +++ b/src/device/deviceview.h @@ -76,7 +76,7 @@ class DeviceView : public AutoExpandingTreeView { void contextMenuEvent(QContextMenuEvent*) override; void mouseDoubleClickEvent(QMouseEvent *e) override; - private slots: + private Q_SLOTS: // Device menu actions void Connect(); void Unmount(); diff --git a/src/device/filesystemdevice.h b/src/device/filesystemdevice.h index 63847cf67..b74baec74 100644 --- a/src/device/filesystemdevice.h +++ b/src/device/filesystemdevice.h @@ -54,7 +54,7 @@ class FilesystemDevice : public ConnectedDevice, public virtual FilesystemMusicS static QStringList url_schemes() { return QStringList() << QStringLiteral("file"); } - private slots: + private Q_SLOTS: void Close() override; void ExitFinished(); diff --git a/src/device/giolister.h b/src/device/giolister.h index 47af888ad..41aff3a77 100644 --- a/src/device/giolister.h +++ b/src/device/giolister.h @@ -67,7 +67,7 @@ class GioLister : public DeviceLister { QString MakeFriendlyName(const QString &id) override; QList MakeDeviceUrls(const QString &id) override; - public slots: + public Q_SLOTS: void MountDevice(const QString &id, const int request_id) override; void UnmountDevice(const QString &id) override; void UpdateDeviceFreeSpace(const QString &id) override; diff --git a/src/device/gpoddevice.h b/src/device/gpoddevice.h index 3352ef4f2..583f64ba6 100644 --- a/src/device/gpoddevice.h +++ b/src/device/gpoddevice.h @@ -71,7 +71,7 @@ class GPodDevice : public ConnectedDevice, public virtual MusicStorage { bool DeleteFromStorage(const DeleteJob &job) override; bool FinishDelete(bool success, QString &error_text) override; - protected slots: + protected Q_SLOTS: void LoadFinished(Itdb_iTunesDB *db, const bool success); void LoaderError(const QString &message); diff --git a/src/device/gpodloader.h b/src/device/gpodloader.h index c9915205e..418c10968 100644 --- a/src/device/gpodloader.h +++ b/src/device/gpodloader.h @@ -49,7 +49,7 @@ class GPodLoader : public QObject { void Abort() { abort_ = true; } - public slots: + public Q_SLOTS: void LoadDatabase(); Q_SIGNALS: diff --git a/src/device/macosdevicelister.h b/src/device/macosdevicelister.h index eca2e68f1..9f54b5530 100644 --- a/src/device/macosdevicelister.h +++ b/src/device/macosdevicelister.h @@ -77,7 +77,7 @@ class MacOsDeviceLister : public DeviceLister { void ExitAsync(); - public slots: + public Q_SLOTS: void UnmountDevice(const QString &id); void ShutDown(); diff --git a/src/device/mtpdevice.h b/src/device/mtpdevice.h index 0aa22ce36..b363d7b56 100644 --- a/src/device/mtpdevice.h +++ b/src/device/mtpdevice.h @@ -70,7 +70,7 @@ class MtpDevice : public ConnectedDevice { bool DeleteFromStorage(const DeleteJob &job) override; bool FinishDelete(const bool success, QString &error_text) override; - private slots: + private Q_SLOTS: void LoadFinished(bool success, MtpConnection *connection); void LoaderError(const QString &message); diff --git a/src/device/mtploader.h b/src/device/mtploader.h index 74662b430..d7ba44de0 100644 --- a/src/device/mtploader.h +++ b/src/device/mtploader.h @@ -46,7 +46,7 @@ class MtpLoader : public QObject { bool Init(); void Abort() { abort_ = true; } - public slots: + public Q_SLOTS: void LoadDatabase(); Q_SIGNALS: diff --git a/src/device/udisks2lister.h b/src/device/udisks2lister.h index 84e0d9d31..f36230c95 100644 --- a/src/device/udisks2lister.h +++ b/src/device/udisks2lister.h @@ -65,14 +65,14 @@ class Udisks2Lister : public DeviceLister { QString MakeFriendlyName(const QString &id) override; QList MakeDeviceUrls(const QString &id) override; - public slots: + public Q_SLOTS: void UnmountDevice(const QString &id) override; void UpdateDeviceFreeSpace(const QString &id) override; protected: bool Init() override; - private slots: + private Q_SLOTS: void DBusInterfaceAdded(const QDBusObjectPath &path, const InterfacesAndProperties &interfaces); void DBusInterfaceRemoved(const QDBusObjectPath &path, const QStringList &interfaces); void JobCompleted(const bool success, const QString &message); diff --git a/src/dialogs/addstreamdialog.h b/src/dialogs/addstreamdialog.h index 38224a439..a7ed9609a 100644 --- a/src/dialogs/addstreamdialog.h +++ b/src/dialogs/addstreamdialog.h @@ -40,7 +40,7 @@ class AddStreamDialog : public QDialog { protected: void showEvent(QShowEvent *e) override; - private slots: + private Q_SLOTS: void TextChanged(const QString &text); private: diff --git a/src/dialogs/console.h b/src/dialogs/console.h index 0ea202941..d2ccfa28e 100644 --- a/src/dialogs/console.h +++ b/src/dialogs/console.h @@ -39,7 +39,7 @@ class Console : public QDialog { public: explicit Console(Application *app, QWidget *parent = nullptr); - private slots: + private Q_SLOTS: void RunQuery(); private: diff --git a/src/dialogs/deleteconfirmationdialog.h b/src/dialogs/deleteconfirmationdialog.h index efc7a3154..c6a1bf7bd 100644 --- a/src/dialogs/deleteconfirmationdialog.h +++ b/src/dialogs/deleteconfirmationdialog.h @@ -32,7 +32,7 @@ class DeleteConfirmationDialog : public QDialog { static QDialogButtonBox::StandardButton warning(const QStringList &files, QWidget *parent = nullptr); - private slots: + private Q_SLOTS: void ButtonClicked(QAbstractButton *button); private: diff --git a/src/dialogs/edittagdialog.h b/src/dialogs/edittagdialog.h index ee098521b..9e78a8e5d 100644 --- a/src/dialogs/edittagdialog.h +++ b/src/dialogs/edittagdialog.h @@ -104,7 +104,7 @@ class EditTagDialog : public QDialog { AlbumCoverImageResult cover_result_; }; - private slots: + private Q_SLOTS: void SetSongsFinished(); void SaveDataFinished(); diff --git a/src/dialogs/errordialog.h b/src/dialogs/errordialog.h index e542df6de..c563c854e 100644 --- a/src/dialogs/errordialog.h +++ b/src/dialogs/errordialog.h @@ -39,7 +39,7 @@ class ErrorDialog : public QDialog { explicit ErrorDialog(QWidget *parent = nullptr); ~ErrorDialog() override; - public slots: + public Q_SLOTS: void ShowMessage(const QString &message); protected: diff --git a/src/dialogs/lastfmimportdialog.h b/src/dialogs/lastfmimportdialog.h index c4539a296..94560e6dc 100644 --- a/src/dialogs/lastfmimportdialog.h +++ b/src/dialogs/lastfmimportdialog.h @@ -47,13 +47,13 @@ class LastFMImportDialog : public QDialog { void ResetFinished(); void Reset(); - private slots: + private Q_SLOTS: void Start(); void Cancel(); void Close(); void UpdateGoButtonState(); - public slots: + public Q_SLOTS: void Finished(); void FinishedWithError(const QString &error); void UpdateTotal(const int lastplayed_total, const int playcount_total); diff --git a/src/dialogs/messagedialog.h b/src/dialogs/messagedialog.h index 44800a3ba..a36e7f608 100644 --- a/src/dialogs/messagedialog.h +++ b/src/dialogs/messagedialog.h @@ -38,7 +38,7 @@ class MessageDialog : public QDialog { void ShowMessage(const QString &title, const QString &message, const QIcon &icon = QIcon()); - private slots: + private Q_SLOTS: void DoNotShowMessageAgain(); protected: diff --git a/src/dialogs/saveplaylistsdialog.h b/src/dialogs/saveplaylistsdialog.h index 7cdcfd182..380257acb 100644 --- a/src/dialogs/saveplaylistsdialog.h +++ b/src/dialogs/saveplaylistsdialog.h @@ -40,7 +40,7 @@ class SavePlaylistsDialog : public QDialog { protected: void accept() override; - private slots: + private Q_SLOTS: void SelectPath(); private: diff --git a/src/dialogs/trackselectiondialog.h b/src/dialogs/trackselectiondialog.h index 341fef849..54f40a7c7 100644 --- a/src/dialogs/trackselectiondialog.h +++ b/src/dialogs/trackselectiondialog.h @@ -46,7 +46,7 @@ class TrackSelectionDialog : public QDialog { void Init(const SongList &songs); - public slots: + public Q_SLOTS: void FetchTagProgress(const Song &original_song, const QString &progress); void FetchTagFinished(const Song &original_song, const SongList &songs_guessed); @@ -57,7 +57,7 @@ class TrackSelectionDialog : public QDialog { void Error(const QString &error); void SongChosen(const Song &original_song, const Song &new_metadata); - private slots: + private Q_SLOTS: void UpdateStack(); void NextSong(); diff --git a/src/engine/enginebase.h b/src/engine/enginebase.h index 4aabe870a..7c5614278 100644 --- a/src/engine/enginebase.h +++ b/src/engine/enginebase.h @@ -136,7 +136,7 @@ class EngineBase : public QObject { bool Play(const QUrl &media_url, const QUrl &stream_url, const bool pause, const TrackChangeFlags flags, const bool force_stop_at_end, const quint64 beginning_nanosec, const qint64 end_nanosec, const quint64 offset_nanosec, const std::optional ebur128_integrated_loudness_lufs); void SetVolume(const uint volume); - public slots: + public Q_SLOTS: virtual void ReloadSettings(); void UpdateVolume(const uint volume); void EmitAboutToFinish(); @@ -156,7 +156,7 @@ class EngineBase : public QObject { QVariant device() { return device_; } - public slots: + public Q_SLOTS: virtual void SetStereoBalancerEnabled(const bool) {} virtual void SetStereoBalance(const float) {} virtual void SetEqualizerEnabled(const bool) {} diff --git a/src/engine/gstengine.h b/src/engine/gstengine.h index 5a86ee81a..3672a768c 100644 --- a/src/engine/gstengine.h +++ b/src/engine/gstengine.h @@ -90,7 +90,7 @@ class GstEngine : public EngineBase, public GstBufferConsumer { void ConsumeBuffer(GstBuffer *buffer, const int pipeline_id, const QString &format) override; - public slots: + public Q_SLOTS: void ReloadSettings() override; // Set whether stereo balancer is enabled @@ -111,7 +111,7 @@ class GstEngine : public EngineBase, public GstBufferConsumer { protected: void timerEvent(QTimerEvent *e) override; - private slots: + private Q_SLOTS: void EndOfStreamReached(const int pipeline_id, const bool has_next_track); void HandlePipelineError(const int pipeline_id, const int domain, const int error_code, const QString &message, const QString &debugstr); void NewMetaData(const int pipeline_id, const EngineMetadata &engine_metadata); diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index 93279cdd1..175ea2c43 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -138,7 +138,7 @@ class GstEnginePipeline : public QObject { bool exclusive_mode() const { return exclusive_mode_; } - public slots: + public Q_SLOTS: void SetFaderVolume(const qreal volume); Q_SIGNALS: @@ -202,7 +202,7 @@ class GstEnginePipeline : public QObject { void ResumeFaderAsync(); - private slots: + private Q_SLOTS: void SetStateAsyncFinished(const GstState state, const GstStateChangeReturn state_change); void FaderTimelineFinished(); diff --git a/src/equalizer/equalizer.h b/src/equalizer/equalizer.h index 6452df27c..984cc0edb 100644 --- a/src/equalizer/equalizer.h +++ b/src/equalizer/equalizer.h @@ -73,7 +73,7 @@ class Equalizer : public QDialog { protected: void closeEvent(QCloseEvent*) override; - private slots: + private Q_SLOTS: void StereoBalancerEnabledChangedSlot(const bool enabled); void StereoBalanceSliderChanged(const int value); void EqualizerEnabledChangedSlot(const bool enabled); diff --git a/src/equalizer/equalizerslider.h b/src/equalizer/equalizerslider.h index 7bfa1439c..4d9f7cf14 100644 --- a/src/equalizer/equalizerslider.h +++ b/src/equalizer/equalizerslider.h @@ -43,7 +43,7 @@ class EqualizerSlider : public QWidget { Q_SIGNALS: void ValueChanged(const int value); - public slots: + public Q_SLOTS: void OnValueChanged(const int value); private: diff --git a/src/globalshortcuts/globalshortcutgrabber.h b/src/globalshortcuts/globalshortcutgrabber.h index 621eb0424..16b6cb240 100644 --- a/src/globalshortcuts/globalshortcutgrabber.h +++ b/src/globalshortcuts/globalshortcutgrabber.h @@ -59,7 +59,7 @@ class GlobalShortcutGrabber : public QDialog { void grabKeyboard(); void releaseKeyboard(); - private slots: + private Q_SLOTS: void Accepted(); void Rejected(); diff --git a/src/globalshortcuts/globalshortcutsbackend-gnome.h b/src/globalshortcuts/globalshortcutsbackend-gnome.h index 1d22d8bea..70944c605 100644 --- a/src/globalshortcuts/globalshortcutsbackend-gnome.h +++ b/src/globalshortcuts/globalshortcutsbackend-gnome.h @@ -46,7 +46,7 @@ class GlobalShortcutsBackendGnome : public GlobalShortcutsBackend { bool DoRegister() override; void DoUnregister() override; - private slots: + private Q_SLOTS: void RegisterFinished(QDBusPendingCallWatcher *watcher); void GnomeMediaKeyPressed(const QString &application, const QString &key); diff --git a/src/globalshortcuts/globalshortcutsbackend-kde.h b/src/globalshortcuts/globalshortcutsbackend-kde.h index defa2604a..afb284220 100644 --- a/src/globalshortcuts/globalshortcutsbackend-kde.h +++ b/src/globalshortcuts/globalshortcutsbackend-kde.h @@ -57,7 +57,7 @@ class GlobalShortcutsBackendKDE : public GlobalShortcutsBackend { static QList ToIntList(const QList &sequence_list); static QList ToKeySequenceList(const QList &sequence_list); - private slots: + private Q_SLOTS: void RegisterFinished(QDBusPendingCallWatcher *watcher); void GlobalShortcutPressed(const QString &component_unique, const QString &shortcut_unique, qint64); diff --git a/src/globalshortcuts/globalshortcutsbackend-mate.h b/src/globalshortcuts/globalshortcutsbackend-mate.h index 434778c7d..fe70bba0c 100644 --- a/src/globalshortcuts/globalshortcutsbackend-mate.h +++ b/src/globalshortcuts/globalshortcutsbackend-mate.h @@ -44,7 +44,7 @@ class GlobalShortcutsBackendMate : public GlobalShortcutsBackend { bool DoRegister() override; void DoUnregister() override; - private slots: + private Q_SLOTS: void RegisterFinished(QDBusPendingCallWatcher *watcher); void MateMediaKeyPressed(const QString &application, const QString &key); diff --git a/src/globalshortcuts/globalshortcutsmanager.h b/src/globalshortcuts/globalshortcutsmanager.h index 0c5f1c451..71279003b 100644 --- a/src/globalshortcuts/globalshortcutsmanager.h +++ b/src/globalshortcuts/globalshortcutsmanager.h @@ -73,7 +73,7 @@ class GlobalShortcutsManager : public QWidget { bool Register(); void Unregister(); - public slots: + public Q_SLOTS: void ReloadSettings(); void ShowMacAccessibilityDialog(); diff --git a/src/lyrics/chartlyricsprovider.h b/src/lyrics/chartlyricsprovider.h index 111f1299f..934416695 100644 --- a/src/lyrics/chartlyricsprovider.h +++ b/src/lyrics/chartlyricsprovider.h @@ -47,7 +47,7 @@ class ChartLyricsProvider : public LyricsProvider { private: void Error(const QString &error, const QVariant &debug = QVariant()) override; - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request); private: diff --git a/src/lyrics/geniuslyricsprovider.h b/src/lyrics/geniuslyricsprovider.h index 040c74f6a..4075fcaf8 100644 --- a/src/lyrics/geniuslyricsprovider.h +++ b/src/lyrics/geniuslyricsprovider.h @@ -79,7 +79,7 @@ class GeniusLyricsProvider : public JsonLyricsProvider { void Error(const QString &error, const QVariant &debug = QVariant()) override; void EndSearch(GeniusLyricsSearchContextPtr search, const GeniusLyricsLyricContext &lyric = GeniusLyricsLyricContext()); - private slots: + private Q_SLOTS: void HandleLoginSSLErrors(const QList &ssl_errors); void RedirectArrived(); void AccessTokenRequestFinished(QNetworkReply *reply); diff --git a/src/lyrics/htmllyricsprovider.h b/src/lyrics/htmllyricsprovider.h index 6d259f7c2..be8a1abb6 100644 --- a/src/lyrics/htmllyricsprovider.h +++ b/src/lyrics/htmllyricsprovider.h @@ -52,7 +52,7 @@ class HtmlLyricsProvider : public LyricsProvider { virtual QUrl Url(const LyricsSearchRequest &request) = 0; void Error(const QString &error, const QVariant &debug = QVariant()) override; - protected slots: + protected Q_SLOTS: virtual void HandleLyricsReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request); protected: diff --git a/src/lyrics/lololyricsprovider.h b/src/lyrics/lololyricsprovider.h index 0aded88de..a0d7b2e8f 100644 --- a/src/lyrics/lololyricsprovider.h +++ b/src/lyrics/lololyricsprovider.h @@ -48,7 +48,7 @@ class LoloLyricsProvider : public LyricsProvider { private: void Error(const QString &error, const QVariant &debug = QVariant()) override; - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request); private: diff --git a/src/lyrics/lyricsfetcher.h b/src/lyrics/lyricsfetcher.h index e553a53b9..95ed45298 100644 --- a/src/lyrics/lyricsfetcher.h +++ b/src/lyrics/lyricsfetcher.h @@ -63,7 +63,7 @@ class LyricsFetcher : public QObject { void LyricsFetched(const quint64 request_id, const QString &provider, const QString &lyrics); void SearchFinished(const quint64 request_id, const LyricsSearchResults &results); - private slots: + private Q_SLOTS: void SingleSearchFinished(const quint64 request_id, const LyricsSearchResults &results); void SingleLyricsFetched(const quint64 request_id, const QString &provider, const QString &lyrics); void StartRequests(); diff --git a/src/lyrics/lyricsfetchersearch.h b/src/lyrics/lyricsfetchersearch.h index f11731eaf..221f200a0 100644 --- a/src/lyrics/lyricsfetchersearch.h +++ b/src/lyrics/lyricsfetchersearch.h @@ -47,7 +47,7 @@ class LyricsFetcherSearch : public QObject { void SearchFinished(const quint64 id, const LyricsSearchResults &results); void LyricsFetched(const quint64 id, const QString &provider, const QString &lyrics); - private slots: + private Q_SLOTS: void ProviderSearchFinished(const int id, const LyricsSearchResults &results); void TerminateSearch(); diff --git a/src/lyrics/lyricsproviders.h b/src/lyrics/lyricsproviders.h index 6ab2adb5d..2a09d21dc 100644 --- a/src/lyrics/lyricsproviders.h +++ b/src/lyrics/lyricsproviders.h @@ -48,7 +48,7 @@ class LyricsProviders : public QObject { bool HasAnyProviders() const { return !lyrics_providers_.isEmpty(); } int NextId(); - private slots: + private Q_SLOTS: void ProviderDestroyed(); private: diff --git a/src/lyrics/musixmatchlyricsprovider.h b/src/lyrics/musixmatchlyricsprovider.h index 1f078ccb7..a7f1b1e03 100644 --- a/src/lyrics/musixmatchlyricsprovider.h +++ b/src/lyrics/musixmatchlyricsprovider.h @@ -66,7 +66,7 @@ class MusixmatchLyricsProvider : public JsonLyricsProvider, public MusixmatchPro void EndSearch(LyricsSearchContextPtr search, const QUrl &url = QUrl()); void Error(const QString &error, const QVariant &debug = QVariant()) override; - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, LyricsSearchContextPtr search); void HandleLyricsReply(QNetworkReply *reply, LyricsSearchContextPtr search, const QUrl &url); diff --git a/src/lyrics/ovhlyricsprovider.h b/src/lyrics/ovhlyricsprovider.h index 28a97adb6..3bbce06c8 100644 --- a/src/lyrics/ovhlyricsprovider.h +++ b/src/lyrics/ovhlyricsprovider.h @@ -48,7 +48,7 @@ class OVHLyricsProvider : public JsonLyricsProvider { private: void Error(const QString &error, const QVariant &debug = QVariant()) override; - private slots: + private Q_SLOTS: void HandleSearchReply(QNetworkReply *reply, const int id, const LyricsSearchRequest &request); private: diff --git a/src/moodbar/moodbarcontroller.h b/src/moodbar/moodbarcontroller.h index cefeba4da..9f9e08f2d 100644 --- a/src/moodbar/moodbarcontroller.h +++ b/src/moodbar/moodbarcontroller.h @@ -38,7 +38,7 @@ class MoodbarController : public QObject { Q_SIGNALS: void CurrentMoodbarDataChanged(const QByteArray &data); - private slots: + private Q_SLOTS: void CurrentSongChanged(const Song &song); void PlaybackStopped(); void AsyncLoadComplete(MoodbarPipeline *pipeline, const QUrl &url); diff --git a/src/moodbar/moodbaritemdelegate.h b/src/moodbar/moodbaritemdelegate.h index 5900c3fcf..7e75df64f 100644 --- a/src/moodbar/moodbaritemdelegate.h +++ b/src/moodbar/moodbaritemdelegate.h @@ -47,7 +47,7 @@ class MoodbarItemDelegate : public QItemDelegate { void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &idx) const override; - private slots: + private Q_SLOTS: void ReloadSettings(); void DataLoaded(const QUrl &url, MoodbarPipeline *pipeline); diff --git a/src/moodbar/moodbarloader.h b/src/moodbar/moodbarloader.h index dd6fc0313..243cad306 100644 --- a/src/moodbar/moodbarloader.h +++ b/src/moodbar/moodbarloader.h @@ -54,7 +54,7 @@ class MoodbarLoader : public QObject { Result Load(const QUrl &url, const bool has_cue, QByteArray *data, MoodbarPipeline **async_pipeline); - private slots: + private Q_SLOTS: void ReloadSettings(); void RequestFinished(MoodbarPipeline *request, const QUrl &url); diff --git a/src/moodbar/moodbarpipeline.h b/src/moodbar/moodbarpipeline.h index 8ee4fbc7b..d04c43d89 100644 --- a/src/moodbar/moodbarpipeline.h +++ b/src/moodbar/moodbarpipeline.h @@ -43,7 +43,7 @@ class MoodbarPipeline : public QObject { bool success() const { return success_; } const QByteArray &data() const { return data_; } - public slots: + public Q_SLOTS: void Start(); Q_SIGNALS: diff --git a/src/moodbar/moodbarproxystyle.h b/src/moodbar/moodbarproxystyle.h index 42d1157eb..f623526bd 100644 --- a/src/moodbar/moodbarproxystyle.h +++ b/src/moodbar/moodbarproxystyle.h @@ -57,7 +57,7 @@ class MoodbarProxyStyle : public QProxyStyle { // QObject bool eventFilter(QObject *object, QEvent *event) override; - public slots: + public Q_SLOTS: // An empty byte array means there's no moodbar, so just show a normal slider. void SetMoodbarData(const QByteArray &data); @@ -82,7 +82,7 @@ class MoodbarProxyStyle : public QProxyStyle { static QPixmap MoodbarPixmap(const ColorVector &colors, const QSize size, const QPalette &palette, const QStyleOptionSlider *opt); - private slots: + private Q_SLOTS: void ReloadSettings(); void FaderValueChanged(qreal value); void ChangeStyle(QAction *action); diff --git a/src/musicbrainz/acoustidclient.h b/src/musicbrainz/acoustidclient.h index 9d056200e..48e4e1b8a 100644 --- a/src/musicbrainz/acoustidclient.h +++ b/src/musicbrainz/acoustidclient.h @@ -63,7 +63,7 @@ class AcoustidClient : public QObject { Q_SIGNALS: void Finished(const int id, const QStringList &mbid_list, const QString &error = QString()); - private slots: + private Q_SLOTS: void RequestFinished(QNetworkReply *reply, const int id); private: diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h index 81e228a45..6ddbc52a5 100644 --- a/src/musicbrainz/musicbrainzclient.h +++ b/src/musicbrainz/musicbrainzclient.h @@ -107,7 +107,7 @@ class MusicBrainzClient : public QObject { // Finished signal emitted when fechting album's songs tags using DiscId void DiscIdFinished(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &result, const QString &error = QString()); - private slots: + private Q_SLOTS: void FlushRequests(); // id identifies the track, and request_number means it's the 'request_number'th request for this track void RequestFinished(QNetworkReply *reply, const int id, const int request_number); diff --git a/src/musicbrainz/tagfetcher.h b/src/musicbrainz/tagfetcher.h index bb7fc2cc2..cd17f1799 100644 --- a/src/musicbrainz/tagfetcher.h +++ b/src/musicbrainz/tagfetcher.h @@ -46,14 +46,14 @@ class TagFetcher : public QObject { void StartFetch(const SongList &songs); - public slots: + public Q_SLOTS: void Cancel(); Q_SIGNALS: void Progress(const Song &original_song, const QString &stage); void ResultAvailable(const Song &original_song, const SongList &songs_guessed, const QString &error = QString()); - private slots: + private Q_SLOTS: void FingerprintFound(const int index); void PuidsFound(const int index, const QStringList &puid_list, const QString &error = QString()); void TagsFetched(const int index, const MusicBrainzClient::ResultList &results, const QString &error = QString()); diff --git a/src/organize/organize.h b/src/organize/organize.h index 2deb9f34e..ab8f70584 100644 --- a/src/organize/organize.h +++ b/src/organize/organize.h @@ -76,7 +76,7 @@ class Organize : public QObject { protected: void timerEvent(QTimerEvent *e) override; - private slots: + private Q_SLOTS: void ProcessSomeFiles(); void FileTranscoded(const QString &input, const QString &output, bool success); void LogLine(const QString &message); diff --git a/src/organize/organizedialog.h b/src/organize/organizedialog.h index e4ca53780..2e13490dd 100644 --- a/src/organize/organizedialog.h +++ b/src/organize/organizedialog.h @@ -89,11 +89,11 @@ class OrganizeDialog : public QDialog { Q_SIGNALS: void FileCopied(const int); - public slots: + public Q_SLOTS: void accept() override; void reject() override; - private slots: + private Q_SLOTS: void SaveSettings(); void RestoreDefaults(); diff --git a/src/osd/osdbase.h b/src/osd/osdbase.h index 31d67c8a8..9d8c2f7bf 100644 --- a/src/osd/osdbase.h +++ b/src/osd/osdbase.h @@ -64,7 +64,7 @@ class OSDBase : public QObject { QString app_name() { return app_name_; } - public slots: + public Q_SLOTS: void ReloadSettings(); void SongChanged(const Song &song); @@ -91,7 +91,7 @@ class OSDBase : public QObject { QString ReplaceMessage(const MessageType type, const QString &message, const Song &song); virtual void ShowMessageNative(const QString &summary, const QString &message, const QString &icon = QString(), const QImage &image = QImage()); - private slots: + private Q_SLOTS: void AlbumCoverLoaded(const Song &song, const QUrl &cover_url, const QImage &image); private: diff --git a/src/osd/osddbus.h b/src/osd/osddbus.h index 30dc3ffdf..138bd5520 100644 --- a/src/osd/osddbus.h +++ b/src/osd/osddbus.h @@ -58,7 +58,7 @@ class OSDDBus : public OSDBase { void Init(); void ShowMessageNative(const QString &summary, const QString &message, const QString &icon = QString(), const QImage &image = QImage()) override; - private slots: + private Q_SLOTS: void CallFinished(QDBusPendingCallWatcher *watcher); private: diff --git a/src/osd/osdpretty.h b/src/osd/osdpretty.h index 55626542f..78212e14b 100644 --- a/src/osd/osdpretty.h +++ b/src/osd/osdpretty.h @@ -109,7 +109,7 @@ class OSDPretty : public QWidget { Q_SIGNALS: void PositionChanged(); - public slots: + public Q_SLOTS: void ReloadSettings(); protected: @@ -131,7 +131,7 @@ class OSDPretty : public QWidget { QRect BoxBorder() const; - private slots: + private Q_SLOTS: void FaderValueChanged(const qreal value); void FaderFinished(); void ScreenAdded(QScreen *screen); diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index d324c9c9e..e05abc647 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -275,7 +275,7 @@ class Playlist : public QAbstractListModel { void ItemReload(const QPersistentModelIndex &idx, const Song &old_metadata, const bool metadata_edit); - public slots: + public Q_SLOTS: void set_current_row(const int i, const Playlist::AutoScroll autoscroll = Playlist::AutoScroll::Maybe, const bool is_stopping = false, const bool force_inform = false); void Paused(); void Playing(); @@ -347,7 +347,7 @@ class Playlist : public QAbstractListModel { void TurnOnDynamicPlaylist(PlaylistGeneratorPtr gen); void InsertDynamicItems(const int count); - private slots: + private Q_SLOTS: void TracksAboutToBeDequeued(const QModelIndex&, const int begin, const int end); void TracksDequeued(); void TracksEnqueued(const QModelIndex&, const int begin, const int end); diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h index db31857a9..b9a356403 100644 --- a/src/playlist/playlistbackend.h +++ b/src/playlist/playlistbackend.h @@ -86,7 +86,7 @@ class PlaylistBackend : public QObject { Application *app() const { return app_; } - public slots: + public Q_SLOTS: void Exit(); void SavePlaylist(const int playlist, const PlaylistItemPtrList &items, const int last_played, PlaylistGeneratorPtr dynamic); diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h index 2d8f36e6f..b875ea095 100644 --- a/src/playlist/playlistcontainer.h +++ b/src/playlist/playlistcontainer.h @@ -73,7 +73,7 @@ class PlaylistContainer : public QWidget { // QWidget void resizeEvent(QResizeEvent*) override; - private slots: + private Q_SLOTS: void NewPlaylist(); void LoadPlaylist(); void SaveCurrentPlaylist() { SavePlaylist(-1); } @@ -101,7 +101,7 @@ class PlaylistContainer : public QWidget { void UpdateNoMatchesLabel(); - public slots: + public Q_SLOTS: void ActivePlaying(); void ActivePaused(); void ActiveStopped(); diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h index e60eb855a..d067f8dd1 100644 --- a/src/playlist/playlistdelegates.h +++ b/src/playlist/playlistdelegates.h @@ -83,7 +83,7 @@ class PlaylistDelegateBase : public QueuedItemDelegate { static const int kMinHeight; - public slots: + public Q_SLOTS: bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &idx) override; protected: @@ -156,7 +156,7 @@ class TagCompleter : public QCompleter { explicit TagCompleter(SharedPtr backend, const Playlist::Column column, QLineEdit *editor); ~TagCompleter() override; - private slots: + private Q_SLOTS: void ModelReady(); private: diff --git a/src/playlist/playlistheader.h b/src/playlist/playlistheader.h index d25451f45..08247989d 100644 --- a/src/playlist/playlistheader.h +++ b/src/playlist/playlistheader.h @@ -57,7 +57,7 @@ class PlaylistHeader : public StretchHeaderView { void MouseEntered(); void SectionRatingLockStatusChanged(const bool); - private slots: + private Q_SLOTS: void HideCurrent(); void ToggleVisible(const int section); void ResetColumns(); diff --git a/src/playlist/playlistlistcontainer.h b/src/playlist/playlistlistcontainer.h index 062c0d319..cc79e5d2a 100644 --- a/src/playlist/playlistlistcontainer.h +++ b/src/playlist/playlistlistcontainer.h @@ -59,7 +59,7 @@ class PlaylistListContainer : public QWidget { void showEvent(QShowEvent *e) override; void contextMenuEvent(QContextMenuEvent *e) override; - private slots: + private Q_SLOTS: // From the UI void NewFolderClicked(); void ItemDoubleClicked(const QModelIndex &proxy_idx); diff --git a/src/playlist/playlistlistmodel.h b/src/playlist/playlistlistmodel.h index 9852bee9c..622f36a0b 100644 --- a/src/playlist/playlistlistmodel.h +++ b/src/playlist/playlistlistmodel.h @@ -84,7 +84,7 @@ class PlaylistListModel : public QStandardItemModel { void PlaylistPathChanged(const int id, const QString &new_path); void PlaylistRenamed(const int id, const QString &new_name); - private slots: + private Q_SLOTS: void RowsChanged(const QModelIndex &begin, const QModelIndex &end); void RowsAboutToBeRemoved(const QModelIndex &parent, const int start, const int end); void RowsInserted(const QModelIndex &parent, const int start, const int end); diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h index 51ad709ac..0f35aabe8 100644 --- a/src/playlist/playlistmanager.h +++ b/src/playlist/playlistmanager.h @@ -82,7 +82,7 @@ class PlaylistManagerInterface : public QObject { virtual void PlaySmartPlaylist(PlaylistGeneratorPtr generator, const bool as_new, const bool clear) = 0; - public slots: + public Q_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(const int id, const QString &filename, const PlaylistSettingsPage::PathType path_type) = 0; @@ -180,7 +180,7 @@ class PlaylistManager : public PlaylistManagerInterface { PlaylistParser *parser() const override { return parser_; } PlaylistContainer *playlist_container() const override { return playlist_container_; } - public slots: + public Q_SLOTS: void New(const QString &name, const SongList &songs = SongList(), const QString &special_type = QString()) override; void Load(const QString &filename) override; void Save(const int id, const QString &filename, const PlaylistSettingsPage::PathType path_type) override; @@ -226,7 +226,7 @@ class PlaylistManager : public PlaylistManagerInterface { void SaveAllPlaylists(); - private slots: + private Q_SLOTS: void SetActivePlaying() override; void SetActivePaused() override; void SetActiveStopped() override; diff --git a/src/playlist/playlistsequence.h b/src/playlist/playlistsequence.h index d1d478a8c..f0f9c0506 100644 --- a/src/playlist/playlistsequence.h +++ b/src/playlist/playlistsequence.h @@ -66,7 +66,7 @@ class PlaylistSequence : public QWidget { QMenu *repeat_menu() const { return repeat_menu_; } QMenu *shuffle_menu() const { return shuffle_menu_; } - public slots: + public Q_SLOTS: void SetRepeatMode(const PlaylistSequence::RepeatMode mode); void SetShuffleMode(const PlaylistSequence::ShuffleMode mode); void CycleShuffleMode(); @@ -76,7 +76,7 @@ class PlaylistSequence : public QWidget { void RepeatModeChanged(const PlaylistSequence::RepeatMode mode); void ShuffleModeChanged(const PlaylistSequence::ShuffleMode mode); - private slots: + private Q_SLOTS: void RepeatActionTriggered(QAction *action); void ShuffleActionTriggered(QAction *action); diff --git a/src/playlist/playlisttabbar.h b/src/playlist/playlisttabbar.h index 65cca403f..aaebe3605 100644 --- a/src/playlist/playlisttabbar.h +++ b/src/playlist/playlisttabbar.h @@ -89,7 +89,7 @@ class PlaylistTabBar : public QTabBar { void timerEvent(QTimerEvent *e) override; bool event(QEvent *e) override; - private slots: + private Q_SLOTS: void CurrentIndexChanged(const int index); void RenameSlot(); void RenameInline(); diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index 9ca0954c9..0f3d4a1d3 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -98,7 +98,7 @@ class PlaylistView : public QTreeView { // QTreeView void setModel(QAbstractItemModel *model) override; - public slots: + public Q_SLOTS: void ReloadSettings(); void SaveSettings(); void SetColumnAlignment(const int section, const Qt::Alignment alignment); @@ -144,7 +144,7 @@ class PlaylistView : public QTreeView { void rowsInserted(const QModelIndex &parent, const int start, const int end) override; void closeEditor(QWidget *editor, const QAbstractItemDelegate::EndEditHint hint) override; - private slots: + private Q_SLOTS: void Update() { update(); } void SetHeaderState(); void InhibitAutoscrollTimeout(); diff --git a/src/playlist/songloaderinserter.h b/src/playlist/songloaderinserter.h index 11ec74a34..531180f6d 100644 --- a/src/playlist/songloaderinserter.h +++ b/src/playlist/songloaderinserter.h @@ -53,7 +53,7 @@ class SongLoaderInserter : public QObject { void PreloadFinished(); void EffectiveLoadFinished(const SongList &songs); - private slots: + private Q_SLOTS: void DestinationDestroyed(); void AudioCDTracksLoadFinished(SongLoader *loader); void AudioCDTagsLoaded(const bool success); diff --git a/src/qobuz/qobuzbaserequest.h b/src/qobuz/qobuzbaserequest.h index ab09f40cb..f633753d0 100644 --- a/src/qobuz/qobuzbaserequest.h +++ b/src/qobuz/qobuzbaserequest.h @@ -91,7 +91,7 @@ class QobuzBaseRequest : public QObject { int max_login_attempts() const { return service_->max_login_attempts(); } int login_attempts() const { return service_->login_attempts(); } - private slots: + private Q_SLOTS: void HandleSSLErrors(const QList &ssl_errors); private: diff --git a/src/qobuz/qobuzfavoriterequest.h b/src/qobuz/qobuzfavoriterequest.h index c86a93d63..5835dcf4e 100644 --- a/src/qobuz/qobuzfavoriterequest.h +++ b/src/qobuz/qobuzfavoriterequest.h @@ -57,11 +57,11 @@ class QobuzFavoriteRequest : public QobuzBaseRequest { void AlbumsRemoved(const SongList &songs); void SongsRemoved(const SongList &songs); - private slots: + private Q_SLOTS: void AddFavoritesReply(QNetworkReply *reply, const QobuzFavoriteRequest::FavoriteType type, const SongList &songs); void RemoveFavoritesReply(QNetworkReply *reply, const QobuzFavoriteRequest::FavoriteType type, const SongList &songs); - public slots: + public Q_SLOTS: void AddArtists(const SongList &songs); void AddAlbums(const SongList &songs); void AddSongs(const SongList &songs); diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h index 0ada2f049..142958515 100644 --- a/src/qobuz/qobuzrequest.h +++ b/src/qobuz/qobuzrequest.h @@ -106,7 +106,7 @@ class QobuzRequest : public QobuzBaseRequest { void UpdateProgress(const int id, const int max); void StreamURLFinished(const QUrl &media_url, const QUrl &url, const Song::FileType filetype, const QString &error = QString()); - private slots: + private Q_SLOTS: void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested); void AlbumsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested); diff --git a/src/qobuz/qobuzservice.h b/src/qobuz/qobuzservice.h index 03ddaa0a0..cc8b6f633 100644 --- a/src/qobuz/qobuzservice.h +++ b/src/qobuz/qobuzservice.h @@ -109,7 +109,7 @@ class QobuzService : public StreamingService { CollectionFilter *albums_collection_filter_model() override { return albums_collection_model_->filter(); } CollectionFilter *songs_collection_filter_model() override { return songs_collection_model_->filter(); } - public slots: + public Q_SLOTS: void ShowConfig() override; void TryLogin(); void SendLogin(); @@ -121,7 +121,7 @@ class QobuzService : public StreamingService { void ResetAlbumsRequest() override; void ResetSongsRequest() override; - private slots: + private Q_SLOTS: void ExitReceived(); void HandleLoginSSLErrors(const QList &ssl_errors); void HandleAuthReply(QNetworkReply *reply); diff --git a/src/qobuz/qobuzstreamurlrequest.h b/src/qobuz/qobuzstreamurlrequest.h index 8d8deded6..69ba2e28b 100644 --- a/src/qobuz/qobuzstreamurlrequest.h +++ b/src/qobuz/qobuzstreamurlrequest.h @@ -58,10 +58,10 @@ class QobuzStreamURLRequest : public QobuzBaseRequest { void StreamURLFailure(const uint id, const QUrl &media_url, const QString &error); void StreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration); - private slots: + private Q_SLOTS: void StreamURLReceived(); - public slots: + public Q_SLOTS: void LoginComplete(const bool success, const QString &error = QString()); private: diff --git a/src/qobuz/qobuzurlhandler.h b/src/qobuz/qobuzurlhandler.h index c4ee63531..ec792be6c 100644 --- a/src/qobuz/qobuzurlhandler.h +++ b/src/qobuz/qobuzurlhandler.h @@ -44,7 +44,7 @@ class QobuzUrlHandler : public UrlHandler { private: void CancelTask(const int task_id); - private slots: + private Q_SLOTS: void GetStreamURLFailure(const uint id, const QUrl &media_url, const QString &error); void GetStreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration); diff --git a/src/queue/queue.h b/src/queue/queue.h index eb34c52cf..b75977c37 100644 --- a/src/queue/queue.h +++ b/src/queue/queue.h @@ -77,7 +77,7 @@ class Queue : public QAbstractProxyModel { bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; Qt::ItemFlags flags(const QModelIndex &idx) const override; - public slots: + public Q_SLOTS: void UpdateSummaryText(); Q_SIGNALS: @@ -85,7 +85,7 @@ class Queue : public QAbstractProxyModel { void ItemCountChanged(const int count); void SummaryTextChanged(const QString &message); - private slots: + private Q_SLOTS: void SourceDataChanged(const QModelIndex &top_left, const QModelIndex &bottom_right); void SourceLayoutChanged(); void UpdateTotalLength(); diff --git a/src/queue/queueview.h b/src/queue/queueview.h index cc8b4a25d..bbf51b72e 100644 --- a/src/queue/queueview.h +++ b/src/queue/queueview.h @@ -44,7 +44,7 @@ class QueueView : public QWidget { void SetPlaylistManager(SharedPtr playlist_manager); void ReloadSettings(); - private slots: + private Q_SLOTS: void CurrentPlaylistChanged(Playlist *playlist); void PlaylistDestroyed(); void UpdateButtonState(); diff --git a/src/radios/radiobackend.h b/src/radios/radiobackend.h index b1c200e38..7d4bb507b 100644 --- a/src/radios/radiobackend.h +++ b/src/radios/radiobackend.h @@ -41,7 +41,7 @@ class RadioBackend : public QObject { void GetChannelsAsync(); void DeleteChannelsAsync(); - private slots: + private Q_SLOTS: void AddChannels(const RadioChannelList &channels); void GetChannels(); void DeleteChannels(); @@ -50,7 +50,7 @@ class RadioBackend : public QObject { void NewChannels(const RadioChannelList &channels); void ExitFinished(); - private slots: + private Q_SLOTS: void Exit(); private: diff --git a/src/radios/radiomodel.h b/src/radios/radiomodel.h index f5e4e886c..2b5fabe76 100644 --- a/src/radios/radiomodel.h +++ b/src/radios/radiomodel.h @@ -82,7 +82,7 @@ class RadioModel : public SimpleTreeModel { QPixmap ChannelIcon(const QModelIndex &idx); QString SortText(QString text); - private slots: + private Q_SLOTS: void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result); private: diff --git a/src/radios/radioparadiseservice.h b/src/radios/radioparadiseservice.h index ec51533da..bc0d65447 100644 --- a/src/radios/radioparadiseservice.h +++ b/src/radios/radioparadiseservice.h @@ -41,10 +41,10 @@ class RadioParadiseService : public RadioService { void Abort(); - public slots: + public Q_SLOTS: void GetChannels() override; - private slots: + private Q_SLOTS: void GetChannelsReply(QNetworkReply *reply, const int task_id); private: diff --git a/src/radios/radioservice.h b/src/radios/radioservice.h index 69c8b909f..15678f04f 100644 --- a/src/radios/radioservice.h +++ b/src/radios/radioservice.h @@ -56,7 +56,7 @@ class RadioService : public QObject { Q_SIGNALS: void NewChannels(const RadioChannelList &channels = RadioChannelList()); - public slots: + public Q_SLOTS: virtual void GetChannels() = 0; protected: diff --git a/src/radios/radioservices.h b/src/radios/radioservices.h index 8d6659179..eed10bc50 100644 --- a/src/radios/radioservices.h +++ b/src/radios/radioservices.h @@ -56,12 +56,12 @@ class RadioServices : public QObject { SharedPtr radio_backend() const { return backend_; } QSortFilterProxyModel *sort_model() const { return sort_model_; } - private slots: + private Q_SLOTS: void ServiceDeleted(); void GotChannelsFromBackend(const RadioChannelList &channels); void GotChannelsFromService(const RadioChannelList &channels); - public slots: + public Q_SLOTS: void GetChannels(); void RefreshChannels(); diff --git a/src/radios/radioview.h b/src/radios/radioview.h index 8fabfb2b4..6e8b9513a 100644 --- a/src/radios/radioview.h +++ b/src/radios/radioview.h @@ -45,7 +45,7 @@ class RadioView : public AutoExpandingTreeView { Q_SIGNALS: void GetChannels(); - private slots: + private Q_SLOTS: void AddToPlaylist(); void ReplacePlaylist(); void OpenInNewPlaylist(); diff --git a/src/radios/somafmservice.h b/src/radios/somafmservice.h index df23a7b31..6163bf650 100644 --- a/src/radios/somafmservice.h +++ b/src/radios/somafmservice.h @@ -42,13 +42,13 @@ class SomaFMService : public RadioService { void Abort(); - public slots: + public Q_SLOTS: void GetChannels() override; private: void GetStreamUrl(const int task_id, const RadioChannel &channel); - private slots: + private Q_SLOTS: void GetChannelsReply(QNetworkReply *reply, const int task_id); void GetStreamUrlsReply(QNetworkReply *reply, const int task_id, RadioChannel channel); diff --git a/src/scrobbler/audioscrobbler.h b/src/scrobbler/audioscrobbler.h index 0c0496b11..c53c1361d 100644 --- a/src/scrobbler/audioscrobbler.h +++ b/src/scrobbler/audioscrobbler.h @@ -77,7 +77,7 @@ class AudioScrobbler : public QObject { void ClearPlaying(); void Scrobble(const Song &song, const qint64 scrobble_point); - public slots: + public Q_SLOTS: void ToggleScrobbling(); void ToggleOffline(); void ErrorReceived(const QString &error); diff --git a/src/scrobbler/lastfmimport.h b/src/scrobbler/lastfmimport.h index caac9942f..8964ba59f 100644 --- a/src/scrobbler/lastfmimport.h +++ b/src/scrobbler/lastfmimport.h @@ -88,7 +88,7 @@ class LastFMImport : public QObject { void Finished(); void FinishedWithError(const QString&); - private slots: + private Q_SLOTS: void FlushRequests(); void GetRecentTracksRequestFinished(QNetworkReply *reply, const int page); void GetTopTracksRequestFinished(QNetworkReply *reply, const int page); diff --git a/src/scrobbler/listenbrainzscrobbler.h b/src/scrobbler/listenbrainzscrobbler.h index 2dc68240d..8e8d84005 100644 --- a/src/scrobbler/listenbrainzscrobbler.h +++ b/src/scrobbler/listenbrainzscrobbler.h @@ -80,10 +80,10 @@ class ListenBrainzScrobbler : public ScrobblerService { Q_SIGNALS: void AuthenticationComplete(const bool success, const QString &error = QString()); - public slots: + public Q_SLOTS: void WriteCache() override { cache_->WriteCache(); } - private slots: + private Q_SLOTS: void RedirectArrived(); void AuthenticateReplyFinished(QNetworkReply *reply); void RequestNewAccessToken() { RequestAccessToken(); } diff --git a/src/scrobbler/scrobblercache.h b/src/scrobbler/scrobblercache.h index 9d5149c5f..1ff0d8ec3 100644 --- a/src/scrobbler/scrobblercache.h +++ b/src/scrobbler/scrobblercache.h @@ -51,7 +51,7 @@ class ScrobblerCache : public QObject { void SetError(ScrobblerCacheItemPtrList cache_items); void Flush(ScrobblerCacheItemPtrList cache_items); - public slots: + public Q_SLOTS: void WriteCache(); private: diff --git a/src/scrobbler/scrobblerservice.h b/src/scrobbler/scrobblerservice.h index 3f44820b2..1b304c78f 100644 --- a/src/scrobbler/scrobblerservice.h +++ b/src/scrobbler/scrobblerservice.h @@ -66,7 +66,7 @@ class ScrobblerService : public QObject { QString StripAlbum(const QString &album) const; QString StripTitle(const QString &title) const; - public slots: + public Q_SLOTS: virtual void Submit() = 0; virtual void WriteCache() = 0; diff --git a/src/scrobbler/scrobblersettings.h b/src/scrobbler/scrobblersettings.h index 612a4ec99..a5c5b815d 100644 --- a/src/scrobbler/scrobblersettings.h +++ b/src/scrobbler/scrobblersettings.h @@ -52,7 +52,7 @@ class ScrobblerSettings : public QObject { void ShowConfig(); - public slots: + public Q_SLOTS: void ToggleScrobbling(); void ToggleOffline(); void ErrorReceived(const QString &error); diff --git a/src/scrobbler/scrobblingapi20.h b/src/scrobbler/scrobblingapi20.h index 549dc8cc2..68e38a9b1 100644 --- a/src/scrobbler/scrobblingapi20.h +++ b/src/scrobbler/scrobblingapi20.h @@ -71,10 +71,10 @@ class ScrobblingAPI20 : public ScrobblerService { Q_SIGNALS: void AuthenticationComplete(const bool success, const QString &error = QString()); - public slots: + public Q_SLOTS: void WriteCache() override { cache_->WriteCache(); } - private slots: + private Q_SLOTS: void RedirectArrived(); void AuthenticateReplyFinished(QNetworkReply *reply); void UpdateNowPlayingRequestFinished(QNetworkReply *reply); diff --git a/src/scrobbler/subsonicscrobbler.h b/src/scrobbler/subsonicscrobbler.h index 666317a6c..f59c28024 100644 --- a/src/scrobbler/subsonicscrobbler.h +++ b/src/scrobbler/subsonicscrobbler.h @@ -58,7 +58,7 @@ class SubsonicScrobbler : public ScrobblerService { SharedPtr service(); - public slots: + public Q_SLOTS: void WriteCache() override {} void Submit() override; diff --git a/src/settings/appearancesettingspage.h b/src/settings/appearancesettingspage.h index 3c2a88751..eca26c0be 100644 --- a/src/settings/appearancesettingspage.h +++ b/src/settings/appearancesettingspage.h @@ -96,7 +96,7 @@ class AppearanceSettingsPage : public SettingsPage { static QColor DefaultTabbarBgColor(); - private slots: + private Q_SLOTS: void SelectBackgroundImage(); void BlurLevelChanged(int); void OpacityLevelChanged(int); diff --git a/src/settings/backendsettingspage.h b/src/settings/backendsettingspage.h index 12ff152c4..4249afc99 100644 --- a/src/settings/backendsettingspage.h +++ b/src/settings/backendsettingspage.h @@ -62,7 +62,7 @@ class BackendSettingsPage : public SettingsPage { }; #endif - private slots: + private Q_SLOTS: void EngineChanged(const int index); void OutputChanged(const int index); void DeviceSelectionChanged(const int index); diff --git a/src/settings/behavioursettingspage.h b/src/settings/behavioursettingspage.h index 1fc4c606f..95129ec07 100644 --- a/src/settings/behavioursettingspage.h +++ b/src/settings/behavioursettingspage.h @@ -77,7 +77,7 @@ class BehaviourSettingsPage : public SettingsPage { void Load() override; void Save() override; - private slots: + private Q_SLOTS: void ShowTrayIconToggled(bool on); private: diff --git a/src/settings/collectionsettingspage.h b/src/settings/collectionsettingspage.h index b0fb98baf..2d3b20e2c 100644 --- a/src/settings/collectionsettingspage.h +++ b/src/settings/collectionsettingspage.h @@ -65,7 +65,7 @@ class CollectionSettingsPage : public SettingsPage { void Load() override; void Save() override; - private slots: + private Q_SLOTS: void AddDirectory(); void RemoveDirectory(); diff --git a/src/settings/contextsettingspage.h b/src/settings/contextsettingspage.h index 233c1b301..0e2d74393 100644 --- a/src/settings/contextsettingspage.h +++ b/src/settings/contextsettingspage.h @@ -61,7 +61,7 @@ class ContextSettingsPage : public SettingsPage { void Load() override; void Save() override; - private slots: + private Q_SLOTS: void InsertVariableFirstLine(QAction *action); void InsertVariableSecondLine(QAction *action); static void ShowMenuTooltip(QAction *action); diff --git a/src/settings/coverssettingspage.h b/src/settings/coverssettingspage.h index ff22a283e..c45bb0337 100644 --- a/src/settings/coverssettingspage.h +++ b/src/settings/coverssettingspage.h @@ -64,7 +64,7 @@ class CoversSettingsPage : public SettingsPage { QString AlbumCoverArtTypeDescription(const QString &type) const; void TypesMove(const int d); - private slots: + private Q_SLOTS: void ProvidersCurrentItemChanged(QListWidgetItem *item_current, QListWidgetItem *item_previous); void ProvidersItemSelectionChanged(); void ProvidersItemChanged(QListWidgetItem *item); diff --git a/src/settings/globalshortcutssettingspage.h b/src/settings/globalshortcutssettingspage.h index 620ae2252..36b08b02b 100644 --- a/src/settings/globalshortcutssettingspage.h +++ b/src/settings/globalshortcutssettingspage.h @@ -50,7 +50,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage { void Load() override; void Save() override; - private slots: + private Q_SLOTS: void ShortcutOptionsChanged(); void OpenGnomeKeybindingProperties(); void OpenMateKeybindingProperties(); diff --git a/src/settings/lyricssettingspage.h b/src/settings/lyricssettingspage.h index ff6ec75f0..742a0768c 100644 --- a/src/settings/lyricssettingspage.h +++ b/src/settings/lyricssettingspage.h @@ -53,7 +53,7 @@ class LyricsSettingsPage : public SettingsPage { void DisconnectAuthentication(LyricsProvider *provider) const; static bool ProviderCompareOrder(LyricsProvider *a, LyricsProvider *b); - private slots: + private Q_SLOTS: void CurrentItemChanged(QListWidgetItem *item_current, QListWidgetItem *item_previous); void ItemSelectionChanged(); void ItemChanged(QListWidgetItem *item); diff --git a/src/settings/notificationssettingspage.h b/src/settings/notificationssettingspage.h index 0647d609b..abb029600 100644 --- a/src/settings/notificationssettingspage.h +++ b/src/settings/notificationssettingspage.h @@ -51,7 +51,7 @@ class NotificationsSettingsPage : public SettingsPage { void hideEvent(QHideEvent*) override; void showEvent(QShowEvent*) override; - private slots: + private Q_SLOTS: void NotificationTypeChanged(); void NotificationCustomTextChanged(bool enabled); void PrepareNotificationPreview(); diff --git a/src/settings/qobuzsettingspage.h b/src/settings/qobuzsettingspage.h index 786439f8b..8296627f1 100644 --- a/src/settings/qobuzsettingspage.h +++ b/src/settings/qobuzsettingspage.h @@ -48,7 +48,7 @@ class QobuzSettingsPage : public SettingsPage { Q_SIGNALS: void Login(const QString &username, const QString &password, const QString &token); - private slots: + private Q_SLOTS: void LoginClicked(); void LogoutClicked(); void LoginSuccess(); diff --git a/src/settings/scrobblersettingspage.h b/src/settings/scrobblersettingspage.h index bea545420..4af305941 100644 --- a/src/settings/scrobblersettingspage.h +++ b/src/settings/scrobblersettingspage.h @@ -48,7 +48,7 @@ class ScrobblerSettingsPage : public SettingsPage { void Load() override; void Save() override; - private slots: + private Q_SLOTS: void LastFM_Login(); void LastFM_Logout(); void LastFM_AuthenticationComplete(const bool success, const QString &error = QString()); diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h index e567036fd..4003a2d20 100644 --- a/src/settings/settingsdialog.h +++ b/src/settings/settingsdialog.h @@ -141,7 +141,7 @@ class SettingsDialog : public QDialog { void ReloadSettings(); void NotificationPreview(const OSDBase::Behaviour, const QString&, const QString&); - private slots: + private Q_SLOTS: void CurrentItemChanged(QTreeWidgetItem *item); void DialogButtonClicked(QAbstractButton *button); diff --git a/src/settings/spotifysettingspage.h b/src/settings/spotifysettingspage.h index 50ef59f7c..d80443c18 100644 --- a/src/settings/spotifysettingspage.h +++ b/src/settings/spotifysettingspage.h @@ -50,7 +50,7 @@ class SpotifySettingsPage : public SettingsPage { Q_SIGNALS: void Authorize(); - private slots: + private Q_SLOTS: void LoginClicked(); void LogoutClicked(); void LoginSuccess(); diff --git a/src/settings/subsonicsettingspage.h b/src/settings/subsonicsettingspage.h index de2a35b80..4621cd992 100644 --- a/src/settings/subsonicsettingspage.h +++ b/src/settings/subsonicsettingspage.h @@ -56,7 +56,7 @@ class SubsonicSettingsPage : public SettingsPage { Q_SIGNALS: void Test(const QUrl &url, const QString &username, const QString &password, const SubsonicSettingsPage::AuthMethod auth_method, const bool redirect = false); - private slots: + private Q_SLOTS: void TestClicked(); void TestSuccess(); void TestFailure(const QString &failure_reason); diff --git a/src/settings/tidalsettingspage.h b/src/settings/tidalsettingspage.h index 1eb12dcda..23a116d14 100644 --- a/src/settings/tidalsettingspage.h +++ b/src/settings/tidalsettingspage.h @@ -57,7 +57,7 @@ class TidalSettingsPage : public SettingsPage { void Authorize(const QString &client_id); void Login(const QString &api_token, const QString &username, const QString &password); - private slots: + private Q_SLOTS: void OAuthClicked(const bool enabled); void LoginClicked(); void LogoutClicked(); diff --git a/src/smartplaylists/playlistgeneratorinserter.h b/src/smartplaylists/playlistgeneratorinserter.h index 2ca5fb6dc..20676b095 100644 --- a/src/smartplaylists/playlistgeneratorinserter.h +++ b/src/smartplaylists/playlistgeneratorinserter.h @@ -52,7 +52,7 @@ class PlaylistGeneratorInserter : public QObject { void Error(const QString &message); void PlayRequested(const QModelIndex idx, const Playlist::AutoScroll autoscroll); - private slots: + private Q_SLOTS: void Finished(); private: diff --git a/src/smartplaylists/smartplaylistquerywizardplugin.h b/src/smartplaylists/smartplaylistquerywizardplugin.h index 52bcb238b..b0c8a8e0c 100644 --- a/src/smartplaylists/smartplaylistquerywizardplugin.h +++ b/src/smartplaylists/smartplaylistquerywizardplugin.h @@ -53,7 +53,7 @@ class SmartPlaylistQueryWizardPlugin : public SmartPlaylistWizardPlugin { void SetGenerator(PlaylistGeneratorPtr) override; PlaylistGeneratorPtr CreateGenerator() const override; - private slots: + private Q_SLOTS: void AddSearchTerm(); void RemoveSearchTerm(); diff --git a/src/smartplaylists/smartplaylistsearchpreview.h b/src/smartplaylists/smartplaylistsearchpreview.h index 6202566c5..872d24461 100644 --- a/src/smartplaylists/smartplaylistsearchpreview.h +++ b/src/smartplaylists/smartplaylistsearchpreview.h @@ -56,7 +56,7 @@ class SmartPlaylistSearchPreview : public QWidget { private: void RunSearch(const SmartPlaylistSearch &search); - private slots: + private Q_SLOTS: void SearchFinished(); private: diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.h b/src/smartplaylists/smartplaylistsearchtermwidget.h index 772051100..8efd3c9a9 100644 --- a/src/smartplaylists/smartplaylistsearchtermwidget.h +++ b/src/smartplaylists/smartplaylistsearchtermwidget.h @@ -71,7 +71,7 @@ class SmartPlaylistSearchTermWidget : public QWidget { void leaveEvent(QEvent*) override; void resizeEvent(QResizeEvent*) override; - private slots: + private Q_SLOTS: void FieldChanged(const int index); void OpChanged(const int idx); void RelativeValueChanged(); diff --git a/src/smartplaylists/smartplaylistsviewcontainer.h b/src/smartplaylists/smartplaylistsviewcontainer.h index f59f60ee5..7ef97977e 100644 --- a/src/smartplaylists/smartplaylistsviewcontainer.h +++ b/src/smartplaylists/smartplaylistsviewcontainer.h @@ -49,7 +49,7 @@ class SmartPlaylistsViewContainer : public QWidget { protected: void showEvent(QShowEvent *e) override; - private slots: + private Q_SLOTS: void ItemsSelectedChanged(); void ItemDoubleClicked(const QModelIndex &idx); diff --git a/src/smartplaylists/smartplaylistwizard.h b/src/smartplaylists/smartplaylistwizard.h index b27667a1c..c63475e38 100644 --- a/src/smartplaylists/smartplaylistwizard.h +++ b/src/smartplaylists/smartplaylistwizard.h @@ -52,7 +52,7 @@ class SmartPlaylistWizard : public QWizard { void AddPlugin(SmartPlaylistWizardPlugin *plugin); - private slots: + private Q_SLOTS: void TypeChanged(const int index); private: diff --git a/src/spotify/spotifybaserequest.h b/src/spotify/spotifybaserequest.h index 20ced90d1..f90481b4e 100644 --- a/src/spotify/spotifybaserequest.h +++ b/src/spotify/spotifybaserequest.h @@ -79,7 +79,7 @@ class SpotifyBaseRequest : public QObject { bool authenticated() const { return service_->authenticated(); } - private slots: + private Q_SLOTS: void HandleSSLErrors(const QList &ssl_errors); private: diff --git a/src/spotify/spotifyfavoriterequest.h b/src/spotify/spotifyfavoriterequest.h index 949037bde..ddd3cef2d 100644 --- a/src/spotify/spotifyfavoriterequest.h +++ b/src/spotify/spotifyfavoriterequest.h @@ -57,11 +57,11 @@ class SpotifyFavoriteRequest : public SpotifyBaseRequest { void AlbumsRemoved(SongList); void SongsRemoved(SongList); - private slots: + private Q_SLOTS: void AddFavoritesReply(QNetworkReply *reply, const SpotifyFavoriteRequest::FavoriteType type, const SongList &songs); void RemoveFavoritesReply(QNetworkReply *reply, const SpotifyFavoriteRequest::FavoriteType type, const SongList &songs); - public slots: + public Q_SLOTS: void AddArtists(const SongList &songs); void AddAlbums(const SongList &songs); void AddSongs(const SongList &songs); diff --git a/src/spotify/spotifyrequest.h b/src/spotify/spotifyrequest.h index 58fe1f85c..dc9d2c3b7 100644 --- a/src/spotify/spotifyrequest.h +++ b/src/spotify/spotifyrequest.h @@ -99,7 +99,7 @@ class SpotifyRequest : public SpotifyBaseRequest { void UpdateProgress(int id, int max); void StreamURLFinished(QUrl original_url, QUrl url, Song::FileType, QString error = QString()); - private slots: + private Q_SLOTS: void FlushRequests(); void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested); diff --git a/src/spotify/spotifyservice.h b/src/spotify/spotifyservice.h index 7498cadd4..79e96acdd 100644 --- a/src/spotify/spotifyservice.h +++ b/src/spotify/spotifyservice.h @@ -95,7 +95,7 @@ class SpotifyService : public StreamingService { CollectionFilter *albums_collection_filter_model() override { return albums_collection_model_->filter(); } CollectionFilter *songs_collection_filter_model() override { return songs_collection_model_->filter(); } - public slots: + public Q_SLOTS: void ShowConfig() override; void Authenticate(); void Deauthenticate(); @@ -106,7 +106,7 @@ class SpotifyService : public StreamingService { void ResetAlbumsRequest() override; void ResetSongsRequest() override; - private slots: + private Q_SLOTS: void ExitReceived(); void RedirectArrived(); void RequestNewAccessToken() { RequestAccessToken(); } diff --git a/src/streaming/streamingcollectionview.h b/src/streaming/streamingcollectionview.h index 85e314a4d..c3aba0cee 100644 --- a/src/streaming/streamingcollectionview.h +++ b/src/streaming/streamingcollectionview.h @@ -72,7 +72,7 @@ class StreamingCollectionView : public AutoExpandingTreeView { int TotalArtists() const; int TotalAlbums() const; - public slots: + public Q_SLOTS: void TotalSongCountUpdated(int count); void TotalArtistCountUpdated(int count); void TotalAlbumCountUpdated(int count); @@ -97,7 +97,7 @@ class StreamingCollectionView : public AutoExpandingTreeView { void mouseReleaseEvent(QMouseEvent *e) override; void contextMenuEvent(QContextMenuEvent *e) override; - private slots: + private Q_SLOTS: void Load(); void AddToPlaylist(); void AddToPlaylistEnqueue(); diff --git a/src/streaming/streamingcollectionviewcontainer.h b/src/streaming/streamingcollectionviewcontainer.h index 15174fc72..94828c292 100644 --- a/src/streaming/streamingcollectionviewcontainer.h +++ b/src/streaming/streamingcollectionviewcontainer.h @@ -58,7 +58,7 @@ class StreamingCollectionViewContainer : public QWidget { QLabel *status() const { return ui_->status; } QProgressBar *progressbar() const { return ui_->progressbar; } - private slots: + private Q_SLOTS: void contextMenuEvent(QContextMenuEvent *e) override; private: diff --git a/src/streaming/streamingsearchmodel.h b/src/streaming/streamingsearchmodel.h index 771144dd8..42dc04585 100644 --- a/src/streaming/streamingsearchmodel.h +++ b/src/streaming/streamingsearchmodel.h @@ -78,7 +78,7 @@ class StreamingSearchModel : public QStandardItemModel { // The implementation creates a SongMimeData with one Song for each Result. MimeData *LoadTracks(const StreamingSearchView::ResultList &results) const; - public slots: + public Q_SLOTS: void AddResults(const StreamingSearchView::ResultList &results); private: diff --git a/src/streaming/streamingsearchview.h b/src/streaming/streamingsearchview.h index 4846ede9f..fa954bc38 100644 --- a/src/streaming/streamingsearchview.h +++ b/src/streaming/streamingsearchview.h @@ -142,7 +142,7 @@ class StreamingSearchView : public QWidget { void AddAlbumsSignal(const SongList &songs); void AddSongsSignal(const SongList &songs); - private slots: + private Q_SLOTS: void SwapModels(); void TextEdited(const QString &text); void StartSearch(const QString &query); @@ -173,7 +173,7 @@ class StreamingSearchView : public QWidget { void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &albumcover_result); - public slots: + public Q_SLOTS: void ReloadSettings(); private: diff --git a/src/streaming/streamingservice.h b/src/streaming/streamingservice.h index 0b522fffd..b315a6d6c 100644 --- a/src/streaming/streamingservice.h +++ b/src/streaming/streamingservice.h @@ -73,7 +73,7 @@ class StreamingService : public QObject { virtual CollectionFilter *albums_collection_filter_model() { return nullptr; } virtual CollectionFilter *songs_collection_filter_model() { return nullptr; } - public slots: + public Q_SLOTS: virtual void ShowConfig() {} virtual void GetArtists() {} virtual void GetAlbums() {} diff --git a/src/streaming/streamingservices.h b/src/streaming/streamingservices.h index 4a0265ba2..577099aa1 100644 --- a/src/streaming/streamingservices.h +++ b/src/streaming/streamingservices.h @@ -58,7 +58,7 @@ class StreamingServices : public QObject { Q_SIGNALS: void ExitFinished(); - private slots: + private Q_SLOTS: void ExitReceived(); private: diff --git a/src/streaming/streamingsongsview.h b/src/streaming/streamingsongsview.h index 1f85b62ee..13edcbe14 100644 --- a/src/streaming/streamingsongsview.h +++ b/src/streaming/streamingsongsview.h @@ -52,7 +52,7 @@ class StreamingSongsView : public QWidget { bool SearchFieldHasFocus() const { return ui_->filter_widget->SearchFieldHasFocus(); } void FocusSearchField() { ui_->filter_widget->FocusSearchField(); } - private slots: + private Q_SLOTS: void OpenSettingsDialog(); void GetSongs(); void AbortGetSongs(); diff --git a/src/streaming/streamingtabsview.h b/src/streaming/streamingtabsview.h index d50f812a2..5a26077df 100644 --- a/src/streaming/streamingtabsview.h +++ b/src/streaming/streamingtabsview.h @@ -57,7 +57,7 @@ class StreamingTabsView : public QWidget { bool SearchFieldHasFocus() const; void FocusSearchField(); - private slots: + private Q_SLOTS: void OpenSettingsDialog(); void GetArtists(); void GetAlbums(); diff --git a/src/subsonic/subsonicbaserequest.h b/src/subsonic/subsonicbaserequest.h index 17a72e228..0e277ca7e 100644 --- a/src/subsonic/subsonicbaserequest.h +++ b/src/subsonic/subsonicbaserequest.h @@ -70,7 +70,7 @@ class SubsonicBaseRequest : public QObject { bool verify_certificate() const { return service_->verify_certificate(); } bool download_album_covers() const { return service_->download_album_covers(); } - private slots: + private Q_SLOTS: void HandleSSLErrors(const QList &ssl_errors); private: diff --git a/src/subsonic/subsonicrequest.h b/src/subsonic/subsonicrequest.h index 6fb4c5e2f..72e588727 100644 --- a/src/subsonic/subsonicrequest.h +++ b/src/subsonic/subsonicrequest.h @@ -83,7 +83,7 @@ class SubsonicRequest : public SubsonicBaseRequest { void ProgressSetMaximum(const int max); void UpdateProgress(const int progress); - private slots: + private Q_SLOTS: void AlbumsReplyReceived(QNetworkReply *reply, const int offset_requested, const int size_requested); void AlbumSongsReplyReceived(QNetworkReply *reply, const QString &artist_id, const QString &album_id, const QString &album_artist); void AlbumCoverReceived(QNetworkReply *reply, const AlbumCoverRequest &request); diff --git a/src/subsonic/subsonicscrobblerequest.h b/src/subsonic/subsonicscrobblerequest.h index 438e14cb9..d212e1cc3 100644 --- a/src/subsonic/subsonicscrobblerequest.h +++ b/src/subsonic/subsonicscrobblerequest.h @@ -49,7 +49,7 @@ class SubsonicScrobbleRequest : public SubsonicBaseRequest { void CreateScrobbleRequest(const QString &song_id, const bool submission, const QDateTime &start_time); - private slots: + private Q_SLOTS: void ScrobbleReplyReceived(QNetworkReply *reply); private: diff --git a/src/subsonic/subsonicservice.h b/src/subsonic/subsonicservice.h index 9313de7ec..6960573b5 100644 --- a/src/subsonic/subsonicservice.h +++ b/src/subsonic/subsonicservice.h @@ -87,7 +87,7 @@ class SubsonicService : public StreamingService { void CheckConfiguration(); void Scrobble(const QString &song_id, const bool submission, const QDateTime &time); - public slots: + public Q_SLOTS: void ShowConfig() override; void SendPing(); void SendPingWithCredentials(QUrl url, const QString &username, const QString &password, const SubsonicSettingsPage::AuthMethod auth_method, const bool redirect = false); @@ -95,7 +95,7 @@ class SubsonicService : public StreamingService { void DeleteSongs(); void ResetSongsRequest() override; - private slots: + private Q_SLOTS: void HandlePingSSLErrors(const QList &ssl_errors); void HandlePingReply(QNetworkReply *reply, const QUrl &url, const QString &username, const QString &password, const SubsonicSettingsPage::AuthMethod auth_method); void SongsResultsReceived(const SongMap &songs, const QString &error); diff --git a/src/tidal/tidalbaserequest.h b/src/tidal/tidalbaserequest.h index 4b8f7f83d..13a2b38b7 100644 --- a/src/tidal/tidalbaserequest.h +++ b/src/tidal/tidalbaserequest.h @@ -97,7 +97,7 @@ class TidalBaseRequest : public QObject { Q_SIGNALS: void RequestLogin(); - private slots: + private Q_SLOTS: void HandleSSLErrors(const QList &ssl_errors); private: diff --git a/src/tidal/tidalfavoriterequest.h b/src/tidal/tidalfavoriterequest.h index 3db180ba0..e6ebe39d3 100644 --- a/src/tidal/tidalfavoriterequest.h +++ b/src/tidal/tidalfavoriterequest.h @@ -61,11 +61,11 @@ class TidalFavoriteRequest : public TidalBaseRequest { void AlbumsRemoved(const SongList &songs); void SongsRemoved(const SongList &songs); - private slots: + private Q_SLOTS: void AddFavoritesReply(QNetworkReply *reply, const TidalFavoriteRequest::FavoriteType type, const SongList &songs); void RemoveFavoritesReply(QNetworkReply *reply, const TidalFavoriteRequest::FavoriteType type, const SongList &songs); - public slots: + public Q_SLOTS: void AddArtists(const SongList &songs); void AddAlbums(const SongList &songs); void AddSongs(const SongList &songs); diff --git a/src/tidal/tidalrequest.h b/src/tidal/tidalrequest.h index 54b72ea5e..8ae3622b2 100644 --- a/src/tidal/tidalrequest.h +++ b/src/tidal/tidalrequest.h @@ -107,7 +107,7 @@ class TidalRequest : public TidalBaseRequest { void UpdateProgress(const int id, const int max); void StreamURLFinished(const QUrl &media_url, const QUrl &url, const Song::FileType filetype, const QString &error = QString()); - private slots: + private Q_SLOTS: void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested); void AlbumsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested); @@ -120,7 +120,7 @@ class TidalRequest : public TidalBaseRequest { void AlbumSongsReplyReceived(QNetworkReply *reply, const Artist &artist, const Album &album, const int offset_requested); void AlbumCoverReceived(QNetworkReply *reply, const QString &album_id, const QUrl &url, const QString &filename); - public slots: + public Q_SLOTS: void LoginComplete(const bool success, const QString &error = QString()); private: diff --git a/src/tidal/tidalservice.h b/src/tidal/tidalservice.h index b2c2ccd8b..0c6ef8c42 100644 --- a/src/tidal/tidalservice.h +++ b/src/tidal/tidalservice.h @@ -116,7 +116,7 @@ class TidalService : public StreamingService { CollectionFilter *albums_collection_filter_model() override { return albums_collection_model_->filter(); } CollectionFilter *songs_collection_filter_model() override { return songs_collection_model_->filter(); } - public slots: + public Q_SLOTS: void ShowConfig() override; void StartAuthorization(const QString &client_id); void TryLogin(); @@ -130,7 +130,7 @@ class TidalService : public StreamingService { void ResetSongsRequest() override; void AuthorizationUrlReceived(const QUrl &url); - private slots: + private Q_SLOTS: void ExitReceived(); void RequestNewAccessToken() { RequestAccessToken(); } void HandleLoginSSLErrors(const QList &ssl_errors); diff --git a/src/tidal/tidalstreamurlrequest.h b/src/tidal/tidalstreamurlrequest.h index 67e739ba8..cf22fd3e7 100644 --- a/src/tidal/tidalstreamurlrequest.h +++ b/src/tidal/tidalstreamurlrequest.h @@ -62,10 +62,10 @@ class TidalStreamURLRequest : public TidalBaseRequest { void StreamURLFailure(const uint id, const QUrl &media_url, const QString &error); void StreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate = -1, const int bit_depth = -1, const qint64 duration = -1); - private slots: + private Q_SLOTS: void StreamURLReceived(); - public slots: + public Q_SLOTS: void LoginComplete(const bool success, const QString &error = QString()); private: diff --git a/src/tidal/tidalurlhandler.h b/src/tidal/tidalurlhandler.h index 6cbb3e31b..fe17a7919 100644 --- a/src/tidal/tidalurlhandler.h +++ b/src/tidal/tidalurlhandler.h @@ -46,7 +46,7 @@ class TidalUrlHandler : public UrlHandler { private: void CancelTask(const int task_id); - private slots: + private Q_SLOTS: void GetStreamURLFailure(const uint id, const QUrl &media_url, const QString &error); void GetStreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration); diff --git a/src/transcoder/transcodedialog.h b/src/transcoder/transcodedialog.h index ff7f2f6e9..c74485882 100644 --- a/src/transcoder/transcodedialog.h +++ b/src/transcoder/transcodedialog.h @@ -66,7 +66,7 @@ class TranscodeDialog : public QDialog { static QString TrimPath(const QString &path); QString GetOutputFileName(const QString &input, const TranscoderPreset &preset) const; - private slots: + private Q_SLOTS: void Add(); void Import(); void Remove(); diff --git a/src/transcoder/transcoder.h b/src/transcoder/transcoder.h index 1e6f46be4..087e27164 100644 --- a/src/transcoder/transcoder.h +++ b/src/transcoder/transcoder.h @@ -70,7 +70,7 @@ class Transcoder : public QObject { QMap GetProgress() const; qint64 QueuedJobsCount() const { return queued_jobs_.count(); } - public slots: + public Q_SLOTS: void Start(); void Cancel(); diff --git a/src/transcoder/transcoderoptionsmp3.h b/src/transcoder/transcoderoptionsmp3.h index be233f4ba..722daa798 100644 --- a/src/transcoder/transcoderoptionsmp3.h +++ b/src/transcoder/transcoderoptionsmp3.h @@ -41,7 +41,7 @@ class TranscoderOptionsMP3 : public TranscoderOptionsInterface { void Load() override; void Save() override; - private slots: + private Q_SLOTS: void QualitySliderChanged(const int value); void QualitySpinboxChanged(const double value); diff --git a/src/widgets/autoexpandingtreeview.h b/src/widgets/autoexpandingtreeview.h index a6e07bde2..1d5b856ba 100644 --- a/src/widgets/autoexpandingtreeview.h +++ b/src/widgets/autoexpandingtreeview.h @@ -43,7 +43,7 @@ class AutoExpandingTreeView : public QTreeView { void SetExpandOnReset(bool v) { expand_on_reset_ = v; } void SetAddOnDoubleClick(bool v) { add_on_double_click_ = v; } - public slots: + public Q_SLOTS: void RecursivelyExpandSlot(const QModelIndex &idx); void UpAndFocus(); void DownAndFocus(); @@ -63,7 +63,7 @@ class AutoExpandingTreeView : public QTreeView { virtual bool CanRecursivelyExpand(const QModelIndex &idx) const { Q_UNUSED(idx); return true; } - private slots: + private Q_SLOTS: void ItemExpanded(const QModelIndex &idx); void ItemClicked(const QModelIndex &idx); void ItemDoubleClicked(const QModelIndex &idx); diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h index d3cbe5549..85ece92c3 100644 --- a/src/widgets/fancytabwidget.h +++ b/src/widgets/fancytabwidget.h @@ -69,11 +69,11 @@ class FancyTabWidget : public QTabWidget { void SetBackgroundPixmap(const QPixmap &pixmap); int IndexOfTab(QWidget *widget); - public slots: + public Q_SLOTS: void SetMode(const Mode mode); void SetCurrentIndex(int idx); - private slots: + private Q_SLOTS: void TabBarUpdateGeometry(); void CurrentTabChangedSlot(const int idx); diff --git a/src/widgets/fileview.h b/src/widgets/fileview.h index a6108d715..d9b6c5c40 100644 --- a/src/widgets/fileview.h +++ b/src/widgets/fileview.h @@ -72,7 +72,7 @@ class FileView : public QWidget { void CopyToDevice(const QList &urls); void EditTags(const QList &urls); - private slots: + private Q_SLOTS: void FileUp(); void FileHome(); void ChangeFilePath(const QString &new_path); diff --git a/src/widgets/fileviewlist.h b/src/widgets/fileviewlist.h index 057040f5c..6bf6e9017 100644 --- a/src/widgets/fileviewlist.h +++ b/src/widgets/fileviewlist.h @@ -63,7 +63,7 @@ class FileViewList : public QListView { QList UrlListFromSelection() const; MimeData *MimeDataFromSelection() const; - private slots: + private Q_SLOTS: void LoadSlot(); void AddToPlaylistSlot(); void OpenInNewPlaylistSlot(); diff --git a/src/widgets/groupediconview.h b/src/widgets/groupediconview.h index 6d097d1cc..3a47be01c 100644 --- a/src/widgets/groupediconview.h +++ b/src/widgets/groupediconview.h @@ -96,7 +96,7 @@ class GroupedIconView : public QListView { QRect visualRect(const QModelIndex &idx) const override; QRegion visualRegionForSelection(const QItemSelection &selection) const override; - private slots: + private Q_SLOTS: void LayoutItems(); private: diff --git a/src/widgets/lineedit.h b/src/widgets/lineedit.h index f9687e238..5edced794 100644 --- a/src/widgets/lineedit.h +++ b/src/widgets/lineedit.h @@ -125,7 +125,7 @@ class LineEdit : public QLineEdit, public ExtendedEditor { QVariant value() const override { return QLineEdit::text(); } void set_value(const QVariant &value) override { QLineEdit::setText(value.toString()); } - public slots: + public Q_SLOTS: void set_focus() override { QLineEdit::setFocus(); } void clear() override { QLineEdit::clear(); } @@ -137,7 +137,7 @@ class LineEdit : public QLineEdit, public ExtendedEditor { bool is_rtl() const { return is_rtl_; } void set_rtl(bool rtl) { is_rtl_ = rtl; } - private slots: + private Q_SLOTS: void text_changed(const QString &text); Q_SIGNALS: @@ -159,7 +159,7 @@ class TextEdit : public QPlainTextEdit, public ExtendedEditor { QVariant value() const override { return QPlainTextEdit::toPlainText(); } void set_value(const QVariant &value) override { QPlainTextEdit::setPlainText(value.toString()); } - public slots: + public Q_SLOTS: void set_focus() override { QPlainTextEdit::setFocus(); } void clear() override { QPlainTextEdit::clear(); } @@ -190,7 +190,7 @@ class SpinBox : public QSpinBox, public ExtendedEditor { void set_value(const QVariant &value) override { QSpinBox::setValue(value.toInt()); } bool is_empty() const override { return text().isEmpty() || text() == QStringLiteral("0"); } - public slots: + public Q_SLOTS: void set_focus() override { QSpinBox::setFocus(); } void clear() override { QSpinBox::clear(); } @@ -219,7 +219,7 @@ class CheckBox : public QCheckBox, public ExtendedEditor { void set_value(const QVariant &value) override { QCheckBox::setCheckState(value.toBool() ? Qt::Checked : Qt::Unchecked); } void set_partially() override { QCheckBox::setCheckState(Qt::PartiallyChecked); } - public slots: + public Q_SLOTS: void set_focus() override { QCheckBox::setFocus(); } void clear() override { QCheckBox::setChecked(false); } @@ -246,7 +246,7 @@ class RatingBox : public RatingWidget, public ExtendedEditor { void set_partially() override { RatingWidget::set_rating(0.0F); } - public slots: + public Q_SLOTS: void set_focus() override { RatingWidget::setFocus(); } void clear() override {} diff --git a/src/widgets/loginstatewidget.h b/src/widgets/loginstatewidget.h index 3b384a396..4e0148ed4 100644 --- a/src/widgets/loginstatewidget.h +++ b/src/widgets/loginstatewidget.h @@ -54,7 +54,7 @@ class LoginStateWidget : public QWidget { // QObject bool eventFilter(QObject *object, QEvent *event) override; - public slots: + public Q_SLOTS: // Changes the "You are logged in/out" label, shows/hides any QGroupBoxes added with AddCredentialGroup. void SetLoggedIn(const LoginStateWidget::State state, const QString &account_name = QString()); @@ -70,7 +70,7 @@ class LoginStateWidget : public QWidget { void LogoutClicked(); void LoginClicked(); - private slots: + private Q_SLOTS: void Logout(); void FocusLastCredentialField(); diff --git a/src/widgets/multiloadingindicator.h b/src/widgets/multiloadingindicator.h index 08badc45c..04026cb99 100644 --- a/src/widgets/multiloadingindicator.h +++ b/src/widgets/multiloadingindicator.h @@ -49,7 +49,7 @@ class MultiLoadingIndicator : public QWidget { protected: void paintEvent(QPaintEvent*) override; - private slots: + private Q_SLOTS: void UpdateText(); private: diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h index 5051670a3..46692d2c4 100644 --- a/src/widgets/playingwidget.h +++ b/src/widgets/playingwidget.h @@ -68,7 +68,7 @@ class PlayingWidget : public QWidget { Q_SIGNALS: void ShowAboveStatusBarChanged(const bool above); - public slots: + public Q_SLOTS: void Playing(); void Stopped(); void Error(); @@ -90,7 +90,7 @@ class PlayingWidget : public QWidget { LargeSongDetails = 1 }; - private slots: + private Q_SLOTS: void Update() { update(); } void SetMode(const Mode mode); void ShowAboveStatusBar(const bool above); diff --git a/src/widgets/qsearchfield.h b/src/widgets/qsearchfield.h index 410a40158..74d0dd11b 100644 --- a/src/widgets/qsearchfield.h +++ b/src/widgets/qsearchfield.h @@ -25,7 +25,7 @@ class QSearchField : public QWidget { #endif void setFocus(Qt::FocusReason); - public slots: + public Q_SLOTS: void setText(const QString &new_text); void setPlaceholderText(const QString &text); void clear(); diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h index 8145d56eb..3b0537d80 100644 --- a/src/widgets/stretchheaderview.h +++ b/src/widgets/stretchheaderview.h @@ -65,7 +65,7 @@ class StretchHeaderView : public QHeaderView { // width is the proportion of the entire width from 0.0 to 1.0. void SetColumnWidth(const int logical_index, const ColumnWidthType width); - public slots: + public Q_SLOTS: // Changes the stretch mode. // Enabling stretch mode will initialize the proportional column widths from the current state of the header. void ToggleStretchEnabled(); @@ -87,7 +87,7 @@ class StretchHeaderView : public QHeaderView { // Resizes the actual columns to make them match the proportional values in column_widths_. void ResizeSections(const QList §ions = QList()); - private slots: + private Q_SLOTS: void SectionResized(const int logical, const int old_size, const int new_size); private: diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h index 88ae44fd5..884871c86 100644 --- a/src/widgets/trackslider.h +++ b/src/widgets/trackslider.h @@ -56,7 +56,7 @@ class TrackSlider : public QWidget { MoodbarProxyStyle *moodbar_style() const { return moodbar_style_; } #endif - public slots: + public Q_SLOTS: void SetValue(const int elapsed, const int total); void SetStopped(); void SetCanSeek(const bool can_seek); @@ -71,7 +71,7 @@ class TrackSlider : public QWidget { void Next(); void Previous(); - private slots: + private Q_SLOTS: void ValueMaybeChanged(const int value); void ToggleTimeDisplay(); diff --git a/src/widgets/tracksliderpopup.h b/src/widgets/tracksliderpopup.h index e458880eb..bfada70c4 100644 --- a/src/widgets/tracksliderpopup.h +++ b/src/widgets/tracksliderpopup.h @@ -39,7 +39,7 @@ class TrackSliderPopup : public QWidget { public: explicit TrackSliderPopup(QWidget *parent); - public slots: + public Q_SLOTS: void SetText(const QString &text); void SetSmallText(const QString &small_text); void SetPopupPosition(const QPoint pos); diff --git a/src/widgets/tracksliderslider.h b/src/widgets/tracksliderslider.h index c4738449d..d6becdbce 100644 --- a/src/widgets/tracksliderslider.h +++ b/src/widgets/tracksliderslider.h @@ -62,7 +62,7 @@ class TrackSliderSlider : public QSlider { void leaveEvent(QEvent *e) override; void keyPressEvent(QKeyEvent *event) override; - private slots: + private Q_SLOTS: void UpdateDeltaTime(); private: diff --git a/src/widgets/volumeslider.h b/src/widgets/volumeslider.h index d61eb4756..47b146d75 100644 --- a/src/widgets/volumeslider.h +++ b/src/widgets/volumeslider.h @@ -64,7 +64,7 @@ class VolumeSlider : public SliderSlider { void mousePressEvent(QMouseEvent*) override; void wheelEvent(QWheelEvent *e) override; - private slots: + private Q_SLOTS: virtual void slotAnimTimer(); private: diff --git a/tests/src/test_utils.h b/tests/src/test_utils.h index 0ac14c8ad..7a78ab872 100644 --- a/tests/src/test_utils.h +++ b/tests/src/test_utils.h @@ -80,7 +80,7 @@ class TestQObject : public QObject { Q_SIGNALS: void Emitted(); - public slots: + public Q_SLOTS: void Invoke(); private: diff --git a/tests/src/testobjectdecorators.h b/tests/src/testobjectdecorators.h index 00ef6af02..408c21a98 100644 --- a/tests/src/testobjectdecorators.h +++ b/tests/src/testobjectdecorators.h @@ -29,7 +29,7 @@ class QStyleOptionProgressBar; class TestObjectDecorators : public QObject { Q_OBJECT - public slots: + public Q_SLOTS: static void initStyleOption(QProgressBar *self, QStyleOptionProgressBar *opt); };