From 358da72ffe2b465c34a97e640f95452f06822323 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 11 Aug 2024 23:23:12 +0200 Subject: [PATCH] Replace signals with Q_SIGNALS --- ext/libstrawberry-common/core/messagereply.h | 2 +- ext/libstrawberry-common/core/workerpool.h | 2 +- src/analyzer/analyzercontainer.h | 2 +- src/collection/collection.h | 2 +- src/collection/collectionbackend.h | 2 +- src/collection/collectionfilterwidget.h | 2 +- src/collection/collectionmodel.h | 2 +- src/collection/collectionview.h | 2 +- src/collection/collectionwatcher.h | 2 +- src/collection/groupbydialog.h | 2 +- src/collection/savedgroupingmanager.h | 4 ++-- src/context/contextalbum.h | 2 +- src/context/contextview.h | 2 +- src/core/application.h | 2 +- src/core/database.h | 2 +- src/core/deletefiles.h | 2 +- src/core/filesystemwatcherinterface.h | 2 +- src/core/localredirectserver.h | 2 +- src/core/macfslistener.h | 2 +- src/core/macsystemtrayicon.h | 2 +- src/core/mainwindow.h | 2 +- src/core/mergedproxymodel.h | 2 +- src/core/mpris2.h | 2 +- src/core/player.h | 4 ++-- src/core/qtsystemtrayicon.h | 2 +- src/core/songloader.h | 2 +- src/core/tagreaderclient.h | 2 +- src/core/taskmanager.h | 2 +- src/core/urlhandler.h | 2 +- src/covermanager/albumcoverchoicecontroller.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/coverexportrunnable.h | 2 +- src/covermanager/coverprovider.h | 2 +- src/covermanager/currentalbumcoverloader.h | 2 +- src/device/cddadevice.h | 2 +- src/device/cddasongloader.h | 2 +- src/device/connecteddevice.h | 2 +- src/device/devicedatabasebackend.h | 2 +- src/device/devicelister.h | 2 +- src/device/devicemanager.h | 2 +- src/device/devicestatefiltermodel.h | 2 +- src/device/gpodloader.h | 2 +- src/device/mtploader.h | 2 +- src/dialogs/edittagdialog.h | 2 +- src/dialogs/trackselectiondialog.h | 2 +- src/engine/enginebase.h | 2 +- src/engine/gstenginepipeline.h | 2 +- src/equalizer/equalizer.h | 2 +- src/equalizer/equalizerslider.h | 2 +- src/globalshortcuts/globalshortcut.h | 2 +- src/globalshortcuts/globalshortcutsbackend.h | 2 +- src/globalshortcuts/globalshortcutsmanager.h | 2 +- src/lyrics/lyricsfetcher.h | 2 +- src/lyrics/lyricsfetchersearch.h | 2 +- src/lyrics/lyricsprovider.h | 2 +- src/moodbar/moodbarcontroller.h | 2 +- src/moodbar/moodbarpipeline.h | 2 +- src/musicbrainz/acoustidclient.h | 2 +- src/musicbrainz/musicbrainzclient.h | 2 +- src/musicbrainz/tagfetcher.h | 2 +- src/organize/organize.h | 2 +- src/organize/organizedialog.h | 2 +- src/osd/osdpretty.h | 2 +- src/playlist/dynamicplaylistcontrols.h | 2 +- src/playlist/playlist.h | 2 +- src/playlist/playlistbackend.h | 2 +- src/playlist/playlistcontainer.h | 2 +- src/playlist/playlistheader.h | 2 +- src/playlist/playlistlistmodel.h | 2 +- src/playlist/playlistlistview.h | 2 +- src/playlist/playlistmanager.h | 2 +- src/playlist/playlistsequence.h | 2 +- src/playlist/playlisttabbar.h | 2 +- src/playlist/playlistview.h | 2 +- src/playlist/songloaderinserter.h | 2 +- src/playlistparsers/parserbase.h | 2 +- src/playlistparsers/playlistparser.h | 2 +- src/qobuz/qobuzfavoriterequest.h | 2 +- src/qobuz/qobuzrequest.h | 2 +- src/qobuz/qobuzstreamurlrequest.h | 2 +- src/queue/queue.h | 2 +- src/radios/radiobackend.h | 2 +- src/radios/radioservice.h | 2 +- src/radios/radioview.h | 2 +- src/radios/radioviewcontainer.h | 2 +- src/scrobbler/audioscrobbler.h | 2 +- src/scrobbler/lastfmimport.h | 2 +- src/scrobbler/listenbrainzscrobbler.h | 2 +- src/scrobbler/scrobblerservice.h | 2 +- src/scrobbler/scrobblersettings.h | 2 +- src/scrobbler/scrobblingapi20.h | 2 +- src/settings/qobuzsettingspage.h | 2 +- src/settings/settingsdialog.h | 2 +- src/settings/settingspage.h | 2 +- src/settings/spotifysettingspage.h | 2 +- src/settings/subsonicsettingspage.h | 2 +- src/settings/tidalsettingspage.h | 2 +- src/smartplaylists/playlistgenerator.h | 2 +- src/smartplaylists/playlistgeneratorinserter.h | 2 +- src/smartplaylists/smartplaylistsearchtermwidget.h | 2 +- src/smartplaylists/smartplaylistsview.h | 2 +- src/smartplaylists/smartplaylistsviewcontainer.h | 2 +- src/spotify/spotifyfavoriterequest.h | 2 +- src/spotify/spotifyrequest.h | 2 +- src/streaming/streamingcollectionview.h | 2 +- src/streaming/streamingsearchview.h | 2 +- src/streaming/streamingservice.h | 2 +- src/streaming/streamingservices.h | 2 +- src/subsonic/subsonicrequest.h | 2 +- src/tidal/tidalbaserequest.h | 2 +- src/tidal/tidalfavoriterequest.h | 2 +- src/tidal/tidalrequest.h | 2 +- src/tidal/tidalstreamurlrequest.h | 2 +- src/transcoder/transcoder.h | 2 +- src/widgets/autoexpandingtreeview.h | 2 +- src/widgets/clickablelabel.h | 2 +- src/widgets/fancytabwidget.h | 2 +- src/widgets/favoritewidget.h | 2 +- src/widgets/fileview.h | 2 +- src/widgets/fileviewlist.h | 2 +- src/widgets/lineedit.h | 8 ++++---- src/widgets/loginstatewidget.h | 2 +- src/widgets/multiloadingindicator.h | 2 +- src/widgets/playingwidget.h | 2 +- src/widgets/qsearchfield.h | 2 +- src/widgets/ratingwidget.h | 2 +- src/widgets/renametablineedit.h | 2 +- src/widgets/sliderslider.h | 2 +- src/widgets/stretchheaderview.h | 2 +- src/widgets/trackslider.h | 2 +- src/widgets/tracksliderslider.h | 2 +- tests/src/test_utils.h | 2 +- 136 files changed, 141 insertions(+), 141 deletions(-) diff --git a/ext/libstrawberry-common/core/messagereply.h b/ext/libstrawberry-common/core/messagereply.h index 2f272f7de..dbf887942 100644 --- a/ext/libstrawberry-common/core/messagereply.h +++ b/ext/libstrawberry-common/core/messagereply.h @@ -45,7 +45,7 @@ class _MessageReplyBase : public QObject { void Abort(); - signals: + Q_SIGNALS: void Finished(); protected: diff --git a/ext/libstrawberry-common/core/workerpool.h b/ext/libstrawberry-common/core/workerpool.h index abae7f25a..bf9ed3c37 100644 --- a/ext/libstrawberry-common/core/workerpool.h +++ b/ext/libstrawberry-common/core/workerpool.h @@ -52,7 +52,7 @@ class _WorkerPoolBase : public QObject { public: explicit _WorkerPoolBase(QObject *parent = nullptr); - signals: + Q_SIGNALS: // Emitted when a worker failed to start. This usually happens when the worker wasn't found, or couldn't be executed. void WorkerFailedToStart(); diff --git a/src/analyzer/analyzercontainer.h b/src/analyzer/analyzercontainer.h index 514bfa879..2586f0c9a 100644 --- a/src/analyzer/analyzercontainer.h +++ b/src/analyzer/analyzercontainer.h @@ -50,7 +50,7 @@ class AnalyzerContainer : public QWidget { static const char *kSettingsGroup; static const char *kSettingsFramerate; - signals: + Q_SIGNALS: void WheelEvent(const int delta); protected: diff --git a/src/collection/collection.h b/src/collection/collection.h index 53b3dd720..8e0206f66 100644 --- a/src/collection/collection.h +++ b/src/collection/collection.h @@ -81,7 +81,7 @@ class SCollection : public QObject { void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false); void SongsRatingChanged(const SongList &songs, const bool save_tags = false); - signals: + Q_SIGNALS: void Error(const QString &error); void ExitFinished(); diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h index 27b760bf7..c36610d1f 100644 --- a/src/collection/collectionbackend.h +++ b/src/collection/collectionbackend.h @@ -275,7 +275,7 @@ class CollectionBackend : public CollectionBackendInterface { void UpdateLastSeen(const int directory_id, const int expire_unavailable_songs_days); void ExpireSongs(const int directory_id, const int expire_unavailable_songs_days); - signals: + Q_SIGNALS: void DirectoryAdded(const CollectionDirectory &dir, const CollectionSubdirectoryList &subdir); void DirectoryDeleted(const CollectionDirectory &dir); diff --git a/src/collection/collectionfilterwidget.h b/src/collection/collectionfilterwidget.h index 2d010b929..f7f980979 100644 --- a/src/collection/collectionfilterwidget.h +++ b/src/collection/collectionfilterwidget.h @@ -91,7 +91,7 @@ class CollectionFilterWidget : public QWidget { void SetFilterMode(CollectionFilterOptions::FilterMode filter_mode); void FocusOnFilter(QKeyEvent *e); - signals: + Q_SIGNALS: void UpPressed(); void DownPressed(); void ReturnPressed(); diff --git a/src/collection/collectionmodel.h b/src/collection/collectionmodel.h index 4e8dc4a2c..10afac9df 100644 --- a/src/collection/collectionmodel.h +++ b/src/collection/collectionmodel.h @@ -201,7 +201,7 @@ class CollectionModel : public SimpleTreeModel { bool CompareItems(const CollectionItem *a, const CollectionItem *b) const; - signals: + Q_SIGNALS: void TotalSongCountUpdated(const int count); void TotalArtistCountUpdated(const int count); void TotalAlbumCountUpdated(const int count); diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h index 5f1a5a937..61d787841 100644 --- a/src/collection/collectionview.h +++ b/src/collection/collectionview.h @@ -82,7 +82,7 @@ class CollectionView : public AutoExpandingTreeView { void EditTagError(const QString &message); - signals: + Q_SIGNALS: void ShowConfigDialog(); void TotalSongCountUpdated_(); diff --git a/src/collection/collectionwatcher.h b/src/collection/collectionwatcher.h index d411e68df..d10bd7831 100644 --- a/src/collection/collectionwatcher.h +++ b/src/collection/collectionwatcher.h @@ -71,7 +71,7 @@ class CollectionWatcher : public QObject { void RescanSongsAsync(const SongList &songs); - signals: + Q_SIGNALS: void NewOrUpdatedSongs(const SongList &songs); void SongsMTimeUpdated(const SongList &songs); void SongsDeleted(const SongList &songs); diff --git a/src/collection/groupbydialog.h b/src/collection/groupbydialog.h index da4ce83cf..3c2313d3d 100644 --- a/src/collection/groupbydialog.h +++ b/src/collection/groupbydialog.h @@ -47,7 +47,7 @@ class GroupByDialog : public QDialog { void CollectionGroupingChanged(const CollectionModel::Grouping g, const bool separate_albums_by_grouping); void accept() override; - signals: + Q_SIGNALS: void Accepted(const CollectionModel::Grouping g, const bool separate_albums_by_grouping); private slots: diff --git a/src/collection/savedgroupingmanager.h b/src/collection/savedgroupingmanager.h index 4a3397a52..e93e7473b 100644 --- a/src/collection/savedgroupingmanager.h +++ b/src/collection/savedgroupingmanager.h @@ -51,8 +51,8 @@ class SavedGroupingManager : public QDialog { static QString GroupByToString(const CollectionModel::GroupBy g); - signals: - void UpdateGroupByActions(); + Q_SIGNALS: + void UpdateGroupByActions(); private slots: void UpdateButtonState(); diff --git a/src/context/contextalbum.h b/src/context/contextalbum.h index 4944f57d2..64a45f7d6 100644 --- a/src/context/contextalbum.h +++ b/src/context/contextalbum.h @@ -78,7 +78,7 @@ class ContextAlbum : public QWidget { void ScaleCover(); void ScalePreviousCovers(); - signals: + Q_SIGNALS: void FadeStopFinished(); private slots: diff --git a/src/context/contextview.h b/src/context/contextview.h index ff53d11de..7c977c23e 100644 --- a/src/context/contextview.h +++ b/src/context/contextview.h @@ -80,7 +80,7 @@ class ContextView : public QWidget { void SearchLyrics(); void UpdateFonts(); - signals: + Q_SIGNALS: void AlbumEnabledChanged(); private slots: diff --git a/src/core/application.h b/src/core/application.h index ae81a0446..dbe93ecdc 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -120,7 +120,7 @@ class Application : public QObject { void ReloadSettings(); void OpenSettingsDialogAtPage(SettingsDialog::Page page); - signals: + Q_SIGNALS: void ErrorAdded(const QString &message); void SettingsChanged(); void SettingsDialogRequested(const SettingsDialog::Page page); diff --git a/src/core/database.h b/src/core/database.h index e28803a6d..3f9fdac16 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -83,7 +83,7 @@ class Database : public QObject { void AttachDatabaseOnDbConnection(const QString &database_name, const AttachedDatabase &database, QSqlDatabase &db); void DetachDatabase(const QString &database_name); - signals: + Q_SIGNALS: void ExitFinished(); void Error(const QString &error); void Errors(const QStringList &errors); diff --git a/src/core/deletefiles.h b/src/core/deletefiles.h index 4bd319143..f6a59dd84 100644 --- a/src/core/deletefiles.h +++ b/src/core/deletefiles.h @@ -44,7 +44,7 @@ class DeleteFiles : public QObject { void Start(const SongList &songs); void Start(const QStringList &filenames); - signals: + Q_SIGNALS: void Finished(const SongList &songs_with_errors); private slots: diff --git a/src/core/filesystemwatcherinterface.h b/src/core/filesystemwatcherinterface.h index d342a7417..1ef187d27 100644 --- a/src/core/filesystemwatcherinterface.h +++ b/src/core/filesystemwatcherinterface.h @@ -39,7 +39,7 @@ class FileSystemWatcherInterface : public QObject { static FileSystemWatcherInterface *Create(QObject *parent = nullptr); - signals: + Q_SIGNALS: void PathChanged(const QString &path); }; diff --git a/src/core/localredirectserver.h b/src/core/localredirectserver.h index a360eb674..f3ee00c5f 100644 --- a/src/core/localredirectserver.h +++ b/src/core/localredirectserver.h @@ -45,7 +45,7 @@ class LocalRedirectServer : public QTcpServer { const QUrl &request_url() const { return request_url_; } const QString &error() const { return error_; } - signals: + Q_SIGNALS: void Finished(); public slots: diff --git a/src/core/macfslistener.h b/src/core/macfslistener.h index 58279c205..aec3b9add 100644 --- a/src/core/macfslistener.h +++ b/src/core/macfslistener.h @@ -44,7 +44,7 @@ class MacFSListener : public FileSystemWatcherInterface { void RemovePath(const QString &path); void Clear(); - signals: + Q_SIGNALS: void PathChanged(const QString &path); private slots: diff --git a/src/core/macsystemtrayicon.h b/src/core/macsystemtrayicon.h index 278e96a48..c2e95a65f 100644 --- a/src/core/macsystemtrayicon.h +++ b/src/core/macsystemtrayicon.h @@ -74,7 +74,7 @@ class SystemTrayIcon : public QObject { private slots: void ActionChanged(); - signals: + Q_SIGNALS: void ChangeVolume(const int delta); void SeekForward(); void SeekBackward(); diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h index d2f9943b2..4ba035108 100644 --- a/src/core/mainwindow.h +++ b/src/core/mainwindow.h @@ -131,7 +131,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { void Activate() override; bool LoadUrl(const QString &url) override; - signals: + Q_SIGNALS: void AlbumCoverReady(const Song &song, const QImage &image); void SearchCoverInProgress(); // Signals that stop playing after track was toggled. diff --git a/src/core/mergedproxymodel.h b/src/core/mergedproxymodel.h index 136b31801..1dd27a5a3 100644 --- a/src/core/mergedproxymodel.h +++ b/src/core/mergedproxymodel.h @@ -85,7 +85,7 @@ class MergedProxyModel : public QAbstractProxyModel { QModelIndexList mapFromSource(const QModelIndexList &source_indexes) const; QModelIndexList mapToSource(const QModelIndexList &proxy_indexes) const; - signals: + Q_SIGNALS: void SubModelReset(const QModelIndex root, QAbstractItemModel *model); private slots: diff --git a/src/core/mpris2.h b/src/core/mpris2.h index b3ec2544c..215eb45e6 100644 --- a/src/core/mpris2.h +++ b/src/core/mpris2.h @@ -191,7 +191,7 @@ class Mpris2 : public QObject { void ActivatePlaylist(const QDBusObjectPath &playlist_id); MprisPlaylistList GetPlaylists(quint32 index, quint32 max_count, const QString &order, bool reverse_order); - signals: + Q_SIGNALS: // Player void Seeked(const qint64 position); diff --git a/src/core/player.h b/src/core/player.h index 1c7692bfa..93fbeb00d 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -102,7 +102,7 @@ class PlayerInterface : public QObject { virtual void PlayHelper() = 0; virtual void ShowOSD() = 0; - signals: + Q_SIGNALS: void Playing(); void Paused(); // Emitted only when playback is manually resumed @@ -190,7 +190,7 @@ class Player : public PlayerInterface { void HandleAuthentication(); - signals: + Q_SIGNALS: void EngineChanged(const EngineBase::Type Type); private slots: diff --git a/src/core/qtsystemtrayicon.h b/src/core/qtsystemtrayicon.h index 241b6e41c..37d9d1984 100644 --- a/src/core/qtsystemtrayicon.h +++ b/src/core/qtsystemtrayicon.h @@ -68,7 +68,7 @@ class SystemTrayIcon : public QSystemTrayIcon { QPixmap CreateIcon(const QPixmap &icon, const QPixmap &grey_icon); void UpdateIcon(); - signals: + Q_SIGNALS: void ChangeVolume(const int delta); void SeekForward(); void SeekBackward(); diff --git a/src/core/songloader.h b/src/core/songloader.h index 31eb73060..65d619c25 100644 --- a/src/core/songloader.h +++ b/src/core/songloader.h @@ -86,7 +86,7 @@ class SongLoader : public QObject { QStringList errors() { return errors_; } - signals: + Q_SIGNALS: void AudioCDTracksLoadFinished(); void LoadAudioCDFinished(const bool success); void LoadRemoteFinished(); diff --git a/src/core/tagreaderclient.h b/src/core/tagreaderclient.h index 4ba9a6b7d..db8547656 100644 --- a/src/core/tagreaderclient.h +++ b/src/core/tagreaderclient.h @@ -113,7 +113,7 @@ class TagReaderClient : public QObject { // TODO: Make this not a singleton static TagReaderClient *Instance() { return sInstance; } - signals: + Q_SIGNALS: void ExitFinished(); private slots: diff --git a/src/core/taskmanager.h b/src/core/taskmanager.h index 147a03ba0..d66ba0aea 100644 --- a/src/core/taskmanager.h +++ b/src/core/taskmanager.h @@ -69,7 +69,7 @@ class TaskManager : public QObject { void SetTaskFinished(const int id); quint64 GetTaskProgress(const int id); - signals: + Q_SIGNALS: void TasksChanged(); void PauseCollectionWatchers(); diff --git a/src/core/urlhandler.h b/src/core/urlhandler.h index 947b734ae..80d5a0e28 100644 --- a/src/core/urlhandler.h +++ b/src/core/urlhandler.h @@ -90,7 +90,7 @@ class UrlHandler : public QObject { // Called by the Player when a song starts loading - gives the handler a chance to do something clever to get a playable track. virtual LoadResult StartLoading(const QUrl &url) { return LoadResult(url); } - signals: + Q_SIGNALS: void AsyncLoadComplete(const UrlHandler::LoadResult &result); }; diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h index 8b124a3a9..79fb0f96e 100644 --- a/src/covermanager/albumcoverchoicecontroller.h +++ b/src/covermanager/albumcoverchoicecontroller.h @@ -162,7 +162,7 @@ class AlbumCoverChoiceController : public QWidget { void AlbumCoverFetched(const quint64 id, const AlbumCoverImageResult &result, const CoverSearchStatistics &statistics); void SaveEmbeddedCoverFinished(TagReaderReply *reply, Song song, const bool art_embedded); - signals: + Q_SIGNALS: void Error(const QString &error); void AutomaticCoverSearchDone(); diff --git a/src/covermanager/albumcoverexporter.h b/src/covermanager/albumcoverexporter.h index 5082856e1..d7a2287db 100644 --- a/src/covermanager/albumcoverexporter.h +++ b/src/covermanager/albumcoverexporter.h @@ -48,7 +48,7 @@ class AlbumCoverExporter : public QObject { int request_count() { return static_cast(requests_.size()); } - signals: + Q_SIGNALS: void AlbumCoversExportUpdate(const int exported, const int skipped, const int all); private slots: diff --git a/src/covermanager/albumcoverfetcher.h b/src/covermanager/albumcoverfetcher.h index 57fca1c85..c3921d175 100644 --- a/src/covermanager/albumcoverfetcher.h +++ b/src/covermanager/albumcoverfetcher.h @@ -117,7 +117,7 @@ class AlbumCoverFetcher : public QObject { void Clear(); - signals: + Q_SIGNALS: void AlbumCoverFetched(const quint64 request_id, const AlbumCoverImageResult &result, const CoverSearchStatistics &statistics); void SearchFinished(const quint64 request_id, const CoverProviderSearchResults &results, const CoverSearchStatistics &statistics); diff --git a/src/covermanager/albumcoverfetchersearch.h b/src/covermanager/albumcoverfetchersearch.h index de98f0755..0c29671e6 100644 --- a/src/covermanager/albumcoverfetchersearch.h +++ b/src/covermanager/albumcoverfetchersearch.h @@ -65,7 +65,7 @@ class AlbumCoverFetcherSearch : public QObject { static bool CoverProviderSearchResultCompareNumber(const CoverProviderSearchResult &a, const CoverProviderSearchResult &b); - signals: + Q_SIGNALS: // It's the end of search (when there was no fetch-me-a-cover request). void SearchFinished(quint64, const CoverProviderSearchResults &results); diff --git a/src/covermanager/albumcoverloader.h b/src/covermanager/albumcoverloader.h index 52806c5c9..723e90d6e 100644 --- a/src/covermanager/albumcoverloader.h +++ b/src/covermanager/albumcoverloader.h @@ -59,7 +59,7 @@ class AlbumCoverLoader : public QObject { void CancelTask(const quint64 id); void CancelTasks(const QSet &ids); - signals: + Q_SIGNALS: void ExitFinished(); void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result); diff --git a/src/covermanager/albumcovermanager.h b/src/covermanager/albumcovermanager.h index c8d21c159..67ef5bd14 100644 --- a/src/covermanager/albumcovermanager.h +++ b/src/covermanager/albumcovermanager.h @@ -149,7 +149,7 @@ class AlbumCoverManager : public QMainWindow { void LoadAlbumCoverAsync(AlbumItem *album_item); - signals: + Q_SIGNALS: void Error(const QString &error); void AddToPlaylist(QMimeData *data); diff --git a/src/covermanager/coverexportrunnable.h b/src/covermanager/coverexportrunnable.h index 9648e3170..b58e73216 100644 --- a/src/covermanager/coverexportrunnable.h +++ b/src/covermanager/coverexportrunnable.h @@ -40,7 +40,7 @@ class CoverExportRunnable : public QObject, public QRunnable { void run() override; - signals: + Q_SIGNALS: void CoverExported(); void CoverSkipped(); diff --git a/src/covermanager/coverprovider.h b/src/covermanager/coverprovider.h index 3a656635b..41ea4e6eb 100644 --- a/src/covermanager/coverprovider.h +++ b/src/covermanager/coverprovider.h @@ -68,7 +68,7 @@ class CoverProvider : public QObject { virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; - signals: + Q_SIGNALS: void AuthenticationComplete(const bool success, const QStringList &errors = QStringList()); void AuthenticationSuccess(); void AuthenticationFailure(const QStringList &errors); diff --git a/src/covermanager/currentalbumcoverloader.h b/src/covermanager/currentalbumcoverloader.h index ae7d0a488..bb8d82f20 100644 --- a/src/covermanager/currentalbumcoverloader.h +++ b/src/covermanager/currentalbumcoverloader.h @@ -53,7 +53,7 @@ class CurrentAlbumCoverLoader : public QObject { void ReloadSettings(); void LoadAlbumCover(const Song &song); - signals: + Q_SIGNALS: void AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &result); void ThumbnailLoaded(const Song &song, const QUrl &thumbnail_uri, const QImage &image); diff --git a/src/device/cddadevice.h b/src/device/cddadevice.h index 04b903ef7..f2a81d75b 100644 --- a/src/device/cddadevice.h +++ b/src/device/cddadevice.h @@ -56,7 +56,7 @@ class CddaDevice : public ConnectedDevice { static QStringList url_schemes() { return QStringList() << QStringLiteral("cdda"); } - signals: + Q_SIGNALS: void SongsDiscovered(const SongList &songs); private slots: diff --git a/src/device/cddasongloader.h b/src/device/cddasongloader.h index 4800bde1f..a964d9d80 100644 --- a/src/device/cddasongloader.h +++ b/src/device/cddasongloader.h @@ -59,7 +59,7 @@ class CddaSongLoader : public QObject { void Error(const QString &error); QUrl GetUrlFromTrack(const int track_number) const; - signals: + Q_SIGNALS: void SongsLoadError(const QString &error); void SongsLoaded(const SongList &songs); void SongsDurationLoaded(const SongList &songs, const QString &error = QString()); diff --git a/src/device/connecteddevice.h b/src/device/connecteddevice.h index bb5e5ae15..e146b4863 100644 --- a/src/device/connecteddevice.h +++ b/src/device/connecteddevice.h @@ -76,7 +76,7 @@ class ConnectedDevice : public QObject, public virtual MusicStorage, public enab public slots: void BackendCloseFinished(); - signals: + Q_SIGNALS: void TaskStarted(const int id); void SongCountUpdated(const int count); void DeviceConnectFinished(const QString &id, const bool success); diff --git a/src/device/devicedatabasebackend.h b/src/device/devicedatabasebackend.h index 8c4e86901..b8922f15d 100644 --- a/src/device/devicedatabasebackend.h +++ b/src/device/devicedatabasebackend.h @@ -71,7 +71,7 @@ class DeviceDatabaseBackend : public QObject { private slots: void Exit(); - signals: + Q_SIGNALS: void ExitFinished(); private: diff --git a/src/device/devicelister.h b/src/device/devicelister.h index 3c20f4417..39c647442 100644 --- a/src/device/devicelister.h +++ b/src/device/devicelister.h @@ -81,7 +81,7 @@ class DeviceLister : public QObject { virtual void UnmountDevice(const QString &id) { Q_UNUSED(id); } virtual void Exit(); - signals: + Q_SIGNALS: void DeviceAdded(const QString &id); void DeviceRemoved(const QString &id); void DeviceChanged(const QString &id); diff --git a/src/device/devicemanager.h b/src/device/devicemanager.h index 6f5831cb8..d25a7447f 100644 --- a/src/device/devicemanager.h +++ b/src/device/devicemanager.h @@ -118,7 +118,7 @@ class DeviceManager : public SimpleTreeModel { public slots: void Unmount(const QModelIndex &idx); - signals: + Q_SIGNALS: void ExitFinished(); void DeviceConnected(const QModelIndex idx); void DeviceDisconnected(const QModelIndex idx); diff --git a/src/device/devicestatefiltermodel.h b/src/device/devicestatefiltermodel.h index 74f54b84e..044d1291e 100644 --- a/src/device/devicestatefiltermodel.h +++ b/src/device/devicestatefiltermodel.h @@ -41,7 +41,7 @@ class DeviceStateFilterModel : public QSortFilterProxyModel { void setSourceModel(QAbstractItemModel *sourceModel) override; - signals: + Q_SIGNALS: void IsEmptyChanged(const bool is_empty); protected: diff --git a/src/device/gpodloader.h b/src/device/gpodloader.h index 63c0d5d73..c9915205e 100644 --- a/src/device/gpodloader.h +++ b/src/device/gpodloader.h @@ -52,7 +52,7 @@ class GPodLoader : public QObject { public slots: void LoadDatabase(); - signals: + Q_SIGNALS: void Error(const QString &message); void TaskStarted(const int task_id); void LoadFinished(Itdb_iTunesDB *db, const bool success); diff --git a/src/device/mtploader.h b/src/device/mtploader.h index 7edf870b2..74662b430 100644 --- a/src/device/mtploader.h +++ b/src/device/mtploader.h @@ -49,7 +49,7 @@ class MtpLoader : public QObject { public slots: void LoadDatabase(); - signals: + Q_SIGNALS: void Error(const QString &message); void TaskStarted(const int task_id); void LoadFinished(const bool success, MtpConnection *connection); diff --git a/src/dialogs/edittagdialog.h b/src/dialogs/edittagdialog.h index 2dac82144..ee098521b 100644 --- a/src/dialogs/edittagdialog.h +++ b/src/dialogs/edittagdialog.h @@ -73,7 +73,7 @@ class EditTagDialog : public QDialog { void accept() override; - signals: + Q_SIGNALS: void Error(const QString &message); protected: diff --git a/src/dialogs/trackselectiondialog.h b/src/dialogs/trackselectiondialog.h index c506bacfe..341fef849 100644 --- a/src/dialogs/trackselectiondialog.h +++ b/src/dialogs/trackselectiondialog.h @@ -53,7 +53,7 @@ class TrackSelectionDialog : public QDialog { // QDialog void accept() override; - signals: + Q_SIGNALS: void Error(const QString &error); void SongChosen(const Song &original_song, const Song &new_metadata); diff --git a/src/engine/enginebase.h b/src/engine/enginebase.h index 8a6eed093..4aabe870a 100644 --- a/src/engine/enginebase.h +++ b/src/engine/enginebase.h @@ -162,7 +162,7 @@ class EngineBase : public QObject { virtual void SetEqualizerEnabled(const bool) {} virtual void SetEqualizerParameters(const int, const QList&) {} - signals: + Q_SIGNALS: // Emitted when crossfading is enabled and the track is crossfade_duration_ away from finishing void TrackAboutToEnd(); diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index d501cf27b..93279cdd1 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -141,7 +141,7 @@ class GstEnginePipeline : public QObject { public slots: void SetFaderVolume(const qreal volume); - signals: + Q_SIGNALS: void Error(const int pipeline_id, const int domain, const int error_code, const QString &message, const QString &debug); void EndOfStreamReached(const int pipeline_id, const bool has_next_track); diff --git a/src/equalizer/equalizer.h b/src/equalizer/equalizer.h index 48ba8bc57..6452df27c 100644 --- a/src/equalizer/equalizer.h +++ b/src/equalizer/equalizer.h @@ -64,7 +64,7 @@ class Equalizer : public QDialog { Params current_params() const; float stereo_balance() const; - signals: + Q_SIGNALS: void StereoBalancerEnabledChanged(const bool enabled); void StereoBalanceChanged(const float balance); void EqualizerEnabledChanged(const bool enabled); diff --git a/src/equalizer/equalizerslider.h b/src/equalizer/equalizerslider.h index b359bad49..7bfa1439c 100644 --- a/src/equalizer/equalizerslider.h +++ b/src/equalizer/equalizerslider.h @@ -40,7 +40,7 @@ class EqualizerSlider : public QWidget { int value() const; void set_value(const int value); - signals: + Q_SIGNALS: void ValueChanged(const int value); public slots: diff --git a/src/globalshortcuts/globalshortcut.h b/src/globalshortcuts/globalshortcut.h index b71e17476..551e112ab 100644 --- a/src/globalshortcuts/globalshortcut.h +++ b/src/globalshortcuts/globalshortcut.h @@ -50,7 +50,7 @@ class GlobalShortcut : public QObject, QAbstractNativeEventFilter { bool setShortcut(const QKeySequence &shortcut); bool unsetShortcut(); - signals: + Q_SIGNALS: void activated(); private: diff --git a/src/globalshortcuts/globalshortcutsbackend.h b/src/globalshortcuts/globalshortcutsbackend.h index f26305838..d421d486d 100644 --- a/src/globalshortcuts/globalshortcutsbackend.h +++ b/src/globalshortcuts/globalshortcutsbackend.h @@ -54,7 +54,7 @@ class GlobalShortcutsBackend : public QObject { bool is_active() const { return active_; } - signals: + Q_SIGNALS: void RegisterFinished(const bool success); protected: diff --git a/src/globalshortcuts/globalshortcutsmanager.h b/src/globalshortcuts/globalshortcutsmanager.h index 6f2c24e68..0c5f1c451 100644 --- a/src/globalshortcuts/globalshortcutsmanager.h +++ b/src/globalshortcuts/globalshortcutsmanager.h @@ -77,7 +77,7 @@ class GlobalShortcutsManager : public QWidget { void ReloadSettings(); void ShowMacAccessibilityDialog(); - signals: + Q_SIGNALS: void Play(); void Pause(); void PlayPause(); diff --git a/src/lyrics/lyricsfetcher.h b/src/lyrics/lyricsfetcher.h index 73af6956a..e553a53b9 100644 --- a/src/lyrics/lyricsfetcher.h +++ b/src/lyrics/lyricsfetcher.h @@ -59,7 +59,7 @@ class LyricsFetcher : public QObject { private: void AddRequest(const Request &request); - signals: + Q_SIGNALS: void LyricsFetched(const quint64 request_id, const QString &provider, const QString &lyrics); void SearchFinished(const quint64 request_id, const LyricsSearchResults &results); diff --git a/src/lyrics/lyricsfetchersearch.h b/src/lyrics/lyricsfetchersearch.h index 5af5179c3..f11731eaf 100644 --- a/src/lyrics/lyricsfetchersearch.h +++ b/src/lyrics/lyricsfetchersearch.h @@ -43,7 +43,7 @@ class LyricsFetcherSearch : public QObject { void Start(SharedPtr lyrics_providers); void Cancel(); - signals: + Q_SIGNALS: void SearchFinished(const quint64 id, const LyricsSearchResults &results); void LyricsFetched(const quint64 id, const QString &provider, const QString &lyrics); diff --git a/src/lyrics/lyricsprovider.h b/src/lyrics/lyricsprovider.h index c84423365..ba2666ee7 100644 --- a/src/lyrics/lyricsprovider.h +++ b/src/lyrics/lyricsprovider.h @@ -56,7 +56,7 @@ class LyricsProvider : public QObject { virtual void Error(const QString &error, const QVariant &debug = QVariant()) = 0; - signals: + Q_SIGNALS: void AuthenticationComplete(const bool success, const QStringList &errors = QStringList()); void AuthenticationSuccess(); void AuthenticationFailure(const QStringList &errors); diff --git a/src/moodbar/moodbarcontroller.h b/src/moodbar/moodbarcontroller.h index c5fc2c3cd..cefeba4da 100644 --- a/src/moodbar/moodbarcontroller.h +++ b/src/moodbar/moodbarcontroller.h @@ -35,7 +35,7 @@ class MoodbarController : public QObject { void ReloadSettings(); - signals: + Q_SIGNALS: void CurrentMoodbarDataChanged(const QByteArray &data); private slots: diff --git a/src/moodbar/moodbarpipeline.h b/src/moodbar/moodbarpipeline.h index 9c752dfec..8ee4fbc7b 100644 --- a/src/moodbar/moodbarpipeline.h +++ b/src/moodbar/moodbarpipeline.h @@ -46,7 +46,7 @@ class MoodbarPipeline : public QObject { public slots: void Start(); - signals: + Q_SIGNALS: void Finished(const bool success); private: diff --git a/src/musicbrainz/acoustidclient.h b/src/musicbrainz/acoustidclient.h index 06e39286f..9d056200e 100644 --- a/src/musicbrainz/acoustidclient.h +++ b/src/musicbrainz/acoustidclient.h @@ -60,7 +60,7 @@ class AcoustidClient : public QObject { // Cancels all requests. Finished() will never be emitted for any pending requests. void CancelAll(); - signals: + Q_SIGNALS: void Finished(const int id, const QStringList &mbid_list, const QString &error = QString()); private slots: diff --git a/src/musicbrainz/musicbrainzclient.h b/src/musicbrainz/musicbrainzclient.h index 608276bc8..81e228a45 100644 --- a/src/musicbrainz/musicbrainzclient.h +++ b/src/musicbrainz/musicbrainzclient.h @@ -101,7 +101,7 @@ class MusicBrainzClient : public QObject { // Cancels all requests. Finished() will never be emitted for any pending requests. void CancelAll(); - signals: + Q_SIGNALS: // Finished signal emitted when fechting songs tags void Finished(const int id, const MusicBrainzClient::ResultList &result, const QString &error = QString()); // Finished signal emitted when fechting album's songs tags using DiscId diff --git a/src/musicbrainz/tagfetcher.h b/src/musicbrainz/tagfetcher.h index cb3028c66..bb7fc2cc2 100644 --- a/src/musicbrainz/tagfetcher.h +++ b/src/musicbrainz/tagfetcher.h @@ -49,7 +49,7 @@ class TagFetcher : public QObject { public slots: void Cancel(); - signals: + 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()); diff --git a/src/organize/organize.h b/src/organize/organize.h index e822a7d3d..2deb9f34e 100644 --- a/src/organize/organize.h +++ b/src/organize/organize.h @@ -68,7 +68,7 @@ class Organize : public QObject { void Start(); - signals: + Q_SIGNALS: void Finished(const QStringList &files_with_errors, const QStringList&); void FileCopied(const int database_id); void SongPathChanged(const Song &song, const QFileInfo &new_file, const std::optional new_collection_directory_id); diff --git a/src/organize/organizedialog.h b/src/organize/organizedialog.h index d53185171..e4ca53780 100644 --- a/src/organize/organizedialog.h +++ b/src/organize/organizedialog.h @@ -86,7 +86,7 @@ class OrganizeDialog : public QDialog { static SongList LoadSongsBlocking(const QStringList &filenames); void SetLoadingSongs(const bool loading); - signals: + Q_SIGNALS: void FileCopied(const int); public slots: diff --git a/src/osd/osdpretty.h b/src/osd/osdpretty.h index 87a9cac6f..55626542f 100644 --- a/src/osd/osdpretty.h +++ b/src/osd/osdpretty.h @@ -106,7 +106,7 @@ class OSDPretty : public QWidget { bool toggle_mode() const { return toggle_mode_; } void set_toggle_mode(const bool toggle_mode) { toggle_mode_ = toggle_mode; } - signals: + Q_SIGNALS: void PositionChanged(); public slots: diff --git a/src/playlist/dynamicplaylistcontrols.h b/src/playlist/dynamicplaylistcontrols.h index cec8060c5..449e14518 100644 --- a/src/playlist/dynamicplaylistcontrols.h +++ b/src/playlist/dynamicplaylistcontrols.h @@ -29,7 +29,7 @@ class DynamicPlaylistControls : public QWidget { DynamicPlaylistControls(QWidget *parent = nullptr); ~DynamicPlaylistControls() override; - signals: + Q_SIGNALS: void Expand(); void Repopulate(); void TurnOff(); diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index ae21eb0d0..d324c9c9e 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -304,7 +304,7 @@ class Playlist : public QAbstractListModel { void AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &result); - signals: + Q_SIGNALS: void RestoreFinished(); void PlaylistLoaded(); void CurrentSongChanged(const Song &metadata); diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h index ffe599d0c..db31857a9 100644 --- a/src/playlist/playlistbackend.h +++ b/src/playlist/playlistbackend.h @@ -90,7 +90,7 @@ class PlaylistBackend : public QObject { void Exit(); void SavePlaylist(const int playlist, const PlaylistItemPtrList &items, const int last_played, PlaylistGeneratorPtr dynamic); - signals: + Q_SIGNALS: void ExitFinished(); private: diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h index 8270fc6aa..2d8f36e6f 100644 --- a/src/playlist/playlistcontainer.h +++ b/src/playlist/playlistcontainer.h @@ -65,7 +65,7 @@ class PlaylistContainer : public QWidget { bool eventFilter(QObject *objectWatched, QEvent *event) override; - signals: + Q_SIGNALS: void UndoRedoActionsChanged(QAction *undo, QAction *redo); void ViewSelectionModelChanged(); diff --git a/src/playlist/playlistheader.h b/src/playlist/playlistheader.h index 4dee37313..d25451f45 100644 --- a/src/playlist/playlistheader.h +++ b/src/playlist/playlistheader.h @@ -52,7 +52,7 @@ class PlaylistHeader : public StretchHeaderView { void enterEvent(QEvent*) override; #endif - signals: + Q_SIGNALS: void SectionVisibilityChanged(const int logical_index, const bool visible); void MouseEntered(); void SectionRatingLockStatusChanged(const bool); diff --git a/src/playlist/playlistlistmodel.h b/src/playlist/playlistlistmodel.h index 0e21e0aad..9852bee9c 100644 --- a/src/playlist/playlistlistmodel.h +++ b/src/playlist/playlistlistmodel.h @@ -80,7 +80,7 @@ class PlaylistListModel : public QStandardItemModel { // QStandardItemModel bool setData(const QModelIndex &idx, const QVariant &value, int role) override; - signals: + Q_SIGNALS: void PlaylistPathChanged(const int id, const QString &new_path); void PlaylistRenamed(const int id, const QString &new_name); diff --git a/src/playlist/playlistlistview.h b/src/playlist/playlistlistview.h index 29830db25..36c0ece70 100644 --- a/src/playlist/playlistlistview.h +++ b/src/playlist/playlistlistview.h @@ -46,7 +46,7 @@ class PlaylistListView : public AutoExpandingTreeView { bool ItemsSelected() const; - signals: + Q_SIGNALS: void ItemsSelectedChanged(const bool); void ItemMimeDataDroppedSignal(const QModelIndex &proxy_idx, const QMimeData *q_mimedata); diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h index 81576a152..51ad709ac 100644 --- a/src/playlist/playlistmanager.h +++ b/src/playlist/playlistmanager.h @@ -114,7 +114,7 @@ class PlaylistManagerInterface : public QObject { // Rate current song using 0 - 5 scale. virtual void RateCurrentSong2(const int rating) = 0; - signals: + Q_SIGNALS: void PlaylistManagerInitialized(); void AllPlaylistsLoaded(); diff --git a/src/playlist/playlistsequence.h b/src/playlist/playlistsequence.h index 7f31ca133..d1d478a8c 100644 --- a/src/playlist/playlistsequence.h +++ b/src/playlist/playlistsequence.h @@ -72,7 +72,7 @@ class PlaylistSequence : public QWidget { void CycleShuffleMode(); void CycleRepeatMode(); - signals: + Q_SIGNALS: void RepeatModeChanged(const PlaylistSequence::RepeatMode mode); void ShuffleModeChanged(const PlaylistSequence::ShuffleMode mode); diff --git a/src/playlist/playlisttabbar.h b/src/playlist/playlisttabbar.h index 7657cf1bf..65cca403f 100644 --- a/src/playlist/playlisttabbar.h +++ b/src/playlist/playlisttabbar.h @@ -70,7 +70,7 @@ class PlaylistTabBar : public QTabBar { void RemoveTab(const int id); void InsertTab(const int id, const int index, const QString &text, const bool favorite); - signals: + Q_SIGNALS: void CurrentIdChanged(const int id); void Rename(const int id, const QString &name); void Close(const int id); diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index dbed1dd2d..9ca0954c9 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -104,7 +104,7 @@ class PlaylistView : public QTreeView { void SetColumnAlignment(const int section, const Qt::Alignment alignment); void JumpToCurrentlyPlayingTrack(); - signals: + Q_SIGNALS: void PlayItem(const QModelIndex idx, const Playlist::AutoScroll autoscroll); void PlayPause(const quint64 offset_nanosec = 0, const Playlist::AutoScroll autoscroll = Playlist::AutoScroll::Never); void RightClicked(const QPoint global_pos, const QModelIndex idx); diff --git a/src/playlist/songloaderinserter.h b/src/playlist/songloaderinserter.h index e7e34d209..11ec74a34 100644 --- a/src/playlist/songloaderinserter.h +++ b/src/playlist/songloaderinserter.h @@ -48,7 +48,7 @@ class SongLoaderInserter : public QObject { void Load(Playlist *destination, int row, bool play_now, bool enqueue, bool enqueue_next, const QList &urls); void LoadAudioCD(Playlist *destination, int row, bool play_now, bool enqueue, bool enqueue_next); - signals: + Q_SIGNALS: void Error(const QString &message); void PreloadFinished(); void EffectiveLoadFinished(const SongList &songs); diff --git a/src/playlistparsers/parserbase.h b/src/playlistparsers/parserbase.h index 5ac122c2d..a0cd2d97f 100644 --- a/src/playlistparsers/parserbase.h +++ b/src/playlistparsers/parserbase.h @@ -61,7 +61,7 @@ class ParserBase : public QObject { virtual SongList Load(QIODevice *device, const QString &playlist_path = QLatin1String(""), const QDir &dir = QDir(), const bool collection_lookup = true) const = 0; virtual void Save(const SongList &songs, QIODevice *device, const QDir &dir = QDir(), const PlaylistSettingsPage::PathType path_type = PlaylistSettingsPage::PathType::Automatic) const = 0; - signals: + Q_SIGNALS: void Error(const QString &error) const; protected: diff --git a/src/playlistparsers/playlistparser.h b/src/playlistparsers/playlistparser.h index 24531545d..c6842274d 100644 --- a/src/playlistparsers/playlistparser.h +++ b/src/playlistparsers/playlistparser.h @@ -67,7 +67,7 @@ class PlaylistParser : public QObject { SongList LoadFromDevice(QIODevice *device, const QString &path_hint = QString(), const QDir &dir_hint = QDir()) const; void Save(const SongList &songs, const QString &filename, const PlaylistSettingsPage::PathType) const; - signals: + Q_SIGNALS: void Error(const QString &error) const; private: diff --git a/src/qobuz/qobuzfavoriterequest.h b/src/qobuz/qobuzfavoriterequest.h index 239b2c5e8..c86a93d63 100644 --- a/src/qobuz/qobuzfavoriterequest.h +++ b/src/qobuz/qobuzfavoriterequest.h @@ -49,7 +49,7 @@ class QobuzFavoriteRequest : public QobuzBaseRequest { Songs }; - signals: + Q_SIGNALS: void ArtistsAdded(const SongList &songs); void AlbumsAdded(const SongList &songs); void SongsAdded(const SongList &songs); diff --git a/src/qobuz/qobuzrequest.h b/src/qobuz/qobuzrequest.h index 66a069f79..0ada2f049 100644 --- a/src/qobuz/qobuzrequest.h +++ b/src/qobuz/qobuzrequest.h @@ -98,7 +98,7 @@ class QobuzRequest : public QobuzBaseRequest { QString filename; }; - signals: + Q_SIGNALS: void LoginSuccess(); void LoginFailure(const QString &failure_reason); void Results(const int id, const SongMap &songs, const QString &error); diff --git a/src/qobuz/qobuzstreamurlrequest.h b/src/qobuz/qobuzstreamurlrequest.h index d1dce5356..8d8deded6 100644 --- a/src/qobuz/qobuzstreamurlrequest.h +++ b/src/qobuz/qobuzstreamurlrequest.h @@ -53,7 +53,7 @@ class QobuzStreamURLRequest : public QobuzBaseRequest { int song_id() const { return song_id_; } bool need_login() const { return need_login_; } - signals: + Q_SIGNALS: void TryLogin(); 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); diff --git a/src/queue/queue.h b/src/queue/queue.h index e96ae9afe..eb34c52cf 100644 --- a/src/queue/queue.h +++ b/src/queue/queue.h @@ -80,7 +80,7 @@ class Queue : public QAbstractProxyModel { public slots: void UpdateSummaryText(); - signals: + Q_SIGNALS: void TotalLengthChanged(const quint64 length); void ItemCountChanged(const int count); void SummaryTextChanged(const QString &message); diff --git a/src/radios/radiobackend.h b/src/radios/radiobackend.h index fc79c09c5..b1c200e38 100644 --- a/src/radios/radiobackend.h +++ b/src/radios/radiobackend.h @@ -46,7 +46,7 @@ class RadioBackend : public QObject { void GetChannels(); void DeleteChannels(); - signals: + Q_SIGNALS: void NewChannels(const RadioChannelList &channels); void ExitFinished(); diff --git a/src/radios/radioservice.h b/src/radios/radioservice.h index d3026eb7f..69c8b909f 100644 --- a/src/radios/radioservice.h +++ b/src/radios/radioservice.h @@ -53,7 +53,7 @@ class RadioService : public QObject { virtual QUrl Homepage() = 0; virtual QUrl Donate() = 0; - signals: + Q_SIGNALS: void NewChannels(const RadioChannelList &channels = RadioChannelList()); public slots: diff --git a/src/radios/radioview.h b/src/radios/radioview.h index dc4db9cc8..8fabfb2b4 100644 --- a/src/radios/radioview.h +++ b/src/radios/radioview.h @@ -42,7 +42,7 @@ class RadioView : public AutoExpandingTreeView { void showEvent(QShowEvent *e) override; void contextMenuEvent(QContextMenuEvent *e) override; - signals: + Q_SIGNALS: void GetChannels(); private slots: diff --git a/src/radios/radioviewcontainer.h b/src/radios/radioviewcontainer.h index 11135f73a..3f2a4c7b8 100644 --- a/src/radios/radioviewcontainer.h +++ b/src/radios/radioviewcontainer.h @@ -37,7 +37,7 @@ class RadioViewContainer : public QWidget { RadioView *view() const { return ui_->view; } - signals: + Q_SIGNALS: void Refresh(); private: diff --git a/src/scrobbler/audioscrobbler.h b/src/scrobbler/audioscrobbler.h index 3e5de2e60..0c0496b11 100644 --- a/src/scrobbler/audioscrobbler.h +++ b/src/scrobbler/audioscrobbler.h @@ -85,7 +85,7 @@ class AudioScrobbler : public QObject { void Love(); void WriteCache(); - signals: + Q_SIGNALS: void ErrorMessage(const QString &error); private: diff --git a/src/scrobbler/lastfmimport.h b/src/scrobbler/lastfmimport.h index 0b45b430a..caac9942f 100644 --- a/src/scrobbler/lastfmimport.h +++ b/src/scrobbler/lastfmimport.h @@ -80,7 +80,7 @@ class LastFMImport : public QObject { void FinishCheck(); - signals: + Q_SIGNALS: void UpdatePlayCount(const QString&, const QString&, const int, const bool = false); void UpdateLastPlayed(const QString&, const QString&, const QString&, const qint64); void UpdateTotal(const int, const int); diff --git a/src/scrobbler/listenbrainzscrobbler.h b/src/scrobbler/listenbrainzscrobbler.h index 12773075e..2dc68240d 100644 --- a/src/scrobbler/listenbrainzscrobbler.h +++ b/src/scrobbler/listenbrainzscrobbler.h @@ -77,7 +77,7 @@ class ListenBrainzScrobbler : public ScrobblerService { APIError }; - signals: + Q_SIGNALS: void AuthenticationComplete(const bool success, const QString &error = QString()); public slots: diff --git a/src/scrobbler/scrobblerservice.h b/src/scrobbler/scrobblerservice.h index bc8402930..3f44820b2 100644 --- a/src/scrobbler/scrobblerservice.h +++ b/src/scrobbler/scrobblerservice.h @@ -70,7 +70,7 @@ class ScrobblerService : public QObject { virtual void Submit() = 0; virtual void WriteCache() = 0; - signals: + Q_SIGNALS: void ErrorMessage(const QString &error); protected: diff --git a/src/scrobbler/scrobblersettings.h b/src/scrobbler/scrobblersettings.h index 7afc63779..612a4ec99 100644 --- a/src/scrobbler/scrobblersettings.h +++ b/src/scrobbler/scrobblersettings.h @@ -57,7 +57,7 @@ class ScrobblerSettings : public QObject { void ToggleOffline(); void ErrorReceived(const QString &error); - signals: + Q_SIGNALS: void ErrorMessage(const QString &error); void ScrobblingEnabledChanged(const bool value); void ScrobblingOfflineChanged(const bool value); diff --git a/src/scrobbler/scrobblingapi20.h b/src/scrobbler/scrobblingapi20.h index a993c82f2..549dc8cc2 100644 --- a/src/scrobbler/scrobblingapi20.h +++ b/src/scrobbler/scrobblingapi20.h @@ -68,7 +68,7 @@ class ScrobblingAPI20 : public ScrobblerService { void Submit() override; void Love() override; - signals: + Q_SIGNALS: void AuthenticationComplete(const bool success, const QString &error = QString()); public slots: diff --git a/src/settings/qobuzsettingspage.h b/src/settings/qobuzsettingspage.h index bd0ccf637..786439f8b 100644 --- a/src/settings/qobuzsettingspage.h +++ b/src/settings/qobuzsettingspage.h @@ -45,7 +45,7 @@ class QobuzSettingsPage : public SettingsPage { bool eventFilter(QObject *object, QEvent *event) override; - signals: + Q_SIGNALS: void Login(const QString &username, const QString &password, const QString &token); private slots: diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h index 076652257..e567036fd 100644 --- a/src/settings/settingsdialog.h +++ b/src/settings/settingsdialog.h @@ -137,7 +137,7 @@ class SettingsDialog : public QDialog { void Apply(); void Save(); - signals: + Q_SIGNALS: void ReloadSettings(); void NotificationPreview(const OSDBase::Behaviour, const QString&, const QString&); diff --git a/src/settings/settingspage.h b/src/settings/settingspage.h index 88fd081b4..9d26ea053 100644 --- a/src/settings/settingspage.h +++ b/src/settings/settingspage.h @@ -80,7 +80,7 @@ class SettingsPage : public QWidget { protected: bool eventFilter(QObject *obj, QEvent *e) override; - signals: + Q_SIGNALS: void NotificationPreview(const OSDBase::Behaviour, const QString&, const QString&); private: diff --git a/src/settings/spotifysettingspage.h b/src/settings/spotifysettingspage.h index 0fb19ae6f..50ef59f7c 100644 --- a/src/settings/spotifysettingspage.h +++ b/src/settings/spotifysettingspage.h @@ -47,7 +47,7 @@ class SpotifySettingsPage : public SettingsPage { bool eventFilter(QObject *object, QEvent *event) override; - signals: + Q_SIGNALS: void Authorize(); private slots: diff --git a/src/settings/subsonicsettingspage.h b/src/settings/subsonicsettingspage.h index de126cc81..de2a35b80 100644 --- a/src/settings/subsonicsettingspage.h +++ b/src/settings/subsonicsettingspage.h @@ -53,7 +53,7 @@ class SubsonicSettingsPage : public SettingsPage { bool eventFilter(QObject *object, QEvent *event) override; - signals: + Q_SIGNALS: void Test(const QUrl &url, const QString &username, const QString &password, const SubsonicSettingsPage::AuthMethod auth_method, const bool redirect = false); private slots: diff --git a/src/settings/tidalsettingspage.h b/src/settings/tidalsettingspage.h index 17f2d7da3..1eb12dcda 100644 --- a/src/settings/tidalsettingspage.h +++ b/src/settings/tidalsettingspage.h @@ -53,7 +53,7 @@ class TidalSettingsPage : public SettingsPage { bool eventFilter(QObject *object, QEvent *event) override; - signals: + Q_SIGNALS: void Authorize(const QString &client_id); void Login(const QString &api_token, const QString &username, const QString &password); diff --git a/src/smartplaylists/playlistgenerator.h b/src/smartplaylists/playlistgenerator.h index a52b2bb1e..cec3e962c 100644 --- a/src/smartplaylists/playlistgenerator.h +++ b/src/smartplaylists/playlistgenerator.h @@ -87,7 +87,7 @@ class PlaylistGenerator : public QObject, public enable_shared_from_this &urls); void MoveToCollection(const QList &urls); diff --git a/src/widgets/lineedit.h b/src/widgets/lineedit.h index 12751164f..f9687e238 100644 --- a/src/widgets/lineedit.h +++ b/src/widgets/lineedit.h @@ -140,7 +140,7 @@ class LineEdit : public QLineEdit, public ExtendedEditor { private slots: void text_changed(const QString &text); - signals: + Q_SIGNALS: void Reset(); }; @@ -167,7 +167,7 @@ class TextEdit : public QPlainTextEdit, public ExtendedEditor { void paintEvent(QPaintEvent*) override; void resizeEvent(QResizeEvent*) override; - signals: + Q_SIGNALS: void Reset(); }; @@ -198,7 +198,7 @@ class SpinBox : public QSpinBox, public ExtendedEditor { void paintEvent(QPaintEvent*) override; void resizeEvent(QResizeEvent*) override; - signals: + Q_SIGNALS: void Reset(); }; @@ -227,7 +227,7 @@ class CheckBox : public QCheckBox, public ExtendedEditor { void paintEvent(QPaintEvent*) override; void resizeEvent(QResizeEvent*) override; - signals: + Q_SIGNALS: void Reset(); }; diff --git a/src/widgets/loginstatewidget.h b/src/widgets/loginstatewidget.h index a00c2fa8a..3b384a396 100644 --- a/src/widgets/loginstatewidget.h +++ b/src/widgets/loginstatewidget.h @@ -66,7 +66,7 @@ class LoginStateWidget : public QWidget { void SetExpires(const QDate expires); - signals: + Q_SIGNALS: void LogoutClicked(); void LoginClicked(); diff --git a/src/widgets/multiloadingindicator.h b/src/widgets/multiloadingindicator.h index a2f6e2fa3..08badc45c 100644 --- a/src/widgets/multiloadingindicator.h +++ b/src/widgets/multiloadingindicator.h @@ -43,7 +43,7 @@ class MultiLoadingIndicator : public QWidget { QSize sizeHint() const override; - signals: + Q_SIGNALS: void TaskCountChange(const int tasks); protected: diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h index 8ae27e880..5051670a3 100644 --- a/src/widgets/playingwidget.h +++ b/src/widgets/playingwidget.h @@ -65,7 +65,7 @@ class PlayingWidget : public QWidget { QSize sizeHint() const override; bool show_above_status_bar() const { return above_statusbar_action_->isChecked(); } - signals: + Q_SIGNALS: void ShowAboveStatusBarChanged(const bool above); public slots: diff --git a/src/widgets/qsearchfield.h b/src/widgets/qsearchfield.h index 1464fac18..410a40158 100644 --- a/src/widgets/qsearchfield.h +++ b/src/widgets/qsearchfield.h @@ -32,7 +32,7 @@ class QSearchField : public QWidget { void selectAll(); void setFocus(); - signals: + Q_SIGNALS: void textChanged(const QString &text); void editingFinished(); void returnPressed(); diff --git a/src/widgets/ratingwidget.h b/src/widgets/ratingwidget.h index 0a8bb7a3e..3488ee376 100644 --- a/src/widgets/ratingwidget.h +++ b/src/widgets/ratingwidget.h @@ -55,7 +55,7 @@ class RatingWidget : public QWidget { float rating() const { return rating_; } void set_rating(const float rating); - signals: + Q_SIGNALS: void RatingChanged(const float rating); protected: diff --git a/src/widgets/renametablineedit.h b/src/widgets/renametablineedit.h index 51df74110..bf61241fb 100644 --- a/src/widgets/renametablineedit.h +++ b/src/widgets/renametablineedit.h @@ -35,7 +35,7 @@ class RenameTabLineEdit : public QLineEdit { public: explicit RenameTabLineEdit(QWidget *parent = nullptr); - signals: + Q_SIGNALS: void EditingCanceled(); protected: diff --git a/src/widgets/sliderslider.h b/src/widgets/sliderslider.h index fc33fb5e7..18e2cb0b6 100644 --- a/src/widgets/sliderslider.h +++ b/src/widgets/sliderslider.h @@ -40,7 +40,7 @@ class SliderSlider : public QSlider { virtual void SetValue(const uint new_value); virtual void setValue(int new_value); - signals: + Q_SIGNALS: // We emit this when the user has specifically changed the slider so connect to it if valueChanged() is too generic Qt also emits valueChanged(int) void SliderReleased(const int); diff --git a/src/widgets/stretchheaderview.h b/src/widgets/stretchheaderview.h index 41364765d..8145d56eb 100644 --- a/src/widgets/stretchheaderview.h +++ b/src/widgets/stretchheaderview.h @@ -71,7 +71,7 @@ class StretchHeaderView : public QHeaderView { void ToggleStretchEnabled(); void SetStretchEnabled(const bool enabled); - signals: + Q_SIGNALS: // Emitted when the stretch mode is changed. void StretchEnabledChanged(const bool enabled); diff --git a/src/widgets/trackslider.h b/src/widgets/trackslider.h index 562ac913c..88ae44fd5 100644 --- a/src/widgets/trackslider.h +++ b/src/widgets/trackslider.h @@ -62,7 +62,7 @@ class TrackSlider : public QWidget { void SetCanSeek(const bool can_seek); void Seek(const int gap); - signals: + Q_SIGNALS: void ValueChanged(const int value); void ValueChangedSeconds(const quint64 value); diff --git a/src/widgets/tracksliderslider.h b/src/widgets/tracksliderslider.h index 4099f6343..c4738449d 100644 --- a/src/widgets/tracksliderslider.h +++ b/src/widgets/tracksliderslider.h @@ -43,7 +43,7 @@ class TrackSliderSlider : public QSlider { public: explicit TrackSliderSlider(QWidget *parent = nullptr); - signals: + Q_SIGNALS: void SeekForward(); void SeekBackward(); void Previous(); diff --git a/tests/src/test_utils.h b/tests/src/test_utils.h index 980878732..0ac14c8ad 100644 --- a/tests/src/test_utils.h +++ b/tests/src/test_utils.h @@ -77,7 +77,7 @@ class TestQObject : public QObject { int invoked() const { return invoked_; } - signals: + Q_SIGNALS: void Emitted(); public slots: