Replace slots with Q_SLOTS

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();

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() {}

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();

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);
 

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);

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<int> &ids, const float rating, const bool save_tags = false);
 
- public slots:
+ public Q_SLOTS:
   void Exit();
   void GetAllSongs(const int id);
   void LoadDirectories();

src/collection/collectiondirectorymodel.h

@@ -54,7 +54,7 @@ class CollectionDirectoryModel : public QStandardItemModel {
   QMap<int, CollectionDirectory> directories() const { return directories_; }
   QStringList paths() const { return paths_; }
 
- private slots:
+ private Q_SLOTS:
   void AddDirectory(const CollectionDirectory &directory);
   void RemoveDirectory(const CollectionDirectory &directory);
 

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();

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;
 };
 

src/collection/collectionmodel.h

@@ -209,7 +209,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
   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<CollectionItem> {
   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();

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();

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);

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:

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();
 

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<PreviousCover> previous_cover);
   void FadePreviousCoverFinished(SharedPtr<PreviousCover> previous_cover);
 
- public slots:
+ public Q_SLOTS:
   void SearchCoverInProgress();
 
  private:

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();

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);

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:

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:

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();

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:

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:

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();
 

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();

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();

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:

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_ = 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();

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:

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();

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();

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);
 

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:

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();
 

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);
 

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

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();
 

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();

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);

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);

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();

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);

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();
 

src/covermanager/coverproviders.h

@@ -59,7 +59,7 @@ class CoverProviders : public QObject {
 
   int NextId();
 
- private slots:
+ private Q_SLOTS:
   void ProviderDestroyed();
 
  private:

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:

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:

src/covermanager/discogscoverprovider.h

@@ -84,7 +84,7 @@ class DiscogsCoverProvider : public JsonCoverProvider {
   void EndSearch(SharedPtr<DiscogsCoverSearchContext> 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);

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:

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);
 

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:

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<QSslError> &ssl_errors);

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:

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:

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:

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:

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

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);
 };
 

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:

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:

src/device/devicemanager.h

@@ -115,7 +115,7 @@ class DeviceManager : public SimpleTreeModel<DeviceInfo> {
   // 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<DeviceInfo> {
   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);

src/device/deviceproperties.h

@@ -51,7 +51,7 @@ class DeviceProperties : public QDialog {
   void SetDeviceManager(SharedPtr<DeviceManager> 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();

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);
 

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();

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();
 

src/device/giolister.h

@@ -67,7 +67,7 @@ class GioLister : public DeviceLister {
   QString MakeFriendlyName(const QString &id) override;
   QList<QUrl> 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;

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);
 

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:

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();
 

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);
 

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:

src/device/udisks2lister.h

@@ -65,14 +65,14 @@ class Udisks2Lister : public DeviceLister {
   QString MakeFriendlyName(const QString &id) override;
   QList<QUrl> 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);

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:

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:

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:

src/dialogs/edittagdialog.h

@@ -104,7 +104,7 @@ class EditTagDialog : public QDialog {
     AlbumCoverImageResult cover_result_;
   };
 
- private slots:
+ private Q_SLOTS:
   void SetSongsFinished();
   void SaveDataFinished();
 

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:

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);

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:

src/dialogs/saveplaylistsdialog.h

@@ -40,7 +40,7 @@ class SavePlaylistsDialog : public QDialog {
  protected:
   void accept() override;
 
- private slots:
+ private Q_SLOTS:
   void SelectPath();
 
  private:

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();

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<double> 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) {}

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);

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();
 

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);

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:

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();
 

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);

src/globalshortcuts/globalshortcutsbackend-kde.h

@@ -57,7 +57,7 @@ class GlobalShortcutsBackendKDE : public GlobalShortcutsBackend {
   static QList<int> ToIntList(const QList<QKeySequence> &sequence_list);
   static QList<QKeySequence> ToKeySequenceList(const QList<int> &sequence_list);
 
- private slots:
+ private Q_SLOTS:
   void RegisterFinished(QDBusPendingCallWatcher *watcher);
   void GlobalShortcutPressed(const QString &component_unique, const QString &shortcut_unique, qint64);
 

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);

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();
 

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:

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<QSslError> &ssl_errors);
   void RedirectArrived();
   void AccessTokenRequestFinished(QNetworkReply *reply);

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:

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:

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();

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();
 

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:

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);
 

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:

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);

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);