From 8da616491d991214e3376905c04781b8c7ea056e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 25 Aug 2024 01:06:30 +0200 Subject: [PATCH] Replace emit with Q_EMIT --- .../core/messagereply.cpp | 2 +- ext/libstrawberry-common/core/workerpool.h | 2 +- src/analyzer/analyzercontainer.cpp | 2 +- src/collection/collection.cpp | 2 +- src/collection/collectionbackend.cpp | 64 ++++++++--------- src/collection/collectionfilterwidget.cpp | 4 +- src/collection/collectionmodel.cpp | 18 ++--- src/collection/collectionview.cpp | 22 +++--- src/collection/collectionwatcher.cpp | 28 ++++---- src/collection/groupbydialog.cpp | 2 +- src/collection/savedgroupingmanager.cpp | 2 +- src/context/contextalbum.cpp | 2 +- src/context/contextview.cpp | 2 +- src/core/application.cpp | 6 +- src/core/database.cpp | 6 +- src/core/deletefiles.cpp | 2 +- src/core/localredirectserver.cpp | 4 +- src/core/mainwindow.cpp | 10 +-- src/core/mergedproxymodel.cpp | 4 +- src/core/mpris2.cpp | 4 +- src/core/player.cpp | 38 +++++----- src/core/qtsystemtrayicon.cpp | 4 +- src/core/simpletreemodel.h | 2 +- src/core/songloader.cpp | 6 +- src/core/tagreaderclient.cpp | 2 +- src/core/taskmanager.cpp | 14 ++-- .../albumcoverchoicecontroller.cpp | 22 +++--- src/covermanager/albumcoverexporter.cpp | 4 +- src/covermanager/albumcoverfetcher.cpp | 4 +- src/covermanager/albumcoverfetchersearch.cpp | 6 +- src/covermanager/albumcoverloader.cpp | 4 +- src/covermanager/albumcovermanager.cpp | 6 +- src/covermanager/coverexportrunnable.cpp | 4 +- src/covermanager/currentalbumcoverloader.cpp | 4 +- src/covermanager/deezercoverprovider.cpp | 10 +-- src/covermanager/discogscoverprovider.cpp | 4 +- src/covermanager/lastfmcoverprovider.cpp | 26 +++---- src/covermanager/musicbrainzcoverprovider.cpp | 12 ++-- src/covermanager/musixmatchcoverprovider.cpp | 34 ++++----- src/covermanager/opentidalcoverprovider.cpp | 10 +-- src/covermanager/qobuzcoverprovider.cpp | 14 ++-- src/covermanager/spotifycoverprovider.cpp | 12 ++-- src/covermanager/tidalcoverprovider.cpp | 12 ++-- src/device/cddadevice.cpp | 2 +- src/device/cddalister.cpp | 2 +- src/device/cddasongloader.cpp | 8 +-- src/device/connecteddevice.cpp | 6 +- src/device/devicedatabasebackend.cpp | 2 +- src/device/devicelister.cpp | 4 +- src/device/devicemanager.cpp | 34 ++++----- src/device/devicestatefiltermodel.cpp | 4 +- src/device/deviceview.cpp | 6 +- src/device/filesystemdevice.cpp | 2 +- src/device/giolister.cpp | 22 +++--- src/device/gpoddevice.cpp | 2 +- src/device/gpodloader.cpp | 8 +-- src/device/mtpdevice.cpp | 2 +- src/device/mtploader.cpp | 8 +-- src/device/udisks2lister.cpp | 12 ++-- src/dialogs/edittagdialog.cpp | 4 +- src/dialogs/trackselectiondialog.cpp | 2 +- src/engine/enginebase.cpp | 4 +- src/engine/gstengine.cpp | 38 +++++----- src/engine/gstenginepipeline.cpp | 30 ++++---- src/engine/vlcengine.cpp | 12 ++-- src/equalizer/equalizer.cpp | 10 +-- src/equalizer/equalizerslider.cpp | 2 +- src/globalshortcuts/globalshortcut.cpp | 2 +- src/lyrics/chartlyricsprovider.cpp | 6 +- src/lyrics/geniuslyricsprovider.cpp | 10 +-- src/lyrics/htmllyricsprovider.cpp | 10 +-- src/lyrics/lololyricsprovider.cpp | 4 +- src/lyrics/lyricfindlyricsprovider.cpp | 2 +- src/lyrics/lyricsfetcher.cpp | 4 +- src/lyrics/lyricsfetchersearch.cpp | 6 +- src/lyrics/musixmatchlyricsprovider.cpp | 2 +- src/lyrics/ovhlyricsprovider.cpp | 10 +-- src/moodbar/moodbarcontroller.cpp | 10 +-- src/moodbar/moodbarpipeline.cpp | 6 +- src/musicbrainz/acoustidclient.cpp | 8 +-- src/musicbrainz/musicbrainzclient.cpp | 6 +- src/musicbrainz/tagfetcher.cpp | 14 ++-- src/organize/organize.cpp | 4 +- src/osd/osdpretty.cpp | 2 +- src/playlist/playlist.cpp | 72 +++++++++---------- src/playlist/playlistbackend.cpp | 2 +- src/playlist/playlistcontainer.cpp | 4 +- src/playlist/playlistheader.cpp | 6 +- src/playlist/playlistlistmodel.cpp | 6 +- src/playlist/playlistlistview.cpp | 6 +- src/playlist/playlistmanager.cpp | 26 +++---- src/playlist/playlistsequence.cpp | 4 +- src/playlist/playlisttabbar.cpp | 14 ++-- src/playlist/playlistview.cpp | 18 ++--- src/playlist/playlistview.h | 2 +- src/playlist/songloaderinserter.cpp | 14 ++-- src/playlistparsers/cueparser.cpp | 2 +- src/playlistparsers/parserbase.cpp | 2 +- src/playlistparsers/playlistparser.cpp | 10 +-- src/qobuz/qobuzfavoriterequest.cpp | 12 ++-- src/qobuz/qobuzrequest.cpp | 64 ++++++++--------- src/qobuz/qobuzservice.cpp | 60 ++++++++-------- src/qobuz/qobuzstreamurlrequest.cpp | 22 +++--- src/qobuz/qobuzurlhandler.cpp | 4 +- src/queue/queue.cpp | 18 ++--- src/radios/radiobackend.cpp | 6 +- src/radios/radiomodel.cpp | 2 +- src/radios/radioparadiseservice.cpp | 6 +- src/radios/radioview.cpp | 8 +-- src/radios/somafmservice.cpp | 8 +-- src/scrobbler/audioscrobbler.cpp | 2 +- src/scrobbler/lastfmimport.cpp | 12 ++-- src/scrobbler/listenbrainzscrobbler.cpp | 6 +- src/scrobbler/scrobblersettings.cpp | 12 ++-- src/scrobbler/scrobblingapi20.cpp | 10 +-- src/settings/notificationssettingspage.cpp | 2 +- src/settings/qobuzsettingspage.cpp | 2 +- src/settings/settingsdialog.cpp | 6 +- src/settings/spotifysettingspage.cpp | 2 +- src/settings/subsonicsettingspage.cpp | 2 +- src/settings/tidalsettingspage.cpp | 4 +- .../smartplaylistquerywizardplugin.cpp | 2 +- .../smartplaylistsearchtermwidget.cpp | 10 +-- src/smartplaylists/smartplaylistsview.cpp | 4 +- .../smartplaylistsviewcontainer.cpp | 12 ++-- src/spotify/spotifyfavoriterequest.cpp | 12 ++-- src/spotify/spotifyrequest.cpp | 66 ++++++++--------- src/spotify/spotifyservice.cpp | 44 ++++++------ src/streaming/streamingcollectionview.cpp | 22 +++--- src/streaming/streamingsearchview.cpp | 14 ++-- src/streaming/streamingservices.cpp | 4 +- src/subsonic/subsonicrequest.cpp | 30 ++++---- src/subsonic/subsonicservice.cpp | 28 ++++---- src/tidal/tidalbaserequest.cpp | 2 +- src/tidal/tidalfavoriterequest.cpp | 12 ++-- src/tidal/tidalrequest.cpp | 66 ++++++++--------- src/tidal/tidalservice.cpp | 68 +++++++++--------- src/tidal/tidalstreamurlrequest.cpp | 32 ++++----- src/tidal/tidalurlhandler.cpp | 4 +- src/transcoder/transcoder.cpp | 28 ++++---- src/widgets/autoexpandingtreeview.cpp | 8 +-- src/widgets/clickablelabel.cpp | 2 +- src/widgets/fancytabwidget.cpp | 4 +- src/widgets/favoritewidget.cpp | 4 +- src/widgets/fileview.cpp | 4 +- src/widgets/fileviewlist.cpp | 22 +++--- src/widgets/loginstatewidget.cpp | 4 +- src/widgets/multiloadingindicator.cpp | 2 +- src/widgets/playingwidget.cpp | 2 +- src/widgets/ratingwidget.cpp | 2 +- src/widgets/renametablineedit.cpp | 4 +- src/widgets/sliderslider.cpp | 6 +- src/widgets/stretchheaderview.cpp | 4 +- src/widgets/trackslider.cpp | 2 +- src/widgets/tracksliderslider.cpp | 12 ++-- src/widgets/volumeslider.cpp | 4 +- tests/src/mock_networkaccessmanager.cpp | 2 +- tests/src/test_utils.cpp | 2 +- 158 files changed, 891 insertions(+), 891 deletions(-) diff --git a/ext/libstrawberry-common/core/messagereply.cpp b/ext/libstrawberry-common/core/messagereply.cpp index a09325f0c..502e3a8bf 100644 --- a/ext/libstrawberry-common/core/messagereply.cpp +++ b/ext/libstrawberry-common/core/messagereply.cpp @@ -41,7 +41,7 @@ void _MessageReplyBase::Abort() { finished_ = true; success_ = false; - emit Finished(); + Q_EMIT Finished(); qLog(Debug) << "Releasing ID" << id() << "(aborted)"; semaphore_.release(); diff --git a/ext/libstrawberry-common/core/workerpool.h b/ext/libstrawberry-common/core/workerpool.h index ee60a04a3..dd7c2bd07 100644 --- a/ext/libstrawberry-common/core/workerpool.h +++ b/ext/libstrawberry-common/core/workerpool.h @@ -357,7 +357,7 @@ void WorkerPool::ProcessError(QProcess::ProcessError error) { // Failed to start errors are bad - it usually means the worker isn't installed. // Don't restart the process, but tell our owner, who will probably want to do something fatal. qLog(Error) << "Worker failed to start"; - emit WorkerFailedToStart(); + Q_EMIT WorkerFailedToStart(); break; default: diff --git a/src/analyzer/analyzercontainer.cpp b/src/analyzer/analyzercontainer.cpp index 6d1900586..6e1e36963 100644 --- a/src/analyzer/analyzercontainer.cpp +++ b/src/analyzer/analyzercontainer.cpp @@ -130,7 +130,7 @@ void AnalyzerContainer::ShowPopupMenu() { } void AnalyzerContainer::wheelEvent(QWheelEvent *e) { - emit WheelEvent(e->angleDelta().y()); + Q_EMIT WheelEvent(e->angleDelta().y()); } void AnalyzerContainer::SetEngine(SharedPtr engine) { diff --git a/src/collection/collection.cpp b/src/collection/collection.cpp index d13ca5dc1..53c1f4a58 100644 --- a/src/collection/collection.cpp +++ b/src/collection/collection.cpp @@ -151,7 +151,7 @@ void SCollection::ExitReceived() { QObject::disconnect(obj, nullptr, this, nullptr); qLog(Debug) << obj << "successfully exited."; wait_for_exit_.removeAll(obj); - if (wait_for_exit_.isEmpty()) emit ExitFinished(); + if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished(); } diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp index 67faf6426..20b52a8e0 100644 --- a/src/collection/collectionbackend.cpp +++ b/src/collection/collectionbackend.cpp @@ -103,7 +103,7 @@ void CollectionBackend::Exit() { Q_ASSERT(QThread::currentThread() == thread()); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } @@ -114,8 +114,8 @@ void CollectionBackend::ReportErrors(const CollectionQuery &query) { qLog(Error) << "Unable to execute collection SQL query:" << sql_error; qLog(Error) << "Failed SQL query:" << query.lastQuery(); qLog(Error) << "Bound SQL values:" << query.boundValues(); - emit Error(tr("Unable to execute collection SQL query: %1").arg(sql_error.text())); - emit Error(tr("Failed SQL query: %1").arg(query.lastQuery())); + Q_EMIT Error(tr("Unable to execute collection SQL query: %1").arg(sql_error.text())); + Q_EMIT Error(tr("Failed SQL query: %1").arg(query.lastQuery())); } } @@ -134,7 +134,7 @@ void CollectionBackend::GetAllSongs(const int id) { q.prepare(QStringLiteral("SELECT %1 FROM %2").arg(Song::kRowIdColumnSpec, songs_table_)); if (!q.exec()) { db_->ReportErrors(q); - emit GotSongs(SongList(), id); + Q_EMIT GotSongs(SongList(), id); return; } @@ -145,7 +145,7 @@ void CollectionBackend::GetAllSongs(const int id) { songs << song; } - emit GotSongs(songs, id); + Q_EMIT GotSongs(songs, id); } @@ -189,7 +189,7 @@ void CollectionBackend::LoadDirectories() { QSqlDatabase db(db_->Connect()); for (const CollectionDirectory &dir : dirs) { - emit DirectoryAdded(dir, SubdirsInDirectory(dir.id, db)); + Q_EMIT DirectoryAdded(dir, SubdirsInDirectory(dir.id, db)); } } @@ -317,7 +317,7 @@ void CollectionBackend::UpdateTotalSongCount() { return; } - emit TotalSongCountUpdated(q.value(0).toInt()); + Q_EMIT TotalSongCountUpdated(q.value(0).toInt()); } @@ -337,7 +337,7 @@ void CollectionBackend::UpdateTotalArtistCount() { return; } - emit TotalArtistCountUpdated(q.value(0).toInt()); + Q_EMIT TotalArtistCountUpdated(q.value(0).toInt()); } @@ -357,7 +357,7 @@ void CollectionBackend::UpdateTotalAlbumCount() { return; } - emit TotalAlbumCountUpdated(q.value(0).toInt()); + Q_EMIT TotalAlbumCountUpdated(q.value(0).toInt()); } @@ -395,7 +395,7 @@ void CollectionBackend::AddDirectory(const QString &path) { dir.path = path; dir.id = q.lastInsertId().toInt(); - emit DirectoryAdded(dir, CollectionSubdirectoryList()); + Q_EMIT DirectoryAdded(dir, CollectionSubdirectoryList()); } @@ -437,7 +437,7 @@ void CollectionBackend::RemoveDirectory(const CollectionDirectory &dir) { transaction.Commit(); - emit DirectoryDeleted(dir); + Q_EMIT DirectoryDeleted(dir); } @@ -717,8 +717,8 @@ void CollectionBackend::AddOrUpdateSongs(const SongList &songs) { transaction.Commit(); - if (!added_songs.isEmpty()) emit SongsAdded(added_songs); - if (!changed_songs.isEmpty()) emit SongsChanged(changed_songs); + if (!added_songs.isEmpty()) Q_EMIT SongsAdded(added_songs); + if (!changed_songs.isEmpty()) Q_EMIT SongsChanged(changed_songs); UpdateTotalSongCountAsync(); UpdateTotalArtistCountAsync(); @@ -819,9 +819,9 @@ void CollectionBackend::UpdateSongsBySongID(const SongMap &new_songs) { transaction.Commit(); - if (!deleted_songs.isEmpty()) emit SongsDeleted(deleted_songs); - if (!added_songs.isEmpty()) emit SongsAdded(added_songs); - if (!changed_songs.isEmpty()) emit SongsChanged(changed_songs); + if (!deleted_songs.isEmpty()) Q_EMIT SongsDeleted(deleted_songs); + if (!added_songs.isEmpty()) Q_EMIT SongsAdded(added_songs); + if (!changed_songs.isEmpty()) Q_EMIT SongsChanged(changed_songs); UpdateTotalSongCountAsync(); UpdateTotalArtistCountAsync(); @@ -867,7 +867,7 @@ void CollectionBackend::DeleteSongs(const SongList &songs) { transaction.Commit(); - emit SongsDeleted(songs); + Q_EMIT SongsDeleted(songs); UpdateTotalSongCountAsync(); UpdateTotalArtistCountAsync(); @@ -894,10 +894,10 @@ void CollectionBackend::MarkSongsUnavailable(const SongList &songs, const bool u transaction.Commit(); if (unavailable) { - emit SongsDeleted(songs); + Q_EMIT SongsDeleted(songs); } else { - emit SongsAdded(songs); + Q_EMIT SongsAdded(songs); } UpdateTotalSongCountAsync(); @@ -1410,7 +1410,7 @@ void CollectionBackend::CompilationsNeedUpdating() { transaction.Commit(); if (!changed_songs.isEmpty()) { - emit SongsChanged(changed_songs); + Q_EMIT SongsChanged(changed_songs); } } @@ -1617,7 +1617,7 @@ void CollectionBackend::UpdateEmbeddedAlbumArt(const QString &effective_albumart } if (!songs.isEmpty()) { - emit SongsChanged(songs); + Q_EMIT SongsChanged(songs); } } @@ -1663,7 +1663,7 @@ void CollectionBackend::UpdateManualAlbumArt(const QString &effective_albumartis } if (!songs.isEmpty()) { - emit SongsChanged(songs); + Q_EMIT SongsChanged(songs); } } @@ -1708,7 +1708,7 @@ void CollectionBackend::UnsetAlbumArt(const QString &effective_albumartist, cons } if (!songs.isEmpty()) { - emit SongsChanged(songs); + Q_EMIT SongsChanged(songs); } } @@ -1754,7 +1754,7 @@ void CollectionBackend::ClearAlbumArt(const QString &effective_albumartist, cons } if (!songs.isEmpty()) { - emit SongsChanged(songs); + Q_EMIT SongsChanged(songs); } } @@ -1803,7 +1803,7 @@ void CollectionBackend::ForceCompilation(const QString &album, const QStringList } if (!songs.isEmpty()) { - emit SongsChanged(songs); + Q_EMIT SongsChanged(songs); } } @@ -1825,7 +1825,7 @@ void CollectionBackend::IncrementPlayCount(const int id) { } Song new_song = GetSongById(id, db); - emit SongsStatisticsChanged(SongList() << new_song); + Q_EMIT SongsStatisticsChanged(SongList() << new_song); } @@ -1847,7 +1847,7 @@ void CollectionBackend::IncrementSkipCount(const int id, const float progress) { } Song new_song = GetSongById(id, db); - emit SongsStatisticsChanged(SongList() << new_song); + Q_EMIT SongsStatisticsChanged(SongList() << new_song); } @@ -1872,7 +1872,7 @@ void CollectionBackend::ResetPlayStatistics(const QList &id_list, const boo const bool success = ResetPlayStatistics(id_str_list); if (success) { const SongList songs = GetSongsById(id_list); - emit SongsStatisticsChanged(songs, save_tags); + Q_EMIT SongsStatisticsChanged(songs, save_tags); } } @@ -1921,7 +1921,7 @@ void CollectionBackend::DeleteAll() { t.Commit(); } - emit DatabaseReset(); + Q_EMIT DatabaseReset(); } @@ -2014,7 +2014,7 @@ void CollectionBackend::UpdateLastPlayed(const QString &artist, const QString &a } } - emit SongsStatisticsChanged(SongList() << songs); + Q_EMIT SongsStatisticsChanged(SongList() << songs); } @@ -2040,7 +2040,7 @@ void CollectionBackend::UpdatePlayCount(const QString &artist, const QString &ti } } - emit SongsStatisticsChanged(SongList() << songs, save_tags); + Q_EMIT SongsStatisticsChanged(SongList() << songs, save_tags); } @@ -2075,7 +2075,7 @@ void CollectionBackend::UpdateSongsRating(const QList &id_list, const float SongList new_song_list = GetSongsById(id_str_list, db); - emit SongsRatingChanged(new_song_list, save_tags); + Q_EMIT SongsRatingChanged(new_song_list, save_tags); } diff --git a/src/collection/collectionfilterwidget.cpp b/src/collection/collectionfilterwidget.cpp index 5a795edb2..bcec1b005 100644 --- a/src/collection/collectionfilterwidget.cpp +++ b/src/collection/collectionfilterwidget.cpp @@ -479,12 +479,12 @@ void CollectionFilterWidget::keyReleaseEvent(QKeyEvent *e) { switch (e->key()) { case Qt::Key_Up: - emit UpPressed(); + Q_EMIT UpPressed(); e->accept(); break; case Qt::Key_Down: - emit DownPressed(); + Q_EMIT DownPressed(); e->accept(); break; diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index ffa438654..a965b5de4 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -266,7 +266,7 @@ void CollectionModel::SetGroupBy(const Grouping g, const std::optional sep ScheduleReset(); - emit GroupingChanged(g, options_current_.separate_albums_by_grouping); + Q_EMIT GroupingChanged(g, options_current_.separate_albums_by_grouping); } @@ -622,7 +622,7 @@ void CollectionModel::UpdateSongsInternal(const SongList &songs) { qLog(Debug) << "Song metadata and title for" << new_song.id() << new_song.PrettyTitleWithArtist() << "changed, informing model"; const QModelIndex idx = ItemToIndex(item); if (!idx.isValid()) continue; - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } else { qLog(Debug) << "Song metadata for" << new_song.id() << new_song.PrettyTitleWithArtist() << "changed"; @@ -633,7 +633,7 @@ void CollectionModel::UpdateSongsInternal(const SongList &songs) { ClearItemPixmapCache(item); const QModelIndex idx = ItemToIndex(item); if (idx.isValid()) { - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } } @@ -989,7 +989,7 @@ void CollectionModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderR const QModelIndex idx = ItemToIndex(item); if (!idx.isValid()) return; - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } @@ -1532,21 +1532,21 @@ CollectionModel::GroupBy &CollectionModel::Grouping::operator[](const int i) { void CollectionModel::TotalSongCountUpdatedSlot(const int count) { total_song_count_ = count; - emit TotalSongCountUpdated(count); + Q_EMIT TotalSongCountUpdated(count); } void CollectionModel::TotalArtistCountUpdatedSlot(const int count) { total_artist_count_ = count; - emit TotalArtistCountUpdated(count); + Q_EMIT TotalArtistCountUpdated(count); } void CollectionModel::TotalAlbumCountUpdatedSlot(const int count) { total_album_count_ = count; - emit TotalAlbumCountUpdated(count); + Q_EMIT TotalAlbumCountUpdated(count); } @@ -1566,7 +1566,7 @@ void CollectionModel::RowsInserted(const QModelIndex &parent, const int first, c } if (!songs.isEmpty()) { - emit SongsAdded(songs); + Q_EMIT SongsAdded(songs); } } @@ -1582,7 +1582,7 @@ void CollectionModel::RowsRemoved(const QModelIndex &parent, const int first, co songs << item->metadata; } - emit SongsRemoved(songs); + Q_EMIT SongsRemoved(songs); } diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp index a392cf3c7..1ed887172 100644 --- a/src/collection/collectionview.cpp +++ b/src/collection/collectionview.cpp @@ -273,7 +273,7 @@ void CollectionView::TotalSongCountUpdated(const int count) { unsetCursor(); } - emit TotalSongCountUpdated_(); + Q_EMIT TotalSongCountUpdated_(); } @@ -290,7 +290,7 @@ void CollectionView::TotalArtistCountUpdated(const int count) { unsetCursor(); } - emit TotalArtistCountUpdated_(); + Q_EMIT TotalArtistCountUpdated_(); } @@ -307,7 +307,7 @@ void CollectionView::TotalAlbumCountUpdated(const int count) { unsetCursor(); } - emit TotalAlbumCountUpdated_(); + Q_EMIT TotalAlbumCountUpdated_(); } @@ -348,7 +348,7 @@ void CollectionView::mouseReleaseEvent(QMouseEvent *e) { QTreeView::mouseReleaseEvent(e); if (total_song_count_ == 0) { - emit ShowConfigDialog(); + Q_EMIT ShowConfigDialog(); } } @@ -538,13 +538,13 @@ void CollectionView::Load() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->clear_first_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } void CollectionView::AddToPlaylist() { - emit AddToPlaylistSignal(model()->mimeData(selectedIndexes())); + Q_EMIT AddToPlaylistSignal(model()->mimeData(selectedIndexes())); } @@ -554,7 +554,7 @@ void CollectionView::AddToPlaylistEnqueue() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->enqueue_now_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } @@ -564,7 +564,7 @@ void CollectionView::AddToPlaylistEnqueueNext() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->enqueue_next_now_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } @@ -574,7 +574,7 @@ void CollectionView::OpenInNewPlaylist() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->open_in_new_playlist_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } @@ -731,7 +731,7 @@ void CollectionView::EditTracks() { } void CollectionView::EditTagError(const QString &message) { - emit Error(message); + Q_EMIT Error(message); } void CollectionView::RescanSongs() { @@ -773,7 +773,7 @@ void CollectionView::FilterReturnPressed() { if (!currentIndex().isValid()) return; - emit doubleClicked(currentIndex()); + Q_EMIT doubleClicked(currentIndex()); } void CollectionView::ShowInBrowser() const { diff --git a/src/collection/collectionwatcher.cpp b/src/collection/collectionwatcher.cpp index 4a03820dd..1415a4eb9 100644 --- a/src/collection/collectionwatcher.cpp +++ b/src/collection/collectionwatcher.cpp @@ -138,7 +138,7 @@ void CollectionWatcher::Exit() { Abort(); if (backend_) backend_->Close(); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } @@ -264,7 +264,7 @@ CollectionWatcher::ScanTransaction::ScanTransaction(CollectionWatcher *watcher, } task_id_ = watcher_->task_manager_->StartTask(description); - emit watcher_->ScanStarted(task_id_); + Q_EMIT watcher_->ScanStarted(task_id_); } @@ -297,35 +297,35 @@ void CollectionWatcher::ScanTransaction::CommitNewOrUpdatedSongs() { if (!deleted_songs.isEmpty()) { if (mark_songs_unavailable_ && watcher_->source() == Song::Source::Collection) { - emit watcher_->SongsUnavailable(deleted_songs); + Q_EMIT watcher_->SongsUnavailable(deleted_songs); } else { - emit watcher_->SongsDeleted(deleted_songs); + Q_EMIT watcher_->SongsDeleted(deleted_songs); } deleted_songs.clear(); } if (!new_songs.isEmpty()) { - emit watcher_->NewOrUpdatedSongs(new_songs); + Q_EMIT watcher_->NewOrUpdatedSongs(new_songs); new_songs.clear(); } if (!touched_songs.isEmpty()) { - emit watcher_->SongsMTimeUpdated(touched_songs); + Q_EMIT watcher_->SongsMTimeUpdated(touched_songs); touched_songs.clear(); } if (!readded_songs.isEmpty()) { - emit watcher_->SongsReadded(readded_songs); + Q_EMIT watcher_->SongsReadded(readded_songs); readded_songs.clear(); } if (!new_subdirs.isEmpty()) { - emit watcher_->SubdirsDiscovered(new_subdirs); + Q_EMIT watcher_->SubdirsDiscovered(new_subdirs); } if (!touched_subdirs.isEmpty()) { - emit watcher_->SubdirsMTimeUpdated(touched_subdirs); + Q_EMIT watcher_->SubdirsMTimeUpdated(touched_subdirs); touched_subdirs.clear(); } @@ -347,7 +347,7 @@ void CollectionWatcher::ScanTransaction::CommitNewOrUpdatedSongs() { new_subdirs.clear(); if (incremental_ || ignores_mtime_) { - emit watcher_->UpdateLastSeen(dir_, expire_unavailable_songs_days_); + Q_EMIT watcher_->UpdateLastSeen(dir_, expire_unavailable_songs_days_); } } @@ -484,7 +484,7 @@ void CollectionWatcher::AddDirectory(const CollectionDirectory &dir, const Colle } } - emit CompilationsNeedUpdating(); + Q_EMIT CompilationsNeedUpdating(); } @@ -1151,7 +1151,7 @@ void CollectionWatcher::RescanPathsNow() { rescan_queue_.clear(); - emit CompilationsNeedUpdating(); + Q_EMIT CompilationsNeedUpdating(); } @@ -1291,7 +1291,7 @@ void CollectionWatcher::PerformScan(const bool incremental, const bool ignore_mt last_scan_time_ = QDateTime::currentSecsSinceEpoch(); - emit CompilationsNeedUpdating(); + Q_EMIT CompilationsNeedUpdating(); } @@ -1372,6 +1372,6 @@ void CollectionWatcher::RescanSongs(const SongList &songs) { } } - emit CompilationsNeedUpdating(); + Q_EMIT CompilationsNeedUpdating(); } diff --git a/src/collection/groupbydialog.cpp b/src/collection/groupbydialog.cpp index cfa7d1fd8..84cff17dc 100644 --- a/src/collection/groupbydialog.cpp +++ b/src/collection/groupbydialog.cpp @@ -116,7 +116,7 @@ void GroupByDialog::Reset() { void GroupByDialog::accept() { - emit Accepted(CollectionModel::Grouping( + Q_EMIT Accepted(CollectionModel::Grouping( p_->mapping_.get().find(ui_->combobox_first->currentIndex())->group_by, p_->mapping_.get().find(ui_->combobox_second->currentIndex())->group_by, p_->mapping_.get().find(ui_->combobox_third->currentIndex())->group_by), diff --git a/src/collection/savedgroupingmanager.cpp b/src/collection/savedgroupingmanager.cpp index 16028647d..72e006345 100644 --- a/src/collection/savedgroupingmanager.cpp +++ b/src/collection/savedgroupingmanager.cpp @@ -207,7 +207,7 @@ void SavedGroupingManager::Remove() { } UpdateModel(); - emit UpdateGroupByActions(); + Q_EMIT UpdateGroupByActions(); } diff --git a/src/context/contextalbum.cpp b/src/context/contextalbum.cpp index ea93dc3e3..95ad8f542 100644 --- a/src/context/contextalbum.cpp +++ b/src/context/contextalbum.cpp @@ -221,7 +221,7 @@ void ContextAlbum::FadeCurrentCover(const qreal value) { void ContextAlbum::FadeCurrentCoverFinished() { if (image_original_ == image_strawberry_) { - emit FadeStopFinished(); + Q_EMIT FadeStopFinished(); } } diff --git a/src/context/contextview.cpp b/src/context/contextview.cpp index 140320b44..f70f54722 100644 --- a/src/context/contextview.cpp +++ b/src/context/contextview.cpp @@ -456,7 +456,7 @@ void ContextView::SetSong() { widget_album_->hide(); widget_album_changed = true; } - if (widget_album_changed) emit AlbumEnabledChanged(); + if (widget_album_changed) Q_EMIT AlbumEnabledChanged(); if (action_show_data_->isChecked()) { widget_play_data_->show(); diff --git a/src/core/application.cpp b/src/core/application.cpp index 0c6d6c5b6..d10702a4d 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -343,9 +343,9 @@ void Application::ExitReceived() { } -void Application::AddError(const QString &message) { emit ErrorAdded(message); } -void Application::ReloadSettings() { emit SettingsChanged(); } -void Application::OpenSettingsDialogAtPage(SettingsDialog::Page page) { emit SettingsDialogRequested(page); } +void Application::AddError(const QString &message) { Q_EMIT ErrorAdded(message); } +void Application::ReloadSettings() { Q_EMIT SettingsChanged(); } +void Application::OpenSettingsDialogAtPage(SettingsDialog::Page page) { Q_EMIT SettingsDialogRequested(page); } SharedPtr Application::tag_reader_client() const { return p_->tag_reader_client_.ptr(); } SharedPtr Application::database() const { return p_->database_.ptr(); } diff --git a/src/core/database.cpp b/src/core/database.cpp index 5327d046f..ec647ffb5 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -105,7 +105,7 @@ void Database::Exit() { Q_ASSERT(QThread::currentThread() == thread()); Close(); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } @@ -482,8 +482,8 @@ void Database::ReportErrors(const SqlQuery &query) { if (sql_error.isValid()) { qLog(Error) << "Unable to execute SQL query:" << sql_error; qLog(Error) << "Failed SQL query:" << query.LastQuery(); - emit Error(tr("Unable to execute SQL query: %1").arg(sql_error.text())); - emit Error(tr("Failed SQL query: %1").arg(query.LastQuery())); + Q_EMIT Error(tr("Unable to execute SQL query: %1").arg(sql_error.text())); + Q_EMIT Error(tr("Failed SQL query: %1").arg(query.LastQuery())); } } diff --git a/src/core/deletefiles.cpp b/src/core/deletefiles.cpp index d8a0137f4..850b630bf 100644 --- a/src/core/deletefiles.cpp +++ b/src/core/deletefiles.cpp @@ -99,7 +99,7 @@ void DeleteFiles::ProcessSomeFiles() { task_manager_->SetTaskFinished(task_id_); - emit Finished(songs_with_errors_); + Q_EMIT Finished(songs_with_errors_); // Move back to the original thread so deleteLater() can get called in the main thread's event loop moveToThread(original_thread_); diff --git a/src/core/localredirectserver.cpp b/src/core/localredirectserver.cpp index 2d061045f..a3fc0169c 100644 --- a/src/core/localredirectserver.cpp +++ b/src/core/localredirectserver.cpp @@ -87,7 +87,7 @@ void LocalRedirectServer::incomingConnection(qintptr socket_descriptor) { delete tcp_socket; close(); error_ = QLatin1String("Unable to set socket descriptor"); - emit Finished(); + Q_EMIT Finished(); return; } socket_ = tcp_socket; @@ -114,7 +114,7 @@ void LocalRedirectServer::ReadyRead() { socket_ = nullptr; request_url_ = ParseUrlFromRequest(buffer_); close(); - emit Finished(); + Q_EMIT Finished(); } else { QObject::connect(socket_, &QAbstractSocket::readyRead, this, &LocalRedirectServer::ReadyRead); diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 307709a0c..1bb830fe4 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -1624,7 +1624,7 @@ void MainWindow::ToggleHide() { void MainWindow::StopAfterCurrent() { app_->playlist_manager()->current()->StopAfter(app_->playlist_manager()->current()->current_row()); - emit StopAfterToggled(app_->playlist_manager()->active()->stop_after_current()); + Q_EMIT StopAfterToggled(app_->playlist_manager()->active()->stop_after_current()); } void MainWindow::showEvent(QShowEvent *e) { @@ -2486,7 +2486,7 @@ void MainWindow::CommandlineOptionsReceived(const CommandlineOptions &options) { const QList urls = options.urls(); for (const QUrl &url : urls) { if (url.scheme() == QLatin1String("tidal") && url.host() == QLatin1String("login")) { - emit AuthorizationUrlReceived(url); + Q_EMIT AuthorizationUrlReceived(url); return; } } @@ -2564,7 +2564,7 @@ bool MainWindow::LoadUrl(const QString &url) { } #ifdef HAVE_TIDAL if (url.startsWith(QLatin1String("tidal://login"))) { - emit AuthorizationUrlReceived(QUrl(url)); + Q_EMIT AuthorizationUrlReceived(QUrl(url)); return true; } #endif @@ -3132,7 +3132,7 @@ void MainWindow::AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult song_ = song; album_cover_ = result.album_cover; - emit AlbumCoverReady(song, result.album_cover.image); + Q_EMIT AlbumCoverReady(song, result.album_cover.image); const bool enable_change_art = song.is_collection_song() && !song.effective_albumartist().isEmpty() && !song.album().isEmpty(); album_cover_choice_controller_->show_cover_action()->setEnabled(result.success && result.type != AlbumCoverLoaderResult::Type::Unset); @@ -3160,7 +3160,7 @@ void MainWindow::GetCoverAutomatically() { !song_.effective_album().isEmpty(); if (search) { - emit SearchCoverInProgress(); + Q_EMIT SearchCoverInProgress(); album_cover_choice_controller_->SearchCoverAutomatically(song_); } diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp index a2d898498..414447b1d 100644 --- a/src/core/mergedproxymodel.cpp +++ b/src/core/mergedproxymodel.cpp @@ -232,7 +232,7 @@ void MergedProxyModel::SubModelResetSlot() { endInsertRows(); } - emit SubModelReset(proxy_parent, submodel); + Q_EMIT SubModelReset(proxy_parent, submodel); } @@ -516,7 +516,7 @@ QAbstractItemModel *MergedProxyModel::GetModel(const QModelIndex &source_index) } void MergedProxyModel::DataChanged(const QModelIndex &top_left, const QModelIndex &bottom_right) { - emit dataChanged(mapFromSource(top_left), mapFromSource(bottom_right)); + Q_EMIT dataChanged(mapFromSource(top_left), mapFromSource(bottom_right)); } void MergedProxyModel::LayoutAboutToBeChanged() { diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp index 233ffff5a..80ef6bce4 100644 --- a/src/core/mpris2.cpp +++ b/src/core/mpris2.cpp @@ -289,7 +289,7 @@ QStringList Mpris2::SupportedMimeTypes() const { } -void Mpris2::Raise() { emit RaiseMainWindow(); } +void Mpris2::Raise() { Q_EMIT RaiseMainWindow(); } void Mpris2::Quit() { QCoreApplication::quit(); } @@ -643,7 +643,7 @@ void Mpris2::PlaylistChangedSlot(Playlist *playlist) { mpris_playlist.id = MakePlaylistPath(playlist->id()); mpris_playlist.name = app_->playlist_manager()->GetPlaylistName(playlist->id()); - emit PlaylistChanged(mpris_playlist); + Q_EMIT PlaylistChanged(mpris_playlist); } diff --git a/src/core/player.cpp b/src/core/player.cpp index 736d23d88..1bd9dceda 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -158,7 +158,7 @@ EngineBase::Type Player::CreateEngine(EngineBase::Type enginetype) { qFatal("Failed to create engine!"); } - emit EngineChanged(use_enginetype); + Q_EMIT EngineChanged(use_enginetype); return use_enginetype; @@ -361,7 +361,7 @@ void Player::HandleLoadResult(const UrlHandler::LoadResult &result) { if (is_current) { InvalidSongRequested(result.media_url_); } - emit Error(result.error_); + Q_EMIT Error(result.error_); break; case UrlHandler::LoadResult::Type::NoMoreTracks: @@ -497,7 +497,7 @@ void Player::NextItem(const EngineBase::TrackChangeFlags change, const Playlist: if (i == -1) { app_->playlist_manager()->active()->set_current_row(i); app_->playlist_manager()->active()->reset_last_played(); - emit PlaylistFinished(); + Q_EMIT PlaylistFinished(); Stop(); return; } @@ -577,7 +577,7 @@ void Player::PlayPause(const quint64 offset_nanosec, const Playlist::AutoScroll switch (engine_->state()) { case EngineBase::State::Paused: UnPause(); - emit Resumed(); + Q_EMIT Resumed(); break; case EngineBase::State::Playing:{ @@ -713,21 +713,21 @@ void Player::EngineStateChanged(const EngineBase::State state) { case EngineBase::State::Paused: pause_time_ = QDateTime::currentDateTime(); play_offset_nanosec_ = engine_->position_nanosec(); - emit Paused(); + Q_EMIT Paused(); break; case EngineBase::State::Playing: pause_time_ = QDateTime(); play_offset_nanosec_ = 0; - emit Playing(); + Q_EMIT Playing(); break; case EngineBase::State::Error: - emit Error(); + Q_EMIT Error(); [[fallthrough]]; case EngineBase::State::Empty: case EngineBase::State::Idle: pause_time_ = QDateTime(); play_offset_nanosec_ = 0; - emit Stopped(); + Q_EMIT Stopped(); break; } @@ -747,7 +747,7 @@ void Player::SetVolumeFromSlider(const int value) { if (volume != volume_) { volume_ = volume; engine_->SetVolume(volume); - emit VolumeChanged(volume); + Q_EMIT VolumeChanged(volume); timer_save_volume_->start(); } @@ -758,7 +758,7 @@ void Player::SetVolumeFromEngine(const uint volume) { const uint new_volume = qBound(0U, volume, 100U); if (new_volume != volume_) { volume_ = new_volume; - emit VolumeChanged(new_volume); + Q_EMIT VolumeChanged(new_volume); timer_save_volume_->start(); } @@ -770,7 +770,7 @@ void Player::SetVolume(const uint volume) { if (new_volume != volume_) { volume_ = new_volume; engine_->SetVolume(new_volume); - emit VolumeChanged(new_volume); + Q_EMIT VolumeChanged(new_volume); timer_save_volume_->start(); } @@ -800,7 +800,7 @@ void Player::PlayAt(const int index, const bool pause, const quint64 offset_nano play_offset_nanosec_ = offset_nanosec; if (current_item_ && change & EngineBase::TrackChangeType::Manual && engine_->position_nanosec() != engine_->length_nanosec()) { - emit TrackSkipped(current_item_); + Q_EMIT TrackSkipped(current_item_); } if (current_item_ && app_->playlist_manager()->active()->has_item_at(index) && current_item_->Metadata().IsOnSameAlbum(app_->playlist_manager()->active()->item_at(index)->Metadata())) { @@ -859,7 +859,7 @@ void Player::SeekTo(const quint64 seconds) { qLog(Debug) << "Track seeked to" << nanosec << "ns - updating scrobble point"; app_->playlist_manager()->active()->UpdateScrobblePoint(nanosec); - emit Seeked(nanosec / 1000); + Q_EMIT Seeked(nanosec / 1000); if (seconds == 0) { app_->playlist_manager()->active()->InformOfCurrentSongChange(false); @@ -963,11 +963,11 @@ void Player::PlayWithPause(const quint64 offset_nanosec) { } void Player::ShowOSD() { - if (current_item_) emit ForceShowOSD(current_item_->Metadata(), false); + if (current_item_) Q_EMIT ForceShowOSD(current_item_->Metadata(), false); } void Player::TogglePrettyOSD() { - if (current_item_) emit ForceShowOSD(current_item_->Metadata(), true); + if (current_item_) Q_EMIT ForceShowOSD(current_item_->Metadata(), true); } void Player::TrackAboutToEnd() { @@ -1009,7 +1009,7 @@ void Player::TrackAboutToEnd() { const UrlHandler::LoadResult result = url_handler->StartLoading(url); switch (result.type_) { case UrlHandler::LoadResult::Type::Error: - emit Error(result.error_); + Q_EMIT Error(result.error_); return; case UrlHandler::LoadResult::Type::NoMoreTracks: return; @@ -1042,12 +1042,12 @@ void Player::FatalError() { } void Player::ValidSongRequested(const QUrl &url) { - emit SongChangeRequestProcessed(url, true); + Q_EMIT SongChangeRequestProcessed(url, true); } void Player::InvalidSongRequested(const QUrl &url) { - if (greyout_) emit SongChangeRequestProcessed(url, false); + if (greyout_) Q_EMIT SongChangeRequestProcessed(url, false); if (!continue_on_error_) { FatalError(); @@ -1110,5 +1110,5 @@ void Player::UrlHandlerDestroyed(QObject *object) { } void Player::HandleAuthentication() { - emit Authenticated(); + Q_EMIT Authenticated(); } diff --git a/src/core/qtsystemtrayicon.cpp b/src/core/qtsystemtrayicon.cpp index 5be0f5218..3f3195a05 100644 --- a/src/core/qtsystemtrayicon.cpp +++ b/src/core/qtsystemtrayicon.cpp @@ -113,11 +113,11 @@ void SystemTrayIcon::Clicked(const QSystemTrayIcon::ActivationReason reason) { switch (reason) { case QSystemTrayIcon::DoubleClick: case QSystemTrayIcon::Trigger: - emit ShowHide(); + Q_EMIT ShowHide(); break; case QSystemTrayIcon::MiddleClick: - emit PlayPause(); + Q_EMIT PlayPause(); break; default: diff --git a/src/core/simpletreemodel.h b/src/core/simpletreemodel.h index 983669077..b0ceb93cc 100644 --- a/src/core/simpletreemodel.h +++ b/src/core/simpletreemodel.h @@ -132,7 +132,7 @@ void SimpleTreeModel::EndDelete() { template void SimpleTreeModel::EmitDataChanged(T *item) { QModelIndex index(ItemToIndex(item)); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); } #endif // SIMPLETREEMODEL_H diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp index ecef7713b..aa69ae47c 100644 --- a/src/core/songloader.cpp +++ b/src/core/songloader.cpp @@ -217,7 +217,7 @@ void SongLoader::AudioCDTracksLoadFinishedSlot(const SongList &songs, const QStr songs_ = songs; errors_ << error; - emit AudioCDTracksLoadFinished(); + Q_EMIT AudioCDTracksLoadFinished(); } @@ -226,7 +226,7 @@ void SongLoader::AudioCDTracksTagsLoaded(const SongList &songs) { CddaSongLoader *cdda_song_loader = qobject_cast(sender()); cdda_song_loader->deleteLater(); songs_ = songs; - emit LoadAudioCDFinished(true); + Q_EMIT LoadAudioCDFinished(true); } #endif @@ -463,7 +463,7 @@ void SongLoader::StopTypefind() { AddAsRawStream(); } - emit LoadRemoteFinished(); + Q_EMIT LoadRemoteFinished(); } diff --git a/src/core/tagreaderclient.cpp b/src/core/tagreaderclient.cpp index d1628e194..23df386c7 100644 --- a/src/core/tagreaderclient.cpp +++ b/src/core/tagreaderclient.cpp @@ -62,7 +62,7 @@ void TagReaderClient::Exit() { Q_ASSERT(QThread::currentThread() == thread()); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } diff --git a/src/core/taskmanager.cpp b/src/core/taskmanager.cpp index 0c3d42c5e..b16169c5e 100644 --- a/src/core/taskmanager.cpp +++ b/src/core/taskmanager.cpp @@ -46,7 +46,7 @@ int TaskManager::StartTask(const QString &name) { tasks_[t.id] = t; } - emit TasksChanged(); + Q_EMIT TasksChanged(); return t.id; } @@ -73,8 +73,8 @@ void TaskManager::SetTaskBlocksCollectionScans(const int id) { tasks_[id].blocks_collection_scans = true; } - emit TasksChanged(); - emit PauseCollectionWatchers(); + Q_EMIT TasksChanged(); + Q_EMIT PauseCollectionWatchers(); } @@ -90,7 +90,7 @@ void TaskManager::SetTaskProgress(const int id, const quint64 progress, const qu tasks_[id] = t; } - emit TasksChanged(); + Q_EMIT TasksChanged(); } void TaskManager::IncreaseTaskProgress(const int id, const quint64 progress, const quint64 max) { @@ -105,7 +105,7 @@ void TaskManager::IncreaseTaskProgress(const int id, const quint64 progress, con tasks_[id] = t; } - emit TasksChanged(); + Q_EMIT TasksChanged(); } @@ -130,8 +130,8 @@ void TaskManager::SetTaskFinished(const int id) { tasks_.remove(id); } - emit TasksChanged(); - if (resume_collection_watchers) emit ResumeCollectionWatchers(); + Q_EMIT TasksChanged(); + if (resume_collection_watchers) Q_EMIT ResumeCollectionWatchers(); } diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index 34256fa6b..b56b76ffc 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -184,7 +184,7 @@ AlbumCoverImageResult AlbumCoverChoiceController::LoadImageFromFile(Song *song) QFile file(cover_file); if (!file.open(QIODevice::ReadOnly)) { qLog(Error) << "Failed to open cover file" << cover_file << "for reading:" << file.errorString(); - emit Error(tr("Failed to open cover file %1 for reading: %2").arg(cover_file, file.errorString())); + Q_EMIT Error(tr("Failed to open cover file %1 for reading: %2").arg(cover_file, file.errorString())); return AlbumCoverImageResult(); } AlbumCoverImageResult result; @@ -192,7 +192,7 @@ AlbumCoverImageResult AlbumCoverChoiceController::LoadImageFromFile(Song *song) file.close(); if (result.image_data.isEmpty()) { qLog(Error) << "Cover file" << cover_file << "is empty."; - emit Error(tr("Cover file %1 is empty.").arg(cover_file)); + Q_EMIT Error(tr("Cover file %1 is empty.").arg(cover_file)); return AlbumCoverImageResult(); } @@ -264,13 +264,13 @@ void AlbumCoverChoiceController::SaveCoverToFileManual(const Song &song, const A QFile file(save_filename); if (!file.open(QIODevice::WriteOnly)) { qLog(Error) << "Failed to open cover file" << save_filename << "for writing:" << file.errorString(); - emit Error(tr("Failed to open cover file %1 for writing: %2").arg(save_filename, file.errorString())); + Q_EMIT Error(tr("Failed to open cover file %1 for writing: %2").arg(save_filename, file.errorString())); file.close(); return; } if (file.write(result.image_data) <= 0) { qLog(Error) << "Failed writing cover to file" << save_filename << file.errorString(); - emit Error(tr("Failed writing cover to file %1: %2").arg(save_filename, file.errorString())); + Q_EMIT Error(tr("Failed writing cover to file %1: %2").arg(save_filename, file.errorString())); file.close(); return; } @@ -279,7 +279,7 @@ void AlbumCoverChoiceController::SaveCoverToFileManual(const Song &song, const A else { if (!result.image.save(save_filename)) { qLog(Error) << "Failed writing cover to file" << save_filename; - emit Error(tr("Failed writing cover to file %1.").arg(save_filename)); + Q_EMIT Error(tr("Failed writing cover to file %1.").arg(save_filename)); } } @@ -381,7 +381,7 @@ bool AlbumCoverChoiceController::DeleteCover(Song *song, const bool unset) { else { success = false; qLog(Error) << "Failed to delete cover file" << art_automatic << file.errorString(); - emit Error(tr("Failed to delete cover file %1: %2").arg(art_automatic, file.errorString())); + Q_EMIT Error(tr("Failed to delete cover file %1: %2").arg(art_automatic, file.errorString())); } } else song->clear_art_automatic(); @@ -398,7 +398,7 @@ bool AlbumCoverChoiceController::DeleteCover(Song *song, const bool unset) { else { success = false; qLog(Error) << "Failed to delete cover file" << art_manual << file.errorString(); - emit Error(tr("Failed to delete cover file %1: %2").arg(art_manual, file.errorString())); + Q_EMIT Error(tr("Failed to delete cover file %1: %2").arg(art_manual, file.errorString())); } } else song->clear_art_manual(); @@ -539,7 +539,7 @@ void AlbumCoverChoiceController::AlbumCoverFetched(const quint64 id, const Album SaveCoverAutomatic(&song, result); } - emit AutomaticCoverSearchDone(); + Q_EMIT AutomaticCoverSearchDone(); } @@ -683,13 +683,13 @@ QUrl AlbumCoverChoiceController::SaveCoverToFileAutomatic(const Song::Source sou } else { qLog(Error) << "Failed to write cover to file" << file.fileName() << file.errorString(); - emit Error(tr("Failed to write cover to file %1: %2").arg(file.fileName(), file.errorString())); + Q_EMIT Error(tr("Failed to write cover to file %1: %2").arg(file.fileName(), file.errorString())); } file.close(); } else { qLog(Error) << "Failed to open cover file" << file.fileName() << "for writing:" << file.errorString(); - emit Error(tr("Failed to open cover file %1 for writing: %2").arg(file.fileName(), file.errorString())); + Q_EMIT Error(tr("Failed to open cover file %1 for writing: %2").arg(file.fileName(), file.errorString())); } } else { @@ -830,7 +830,7 @@ void AlbumCoverChoiceController::SaveEmbeddedCoverFinished(TagReaderReply *reply SaveArtEmbeddedToSong(&song, art_embedded); } else { - emit Error(tr("Could not save cover to file %1.").arg(song.url().toLocalFile())); + Q_EMIT Error(tr("Could not save cover to file %1.").arg(song.url().toLocalFile())); } } diff --git a/src/covermanager/albumcoverexporter.cpp b/src/covermanager/albumcoverexporter.cpp index f16e07e4b..a47e78b77 100644 --- a/src/covermanager/albumcoverexporter.cpp +++ b/src/covermanager/albumcoverexporter.cpp @@ -83,7 +83,7 @@ void AlbumCoverExporter::AddJobsToPool() { void AlbumCoverExporter::CoverExported() { ++exported_; - emit AlbumCoversExportUpdate(exported_, skipped_, all_); + Q_EMIT AlbumCoversExportUpdate(exported_, skipped_, all_); AddJobsToPool(); } @@ -91,7 +91,7 @@ void AlbumCoverExporter::CoverExported() { void AlbumCoverExporter::CoverSkipped() { ++skipped_; - emit AlbumCoversExportUpdate(exported_, skipped_, all_); + Q_EMIT AlbumCoversExportUpdate(exported_, skipped_, all_); AddJobsToPool(); } diff --git a/src/covermanager/albumcoverfetcher.cpp b/src/covermanager/albumcoverfetcher.cpp index 59f78059c..dae416900 100644 --- a/src/covermanager/albumcoverfetcher.cpp +++ b/src/covermanager/albumcoverfetcher.cpp @@ -145,7 +145,7 @@ void AlbumCoverFetcher::SingleSearchFinished(const quint64 request_id, const Cov AlbumCoverFetcherSearch *search = active_requests_.take(request_id); search->deleteLater(); - emit SearchFinished(request_id, results, search->statistics()); + Q_EMIT SearchFinished(request_id, results, search->statistics()); } @@ -155,6 +155,6 @@ void AlbumCoverFetcher::SingleCoverFetched(const quint64 request_id, const Album AlbumCoverFetcherSearch *search = active_requests_.take(request_id); search->deleteLater(); - emit AlbumCoverFetched(request_id, result, search->statistics()); + Q_EMIT AlbumCoverFetched(request_id, result, search->statistics()); } diff --git a/src/covermanager/albumcoverfetchersearch.cpp b/src/covermanager/albumcoverfetchersearch.cpp index e3772e941..331270dfd 100644 --- a/src/covermanager/albumcoverfetchersearch.cpp +++ b/src/covermanager/albumcoverfetchersearch.cpp @@ -253,14 +253,14 @@ void AlbumCoverFetcherSearch::AllProvidersFinished() { // If we only wanted to do the search then we're done if (request_.search) { - emit SearchFinished(request_.id, results_); + Q_EMIT SearchFinished(request_.id, results_); return; } // No results? if (results_.isEmpty()) { statistics_.missing_images_++; - emit AlbumCoverFetched(request_.id, AlbumCoverImageResult()); + Q_EMIT AlbumCoverFetched(request_.id, AlbumCoverImageResult()); return; } @@ -402,7 +402,7 @@ void AlbumCoverFetcherSearch::SendBestImage() { statistics_.missing_images_++; } - emit AlbumCoverFetched(request_.id, result); + Q_EMIT AlbumCoverFetched(request_.id, result); } diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp index b25ebab7f..0e0b3220a 100644 --- a/src/covermanager/albumcoverloader.cpp +++ b/src/covermanager/albumcoverloader.cpp @@ -72,7 +72,7 @@ void AlbumCoverLoader::Exit() { Q_ASSERT(QThread::currentThread() == thread()); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } @@ -231,7 +231,7 @@ void AlbumCoverLoader::FinishTask(TaskPtr task, const AlbumCoverLoaderResult::Ty } } - emit AlbumCoverLoaded(task->id, AlbumCoverLoaderResult(task->success, task->result_type, task->album_cover, image_scaled, task->art_manual_updated, task->art_automatic_updated)); + Q_EMIT AlbumCoverLoaded(task->id, AlbumCoverLoaderResult(task->success, task->result_type, task->album_cover, image_scaled, task->art_manual_updated, task->art_automatic_updated)); } diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp index 712ecd5dc..964e3065a 100644 --- a/src/covermanager/albumcovermanager.cpp +++ b/src/covermanager/albumcovermanager.cpp @@ -932,7 +932,7 @@ void AlbumCoverManager::AlbumDoubleClicked(const QModelIndex &idx) { } void AlbumCoverManager::AddSelectedToPlaylist() { - emit AddToPlaylist(GetMimeDataForAlbums(ui_->albums->selectionModel()->selectedIndexes())); + Q_EMIT AddToPlaylist(GetMimeDataForAlbums(ui_->albums->selectionModel()->selectedIndexes())); } void AlbumCoverManager::LoadSelectedToPlaylist() { @@ -940,7 +940,7 @@ void AlbumCoverManager::LoadSelectedToPlaylist() { SongMimeData *mimedata = GetMimeDataForAlbums(ui_->albums->selectionModel()->selectedIndexes()); if (mimedata) { mimedata->clear_first_ = true; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); } } @@ -1060,7 +1060,7 @@ void AlbumCoverManager::SaveEmbeddedCoverFinished(TagReaderReply *reply, AlbumIt } if (!reply->is_successful()) { - emit Error(tr("Could not save cover to file %1.").arg(url.toLocalFile())); + Q_EMIT Error(tr("Could not save cover to file %1.").arg(url.toLocalFile())); return; } diff --git a/src/covermanager/coverexportrunnable.cpp b/src/covermanager/coverexportrunnable.cpp index 983bc7fd3..df9a04915 100644 --- a/src/covermanager/coverexportrunnable.cpp +++ b/src/covermanager/coverexportrunnable.cpp @@ -235,6 +235,6 @@ void CoverExportRunnable::ExportCover() { } -void CoverExportRunnable::EmitCoverExported() { emit CoverExported(); } +void CoverExportRunnable::EmitCoverExported() { Q_EMIT CoverExported(); } -void CoverExportRunnable::EmitCoverSkipped() { emit CoverSkipped(); } +void CoverExportRunnable::EmitCoverSkipped() { Q_EMIT CoverSkipped(); } diff --git a/src/covermanager/currentalbumcoverloader.cpp b/src/covermanager/currentalbumcoverloader.cpp index 41f4d8659..3d8fd47dc 100644 --- a/src/covermanager/currentalbumcoverloader.cpp +++ b/src/covermanager/currentalbumcoverloader.cpp @@ -126,7 +126,7 @@ void CurrentAlbumCoverLoader::AlbumCoverReady(const quint64 id, AlbumCoverLoader last_song_.set_art_automatic(result.art_automatic_updated); } - emit AlbumCoverLoaded(last_song_, result); - emit ThumbnailLoaded(last_song_, thumbnail_url, result.image_scaled); + Q_EMIT AlbumCoverLoaded(last_song_, result); + Q_EMIT ThumbnailLoaded(last_song_, thumbnail_url, result.image_scaled); } diff --git a/src/covermanager/deezercoverprovider.cpp b/src/covermanager/deezercoverprovider.cpp index d264817b3..d357868a7 100644 --- a/src/covermanager/deezercoverprovider.cpp +++ b/src/covermanager/deezercoverprovider.cpp @@ -197,19 +197,19 @@ void DeezerCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) QByteArray data = GetReplyData(reply); if (data.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } QJsonValue value_data = ExtractData(data); if (!value_data.isArray()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } QJsonArray array_data = value_data.toArray(); if (array_data.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } @@ -298,12 +298,12 @@ void DeezerCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) } if (results.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); } else { CoverProviderSearchResults cover_results = results.values(); std::stable_sort(cover_results.begin(), cover_results.end(), AlbumCoverFetcherSearch::CoverProviderSearchResultCompareNumber); - emit SearchFinished(id, cover_results); + Q_EMIT SearchFinished(id, cover_results); } } diff --git a/src/covermanager/discogscoverprovider.cpp b/src/covermanager/discogscoverprovider.cpp index c7e86a111..89ce866f4 100644 --- a/src/covermanager/discogscoverprovider.cpp +++ b/src/covermanager/discogscoverprovider.cpp @@ -443,7 +443,7 @@ void DiscogsCoverProvider::HandleReleaseReply(QNetworkReply *reply, const int se search->results.append(result); } - emit SearchResults(search->id, search->results); + Q_EMIT SearchResults(search->id, search->results); search->results.clear(); EndSearch(search, release.id); @@ -457,7 +457,7 @@ void DiscogsCoverProvider::EndSearch(SharedPtr search } if (search->requests_release_.count() <= 0) { requests_search_.remove(search->id); - emit SearchFinished(search->id, search->results); + Q_EMIT SearchFinished(search->id, search->results); } if (queue_release_requests_.isEmpty() && queue_search_requests_.isEmpty()) { diff --git a/src/covermanager/lastfmcoverprovider.cpp b/src/covermanager/lastfmcoverprovider.cpp index f738c9866..759efc861 100644 --- a/src/covermanager/lastfmcoverprovider.cpp +++ b/src/covermanager/lastfmcoverprovider.cpp @@ -133,13 +133,13 @@ void LastFmCoverProvider::QueryFinished(QNetworkReply *reply, const int id, cons QByteArray data = GetReplyData(reply); if (data.isEmpty()) { - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } @@ -151,25 +151,25 @@ void LastFmCoverProvider::QueryFinished(QNetworkReply *reply, const int id, cons int error = json_obj[QLatin1String("error")].toInt(); QString message = json_obj[QLatin1String("message")].toString(); Error(QStringLiteral("Error: %1: %2").arg(QString::number(error), message)); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } else { Error(QStringLiteral("Json reply is missing results."), json_obj); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } if (!value_results.isObject()) { Error(QStringLiteral("Json results is not a object."), value_results); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonObject obj_results = value_results.toObject(); if (obj_results.isEmpty()) { Error(QStringLiteral("Json results object is empty."), value_results); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } @@ -181,7 +181,7 @@ void LastFmCoverProvider::QueryFinished(QNetworkReply *reply, const int id, cons } else { Error(QStringLiteral("Json results object is missing albummatches."), obj_results); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } } @@ -191,35 +191,35 @@ void LastFmCoverProvider::QueryFinished(QNetworkReply *reply, const int id, cons } else { Error(QStringLiteral("Json results object is missing trackmatches."), obj_results); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } } if (!value_matches.isObject()) { Error(QStringLiteral("Json albummatches or trackmatches is not an object."), value_matches); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonObject obj_matches = value_matches.toObject(); if (obj_matches.isEmpty()) { Error(QStringLiteral("Json albummatches or trackmatches object is empty."), value_matches); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonValue value_type; if (!obj_matches.contains(type)) { Error(QStringLiteral("Json object is missing %1.").arg(type), obj_matches); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } value_type = obj_matches[type]; if (!value_type.isArray()) { Error(QStringLiteral("Json album value in albummatches object is not an array."), value_type); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } const QJsonArray array_type = value_type.toArray(); @@ -284,7 +284,7 @@ void LastFmCoverProvider::QueryFinished(QNetworkReply *reply, const int id, cons cover_result.image_size = QSize(300, 300); results << cover_result; } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/covermanager/musicbrainzcoverprovider.cpp b/src/covermanager/musicbrainzcoverprovider.cpp index 04a42c2e1..d18579868 100644 --- a/src/covermanager/musicbrainzcoverprovider.cpp +++ b/src/covermanager/musicbrainzcoverprovider.cpp @@ -130,13 +130,13 @@ void MusicbrainzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int QByteArray data = GetReplyData(reply); if (data.isEmpty()) { - emit SearchFinished(search_id, results); + Q_EMIT SearchFinished(search_id, results); return; } QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { - emit SearchFinished(search_id, results); + Q_EMIT SearchFinished(search_id, results); return; } @@ -148,20 +148,20 @@ void MusicbrainzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int else { Error(QStringLiteral("Json reply is missing releases."), json_obj); } - emit SearchFinished(search_id, results); + Q_EMIT SearchFinished(search_id, results); return; } QJsonValue value_releases = json_obj[QLatin1String("releases")]; if (!value_releases.isArray()) { Error(QStringLiteral("Json releases is not an array."), value_releases); - emit SearchFinished(search_id, results); + Q_EMIT SearchFinished(search_id, results); return; } const QJsonArray array_releases = value_releases.toArray(); if (array_releases.isEmpty()) { - emit SearchFinished(search_id, results); + Q_EMIT SearchFinished(search_id, results); return; } @@ -222,7 +222,7 @@ void MusicbrainzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int cover_result.image_url = url; results.append(cover_result); } - emit SearchFinished(search_id, results); + Q_EMIT SearchFinished(search_id, results); } diff --git a/src/covermanager/musixmatchcoverprovider.cpp b/src/covermanager/musixmatchcoverprovider.cpp index b870cdbe2..20e51fb09 100644 --- a/src/covermanager/musixmatchcoverprovider.cpp +++ b/src/covermanager/musixmatchcoverprovider.cpp @@ -91,26 +91,26 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int if (reply->error() != QNetworkReply::NoError) { Error(QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error())); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) { Error(QStringLiteral("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt())); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } const QByteArray data = reply->readAll(); if (data.isEmpty()) { Error(QStringLiteral("Empty reply received from server.")); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } const QString content = QString::fromUtf8(data); const QString data_begin = QLatin1String(""); if (!content.contains(data_begin) || !content.contains(data_end)) { - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } qint64 begin_idx = content.indexOf(data_begin); @@ -124,13 +124,13 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int } if (content_json.isEmpty()) { - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } static const QRegularExpression regex_html_tag(QStringLiteral("<[^>]*>")); if (content_json.contains(regex_html_tag)) { // Make sure it's not HTML code. - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } @@ -139,60 +139,60 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int if (error.error != QJsonParseError::NoError) { Error(QStringLiteral("Failed to parse json data: %1").arg(error.errorString())); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } if (json_doc.isEmpty()) { Error(QStringLiteral("Received empty Json document."), data); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } if (!json_doc.isObject()) { Error(QStringLiteral("Json document is not an object."), json_doc); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonObject obj_data = json_doc.object(); if (obj_data.isEmpty()) { Error(QStringLiteral("Received empty Json object."), json_doc); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } if (!obj_data.contains(QLatin1String("props")) || !obj_data[QLatin1String("props")].isObject()) { Error(QStringLiteral("Json reply is missing props."), obj_data); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } obj_data = obj_data[QLatin1String("props")].toObject(); if (!obj_data.contains(QLatin1String("pageProps")) || !obj_data[QLatin1String("pageProps")].isObject()) { Error(QStringLiteral("Json props is missing pageProps."), obj_data); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } obj_data = obj_data[QLatin1String("pageProps")].toObject(); if (!obj_data.contains(QLatin1String("data")) || !obj_data[QLatin1String("data")].isObject()) { Error(QStringLiteral("Json pageProps is missing data."), obj_data); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } obj_data = obj_data[QLatin1String("data")].toObject(); if (!obj_data.contains(QLatin1String("albumGet")) || !obj_data[QLatin1String("albumGet")].isObject()) { Error(QStringLiteral("Json data is missing albumGet."), obj_data); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } obj_data = obj_data[QLatin1String("albumGet")].toObject(); if (!obj_data.contains(QLatin1String("data")) || !obj_data[QLatin1String("data")].isObject()) { Error(QStringLiteral("Json albumGet reply is missing data."), obj_data); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } obj_data = obj_data[QLatin1String("data")].toObject(); @@ -206,7 +206,7 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int } if (result.artist.compare(artist, Qt::CaseInsensitive) != 0 && result.album.compare(album, Qt::CaseInsensitive) != 0) { - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } @@ -224,7 +224,7 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int } } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/covermanager/opentidalcoverprovider.cpp b/src/covermanager/opentidalcoverprovider.cpp index 881774ec6..29da2a47d 100644 --- a/src/covermanager/opentidalcoverprovider.cpp +++ b/src/covermanager/opentidalcoverprovider.cpp @@ -358,20 +358,20 @@ void OpenTidalCoverProvider::HandleSearchReply(QNetworkReply *reply, SearchReque search_requests_queue_.prepend(search_request); } else { - emit SearchFinished(search_request->id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(search_request->id, CoverProviderSearchResults()); } return; } if (!json_obj.contains(QLatin1String("albums")) || !json_obj[QLatin1String("albums")].isArray()) { qLog(Debug) << "OpenTidal: Json object is missing albums."; - emit SearchFinished(search_request->id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(search_request->id, CoverProviderSearchResults()); return; } const QJsonArray array_albums = json_obj[QLatin1String("albums")].toArray(); if (array_albums.isEmpty()) { - emit SearchFinished(search_request->id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(search_request->id, CoverProviderSearchResults()); return; } @@ -446,7 +446,7 @@ void OpenTidalCoverProvider::HandleSearchReply(QNetworkReply *reply, SearchReque } } - emit SearchFinished(search_request->id, results); + Q_EMIT SearchFinished(search_request->id, results); } @@ -456,7 +456,7 @@ void OpenTidalCoverProvider::FinishAllSearches() { while (!search_requests_queue_.isEmpty()) { SearchRequestPtr search_request = search_requests_queue_.dequeue(); - emit SearchFinished(search_request->id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(search_request->id, CoverProviderSearchResults()); } } diff --git a/src/covermanager/qobuzcoverprovider.cpp b/src/covermanager/qobuzcoverprovider.cpp index b306f0f65..bff615f4c 100644 --- a/src/covermanager/qobuzcoverprovider.cpp +++ b/src/covermanager/qobuzcoverprovider.cpp @@ -168,13 +168,13 @@ void QobuzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { QByteArray data = GetReplyData(reply); if (data.isEmpty()) { - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } @@ -187,27 +187,27 @@ void QobuzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { } else { Error(QStringLiteral("Json reply is missing albums and tracks object."), json_obj); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } if (!value_type.isObject()) { Error(QStringLiteral("Json albums or tracks is not a object."), value_type); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonObject obj_type = value_type.toObject(); if (!obj_type.contains(QLatin1String("items"))) { Error(QStringLiteral("Json albums or tracks object does not contain items."), obj_type); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } QJsonValue value_items = obj_type[QLatin1String("items")]; if (!value_items.isArray()) { Error(QStringLiteral("Json albums or track object items is not a array."), value_items); - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); return; } const QJsonArray array_items = value_items.toArray(); @@ -273,7 +273,7 @@ void QobuzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { results << cover_result; } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/covermanager/spotifycoverprovider.cpp b/src/covermanager/spotifycoverprovider.cpp index fbe72cce3..6ece328aa 100644 --- a/src/covermanager/spotifycoverprovider.cpp +++ b/src/covermanager/spotifycoverprovider.cpp @@ -178,32 +178,32 @@ void SpotifyCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id, QByteArray data = GetReplyData(reply); if (data.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } if (!json_obj.contains(extract) || !json_obj[extract].isObject()) { Error(QStringLiteral("Json object is missing %1 object.").arg(extract), json_obj); - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } json_obj = json_obj[extract].toObject(); if (!json_obj.contains(QLatin1String("items")) || !json_obj[QLatin1String("items")].isArray()) { Error(QStringLiteral("%1 object is missing items array.").arg(extract), json_obj); - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } const QJsonArray array_items = json_obj[QLatin1String("items")].toArray(); if (array_items.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } @@ -252,7 +252,7 @@ void SpotifyCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id, } } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/covermanager/tidalcoverprovider.cpp b/src/covermanager/tidalcoverprovider.cpp index c42c4f9bb..10e7e4d23 100644 --- a/src/covermanager/tidalcoverprovider.cpp +++ b/src/covermanager/tidalcoverprovider.cpp @@ -170,30 +170,30 @@ void TidalCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { QByteArray data = GetReplyData(reply); if (data.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } if (!json_obj.contains(QLatin1String("items"))) { Error(QStringLiteral("Json object is missing items."), json_obj); - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } QJsonValue value_items = json_obj[QLatin1String("items")]; if (!value_items.isArray()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } const QJsonArray array_items = value_items.toArray(); if (array_items.isEmpty()) { - emit SearchFinished(id, CoverProviderSearchResults()); + Q_EMIT SearchFinished(id, CoverProviderSearchResults()); return; } @@ -261,7 +261,7 @@ void TidalCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) { } } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/device/cddadevice.cpp b/src/device/cddadevice.cpp index 74f9b3615..7c4d4d0f2 100644 --- a/src/device/cddadevice.cpp +++ b/src/device/cddadevice.cpp @@ -65,7 +65,7 @@ void CddaDevice::Refresh() { void CddaDevice::SongsLoaded(const SongList &songs) { model_->Reset(); - emit SongsDiscovered(songs); + Q_EMIT SongsDiscovered(songs); song_count_ = songs.size(); } diff --git a/src/device/cddalister.cpp b/src/device/cddalister.cpp index acfced67b..f7daddeb1 100644 --- a/src/device/cddalister.cpp +++ b/src/device/cddalister.cpp @@ -129,7 +129,7 @@ bool CddaLister::Init() { #endif if (!devices_list_.contains(device)) { devices_list_ << device; - emit DeviceAdded(device); + Q_EMIT DeviceAdded(device); } } diff --git a/src/device/cddasongloader.cpp b/src/device/cddasongloader.cpp index 75bdfa5c1..02bc8dda2 100644 --- a/src/device/cddasongloader.cpp +++ b/src/device/cddasongloader.cpp @@ -143,7 +143,7 @@ void CddaSongLoader::LoadSongs() { song.set_track(track_number); songs << song; } - emit SongsLoaded(songs); + Q_EMIT SongsLoaded(songs); gst_tag_register_musicbrainz_tags(); @@ -189,7 +189,7 @@ void CddaSongLoader::LoadSongs() { } gst_message_unref(msg_toc); } - emit SongsDurationLoaded(songs); + Q_EMIT SongsDurationLoaded(songs); #ifdef HAVE_MUSICBRAINZ // Handle TAG message: generate MusicBrainz DiscId @@ -241,7 +241,7 @@ void CddaSongLoader::AudioCDTagsLoaded(const QString &artist, const QString &alb song.set_url(GetUrlFromTrack(track_number++)); songs << song; } - emit SongsMetadataLoaded(songs); + Q_EMIT SongsMetadataLoaded(songs); } #endif @@ -264,6 +264,6 @@ bool CddaSongLoader::HasChanged() { void CddaSongLoader::Error(const QString &error) { qLog(Error) << error; - emit SongsDurationLoaded(SongList(), error); + Q_EMIT SongsDurationLoaded(SongList(), error); } diff --git a/src/device/connecteddevice.cpp b/src/device/connecteddevice.cpp index 2e6f4e726..51ca93c1c 100644 --- a/src/device/connecteddevice.cpp +++ b/src/device/connecteddevice.cpp @@ -104,7 +104,7 @@ void ConnectedDevice::InitBackendDirectory(const QString &mount_point, const boo } -void ConnectedDevice::ConnectAsync() { emit DeviceConnectFinished(unique_id_, true); } +void ConnectedDevice::ConnectAsync() { Q_EMIT DeviceConnectFinished(unique_id_, true); } void ConnectedDevice::Close() { @@ -115,7 +115,7 @@ void ConnectedDevice::Close() { void ConnectedDevice::BackendCloseFinished() { - emit DeviceCloseFinished(unique_id_); + Q_EMIT DeviceCloseFinished(unique_id_); } @@ -167,5 +167,5 @@ Song::FileType ConnectedDevice::GetTranscodeFormat() const { void ConnectedDevice::BackendTotalSongCountUpdated(int count) { song_count_ = count; - emit SongCountUpdated(count); + Q_EMIT SongCountUpdated(count); } diff --git a/src/device/devicedatabasebackend.cpp b/src/device/devicedatabasebackend.cpp index 2256d4a25..c6ad6d9d5 100644 --- a/src/device/devicedatabasebackend.cpp +++ b/src/device/devicedatabasebackend.cpp @@ -71,7 +71,7 @@ void DeviceDatabaseBackend::Exit() { Q_ASSERT(QThread::currentThread() == thread()); Close(); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } diff --git a/src/device/devicelister.cpp b/src/device/devicelister.cpp index 26200aea0..6ef1dba1a 100644 --- a/src/device/devicelister.cpp +++ b/src/device/devicelister.cpp @@ -83,7 +83,7 @@ void DeviceLister::UnmountDeviceAsync(const QString &id) { } void DeviceLister::MountDevice(const QString &id, const int request_id) { - emit DeviceMounted(id, request_id, true); + Q_EMIT DeviceMounted(id, request_id, true); } void DeviceLister::ExitAsync() { @@ -96,7 +96,7 @@ void DeviceLister::Exit() { if (thread_) { moveToThread(original_thread_); } - emit ExitFinished(); + Q_EMIT ExitFinished(); } diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp index ba1de71db..4d80a5d22 100644 --- a/src/device/devicemanager.cpp +++ b/src/device/devicemanager.cpp @@ -202,7 +202,7 @@ void DeviceManager::BackendClosed() { QObject::disconnect(obj, nullptr, this, nullptr); qLog(Debug) << obj << "successfully closed."; wait_for_exit_.removeAll(obj); - if (wait_for_exit_.isEmpty()) emit ExitFinished(); + if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished(); } @@ -236,7 +236,7 @@ void DeviceManager::LoadAllDevices() { for (const DeviceDatabaseBackend::Device &device : devices) { DeviceInfo *info = new DeviceInfo(DeviceInfo::Type::Device, root_); info->InitFromDb(device); - emit DeviceCreatedFromDB(info); + Q_EMIT DeviceCreatedFromDB(info); } // This is done in a concurrent thread so close the unique DB connection. @@ -260,7 +260,7 @@ void DeviceManager::AddDeviceFromDB(DeviceInfo *info) { existing->icon_name_ = info->icon_name_; existing->icon_ = info->icon_; QModelIndex idx = ItemToIndex(existing); - if (idx.isValid()) emit dataChanged(idx, idx); + if (idx.isValid()) Q_EMIT dataChanged(idx, idx); root_->Delete(info->row); } else { @@ -460,7 +460,7 @@ void DeviceManager::PhysicalDeviceAdded(const QString &id) { } } QModelIndex idx = ItemToIndex(info); - if (idx.isValid()) emit dataChanged(idx, idx); + if (idx.isValid()) Q_EMIT dataChanged(idx, idx); } else { // Check if we have another device with the same URL @@ -476,7 +476,7 @@ void DeviceManager::PhysicalDeviceAdded(const QString &id) { info->LoadIcon(lister->DeviceIcons(id), info->friendly_name_); } QModelIndex idx = ItemToIndex(info); - if (idx.isValid()) emit dataChanged(idx, idx); + if (idx.isValid()) Q_EMIT dataChanged(idx, idx); } else { // It's a completely new device @@ -518,9 +518,9 @@ void DeviceManager::PhysicalDeviceRemoved(const QString &id) { info->device_->Close(); } - if (!info->device_) emit DeviceDisconnected(idx); + if (!info->device_) Q_EMIT DeviceDisconnected(idx); - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } else { // If this was the last lister for the device then remove it from the model @@ -661,7 +661,7 @@ SharedPtr DeviceManager::Connect(DeviceInfo *info) { QModelIndex idx = ItemToIndex(info); if (!idx.isValid()) return ret; - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); QObject::connect(&*info->device_, &ConnectedDevice::TaskStarted, this, &DeviceManager::DeviceTaskStarted); QObject::connect(&*info->device_, &ConnectedDevice::SongCountUpdated, this, &DeviceManager::DeviceSongCountUpdated); @@ -681,7 +681,7 @@ void DeviceManager::DeviceConnectFinished(const QString &id, const bool success) if (!idx.isValid()) return; if (success) { - emit DeviceConnected(idx); + Q_EMIT DeviceConnected(idx); } else { info->device_->Close(); @@ -699,8 +699,8 @@ void DeviceManager::DeviceCloseFinished(const QString &id) { QModelIndex idx = ItemToIndex(info); if (!idx.isValid()) return; - emit DeviceDisconnected(idx); - emit dataChanged(idx, idx); + Q_EMIT DeviceDisconnected(idx); + Q_EMIT dataChanged(idx, idx); if (info->unmount_ && info->BestBackend() && info->BestBackend()->lister_) { info->BestBackend()->lister_->UnmountDeviceAsync(info->BestBackend()->unique_id_); @@ -799,7 +799,7 @@ void DeviceManager::RemoveFromDB(DeviceInfo *info, const QModelIndex &idx) { info->friendly_name_ = info->BestBackend()->lister_->MakeFriendlyName(id); info->LoadIcon(info->BestBackend()->lister_->DeviceIcons(id), info->friendly_name_); - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } } @@ -816,7 +816,7 @@ void DeviceManager::SetDeviceOptions(const QModelIndex &idx, const QString &frie info->transcode_mode_ = mode; info->transcode_format_ = format; - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); if (info->database_id_ != -1) { backend_->SetDeviceOptions(info->database_id_, friendly_name, icon_name, mode, format); @@ -836,7 +836,7 @@ void DeviceManager::DeviceTaskStarted(const int id) { if (!index.isValid()) continue; active_tasks_[id] = index; info->task_percentage_ = 0; - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return; } } @@ -862,7 +862,7 @@ void DeviceManager::TasksChanged() { info->task_percentage_ = 0; } - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); finished_tasks.removeAll(idx); } @@ -875,7 +875,7 @@ void DeviceManager::TasksChanged() { if (!info) continue; info->task_percentage_ = -1; - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); active_tasks_.remove(active_tasks_.key(idx)); } @@ -918,7 +918,7 @@ void DeviceManager::DeviceSongCountUpdated(const int count) { QModelIndex idx = ItemToIndex(info); if (!idx.isValid()) return; - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } diff --git a/src/device/devicestatefiltermodel.cpp b/src/device/devicestatefiltermodel.cpp index cf146c3bd..df62db1dc 100644 --- a/src/device/devicestatefiltermodel.cpp +++ b/src/device/devicestatefiltermodel.cpp @@ -44,13 +44,13 @@ bool DeviceStateFilterModel::filterAcceptsRow(int row, const QModelIndex&) const void DeviceStateFilterModel::ProxyRowCountChanged(const QModelIndex&, const int, const int) { - emit IsEmptyChanged(rowCount() == 0); + Q_EMIT IsEmptyChanged(rowCount() == 0); } void DeviceStateFilterModel::ProxyReset() { - emit IsEmptyChanged(rowCount() == 0); + Q_EMIT IsEmptyChanged(rowCount() == 0); } diff --git a/src/device/deviceview.cpp b/src/device/deviceview.cpp index 8fbb10904..ff57616d2 100644 --- a/src/device/deviceview.cpp +++ b/src/device/deviceview.cpp @@ -398,12 +398,12 @@ void DeviceView::Load() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->clear_first_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } void DeviceView::AddToPlaylist() { - emit AddToPlaylistSignal(model()->mimeData(selectedIndexes())); + Q_EMIT AddToPlaylistSignal(model()->mimeData(selectedIndexes())); } void DeviceView::OpenInNewPlaylist() { @@ -412,7 +412,7 @@ void DeviceView::OpenInNewPlaylist() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->open_in_new_playlist_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } diff --git a/src/device/filesystemdevice.cpp b/src/device/filesystemdevice.cpp index 1ec26b790..f31970d76 100644 --- a/src/device/filesystemdevice.cpp +++ b/src/device/filesystemdevice.cpp @@ -113,7 +113,7 @@ void FilesystemDevice::ExitFinished() { qLog(Debug) << obj << "successfully exited."; wait_for_exit_.removeAll(obj); if (wait_for_exit_.isEmpty()) { - emit DeviceCloseFinished(unique_id()); + Q_EMIT DeviceCloseFinished(unique_id()); } } diff --git a/src/device/giolister.cpp b/src/device/giolister.cpp index f1d376efe..04e73686f 100644 --- a/src/device/giolister.cpp +++ b/src/device/giolister.cpp @@ -314,7 +314,7 @@ void GioLister::VolumeAdded(GVolume *volume) { devices_[info.unique_id()] = info; } - emit DeviceAdded(info.unique_id()); + Q_EMIT DeviceAdded(info.unique_id()); } @@ -330,7 +330,7 @@ void GioLister::VolumeRemoved(GVolume *volume) { devices_.remove(id); } - emit DeviceRemoved(id); + Q_EMIT DeviceRemoved(id); } void GioLister::MountAdded(GMount *mount) { @@ -370,7 +370,7 @@ void GioLister::MountAdded(GMount *mount) { // If the ID has changed (for example, after it's been mounted), we need // to remove the old device. devices_.remove(old_id); - emit DeviceRemoved(old_id); + Q_EMIT DeviceRemoved(old_id); old_id = QString(); } @@ -378,10 +378,10 @@ void GioLister::MountAdded(GMount *mount) { } if (old_id.isEmpty()) { - emit DeviceAdded(info.unique_id()); + Q_EMIT DeviceAdded(info.unique_id()); } else { - emit DeviceChanged(old_id); + Q_EMIT DeviceChanged(old_id); } } @@ -409,7 +409,7 @@ void GioLister::MountChanged(GMount *mount) { devices_[id] = new_info; } - emit DeviceChanged(id); + Q_EMIT DeviceChanged(id); } @@ -424,7 +424,7 @@ void GioLister::MountRemoved(GMount *mount) { devices_.remove(id); } - emit DeviceRemoved(id); + Q_EMIT DeviceRemoved(id); } @@ -598,7 +598,7 @@ void GioLister::UpdateDeviceFreeSpace(const QString &id) { g_object_unref(root); } - emit DeviceChanged(id); + Q_EMIT DeviceChanged(id); } @@ -613,19 +613,19 @@ void GioLister::MountDevice(const QString &id, const int request_id) { QMutexLocker l(&mutex_); if (!devices_.contains(id)) { - emit DeviceMounted(id, request_id, false); + Q_EMIT DeviceMounted(id, request_id, false); return; } const DeviceInfo device_info = devices_.value(id); if (device_info.mount_ptr) { // Already mounted - emit DeviceMounted(id, request_id, true); + Q_EMIT DeviceMounted(id, request_id, true); return; } g_volume_mount(device_info.volume_ptr, G_MOUNT_MOUNT_NONE, nullptr, nullptr, VolumeMountFinished, nullptr); - emit DeviceMounted(id, request_id, true); + Q_EMIT DeviceMounted(id, request_id, true); } diff --git a/src/device/gpoddevice.cpp b/src/device/gpoddevice.cpp index 621d16fff..8b84c7db0 100644 --- a/src/device/gpoddevice.cpp +++ b/src/device/gpoddevice.cpp @@ -129,7 +129,7 @@ void GPodDevice::LoadFinished(Itdb_iTunesDB *db, const bool success) { ConnectedDevice::Close(); } else { - emit DeviceConnectFinished(unique_id_, success); + Q_EMIT DeviceConnectFinished(unique_id_, success); } } diff --git a/src/device/gpodloader.cpp b/src/device/gpodloader.cpp index 432fe6ed6..bd4ce910e 100644 --- a/src/device/gpodloader.cpp +++ b/src/device/gpodloader.cpp @@ -52,14 +52,14 @@ GPodLoader::~GPodLoader() = default; void GPodLoader::LoadDatabase() { int task_id = task_manager_->StartTask(tr("Loading iPod database")); - emit TaskStarted(task_id); + Q_EMIT TaskStarted(task_id); Itdb_iTunesDB *db = TryLoad(); moveToThread(original_thread_); task_manager_->SetTaskFinished(task_id); - emit LoadFinished(db, !abort_); + Q_EMIT LoadFinished(db, !abort_); } @@ -74,11 +74,11 @@ Itdb_iTunesDB *GPodLoader::TryLoad() { if (!db) { if (error) { qLog(Error) << "loading database failed:" << error->message; - emit Error(QString::fromUtf8(error->message)); + Q_EMIT Error(QString::fromUtf8(error->message)); g_error_free(error); } else { - emit Error(tr("An error occurred loading the iTunes database")); + Q_EMIT Error(tr("An error occurred loading the iTunes database")); } return db; diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp index 48307ff8b..30fbbe799 100644 --- a/src/device/mtpdevice.cpp +++ b/src/device/mtpdevice.cpp @@ -124,7 +124,7 @@ void MtpDevice::LoadFinished(const bool success, MtpConnection *connection) { ConnectedDevice::Close(); } else { - emit DeviceConnectFinished(unique_id_, success); + Q_EMIT DeviceConnectFinished(unique_id_, success); } } diff --git a/src/device/mtploader.cpp b/src/device/mtploader.cpp index 514c66ef7..e126bf8b6 100644 --- a/src/device/mtploader.cpp +++ b/src/device/mtploader.cpp @@ -53,14 +53,14 @@ bool MtpLoader::Init() { return true; } void MtpLoader::LoadDatabase() { int task_id = task_manager_->StartTask(tr("Loading MTP device")); - emit TaskStarted(task_id); + Q_EMIT TaskStarted(task_id); bool success = TryLoad(); moveToThread(original_thread_); task_manager_->SetTaskFinished(task_id); - emit LoadFinished(success, connection_.release()); + Q_EMIT LoadFinished(success, connection_.release()); } @@ -69,12 +69,12 @@ bool MtpLoader::TryLoad() { connection_ = make_unique(url_); if (!connection_) { - emit Error(tr("Error connecting MTP device %1").arg(url_.toString())); + Q_EMIT Error(tr("Error connecting MTP device %1").arg(url_.toString())); return false; } if (!connection_->is_valid()) { - emit Error(tr("Error connecting MTP device %1: %2").arg(url_.toString(), connection_->error_text())); + Q_EMIT Error(tr("Error connecting MTP device %1: %2").arg(url_.toString(), connection_->error_text())); return false; } diff --git a/src/device/udisks2lister.cpp b/src/device/udisks2lister.cpp index ba546296c..92ef80113 100644 --- a/src/device/udisks2lister.cpp +++ b/src/device/udisks2lister.cpp @@ -176,7 +176,7 @@ void Udisks2Lister::UnmountDevice(const QString &id) { } device_data_.remove(id); - emit DeviceRemoved(id); + Q_EMIT DeviceRemoved(id); } } @@ -184,7 +184,7 @@ void Udisks2Lister::UnmountDevice(const QString &id) { void Udisks2Lister::UpdateDeviceFreeSpace(const QString &id) { QWriteLocker locker(&device_data_lock_); device_data_[id].free_space = Utilities::FileSystemFreeSpace(device_data_.value(id).mount_paths.value(0)); - emit DeviceChanged(id); + Q_EMIT DeviceChanged(id); } bool Udisks2Lister::Init() { @@ -212,7 +212,7 @@ bool Udisks2Lister::Init() { const QStringList ids = device_data_.keys(); for (const QString &id : ids) { - emit DeviceAdded(id); + Q_EMIT DeviceAdded(id); } QObject::connect(&*udisks2_interface_, &OrgFreedesktopDBusObjectManagerInterface::InterfacesAdded, this, &Udisks2Lister::DBusInterfaceAdded); @@ -293,7 +293,7 @@ void Udisks2Lister::RemoveDevice(const QDBusObjectPath &device_path) { qLog(Debug) << "UDisks2 device removed: " << device_path.path(); device_data_.remove(id); - emit DeviceRemoved(id); + Q_EMIT DeviceRemoved(id); } @@ -342,7 +342,7 @@ void Udisks2Lister::HandleFinishedMountJob(const PartitionData &partition_data) QWriteLocker locker(&device_data_lock_); device_data_[partition_data.unique_id()] = partition_data; - emit DeviceAdded(partition_data.unique_id()); + Q_EMIT DeviceAdded(partition_data.unique_id()); } @@ -362,7 +362,7 @@ void Udisks2Lister::HandleFinishedUnmountJob(const PartitionData &partition_data if (!id.isEmpty()) { qLog(Debug) << "Partition " << partition_data.dbus_path << " has no more mount points, removing it from device list"; device_data_.remove(id); - emit DeviceRemoved(id); + Q_EMIT DeviceRemoved(id); } } diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp index 726e9478a..3a5aa06cb 100644 --- a/src/dialogs/edittagdialog.cpp +++ b/src/dialogs/edittagdialog.cpp @@ -1494,10 +1494,10 @@ void EditTagDialog::SongSaveTagsComplete(TagReaderReply *reply, const QString &f } else { if (error.isEmpty()) { - emit Error(tr("Could not write metadata to %1").arg(filename)); + Q_EMIT Error(tr("Could not write metadata to %1").arg(filename)); } else { - emit Error(tr("Could not write metadata to %1: %2").arg(filename, error)); + Q_EMIT Error(tr("Could not write metadata to %1: %2").arg(filename, error)); } } diff --git a/src/dialogs/trackselectiondialog.cpp b/src/dialogs/trackselectiondialog.cpp index b868ee126..6b36c994d 100644 --- a/src/dialogs/trackselectiondialog.cpp +++ b/src/dialogs/trackselectiondialog.cpp @@ -309,7 +309,7 @@ void TrackSelectionDialog::accept() { const Song &new_metadata = tag_data.results_[tag_data.selected_result_]; - emit SongChosen(tag_data.original_song_, new_metadata); + Q_EMIT SongChosen(tag_data.original_song_, new_metadata); } } diff --git a/src/engine/enginebase.cpp b/src/engine/enginebase.cpp index 0076f0bce..b772f4348 100644 --- a/src/engine/enginebase.cpp +++ b/src/engine/enginebase.cpp @@ -152,7 +152,7 @@ bool EngineBase::Play(const QUrl &media_url, const QUrl &stream_url, const bool void EngineBase::UpdateVolume(const uint volume) { volume_ = volume; - emit VolumeChanged(volume); + Q_EMIT VolumeChanged(volume); } @@ -261,7 +261,7 @@ void EngineBase::EmitAboutToFinish() { about_to_end_emitted_ = true; - emit TrackAboutToEnd(); + Q_EMIT TrackAboutToEnd(); } diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp index d3b30f226..9662dbfbc 100644 --- a/src/engine/gstengine.cpp +++ b/src/engine/gstengine.cpp @@ -322,7 +322,7 @@ void GstEngine::Stop(const bool stop_after) { BufferingFinished(); - emit StateChanged(State::Empty); + Q_EMIT StateChanged(State::Empty); } @@ -344,7 +344,7 @@ void GstEngine::Pause() { } else { current_pipeline_->SetStateAsync(GST_STATE_PAUSED); - emit StateChanged(State::Paused); + Q_EMIT StateChanged(State::Paused); StopTimers(); } } @@ -367,7 +367,7 @@ void GstEngine::Unpause() { current_pipeline_->SetStateAsync(GST_STATE_PLAYING); - emit StateChanged(State::Playing); + Q_EMIT StateChanged(State::Playing); StartTimers(); } @@ -598,7 +598,7 @@ void GstEngine::EndOfStreamReached(const int pipeline_id, const bool has_next_tr BufferingFinished(); } - emit TrackEnded(); + Q_EMIT TrackEnded(); } @@ -612,7 +612,7 @@ void GstEngine::HandlePipelineError(const int pipeline_id, const int domain, con current_pipeline_ = GstEnginePipelinePtr(); BufferingFinished(); - emit StateChanged(State::Error); + Q_EMIT StateChanged(State::Error); if ( (domain == static_cast(GST_RESOURCE_ERROR) && ( @@ -622,21 +622,21 @@ void GstEngine::HandlePipelineError(const int pipeline_id, const int domain, con )) || (domain == static_cast(GST_STREAM_ERROR)) ) { - emit InvalidSongRequested(stream_url_); + Q_EMIT InvalidSongRequested(stream_url_); } else { - emit FatalError(); + Q_EMIT FatalError(); } - emit Error(message); - emit Error(debugstr); + Q_EMIT Error(message); + Q_EMIT Error(debugstr); } void GstEngine::NewMetaData(const int pipeline_id, const EngineMetadata &engine_metadata) { if (!current_pipeline_|| current_pipeline_->id() != pipeline_id) return; - emit MetaData(engine_metadata); + Q_EMIT MetaData(engine_metadata); } @@ -667,18 +667,18 @@ void GstEngine::FadeoutFinished(const int pipeline_id) { fadeout_pipelines_.remove(pipeline_id); FinishPipeline(pipeline); - emit FadeoutFinishedSignal(); + Q_EMIT FadeoutFinishedSignal(); } void GstEngine::FadeoutPauseFinished() { fadeout_pause_pipeline_->SetStateAsync(GST_STATE_PAUSED); - emit StateChanged(State::Paused); + Q_EMIT StateChanged(State::Paused); StopTimers(); has_faded_out_to_pause_ = true; fadeout_pause_pipeline_ = GstEnginePipelinePtr(); - emit FadeoutFinishedSignal(); + Q_EMIT FadeoutFinishedSignal(); } @@ -731,10 +731,10 @@ void GstEngine::PlayDone(const GstStateChangeReturn ret, const bool pause, const StartTimers(); } - emit StateChanged(pause ? State::Paused : State::Playing); + Q_EMIT StateChanged(pause ? State::Paused : State::Playing); // We've successfully started playing a media stream with this url - emit ValidSongRequested(stream_url_); + Q_EMIT ValidSongRequested(stream_url_); } @@ -901,9 +901,9 @@ GstEnginePipelinePtr GstEngine::CreatePipeline(const QUrl &media_url, const QUrl QString error; if (!ret->InitFromUrl(media_url, stream_url, gst_url, end_nanosec, ebur128_loudness_normalizing_gain_db, error)) { ret.reset(); - emit Error(error); - emit StateChanged(State::Error); - emit FatalError(); + Q_EMIT Error(error); + Q_EMIT StateChanged(State::Error); + Q_EMIT FatalError(); } return ret; @@ -1084,7 +1084,7 @@ void GstEngine::StreamDiscovered(GstDiscoverer*, GstDiscovererInfo *info, GError qLog(Debug) << "Got stream info for" << discovered_url + ":" << Song::TextForFiletype(engine_metadata.filetype); - emit instance->MetaData(engine_metadata); + Q_EMIT instance->MetaData(engine_metadata); } else { diff --git a/src/engine/gstenginepipeline.cpp b/src/engine/gstenginepipeline.cpp index 675514387..5f5a205ec 100644 --- a/src/engine/gstenginepipeline.cpp +++ b/src/engine/gstenginepipeline.cpp @@ -1086,7 +1086,7 @@ void GstEnginePipeline::SourceSetupCallback(GstElement *playbin, GstElement *sou if (instance->buffering_) { qLog(Debug) << "Buffering finished"; instance->buffering_ = false; - emit instance->BufferingFinished(); + Q_EMIT instance->BufferingFinished(); instance->SetStateAsync(GST_STATE_PLAYING); } @@ -1106,7 +1106,7 @@ void GstEnginePipeline::NotifyVolumeCallback(GstElement *element, GParamSpec *pa const uint volume_percent = static_cast(qBound(0L, lround(instance->volume_internal_ / 0.01), 100L)); if (volume_percent != instance->volume_percent_) { instance->volume_percent_ = volume_percent; - emit instance->VolumeChanged(volume_percent); + Q_EMIT instance->VolumeChanged(volume_percent); } } @@ -1336,11 +1336,11 @@ GstPadProbeReturn GstEnginePipeline::BufferProbeCallback(GstPad *pad, GstPadProb // GstEngine will try to seek to the start of the new section, but we're already there so ignore it. instance->ignore_next_seek_ = true; - emit instance->EndOfStreamReached(instance->id(), true); + Q_EMIT instance->EndOfStreamReached(instance->id(), true); } else { // There's no next song - emit instance->EndOfStreamReached(instance->id(), false); + Q_EMIT instance->EndOfStreamReached(instance->id(), false); } } @@ -1362,7 +1362,7 @@ void GstEnginePipeline::AboutToFinishCallback(GstPlayBin *playbin, gpointer self instance->SetNextUrl(); } - emit instance->AboutToFinish(); + Q_EMIT instance->AboutToFinish(); } @@ -1374,7 +1374,7 @@ GstBusSyncReply GstEnginePipeline::BusSyncCallback(GstBus *bus, GstMessage *msg, switch (GST_MESSAGE_TYPE(msg)) { case GST_MESSAGE_EOS: - emit instance->EndOfStreamReached(instance->id(), false); + Q_EMIT instance->EndOfStreamReached(instance->id(), false); break; case GST_MESSAGE_TAG: @@ -1473,7 +1473,7 @@ void GstEnginePipeline::StreamStartMessageReceived() { next_beginning_offset_nanosec_ = 0; next_end_offset_nanosec_ = 0; - emit EndOfStreamReached(id(), true); + Q_EMIT EndOfStreamReached(id(), true); } } @@ -1549,7 +1549,7 @@ void GstEnginePipeline::ErrorMessageReceived(GstMessage *msg) { } #endif - emit Error(id(), static_cast(domain), code, message, debugstr); + Q_EMIT Error(id(), static_cast(domain), code, message, debugstr); } @@ -1602,7 +1602,7 @@ void GstEnginePipeline::TagMessageReceived(GstMessage *msg) { gst_tag_list_unref(taglist); - emit MetadataFound(id(), engine_metadata); + Q_EMIT MetadataFound(id(), engine_metadata); } @@ -1716,7 +1716,7 @@ void GstEnginePipeline::BufferingMessageReceived(GstMessage *msg) { if (percent < 100 && !buffering_) { qLog(Debug) << "Buffering started"; buffering_ = true; - emit BufferingStarted(); + Q_EMIT BufferingStarted(); if (current_state == GST_STATE_PLAYING) { SetStateAsync(GST_STATE_PAUSED); if (pending_state_ == GST_STATE_NULL) { @@ -1727,7 +1727,7 @@ void GstEnginePipeline::BufferingMessageReceived(GstMessage *msg) { else if (percent == 100 && buffering_) { qLog(Debug) << "Buffering finished"; buffering_ = false; - emit BufferingFinished(); + Q_EMIT BufferingFinished(); if (pending_seek_nanosec_ != -1) { SeekAsync(pending_seek_nanosec_); pending_seek_nanosec_ = -1; @@ -1738,7 +1738,7 @@ void GstEnginePipeline::BufferingMessageReceived(GstMessage *msg) { } } else if (buffering_) { - emit BufferingProgress(percent); + Q_EMIT BufferingProgress(percent); } } @@ -1800,10 +1800,10 @@ void GstEnginePipeline::SetStateAsyncFinished(const GstState state, const GstSta case GST_STATE_CHANGE_ASYNC: case GST_STATE_CHANGE_NO_PREROLL: qLog(Debug) << "Pipeline" << id_ << "state successfully set to" << GstStateText(state); - emit SetStateFinished(state_change); + Q_EMIT SetStateFinished(state_change); if (!finished_ && finish_requested_) { finished_ = true; - emit Finished(); + Q_EMIT Finished(); } break; case GST_STATE_CHANGE_FAILURE: @@ -2046,7 +2046,7 @@ void GstEnginePipeline::timerEvent(QTimerEvent *e) { if (e->timerId() == fader_fudge_timer_.timerId()) { fader_fudge_timer_.stop(); - emit FaderFinished(id_); + Q_EMIT FaderFinished(id_); return; } diff --git a/src/engine/vlcengine.cpp b/src/engine/vlcengine.cpp index ceab1fcbc..7d6fd1467 100644 --- a/src/engine/vlcengine.cpp +++ b/src/engine/vlcengine.cpp @@ -311,30 +311,30 @@ void VLCEngine::StateChangedCallback(const libvlc_event_t *e, void *data) { const EngineBase::State state = engine->state_; engine->state_ = EngineBase::State::Empty; if (state == EngineBase::State::Playing) { - emit engine->StateChanged(engine->state_); + Q_EMIT engine->StateChanged(engine->state_); } break; } case libvlc_MediaPlayerEncounteredError: engine->state_ = EngineBase::State::Error; - emit engine->StateChanged(engine->state_); - emit engine->FatalError(); + Q_EMIT engine->StateChanged(engine->state_); + Q_EMIT engine->FatalError(); break; case libvlc_MediaPlayerPlaying: engine->state_ = EngineBase::State::Playing; - emit engine->StateChanged(engine->state_); + Q_EMIT engine->StateChanged(engine->state_); break; case libvlc_MediaPlayerPaused: engine->state_ = EngineBase::State::Paused; - emit engine->StateChanged(engine->state_); + Q_EMIT engine->StateChanged(engine->state_); break; case libvlc_MediaPlayerEndReached: engine->state_ = EngineBase::State::Idle; - emit engine->TrackEnded(); + Q_EMIT engine->TrackEnded(); break; } diff --git a/src/equalizer/equalizer.cpp b/src/equalizer/equalizer.cpp index 92ee86965..c6d8f0ac1 100644 --- a/src/equalizer/equalizer.cpp +++ b/src/equalizer/equalizer.cpp @@ -291,24 +291,24 @@ void Equalizer::StereoBalancerEnabledChangedSlot(const bool enabled) { if (!enabled) { ui_->stereo_balance_slider->setValue(0); - emit StereoBalanceChanged(stereo_balance()); + Q_EMIT StereoBalanceChanged(stereo_balance()); } ui_->stereo_balance_slider->setEnabled(enabled); - emit StereoBalancerEnabledChanged(enabled); + Q_EMIT StereoBalancerEnabledChanged(enabled); Save(); } void Equalizer::StereoBalanceSliderChanged(const int) { - emit StereoBalanceChanged(stereo_balance()); + Q_EMIT StereoBalanceChanged(stereo_balance()); Save(); } void Equalizer::EqualizerEnabledChangedSlot(const bool enabled) { - emit EqualizerEnabledChanged(enabled); + Q_EMIT EqualizerEnabledChanged(enabled); ui_->slider_container->setEnabled(enabled); Save(); @@ -317,7 +317,7 @@ void Equalizer::EqualizerEnabledChangedSlot(const bool enabled) { void Equalizer::EqualizerParametersChangedSlot() { if (loading_) return; - emit EqualizerParametersChanged(preamp_value(), gain_values()); + Q_EMIT EqualizerParametersChanged(preamp_value(), gain_values()); } diff --git a/src/equalizer/equalizerslider.cpp b/src/equalizer/equalizerslider.cpp index bb3f65bf1..68eb5edc4 100644 --- a/src/equalizer/equalizerslider.cpp +++ b/src/equalizer/equalizerslider.cpp @@ -57,7 +57,7 @@ void EqualizerSlider::OnValueChanged(const int value) { float gain = (static_cast(value) < 0) ? static_cast(value) * static_cast(0.24) : static_cast(value) * static_cast(0.12); ui_->gain->setText(tr("%1 dB").arg(gain)); // Gain [dB] - emit ValueChanged(value); + Q_EMIT ValueChanged(value); } diff --git a/src/globalshortcuts/globalshortcut.cpp b/src/globalshortcuts/globalshortcut.cpp index d3d1f7dab..379350848 100644 --- a/src/globalshortcuts/globalshortcut.cpp +++ b/src/globalshortcuts/globalshortcut.cpp @@ -165,7 +165,7 @@ void GlobalShortcut::activateShortcut(const quint32 native_key, const quint32 na GlobalShortcut *gshortcut = internal_shortcuts_.value(hash); if (gshortcut && gshortcut != initialized_) { - emit gshortcut->activated(); + Q_EMIT gshortcut->activated(); } } diff --git a/src/lyrics/chartlyricsprovider.cpp b/src/lyrics/chartlyricsprovider.cpp index 6e5e64d1f..fe0df2f22 100644 --- a/src/lyrics/chartlyricsprovider.cpp +++ b/src/lyrics/chartlyricsprovider.cpp @@ -82,13 +82,13 @@ void ChartLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, if (reply->error() != QNetworkReply::NoError) { Error(QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error())); - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) { Error(QStringLiteral("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt())); - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } @@ -134,7 +134,7 @@ void ChartLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, qLog(Debug) << "ChartLyrics: Got lyrics for" << request.artist << request.title; } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/lyrics/geniuslyricsprovider.cpp b/src/lyrics/geniuslyricsprovider.cpp index fbf1673f4..ba6fc392a 100644 --- a/src/lyrics/geniuslyricsprovider.cpp +++ b/src/lyrics/geniuslyricsprovider.cpp @@ -311,8 +311,8 @@ void GeniusLyricsProvider::AccessTokenRequestFinished(QNetworkReply *reply) { qLog(Debug) << "Genius: Authentication was successful."; - emit AuthenticationComplete(true); - emit AuthenticationSuccess(); + Q_EMIT AuthenticationComplete(true); + Q_EMIT AuthenticationSuccess(); } @@ -525,8 +525,8 @@ void GeniusLyricsProvider::AuthError(const QString &error, const QVariant &debug for (const QString &e : std::as_const(login_errors_)) Error(e); if (debug.isValid()) qLog(Debug) << debug; - emit AuthenticationFailure(login_errors_); - emit AuthenticationComplete(false, login_errors_); + Q_EMIT AuthenticationFailure(login_errors_); + Q_EMIT AuthenticationComplete(false, login_errors_); login_errors_.clear(); @@ -552,7 +552,7 @@ void GeniusLyricsProvider::EndSearch(GeniusLyricsSearchContextPtr search, const else { qLog(Debug) << "GeniusLyrics: Got lyrics for" << search->request.artist << search->request.title; } - emit SearchFinished(search->id, search->results); + Q_EMIT SearchFinished(search->id, search->results); } } diff --git a/src/lyrics/htmllyricsprovider.cpp b/src/lyrics/htmllyricsprovider.cpp index c6f340d43..33bbc93b5 100644 --- a/src/lyrics/htmllyricsprovider.cpp +++ b/src/lyrics/htmllyricsprovider.cpp @@ -92,34 +92,34 @@ void HtmlLyricsProvider::HandleLyricsReply(QNetworkReply *reply, const int id, c else { qLog(Error) << name_ << reply->errorString() << reply->error(); } - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) { qLog(Error) << name_ << "Received HTTP code" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } QByteArray data = reply->readAll(); if (data.isEmpty()) { qLog(Error) << name_ << "Empty reply received from server."; - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } const QString lyrics = ParseLyricsFromHTML(QString::fromUtf8(data), QRegularExpression(start_tag_), QRegularExpression(end_tag_), QRegularExpression(lyrics_start_), multiple_); if (lyrics.isEmpty() || lyrics.contains(QLatin1String("we do not have the lyrics for"), Qt::CaseInsensitive)) { qLog(Debug) << name_ << "No lyrics for" << request.artist << request.album << request.title; - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } qLog(Debug) << name_ << "Got lyrics for" << request.artist << request.album << request.title; LyricsSearchResult result(lyrics); - emit SearchFinished(id, LyricsSearchResults() << result); + Q_EMIT SearchFinished(id, LyricsSearchResults() << result); } diff --git a/src/lyrics/lololyricsprovider.cpp b/src/lyrics/lololyricsprovider.cpp index 8658ac9e5..5fc47f7e2 100644 --- a/src/lyrics/lololyricsprovider.cpp +++ b/src/lyrics/lololyricsprovider.cpp @@ -85,7 +85,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, c failure_reason = QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error()); if (reply->error() < 200) { Error(failure_reason); - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } } @@ -140,7 +140,7 @@ void LoloLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, c qLog(Debug) << "LoloLyrics: Got lyrics for" << request.artist << request.title; } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/lyrics/lyricfindlyricsprovider.cpp b/src/lyrics/lyricfindlyricsprovider.cpp index 25f99cef2..21ed7e6d9 100644 --- a/src/lyrics/lyricfindlyricsprovider.cpp +++ b/src/lyrics/lyricfindlyricsprovider.cpp @@ -213,6 +213,6 @@ void LyricFindLyricsProvider::EndSearch(const int id, const LyricsSearchRequest qLog(Debug) << "LyricFind: Got lyrics for" << request.artist << request.title; } - emit SearchFinished(id, results); + Q_EMIT SearchFinished(id, results); } diff --git a/src/lyrics/lyricsfetcher.cpp b/src/lyrics/lyricsfetcher.cpp index 59e3227ce..7158700ca 100644 --- a/src/lyrics/lyricsfetcher.cpp +++ b/src/lyrics/lyricsfetcher.cpp @@ -117,7 +117,7 @@ void LyricsFetcher::SingleSearchFinished(const quint64 request_id, const LyricsS LyricsFetcherSearch *search = active_requests_.take(request_id); search->deleteLater(); - emit SearchFinished(request_id, results); + Q_EMIT SearchFinished(request_id, results); } @@ -127,6 +127,6 @@ void LyricsFetcher::SingleLyricsFetched(const quint64 request_id, const QString LyricsFetcherSearch *search = active_requests_.take(request_id); search->deleteLater(); - emit LyricsFetched(request_id, provider, lyrics); + Q_EMIT LyricsFetched(request_id, provider, lyrics); } diff --git a/src/lyrics/lyricsfetchersearch.cpp b/src/lyrics/lyricsfetchersearch.cpp index 114b567b5..d46ecac06 100644 --- a/src/lyrics/lyricsfetchersearch.cpp +++ b/src/lyrics/lyricsfetchersearch.cpp @@ -134,13 +134,13 @@ void LyricsFetcherSearch::AllProvidersFinished() { if (!results_.isEmpty()) { qLog(Debug) << "Using lyrics from" << results_.last().provider << "for" << request_.artist << request_.title << "with score" << results_.last().score; - emit LyricsFetched(id_, results_.constLast().provider, results_.constLast().lyrics); + Q_EMIT LyricsFetched(id_, results_.constLast().provider, results_.constLast().lyrics); } else { - emit LyricsFetched(id_, QString(), QString()); + Q_EMIT LyricsFetched(id_, QString(), QString()); } - emit SearchFinished(id_, results_); + Q_EMIT SearchFinished(id_, results_); } diff --git a/src/lyrics/musixmatchlyricsprovider.cpp b/src/lyrics/musixmatchlyricsprovider.cpp index af97aebe5..3594ab2a9 100644 --- a/src/lyrics/musixmatchlyricsprovider.cpp +++ b/src/lyrics/musixmatchlyricsprovider.cpp @@ -437,7 +437,7 @@ void MusixmatchLyricsProvider::EndSearch(LyricsSearchContextPtr search, const QU else { qLog(Debug) << "MusixmatchLyrics: Got lyrics for" << search->request.artist << search->request.title; } - emit SearchFinished(search->id, search->results); + Q_EMIT SearchFinished(search->id, search->results); } } diff --git a/src/lyrics/ovhlyricsprovider.cpp b/src/lyrics/ovhlyricsprovider.cpp index 6d5cbf242..9fc8fe7f3 100644 --- a/src/lyrics/ovhlyricsprovider.cpp +++ b/src/lyrics/ovhlyricsprovider.cpp @@ -76,19 +76,19 @@ void OVHLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, co QJsonObject json_obj = ExtractJsonObj(reply); if (json_obj.isEmpty()) { - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } if (json_obj.contains(QLatin1String("error"))) { Error(json_obj[QLatin1String("error")].toString()); qLog(Debug) << "OVHLyrics: No lyrics for" << request.artist << request.title; - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } if (!json_obj.contains(QLatin1String("lyrics"))) { - emit SearchFinished(id); + Q_EMIT SearchFinished(id); return; } @@ -97,12 +97,12 @@ void OVHLyricsProvider::HandleSearchReply(QNetworkReply *reply, const int id, co if (result.lyrics.isEmpty()) { qLog(Debug) << "OVHLyrics: No lyrics for" << request.artist << request.title; - emit SearchFinished(id); + Q_EMIT SearchFinished(id); } else { result.lyrics = Utilities::DecodeHtmlEntities(result.lyrics); qLog(Debug) << "OVHLyrics: Got lyrics for" << request.artist << request.title; - emit SearchFinished(id, LyricsSearchResults() << result); + Q_EMIT SearchFinished(id, LyricsSearchResults() << result); } } diff --git a/src/moodbar/moodbarcontroller.cpp b/src/moodbar/moodbarcontroller.cpp index 8343d9a5c..d147b66c3 100644 --- a/src/moodbar/moodbarcontroller.cpp +++ b/src/moodbar/moodbarcontroller.cpp @@ -62,17 +62,17 @@ void MoodbarController::CurrentSongChanged(const Song &song) { switch (result) { case MoodbarLoader::Result::CannotLoad: - emit CurrentMoodbarDataChanged(QByteArray()); + Q_EMIT CurrentMoodbarDataChanged(QByteArray()); break; case MoodbarLoader::Result::Loaded: - emit CurrentMoodbarDataChanged(data); + Q_EMIT CurrentMoodbarDataChanged(data); break; case MoodbarLoader::Result::WillLoadAsync: // Emit an empty array for now so the GUI reverts to a normal progress // bar. Our slot will be called when the data is actually loaded. - emit CurrentMoodbarDataChanged(QByteArray()); + Q_EMIT CurrentMoodbarDataChanged(QByteArray()); QObject::connect(pipeline, &MoodbarPipeline::Finished, this, [this, pipeline, song]() { AsyncLoadComplete(pipeline, song.url()); }); break; @@ -82,7 +82,7 @@ void MoodbarController::CurrentSongChanged(const Song &song) { void MoodbarController::PlaybackStopped() { if (enabled_) { - emit CurrentMoodbarDataChanged(QByteArray()); + Q_EMIT CurrentMoodbarDataChanged(QByteArray()); } } @@ -104,6 +104,6 @@ void MoodbarController::AsyncLoadComplete(MoodbarPipeline *pipeline, const QUrl break; } - emit CurrentMoodbarDataChanged(pipeline->data()); + Q_EMIT CurrentMoodbarDataChanged(pipeline->data()); } diff --git a/src/moodbar/moodbarpipeline.cpp b/src/moodbar/moodbarpipeline.cpp index 1849d9a9a..c5e3631e7 100644 --- a/src/moodbar/moodbarpipeline.cpp +++ b/src/moodbar/moodbarpipeline.cpp @@ -100,7 +100,7 @@ void MoodbarPipeline::Start() { if (!decodebin || !convert_element_ || !spectrum || !fakesink) { gst_object_unref(GST_OBJECT(pipeline_)); pipeline_ = nullptr; - emit Finished(false); + Q_EMIT Finished(false); return; } @@ -109,7 +109,7 @@ void MoodbarPipeline::Start() { qLog(Error) << "Failed to link elements"; gst_object_unref(GST_OBJECT(pipeline_)); pipeline_ = nullptr; - emit Finished(false); + Q_EMIT Finished(false); return; } @@ -222,7 +222,7 @@ void MoodbarPipeline::Stop(const bool success) { builder_.reset(); } - emit Finished(success); + Q_EMIT Finished(success); } diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp index 081279c07..e11aaa4f0 100644 --- a/src/musicbrainz/acoustidclient.cpp +++ b/src/musicbrainz/acoustidclient.cpp @@ -137,7 +137,7 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id) else { qLog(Error) << QStringLiteral("Acoustid: Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()); } - emit Finished(request_id, QStringList()); + Q_EMIT Finished(request_id, QStringList()); return; } @@ -145,7 +145,7 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id) QJsonDocument json_document = QJsonDocument::fromJson(reply->readAll(), &error); if (error.error != QJsonParseError::NoError) { - emit Finished(request_id, QStringList()); + Q_EMIT Finished(request_id, QStringList()); return; } @@ -153,7 +153,7 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id) QString status = json_object[QLatin1String("status")].toString(); if (status != QLatin1String("ok")) { - emit Finished(request_id, QStringList(), status); + Q_EMIT Finished(request_id, QStringList(), status); return; } @@ -188,6 +188,6 @@ void AcoustidClient::RequestFinished(QNetworkReply *reply, const int request_id) id_list << is.id_; } - emit Finished(request_id, id_list); + Q_EMIT Finished(request_id, id_list); } diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp index b6a7c15b0..16b09cfae 100644 --- a/src/musicbrainz/musicbrainzclient.cpp +++ b/src/musicbrainz/musicbrainzclient.cpp @@ -234,7 +234,7 @@ void MusicBrainzClient::RequestFinished(QNetworkReply *reply, const int id, cons for (const PendingResults &result_list : std::as_const(result_list_list)) { ret << result_list.results_; } - emit Finished(id, UniqueResults(ret, UniqueResultsSortOption::KeepOriginalOrder), error); + Q_EMIT Finished(id, UniqueResults(ret, UniqueResultsSortOption::KeepOriginalOrder), error); } } @@ -252,7 +252,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep QString error; QByteArray data = GetReplyData(reply, error); if (data.isEmpty()) { - emit DiscIdFinished(artist, album, ret, error); + Q_EMIT DiscIdFinished(artist, album, ret, error); return; } @@ -316,7 +316,7 @@ void MusicBrainzClient::DiscIdRequestFinished(const QString &discid, QNetworkRep } } - emit DiscIdFinished(artist, album, UniqueResults(ret, UniqueResultsSortOption::SortResults)); + Q_EMIT DiscIdFinished(artist, album, UniqueResults(ret, UniqueResultsSortOption::SortResults)); } diff --git a/src/musicbrainz/tagfetcher.cpp b/src/musicbrainz/tagfetcher.cpp index 8438d40cb..fab3bd421 100644 --- a/src/musicbrainz/tagfetcher.cpp +++ b/src/musicbrainz/tagfetcher.cpp @@ -67,7 +67,7 @@ void TagFetcher::StartFetch(const SongList &songs) { if (have_fingerprints) { for (int i = 0; i < songs_.count(); ++i) { const Song song = songs_.value(i); - emit Progress(song, tr("Identifying song")); + Q_EMIT Progress(song, tr("Identifying song")); acoustid_client_->Start(i, song.fingerprint(), static_cast(song.length_nanosec() / kNsecPerMsec)); } } @@ -77,7 +77,7 @@ void TagFetcher::StartFetch(const SongList &songs) { QObject::connect(fingerprint_watcher_, &QFutureWatcher::resultReadyAt, this, &TagFetcher::FingerprintFound); fingerprint_watcher_->setFuture(future); for (const Song &song : std::as_const(songs_)) { - emit Progress(song, tr("Fingerprinting song")); + Q_EMIT Progress(song, tr("Fingerprinting song")); } } @@ -107,11 +107,11 @@ void TagFetcher::FingerprintFound(const int index) { const Song song = songs_.value(index); if (fingerprint.isEmpty()) { - emit ResultAvailable(song, SongList()); + Q_EMIT ResultAvailable(song, SongList()); return; } - emit Progress(song, tr("Identifying song")); + Q_EMIT Progress(song, tr("Identifying song")); acoustid_client_->Start(index, fingerprint, static_cast(song.length_nanosec() / kNsecPerMsec)); } @@ -125,11 +125,11 @@ void TagFetcher::PuidsFound(const int index, const QStringList &puid_list, const const Song song = songs_.value(index); if (puid_list.isEmpty()) { - emit ResultAvailable(song, SongList(), error); + Q_EMIT ResultAvailable(song, SongList(), error); return; } - emit Progress(song, tr("Downloading metadata")); + Q_EMIT Progress(song, tr("Downloading metadata")); musicbrainz_client_->Start(index, puid_list); } @@ -151,6 +151,6 @@ void TagFetcher::TagsFetched(const int index, const MusicBrainzClient::ResultLis songs_guessed << song; } - emit ResultAvailable(original_song, songs_guessed, error); + Q_EMIT ResultAvailable(original_song, songs_guessed, error); } diff --git a/src/organize/organize.cpp b/src/organize/organize.cpp index c8696217b..412d5377b 100644 --- a/src/organize/organize.cpp +++ b/src/organize/organize.cpp @@ -155,7 +155,7 @@ void Organize::ProcessSomeFiles() { task_manager_->SetTaskFinished(task_id_); - emit Finished(files_with_errors_, log_); + Q_EMIT Finished(files_with_errors_, log_); // Move back to the original thread so deleteLater() can get called in the main thread's event loop moveToThread(original_thread_); @@ -263,7 +263,7 @@ void Organize::ProcessSomeFiles() { // Notify other aspects of system that song has been invalidated QString root = destination_->LocalPath(); QFileInfo new_file = QFileInfo(root + QLatin1Char('/') + task.song_info_.new_filename_); - emit SongPathChanged(song, new_file, destination_->collection_directory_id()); + Q_EMIT SongPathChanged(song, new_file, destination_->collection_directory_id()); } } else { diff --git a/src/osd/osdpretty.cpp b/src/osd/osdpretty.cpp index a85e73f72..aed365bcf 100644 --- a/src/osd/osdpretty.cpp +++ b/src/osd/osdpretty.cpp @@ -538,7 +538,7 @@ void OSDPretty::mouseReleaseEvent(QMouseEvent *) { popup_screen_ = current_screen(); popup_screen_name_ = current_screen()->name(); popup_pos_ = current_pos(); - emit PositionChanged(); + Q_EMIT PositionChanged(); } } diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index fc1c990fa..c9e829adb 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -398,7 +398,7 @@ QVariant Playlist::data(const QModelIndex &idx, const int role) const { #ifdef HAVE_MOODBAR void Playlist::MoodbarUpdated(const QModelIndex &idx) { - emit dataChanged(idx.sibling(idx.row(), static_cast(Column::Mood)), idx.sibling(idx.row(), static_cast(Column::Mood))); + Q_EMIT dataChanged(idx.sibling(idx.row(), static_cast(Column::Mood)), idx.sibling(idx.row(), static_cast(Column::Mood))); } #endif @@ -436,10 +436,10 @@ void Playlist::SongSaveComplete(TagReaderReply *reply, const QPersistentModelInd } else { if (reply->request_message().write_file_response().has_error()) { - emit Error(tr("Could not write metadata to %1: %2").arg(QString::fromStdString(reply->request_message().write_file_request().filename()), QString::fromStdString(reply->request_message().write_file_response().error()))); + Q_EMIT Error(tr("Could not write metadata to %1: %2").arg(QString::fromStdString(reply->request_message().write_file_request().filename()), QString::fromStdString(reply->request_message().write_file_response().error()))); } else { - emit Error(tr("Could not write metadata to %1").arg(QString::fromStdString(reply->request_message().write_file_request().filename()))); + Q_EMIT Error(tr("Could not write metadata to %1").arg(QString::fromStdString(reply->request_message().write_file_request().filename()))); } } } @@ -473,14 +473,14 @@ void Playlist::ItemReloadComplete(const QPersistentModelIndex &idx, const Song & ItemChanged(idx.row(), ChangedColumns(old_metadata, item->Metadata())); if (idx.row() == current_row()) { if (MinorMetadataChange(old_metadata, item->Metadata())) { - emit CurrentSongMetadataChanged(item->Metadata()); + Q_EMIT CurrentSongMetadataChanged(item->Metadata()); } else { - emit CurrentSongChanged(item->Metadata()); + Q_EMIT CurrentSongChanged(item->Metadata()); } } if (metadata_edit) { - emit EditingFinished(id_, idx); + Q_EMIT EditingFinished(id_, idx); } ScheduleSaveAsync(); } @@ -668,7 +668,7 @@ void Playlist::set_current_row(const int i, const AutoScroll autoscroll, const b PlaylistItemPtr next_item = item_at(nextrow); if (next_item) { next_item->ClearTemporaryMetadata(); - emit dataChanged(index(nextrow, 0), index(nextrow, ColumnCount - 1)); + Q_EMIT dataChanged(index(nextrow, 0), index(nextrow, ColumnCount - 1)); } } @@ -685,7 +685,7 @@ void Playlist::set_current_row(const int i, const AutoScroll autoscroll, const b } if (old_current_item_index.isValid()) { - emit dataChanged(old_current_item_index, old_current_item_index.sibling(old_current_item_index.row(), ColumnCount - 1)); + Q_EMIT dataChanged(old_current_item_index, old_current_item_index.sibling(old_current_item_index.row(), ColumnCount - 1)); } // Update the virtual index @@ -710,8 +710,8 @@ void Playlist::set_current_row(const int i, const AutoScroll autoscroll, const b if (current_item_index_.isValid() && !is_stopping) { InformOfCurrentSongChange(false); - emit dataChanged(index(current_item_index_.row(), 0), index(current_item_index_.row(), ColumnCount - 1)); - emit MaybeAutoscroll(autoscroll); + Q_EMIT dataChanged(index(current_item_index_.row(), 0), index(current_item_index_.row(), ColumnCount - 1)); + Q_EMIT MaybeAutoscroll(autoscroll); } // The structure of a dynamic playlist is as follows: @@ -925,7 +925,7 @@ void Playlist::TurnOnDynamicPlaylist(PlaylistGeneratorPtr gen) { dynamic_playlist_ = gen; ShuffleModeChanged(PlaylistSequence::ShuffleMode::Off); - emit DynamicModeChanged(true); + Q_EMIT DynamicModeChanged(true); ScheduleSave(); @@ -937,7 +937,7 @@ void Playlist::MoveItemWithoutUndo(const int source, const int dest) { void Playlist::MoveItemsWithoutUndo(const QList &source_rows, int pos) { - emit layoutAboutToBeChanged(); + Q_EMIT layoutAboutToBeChanged(); PlaylistItemPtrList old_items = items_; PlaylistItemPtrList moved_items; @@ -999,7 +999,7 @@ void Playlist::MoveItemsWithoutUndo(const QList &source_rows, int pos) { current_virtual_index_ = -1; } - emit layoutChanged(); + Q_EMIT layoutChanged(); ScheduleSave(); @@ -1007,7 +1007,7 @@ void Playlist::MoveItemsWithoutUndo(const QList &source_rows, int pos) { void Playlist::MoveItemsWithoutUndo(int start, const QList &dest_rows) { - emit layoutAboutToBeChanged(); + Q_EMIT layoutAboutToBeChanged(); PlaylistItemPtrList old_items = items_; PlaylistItemPtrList moved_items; @@ -1072,7 +1072,7 @@ void Playlist::MoveItemsWithoutUndo(int start, const QList &dest_rows) { current_virtual_index_ = -1; } - emit layoutChanged(); + Q_EMIT layoutChanged(); ScheduleSave(); @@ -1097,7 +1097,7 @@ void Playlist::InsertItems(const PlaylistItemPtrList &itemsIn, const int pos, co undo_stack_->push(new PlaylistUndoCommands::InsertItems(this, items, pos, enqueue, enqueue_next)); } - if (play_now) emit PlayRequested(index(start, 0), AutoScroll::Maybe); + if (play_now) Q_EMIT PlayRequested(index(start, 0), AutoScroll::Maybe); } @@ -1249,7 +1249,7 @@ void Playlist::UpdateItems(SongList songs) { } } items_[i] = new_item; - emit dataChanged(index(i, 0), index(i, ColumnCount - 1)); + Q_EMIT dataChanged(index(i, 0), index(i, ColumnCount - 1)); // Also update undo actions for (int y = 0; y < undo_stack_->count(); y++) { QUndoCommand *undo_action = const_cast(undo_stack_->command(i)); @@ -1265,7 +1265,7 @@ void Playlist::UpdateItems(SongList songs) { } } - emit PlaylistChanged(); + Q_EMIT PlaylistChanged(); ScheduleSave(); @@ -1486,7 +1486,7 @@ void Playlist::sort(const int column_number, const Qt::SortOrder order) { void Playlist::ReOrderWithoutUndo(const PlaylistItemPtrList &new_items) { - emit layoutAboutToBeChanged(); + Q_EMIT layoutAboutToBeChanged(); PlaylistItemPtrList old_items = items_; items_ = new_items; @@ -1518,9 +1518,9 @@ void Playlist::ReOrderWithoutUndo(const PlaylistItemPtrList &new_items) { current_virtual_index_ = -1; } - emit layoutChanged(); + Q_EMIT layoutChanged(); - emit PlaylistChanged(); + Q_EMIT PlaylistChanged(); ScheduleSave(); @@ -1539,7 +1539,7 @@ void Playlist::SetCurrentIsPaused(const bool paused) { current_is_paused_ = paused; if (current_item_index_.isValid()) { - emit dataChanged(index(current_item_index_.row(), 0), index(current_item_index_.row(), ColumnCount - 1)); + Q_EMIT dataChanged(index(current_item_index_.row(), 0), index(current_item_index_.row(), ColumnCount - 1)); } } @@ -1634,7 +1634,7 @@ void Playlist::ItemsLoaded() { } } - emit RestoreFinished(); + Q_EMIT RestoreFinished(); Settings s; s.beginGroup(kSettingsGroup); @@ -1650,7 +1650,7 @@ void Playlist::ItemsLoaded() { #endif } - emit PlaylistLoaded(); + Q_EMIT PlaylistLoaded(); } @@ -1795,10 +1795,10 @@ void Playlist::StopAfter(const int row) { } if (old_stop_after.isValid()) { - emit dataChanged(old_stop_after, old_stop_after.sibling(old_stop_after.row(), ColumnCount - 1)); + Q_EMIT dataChanged(old_stop_after, old_stop_after.sibling(old_stop_after.row(), ColumnCount - 1)); } if (stop_after_.isValid()) { - emit dataChanged(stop_after_, stop_after_.sibling(stop_after_.row(), ColumnCount - 1)); + Q_EMIT dataChanged(stop_after_, stop_after_.sibling(stop_after_.row(), ColumnCount - 1)); } } @@ -2101,10 +2101,10 @@ void Playlist::TracksAboutToBeDequeued(const QModelIndex&, const int begin, cons void Playlist::TracksDequeued() { for (const QModelIndex &idx : std::as_const(temp_dequeue_change_indexes_)) { - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } temp_dequeue_change_indexes_.clear(); - emit QueueChanged(); + Q_EMIT QueueChanged(); } @@ -2112,7 +2112,7 @@ void Playlist::TracksEnqueued(const QModelIndex&, const int begin, const int end const QModelIndex &b = queue_->mapToSource(queue_->index(begin, static_cast(Column::Title))); const QModelIndex &e = queue_->mapToSource(queue_->index(end, static_cast(Column::Title))); - emit dataChanged(b, e); + Q_EMIT dataChanged(b, e); } @@ -2120,7 +2120,7 @@ void Playlist::QueueLayoutChanged() { for (int i = 0; i < queue_->rowCount(); ++i) { const QModelIndex &idx = queue_->mapToSource(queue_->index(i, static_cast(Column::Title))); - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } } @@ -2280,14 +2280,14 @@ void Playlist::ItemChanged(const int row, const Columns columns) { const QModelIndex idx_column_first = index(row, 0); const QModelIndex idx_column_last = index(row, ColumnCount - 1); if (idx_column_first.isValid() && idx_column_last.isValid()) { - emit dataChanged(index(row, 0), index(row, ColumnCount - 1)); + Q_EMIT dataChanged(index(row, 0), index(row, ColumnCount - 1)); } } else { for (const Column &column : columns) { const QModelIndex idx = index(row, static_cast(column)); if (idx.isValid()) { - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } } } @@ -2302,10 +2302,10 @@ void Playlist::InformOfCurrentSongChange(const bool minor) { } if (minor) { - emit CurrentSongMetadataChanged(metadata); + Q_EMIT CurrentSongMetadataChanged(metadata); } else { - emit CurrentSongChanged(metadata); + Q_EMIT CurrentSongChanged(metadata); } } @@ -2465,7 +2465,7 @@ void Playlist::SkipTracks(const QModelIndexList &source_indexes) { for (const QModelIndex &source_index : source_indexes) { PlaylistItemPtr track_to_skip = item_at(source_index.row()); track_to_skip->SetShouldSkip(!((track_to_skip)->GetShouldSkip())); - emit dataChanged(source_index, source_index); + Q_EMIT dataChanged(source_index, source_index); } } @@ -2521,7 +2521,7 @@ void Playlist::TurnOffDynamicPlaylist() { ShuffleModeChanged(ShuffleMode()); } - emit DynamicModeChanged(false); + Q_EMIT DynamicModeChanged(false); ScheduleSave(); diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index 5cd4be5bd..a9a9fd917 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -87,7 +87,7 @@ void PlaylistBackend::Exit() { Q_ASSERT(QThread::currentThread() == thread()); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp index af1cd56ac..f497a081d 100644 --- a/src/playlist/playlistcontainer.cpp +++ b/src/playlist/playlistcontainer.cpp @@ -204,7 +204,7 @@ void PlaylistContainer::SetViewModel(Playlist *playlist, const int scroll_positi playlist->IgnoreSorting(false); QObject::connect(view()->selectionModel(), &QItemSelectionModel::selectionChanged, this, &PlaylistContainer::SelectionChanged); - emit ViewSelectionModelChanged(); + Q_EMIT ViewSelectionModelChanged(); // Update filter ui_->search_field->setText(playlist->filter()->filter_string()); @@ -236,7 +236,7 @@ void PlaylistContainer::SetViewModel(Playlist *playlist, const int scroll_positi ui_->undo->setDefaultAction(undo_); ui_->redo->setDefaultAction(redo_); - emit UndoRedoActionsChanged(undo_, redo_); + Q_EMIT UndoRedoActionsChanged(undo_, redo_); } diff --git a/src/playlist/playlistheader.cpp b/src/playlist/playlistheader.cpp index af4adbd60..067a3fd77 100644 --- a/src/playlist/playlistheader.cpp +++ b/src/playlist/playlistheader.cpp @@ -161,7 +161,7 @@ void PlaylistHeader::SetColumnAlignment(QAction *action) { void PlaylistHeader::ToggleVisible(const int section) { SetSectionHidden(section, !isSectionHidden(section)); - emit SectionVisibilityChanged(section, !isSectionHidden(section)); + Q_EMIT SectionVisibilityChanged(section, !isSectionHidden(section)); } #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) @@ -169,7 +169,7 @@ void PlaylistHeader::enterEvent(QEnterEvent*) { #else void PlaylistHeader::enterEvent(QEvent*) { #endif - emit MouseEntered(); + Q_EMIT MouseEntered(); } void PlaylistHeader::ResetColumns() { @@ -177,5 +177,5 @@ void PlaylistHeader::ResetColumns() { } void PlaylistHeader::ToggleRatingEditStatus() { - emit SectionRatingLockStatusChanged(action_rating_lock_->isChecked()); + Q_EMIT SectionRatingLockStatusChanged(action_rating_lock_->isChecked()); } diff --git a/src/playlist/playlistlistmodel.cpp b/src/playlist/playlistlistmodel.cpp index 5415045c5..29b2c9a58 100644 --- a/src/playlist/playlistlistmodel.cpp +++ b/src/playlist/playlistlistmodel.cpp @@ -105,7 +105,7 @@ void PlaylistListModel::AddRowItem(QStandardItem *item, const QString &parent_pa playlists_by_id_[id] = item; if (dropping_rows_) { - emit PlaylistPathChanged(id, parent_path); + Q_EMIT PlaylistPathChanged(id, parent_path); } break; @@ -227,7 +227,7 @@ bool PlaylistListModel::setData(const QModelIndex &idx, const QVariant &value, i switch (idx.data(Role_Type).toInt()) { case Type_Playlist: - emit PlaylistRenamed(idx.data(Role_PlaylistId).toInt(), value.toString()); + Q_EMIT PlaylistRenamed(idx.data(Role_PlaylistId).toInt(), value.toString()); break; case Type_Folder: @@ -247,7 +247,7 @@ void PlaylistListModel::UpdatePathsRecursive(const QModelIndex &parent) { switch (parent.data(Role_Type).toInt()) { case Type_Playlist: - emit PlaylistPathChanged(parent.data(Role_PlaylistId).toInt(), ItemPath(itemFromIndex(parent))); + Q_EMIT PlaylistPathChanged(parent.data(Role_PlaylistId).toInt(), ItemPath(itemFromIndex(parent))); break; case Type_Folder: diff --git a/src/playlist/playlistlistview.cpp b/src/playlist/playlistlistview.cpp index 51ec83bed..fd1f1b6ab 100644 --- a/src/playlist/playlistlistview.cpp +++ b/src/playlist/playlistlistview.cpp @@ -68,7 +68,7 @@ bool PlaylistListView::ItemsSelected() const { } void PlaylistListView::selectionChanged(const QItemSelection&, const QItemSelection&) { - emit ItemsSelectedChanged(selectionModel()->selectedRows().count() > 0); + Q_EMIT ItemsSelectedChanged(selectionModel()->selectedRows().count() > 0); } void PlaylistListView::dragEnterEvent(QDragEnterEvent *e) { @@ -121,7 +121,7 @@ void PlaylistListView::timerEvent(QTimerEvent *e) { QTreeView::timerEvent(e); if (e->timerId() == drag_hover_timer_.timerId()) { drag_hover_timer_.stop(); - emit doubleClicked(currentIndex()); + Q_EMIT doubleClicked(currentIndex()); } } @@ -132,7 +132,7 @@ void PlaylistListView::dropEvent(QDropEvent *e) { if (drag_hover_timer_.isActive()) { drag_hover_timer_.stop(); } - emit ItemMimeDataDroppedSignal(currentIndex(), e->mimeData()); + Q_EMIT ItemMimeDataDroppedSignal(currentIndex(), e->mimeData()); } else { AutoExpandingTreeView::dropEvent(e); diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index 0661497ef..388bb81d3 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -112,7 +112,7 @@ void PlaylistManager::Init(SharedPtr collection_backend, Shar // If no playlist exists then make a new one if (playlists_.isEmpty()) New(tr("Playlist")); - emit PlaylistManagerInitialized(); + Q_EMIT PlaylistManagerInitialized(); } @@ -123,7 +123,7 @@ void PlaylistManager::PlaylistLoaded() { QObject::disconnect(playlist, &Playlist::PlaylistLoaded, this, &PlaylistManager::PlaylistLoaded); --playlists_loading_; if (playlists_loading_ == 0) { - emit AllPlaylistsLoaded(); + Q_EMIT AllPlaylistsLoaded(); } } @@ -165,7 +165,7 @@ Playlist *PlaylistManager::AddPlaylist(const int id, const QString &name, const playlists_[id] = Data(ret, name); - emit PlaylistAdded(id, name, favorite); + Q_EMIT PlaylistAdded(id, name, favorite); if (current_ == -1) { SetCurrentPlaylist(id); @@ -205,7 +205,7 @@ void PlaylistManager::Load(const QString &filename) { int id = playlist_backend_->CreatePlaylist(fileinfo.completeBaseName(), QString()); if (id == -1) { - emit Error(tr("Couldn't create playlist")); + Q_EMIT Error(tr("Couldn't create playlist")); return; } @@ -292,7 +292,7 @@ void PlaylistManager::Rename(const int id, const QString &new_name) { playlist_backend_->RenamePlaylist(id, new_name); playlists_[id].name = new_name; - emit PlaylistRenamed(id, new_name); + Q_EMIT PlaylistRenamed(id, new_name); } @@ -309,7 +309,7 @@ void PlaylistManager::Favorite(const int id, const bool favorite) { // while it's not visible in the playlist tabbar either, because it has been closed: delete it. playlist_backend_->RemovePlaylist(id); } - emit PlaylistFavorited(id, favorite); + Q_EMIT PlaylistFavorited(id, favorite); } @@ -332,11 +332,11 @@ bool PlaylistManager::Close(const int id) { if (id == current_) SetCurrentPlaylist(next_id); Data data = playlists_.take(id); - emit PlaylistClosed(id); + Q_EMIT PlaylistClosed(id); if (!data.p->is_favorite()) { playlist_backend_->RemovePlaylist(id); - emit PlaylistDeleted(id); + Q_EMIT PlaylistDeleted(id); } delete data.p; @@ -351,12 +351,12 @@ void PlaylistManager::Delete(const int id) { } playlist_backend_->RemovePlaylist(id); - emit PlaylistDeleted(id); + Q_EMIT PlaylistDeleted(id); } void PlaylistManager::OneOfPlaylistsChanged() { - emit PlaylistChanged(qobject_cast(sender())); + Q_EMIT PlaylistChanged(qobject_cast(sender())); } void PlaylistManager::SetCurrentPlaylist(const int id) { @@ -369,7 +369,7 @@ void PlaylistManager::SetCurrentPlaylist(const int id) { } current_ = id; - emit CurrentChanged(current(), playlists_[id].scroll_position); + Q_EMIT CurrentChanged(current(), playlists_[id].scroll_position); UpdateSummaryText(); } @@ -383,7 +383,7 @@ void PlaylistManager::SetActivePlaylist(const int id) { active_ = id; - emit ActiveChanged(active()); + Q_EMIT ActiveChanged(active()); } @@ -458,7 +458,7 @@ void PlaylistManager::UpdateSummaryText() { summary += QLatin1String(" - [ ") + Utilities::WordyTimeNanosec(nanoseconds) + QLatin1String(" ]"); } - emit SummaryTextChanged(summary); + Q_EMIT SummaryTextChanged(summary); } diff --git a/src/playlist/playlistsequence.cpp b/src/playlist/playlistsequence.cpp index e2eb050e9..03b22482c 100644 --- a/src/playlist/playlistsequence.cpp +++ b/src/playlist/playlistsequence.cpp @@ -181,7 +181,7 @@ void PlaylistSequence::SetRepeatMode(const RepeatMode mode) { if (mode != repeat_mode_) { repeat_mode_ = mode; - emit RepeatModeChanged(mode); + Q_EMIT RepeatModeChanged(mode); } Save(); @@ -201,7 +201,7 @@ void PlaylistSequence::SetShuffleMode(const ShuffleMode mode) { if (mode != shuffle_mode_) { shuffle_mode_ = mode; - emit ShuffleModeChanged(mode); + Q_EMIT ShuffleModeChanged(mode); } Save(); diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp index 7684cf5f3..56f66277f 100644 --- a/src/playlist/playlisttabbar.cpp +++ b/src/playlist/playlisttabbar.cpp @@ -183,12 +183,12 @@ void PlaylistTabBar::RenameSlot() { if (new_name.isEmpty() || new_name == old_name) return; - emit Rename(playlist_id, new_name); + Q_EMIT Rename(playlist_id, new_name); } void PlaylistTabBar::RenameInline() { - emit Rename(tabData(menu_index_).toInt(), rename_editor_->text()); + Q_EMIT Rename(tabData(menu_index_).toInt(), rename_editor_->text()); HideEditor(); } @@ -267,7 +267,7 @@ void PlaylistTabBar::CloseSlot() { // Close the playlist. If the playlist is not a favorite playlist, it will be deleted, as it will not be visible after being closed. // Otherwise, the tab is closed but the playlist still exists and can be resurrected from the "Playlists" tab. - emit Close(playlist_id); + Q_EMIT Close(playlist_id); // Select the nearest tab. if (menu_index_ > 1) { @@ -291,7 +291,7 @@ void PlaylistTabBar::SaveSlot() { if (menu_index_ == -1) return; - emit Save(tabData(menu_index_).toInt()); + Q_EMIT Save(tabData(menu_index_).toInt()); } @@ -341,7 +341,7 @@ void PlaylistTabBar::set_text_by_id(const int id, const QString &text) { } void PlaylistTabBar::CurrentIndexChanged(const int index) { - if (!suppress_current_changed_) emit CurrentIdChanged(tabData(index).toInt()); + if (!suppress_current_changed_) Q_EMIT CurrentIdChanged(tabData(index).toInt()); } void PlaylistTabBar::InsertTab(const int id, const int index, const QString &text, const bool favorite) { @@ -363,7 +363,7 @@ void PlaylistTabBar::InsertTab(const int id, const int index, const QString &tex // If we are still starting up, we don't need to do this, as the tab ordering after startup will be the same as was already in the db. if (initialized_) { - if (currentIndex() == index) emit CurrentIdChanged(id); + if (currentIndex() == index) Q_EMIT CurrentIdChanged(id); // Update playlist tab order/visibility TabMoved(); @@ -378,7 +378,7 @@ void PlaylistTabBar::TabMoved() { for (int i = 0; i < count(); ++i) { ids << tabData(i).toInt(); } - emit PlaylistOrderChanged(ids); + Q_EMIT PlaylistOrderChanged(ids); } diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index e8b3385e5..ba86ffb09 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -411,7 +411,7 @@ void PlaylistView::RestoreHeaderState() { header_state_restored_ = true; - emit ColumnAlignmentChanged(column_alignment_); + Q_EMIT ColumnAlignmentChanged(column_alignment_); } @@ -671,23 +671,23 @@ void PlaylistView::keyPressEvent(QKeyEvent *event) { CopyCurrentSongToClipboard(); } else if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) { - if (currentIndex().isValid()) emit PlayItem(currentIndex(), Playlist::AutoScroll::Never); + if (currentIndex().isValid()) Q_EMIT PlayItem(currentIndex(), Playlist::AutoScroll::Never); event->accept(); } else if (event->modifiers() != Qt::ControlModifier && event->key() == Qt::Key_Space) { - emit PlayPause(); + Q_EMIT PlayPause(); event->accept(); } else if (event->key() == Qt::Key_Left) { - emit SeekBackward(); + Q_EMIT SeekBackward(); event->accept(); } else if (event->key() == Qt::Key_Right) { - emit SeekForward(); + Q_EMIT SeekForward(); event->accept(); } else if (event->modifiers() == Qt::NoModifier && ((event->key() >= Qt::Key_Exclam && event->key() <= Qt::Key_Z) || event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Escape)) { - emit FocusOnFilterSignal(event); + Q_EMIT FocusOnFilterSignal(event); event->accept(); } else { @@ -697,7 +697,7 @@ void PlaylistView::keyPressEvent(QKeyEvent *event) { } void PlaylistView::contextMenuEvent(QContextMenuEvent *e) { - emit RightClicked(e->globalPos(), indexAt(e->pos())); + Q_EMIT RightClicked(e->globalPos(), indexAt(e->pos())); e->accept(); } @@ -1271,7 +1271,7 @@ void PlaylistView::ReloadSettings() { } setProperty("default_background_enabled", background_image_type_ == AppearanceSettingsPage::BackgroundImageType::Default); setProperty("strawbs_background_enabled", background_image_type_ == AppearanceSettingsPage::BackgroundImageType::Strawbs); - emit BackgroundPropertyChanged(); + Q_EMIT BackgroundPropertyChanged(); force_background_redraw_ = true; } @@ -1365,7 +1365,7 @@ void PlaylistView::SetColumnAlignment(const int section, const Qt::Alignment ali if (section < 0) return; column_alignment_[section] = alignment; - emit ColumnAlignmentChanged(column_alignment_); + Q_EMIT ColumnAlignmentChanged(column_alignment_); SaveSettings(); } diff --git a/src/playlist/playlistview.h b/src/playlist/playlistview.h index 0f3d4a1d3..4256fb35f 100644 --- a/src/playlist/playlistview.h +++ b/src/playlist/playlistview.h @@ -177,7 +177,7 @@ class PlaylistView : public QTreeView { void set_background_image_type(AppearanceSettingsPage::BackgroundImageType bg) { background_image_type_ = bg; - emit BackgroundPropertyChanged(); // clazy:exclude=incorrect-emit + Q_EMIT BackgroundPropertyChanged(); // clazy:exclude=incorrect-emit } // Save image as the background_image_ after applying some modifications (opacity, ...). // Should be used instead of modifying background_image_ directly diff --git a/src/playlist/songloaderinserter.cpp b/src/playlist/songloaderinserter.cpp index 71f2f22e2..05dfce69c 100644 --- a/src/playlist/songloaderinserter.cpp +++ b/src/playlist/songloaderinserter.cpp @@ -76,7 +76,7 @@ void SongLoaderInserter::Load(Playlist *destination, int row, bool play_now, boo else { const QStringList errors = loader->errors(); for (const QString &error : errors) { - emit Error(error); + Q_EMIT Error(error); } } delete loader; @@ -114,11 +114,11 @@ void SongLoaderInserter::LoadAudioCD(Playlist *destination, int row, bool play_n SongLoader::Result ret = loader->LoadAudioCD(); if (ret == SongLoader::Result::Error) { if (loader->errors().isEmpty()) - emit Error(tr("Error while loading audio CD.")); + Q_EMIT Error(tr("Error while loading audio CD.")); else { const QStringList errors = loader->errors(); for (const QString &error : errors) { - emit Error(error); + Q_EMIT Error(error); } } delete loader; @@ -135,7 +135,7 @@ void SongLoaderInserter::AudioCDTracksLoadFinished(SongLoader *loader) { if (songs_.isEmpty()) { const QStringList errors = loader->errors(); for (const QString &error : errors) { - emit Error(error); + Q_EMIT Error(error); } } else { @@ -184,7 +184,7 @@ void SongLoaderInserter::AsyncLoad() { if (res == SongLoader::Result::Error) { const QStringList errors = loader->errors(); for (const QString &error : errors) { - emit Error(error); + Q_EMIT Error(error); } continue; } @@ -200,7 +200,7 @@ void SongLoaderInserter::AsyncLoad() { } task_manager_->SetTaskFinished(async_load_id); - emit PreloadFinished(); + Q_EMIT PreloadFinished(); // Songs are inserted in playlist, now load them completely. async_progress = 0; @@ -219,7 +219,7 @@ void SongLoaderInserter::AsyncLoad() { task_manager_->SetTaskFinished(async_load_id); // Replace the partially-loaded items by the new ones, fully loaded. - emit EffectiveLoadFinished(songs); + Q_EMIT EffectiveLoadFinished(songs); deleteLater(); diff --git a/src/playlistparsers/cueparser.cpp b/src/playlistparsers/cueparser.cpp index 1de87b261..43f54433e 100644 --- a/src/playlistparsers/cueparser.cpp +++ b/src/playlistparsers/cueparser.cpp @@ -394,7 +394,7 @@ void CueParser::Save(const SongList &songs, QIODevice *device, const QDir &dir, Q_UNUSED(dir); Q_UNUSED(path_type); - emit Error(tr("Saving CUE files is not supported.")); + Q_EMIT Error(tr("Saving CUE files is not supported.")); // TODO diff --git a/src/playlistparsers/parserbase.cpp b/src/playlistparsers/parserbase.cpp index 77203c11e..17f3f06c0 100644 --- a/src/playlistparsers/parserbase.cpp +++ b/src/playlistparsers/parserbase.cpp @@ -60,7 +60,7 @@ void ParserBase::LoadSong(const QString &filename_or_url, const qint64 beginning } else { qLog(Error) << "Don't know how to handle" << url; - emit Error(tr("Don't know how to handle %1").arg(filename_or_url)); + Q_EMIT Error(tr("Don't know how to handle %1").arg(filename_or_url)); return; } } diff --git a/src/playlistparsers/playlistparser.cpp b/src/playlistparsers/playlistparser.cpp index d7e0c288c..a832e1b96 100644 --- a/src/playlistparsers/playlistparser.cpp +++ b/src/playlistparsers/playlistparser.cpp @@ -182,14 +182,14 @@ SongList PlaylistParser::LoadFromFile(const QString &filename) const { ParserBase *parser = ParserForExtension(Type::Load, fileinfo.suffix()); if (!parser) { qLog(Error) << "Unknown filetype:" << filename; - emit Error(tr("Unknown filetype: %1").arg(filename)); + Q_EMIT Error(tr("Unknown filetype: %1").arg(filename)); return SongList(); } // Open the file QFile file(filename); if (!file.open(QIODevice::ReadOnly)) { - emit Error(tr("Could not open file %1").arg(filename)); + Q_EMIT Error(tr("Could not open file %1").arg(filename)); return SongList(); } @@ -219,7 +219,7 @@ void PlaylistParser::Save(const SongList &songs, const QString &filename, const if (!dir.exists()) { qLog(Error) << "Directory" << dir.path() << "does not exist"; - emit Error(tr("Directory %1 does not exist.").arg(dir.path())); + Q_EMIT Error(tr("Directory %1 does not exist.").arg(dir.path())); return; } @@ -227,7 +227,7 @@ void PlaylistParser::Save(const SongList &songs, const QString &filename, const ParserBase *parser = ParserForExtension(Type::Save, fileinfo.suffix()); if (!parser) { qLog(Error) << "Unknown filetype" << filename; - emit Error(tr("Unknown filetype: %1").arg(filename)); + Q_EMIT Error(tr("Unknown filetype: %1").arg(filename)); return; } @@ -242,7 +242,7 @@ void PlaylistParser::Save(const SongList &songs, const QString &filename, const QFile file(fileinfo.absoluteFilePath()); if (!file.open(QIODevice::WriteOnly)) { qLog(Error) << "Failed to open" << filename << "for writing."; - emit Error(tr("Failed to open %1 for writing.").arg(filename)); + Q_EMIT Error(tr("Failed to open %1 for writing.").arg(filename)); return; } diff --git a/src/qobuz/qobuzfavoriterequest.cpp b/src/qobuz/qobuzfavoriterequest.cpp index 418bfb2fa..829380b70 100644 --- a/src/qobuz/qobuzfavoriterequest.cpp +++ b/src/qobuz/qobuzfavoriterequest.cpp @@ -167,13 +167,13 @@ void QobuzFavoriteRequest::AddFavoritesReply(QNetworkReply *reply, const Favorit switch (type) { case FavoriteType::Artists: - emit ArtistsAdded(songs); + Q_EMIT ArtistsAdded(songs); break; case FavoriteType::Albums: - emit AlbumsAdded(songs); + Q_EMIT AlbumsAdded(songs); break; case FavoriteType::Songs: - emit SongsAdded(songs); + Q_EMIT SongsAdded(songs); break; } @@ -261,13 +261,13 @@ void QobuzFavoriteRequest::RemoveFavoritesReply(QNetworkReply *reply, const Favo switch (type) { case FavoriteType::Artists: - emit ArtistsRemoved(songs); + Q_EMIT ArtistsRemoved(songs); break; case FavoriteType::Albums: - emit AlbumsRemoved(songs); + Q_EMIT AlbumsRemoved(songs); break; case FavoriteType::Songs: - emit SongsRemoved(songs); + Q_EMIT SongsRemoved(songs); break; } diff --git a/src/qobuz/qobuzrequest.cpp b/src/qobuz/qobuzrequest.cpp index 1b31c81e3..574bd0290 100644 --- a/src/qobuz/qobuzrequest.cpp +++ b/src/qobuz/qobuzrequest.cpp @@ -202,8 +202,8 @@ void QobuzRequest::Search(const int query_id, const QString &search_text) { void QobuzRequest::GetArtists() { - emit UpdateStatus(query_id_, tr("Receiving artists...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving artists...")); + Q_EMIT UpdateProgress(query_id_, 0); AddArtistsRequest(); } @@ -254,8 +254,8 @@ void QobuzRequest::FlushArtistsRequests() { void QobuzRequest::GetAlbums() { - emit UpdateStatus(query_id_, tr("Receiving albums...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving albums...")); + Q_EMIT UpdateProgress(query_id_, 0); AddAlbumsRequest(); } @@ -306,8 +306,8 @@ void QobuzRequest::FlushAlbumsRequests() { void QobuzRequest::GetSongs() { - emit UpdateStatus(query_id_, tr("Receiving songs...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving songs...")); + Q_EMIT UpdateProgress(query_id_, 0); AddSongsRequest(); } @@ -358,8 +358,8 @@ void QobuzRequest::FlushSongsRequests() { void QobuzRequest::ArtistsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddArtistsSearchRequest(); } @@ -372,8 +372,8 @@ void QobuzRequest::AddArtistsSearchRequest(const int offset) { void QobuzRequest::AlbumsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddAlbumsSearchRequest(); } @@ -386,8 +386,8 @@ void QobuzRequest::AddAlbumsSearchRequest(const int offset) { void QobuzRequest::SongsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddSongsSearchRequest(); } @@ -464,7 +464,7 @@ void QobuzRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_re } if (offset_requested == 0) { - emit UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); } QJsonValue value_items = ExtractItems(obj_artists); @@ -523,7 +523,7 @@ void QobuzRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_re } artists_received_ += artists_received; - if (offset_requested != 0) emit UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); + if (offset_requested != 0) Q_EMIT UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); ArtistsFinishCheck(limit_requested, offset, artists_received); @@ -551,9 +551,9 @@ void QobuzRequest::ArtistsFinishCheck(const int limit, const int offset, const i artist_albums_requests_pending_.clear(); if (artist_albums_requests_total_ > 0) { - if (artist_albums_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving albums for %1 artist...").arg(artist_albums_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving albums for %1 artists...").arg(artist_albums_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (artist_albums_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving albums for %1 artist...").arg(artist_albums_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving albums for %1 artists...").arg(artist_albums_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); } } @@ -607,7 +607,7 @@ void QobuzRequest::ArtistAlbumsReplyReceived(QNetworkReply *reply, const Artist --artist_albums_requests_active_; ++artist_albums_requests_received_; - emit UpdateProgress(query_id_, GetProgress(artist_albums_requests_received_, artist_albums_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(artist_albums_requests_received_, artist_albums_requests_total_)); AlbumsReceived(reply, artist, 0, offset_requested); } @@ -759,7 +759,7 @@ void QobuzRequest::AlbumsReceived(QNetworkReply *reply, const Artist &artist_req if (query_type_ == Type::FavouriteAlbums || query_type_ == Type::SearchAlbums) { albums_received_ += albums_received; - emit UpdateProgress(query_id_, GetProgress(albums_received_, albums_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(albums_received_, albums_total_)); } AlbumsFinishCheck(artist_requested, limit_requested, offset, albums_total, albums_received); @@ -808,9 +808,9 @@ void QobuzRequest::AlbumsFinishCheck(const Artist &artist, const int limit, cons album_songs_requests_pending_.clear(); if (album_songs_requests_total_ > 0) { - if (album_songs_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving songs for %1 album...").arg(album_songs_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving songs for %1 albums...").arg(album_songs_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (album_songs_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving songs for %1 album...").arg(album_songs_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving songs for %1 albums...").arg(album_songs_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); } } @@ -863,7 +863,7 @@ void QobuzRequest::AlbumSongsReplyReceived(QNetworkReply *reply, const Artist &a --album_songs_requests_active_; ++album_songs_requests_received_; if (offset_requested == 0) { - emit UpdateProgress(query_id_, GetProgress(album_songs_requests_received_, album_songs_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(album_songs_requests_received_, album_songs_requests_total_)); } SongsReceived(reply, artist, album, 0, offset_requested); @@ -1022,7 +1022,7 @@ void QobuzRequest::SongsReceived(QNetworkReply *reply, const Artist &artist_requ if (query_type_ == Type::FavouriteSongs || query_type_ == Type::SearchSongs) { songs_received_ += songs_received; - emit UpdateProgress(query_id_, GetProgress(songs_received_, songs_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(songs_received_, songs_total_)); } SongsFinishCheck(album_artist, album, limit_requested, offset_requested, songs_total, songs_received); @@ -1258,9 +1258,9 @@ void QobuzRequest::GetAlbumCovers() { AddAlbumCoverRequest(song); } - if (album_covers_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving album cover for %1 album...").arg(album_covers_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving album covers for %1 albums...").arg(album_covers_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (album_covers_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving album cover for %1 album...").arg(album_covers_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving album covers for %1 albums...").arg(album_covers_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); StartRequests(); @@ -1323,7 +1323,7 @@ void QobuzRequest::AlbumCoverReceived(QNetworkReply *reply, const QUrl &cover_ur if (finished_) return; - emit UpdateProgress(query_id_, GetProgress(album_covers_requests_received_, album_covers_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(album_covers_requests_received_, album_covers_requests_total_)); if (!album_covers_requests_sent_.contains(cover_url)) { AlbumCoverFinishCheck(); @@ -1425,15 +1425,15 @@ void QobuzRequest::FinishCheck() { finished_ = true; if (no_results_ && songs_.isEmpty()) { if (IsSearch()) - emit Results(query_id_, SongMap(), tr("No match.")); + Q_EMIT Results(query_id_, SongMap(), tr("No match.")); else - emit Results(query_id_, SongMap(), QString()); + Q_EMIT Results(query_id_, SongMap(), QString()); } else { if (songs_.isEmpty() && errors_.isEmpty()) - emit Results(query_id_, songs_, tr("Unknown error")); + Q_EMIT Results(query_id_, songs_, tr("Unknown error")); else - emit Results(query_id_, songs_, ErrorsToHTML(errors_)); + Q_EMIT Results(query_id_, songs_, ErrorsToHTML(errors_)); } } diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp index b3290838d..a94e45b86 100644 --- a/src/qobuz/qobuzservice.cpp +++ b/src/qobuz/qobuzservice.cpp @@ -201,7 +201,7 @@ void QobuzService::ExitReceived() { QObject::disconnect(obj, nullptr, this, nullptr); qLog(Debug) << obj << "successfully exited."; wait_for_exit_.removeAll(obj); - if (wait_for_exit_.isEmpty()) emit ExitFinished(); + if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished(); } @@ -268,7 +268,7 @@ void QobuzService::SendLogin() { void QobuzService::SendLoginWithCredentials(const QString &app_id, const QString &username, const QString &password) { - emit UpdateStatus(tr("Authenticating...")); + Q_EMIT UpdateStatus(tr("Authenticating...")); login_errors_.clear(); login_sent_ = true; @@ -446,8 +446,8 @@ void QobuzService::HandleAuthReply(QNetworkReply *reply) { login_attempts_ = 0; if (timer_login_attempt_->isActive()) timer_login_attempt_->stop(); - emit LoginComplete(true); - emit LoginSuccess(); + Q_EMIT LoginComplete(true); + Q_EMIT LoginSuccess(); } @@ -477,23 +477,23 @@ void QobuzService::TryLogin() { if (authenticated() || login_sent_) return; if (login_attempts_ >= kLoginAttempts) { - emit LoginComplete(false, tr("Maximum number of login attempts reached.")); + Q_EMIT LoginComplete(false, tr("Maximum number of login attempts reached.")); return; } if (app_id_.isEmpty()) { - emit LoginComplete(false, tr("Missing Qobuz app ID.")); + Q_EMIT LoginComplete(false, tr("Missing Qobuz app ID.")); return; } if (username_.isEmpty()) { - emit LoginComplete(false, tr("Missing Qobuz username.")); + Q_EMIT LoginComplete(false, tr("Missing Qobuz username.")); return; } if (password_.isEmpty()) { - emit LoginComplete(false, tr("Missing Qobuz password.")); + Q_EMIT LoginComplete(false, tr("Missing Qobuz password.")); return; } - emit RequestLogin(); + Q_EMIT RequestLogin(); } @@ -510,12 +510,12 @@ void QobuzService::ResetArtistsRequest() { void QobuzService::GetArtists() { if (app_id().isEmpty()) { - emit ArtistsResults(SongMap(), tr("Missing Qobuz app ID.")); + Q_EMIT ArtistsResults(SongMap(), tr("Missing Qobuz app ID.")); return; } if (!authenticated()) { - emit ArtistsResults(SongMap(), tr("Not authenticated with Qobuz.")); + Q_EMIT ArtistsResults(SongMap(), tr("Not authenticated with Qobuz.")); return; } @@ -532,19 +532,19 @@ void QobuzService::GetArtists() { void QobuzService::ArtistsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit ArtistsResults(songs, error); + Q_EMIT ArtistsResults(songs, error); ResetArtistsRequest(); } void QobuzService::ArtistsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit ArtistsUpdateStatus(text); + Q_EMIT ArtistsUpdateStatus(text); } void QobuzService::ArtistsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit ArtistsUpdateProgress(progress); + Q_EMIT ArtistsUpdateProgress(progress); } void QobuzService::ResetAlbumsRequest() { @@ -560,12 +560,12 @@ void QobuzService::ResetAlbumsRequest() { void QobuzService::GetAlbums() { if (app_id().isEmpty()) { - emit AlbumsResults(SongMap(), tr("Missing Qobuz app ID.")); + Q_EMIT AlbumsResults(SongMap(), tr("Missing Qobuz app ID.")); return; } if (!authenticated()) { - emit AlbumsResults(SongMap(), tr("Not authenticated with Qobuz.")); + Q_EMIT AlbumsResults(SongMap(), tr("Not authenticated with Qobuz.")); return; } @@ -582,19 +582,19 @@ void QobuzService::GetAlbums() { void QobuzService::AlbumsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit AlbumsResults(songs, error); + Q_EMIT AlbumsResults(songs, error); ResetAlbumsRequest(); } void QobuzService::AlbumsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit AlbumsUpdateStatus(text); + Q_EMIT AlbumsUpdateStatus(text); } void QobuzService::AlbumsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit AlbumsUpdateProgress(progress); + Q_EMIT AlbumsUpdateProgress(progress); } void QobuzService::ResetSongsRequest() { @@ -610,12 +610,12 @@ void QobuzService::ResetSongsRequest() { void QobuzService::GetSongs() { if (app_id().isEmpty()) { - emit SongsResults(SongMap(), tr("Missing Qobuz app ID.")); + Q_EMIT SongsResults(SongMap(), tr("Missing Qobuz app ID.")); return; } if (!authenticated()) { - emit SongsResults(SongMap(), tr("Not authenticated with Qobuz.")); + Q_EMIT SongsResults(SongMap(), tr("Not authenticated with Qobuz.")); return; } @@ -632,19 +632,19 @@ void QobuzService::GetSongs() { void QobuzService::SongsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit SongsResults(songs, error); + Q_EMIT SongsResults(songs, error); ResetSongsRequest(); } void QobuzService::SongsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit SongsUpdateStatus(text); + Q_EMIT SongsUpdateStatus(text); } void QobuzService::SongsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit SongsUpdateProgress(progress); + Q_EMIT SongsUpdateProgress(progress); } int QobuzService::Search(const QString &text, StreamingSearchView::SearchType type) { @@ -672,7 +672,7 @@ void QobuzService::StartSearch() { search_text_ = pending_search_text_; if (app_id_.isEmpty()) { // App ID is the only thing needed to search. - emit SearchResults(search_id_, SongMap(), tr("Missing Qobuz app ID.")); + Q_EMIT SearchResults(search_id_, SongMap(), tr("Missing Qobuz app ID.")); return; } @@ -713,7 +713,7 @@ void QobuzService::SendSearch() { void QobuzService::SearchResultsReceived(const int id, const SongMap &songs, const QString &error) { search_request_.reset(); - emit SearchResults(id, songs, error); + Q_EMIT SearchResults(id, songs, error); } @@ -746,7 +746,7 @@ void QobuzService::HandleStreamURLFailure(const uint id, const QUrl &media_url, if (!stream_url_requests_.contains(id)) return; stream_url_requests_.remove(id); - emit StreamURLFailure(id, media_url, error); + Q_EMIT StreamURLFailure(id, media_url, error); } @@ -755,7 +755,7 @@ void QobuzService::HandleStreamURLSuccess(const uint id, const QUrl &media_url, if (!stream_url_requests_.contains(id)) return; stream_url_requests_.remove(id); - emit StreamURLSuccess(id, media_url, stream_url, filetype, samplerate, bit_depth, duration); + Q_EMIT StreamURLSuccess(id, media_url, stream_url, filetype, samplerate, bit_depth, duration); } @@ -770,8 +770,8 @@ void QobuzService::LoginError(const QString &error, const QVariant &debug) { } if (debug.isValid()) qLog(Debug) << debug; - emit LoginFailure(error_html); - emit LoginComplete(false, error_html); + Q_EMIT LoginFailure(error_html); + Q_EMIT LoginComplete(false, error_html); login_errors_.clear(); diff --git a/src/qobuz/qobuzstreamurlrequest.cpp b/src/qobuz/qobuzstreamurlrequest.cpp index d617e0386..68bb93065 100644 --- a/src/qobuz/qobuzstreamurlrequest.cpp +++ b/src/qobuz/qobuzstreamurlrequest.cpp @@ -69,7 +69,7 @@ void QobuzStreamURLRequest::LoginComplete(const bool success, const QString &err need_login_ = false; if (!success) { - emit StreamURLFailure(id_, media_url_, error); + Q_EMIT StreamURLFailure(id_, media_url_, error); return; } @@ -80,13 +80,13 @@ void QobuzStreamURLRequest::LoginComplete(const bool success, const QString &err void QobuzStreamURLRequest::Process() { if (app_id().isEmpty() || app_secret().isEmpty()) { - emit StreamURLFailure(id_, media_url_, tr("Missing Qobuz app ID or secret.")); + Q_EMIT StreamURLFailure(id_, media_url_, tr("Missing Qobuz app ID or secret.")); return; } if (!authenticated()) { need_login_ = true; - emit TryLogin(); + Q_EMIT TryLogin(); return; } GetStreamURL(); @@ -99,7 +99,7 @@ void QobuzStreamURLRequest::Cancel() { reply_->abort(); } else { - emit StreamURLFailure(id_, media_url_, tr("Cancelled.")); + Q_EMIT StreamURLFailure(id_, media_url_, tr("Cancelled.")); } } @@ -159,32 +159,32 @@ void QobuzStreamURLRequest::StreamURLReceived() { need_login_ = true; return; } - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } if (!json_obj.contains(QLatin1String("track_id"))) { Error(QStringLiteral("Invalid Json reply, stream url is missing track_id."), json_obj); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } int track_id = json_obj[QLatin1String("track_id")].toInt(); if (track_id != song_id_) { Error(QStringLiteral("Incorrect track ID returned."), json_obj); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } if (!json_obj.contains(QLatin1String("mime_type")) || !json_obj.contains(QLatin1String("url"))) { Error(QStringLiteral("Invalid Json reply, stream url is missing url or mime_type."), json_obj); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } @@ -205,7 +205,7 @@ void QobuzStreamURLRequest::StreamURLReceived() { if (!url.isValid()) { Error(QStringLiteral("Returned stream url is invalid."), json_obj); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } @@ -222,7 +222,7 @@ void QobuzStreamURLRequest::StreamURLReceived() { bit_depth = static_cast(json_obj[QLatin1String("bit_depth")].toDouble()); } - emit StreamURLSuccess(id_, media_url_, url, filetype, samplerate, bit_depth, duration); + Q_EMIT StreamURLSuccess(id_, media_url_, url, filetype, samplerate, bit_depth, duration); } diff --git a/src/qobuz/qobuzurlhandler.cpp b/src/qobuz/qobuzurlhandler.cpp index 9637a8edf..0248a7aa4 100644 --- a/src/qobuz/qobuzurlhandler.cpp +++ b/src/qobuz/qobuzurlhandler.cpp @@ -65,7 +65,7 @@ void QobuzUrlHandler::GetStreamURLFailure(const uint id, const QUrl &media_url, Request req = requests_.take(id); CancelTask(req.task_id); - emit AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::Error, error)); + Q_EMIT AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::Error, error)); } @@ -75,7 +75,7 @@ void QobuzUrlHandler::GetStreamURLSuccess(const uint id, const QUrl &media_url, Request req = requests_.take(id); CancelTask(req.task_id); - emit AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::TrackAvailable, stream_url, filetype, samplerate, bit_depth, duration)); + Q_EMIT AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::TrackAvailable, stream_url, filetype, samplerate, bit_depth, duration)); } diff --git a/src/queue/queue.cpp b/src/queue/queue.cpp index b346fe302..4ba69b17b 100644 --- a/src/queue/queue.cpp +++ b/src/queue/queue.cpp @@ -106,9 +106,9 @@ void Queue::SourceDataChanged(const QModelIndex &top_left, const QModelIndex &bo QModelIndex proxy_index = mapFromSource(sourceModel()->index(row, 0)); if (!proxy_index.isValid()) continue; - emit dataChanged(proxy_index, proxy_index); + Q_EMIT dataChanged(proxy_index, proxy_index); } - emit ItemCountChanged(ItemCount()); + Q_EMIT ItemCountChanged(ItemCount()); } @@ -127,7 +127,7 @@ void Queue::SourceLayoutChanged() { signal_item_count_changed_ = QObject::connect(this, &Queue::ItemCountChanged, this, &Queue::UpdateTotalLength); - emit ItemCountChanged(ItemCount()); + Q_EMIT ItemCountChanged(ItemCount()); } @@ -242,7 +242,7 @@ void Queue::UpdateTotalLength() { total_length_ns_ = total; - emit TotalLengthChanged(total); + Q_EMIT TotalLengthChanged(total); } @@ -258,7 +258,7 @@ void Queue::UpdateSummaryText() { summary += QLatin1String(" - [ ") + Utilities::WordyTimeNanosec(nanoseconds) + QLatin1String(" ]"); } - emit SummaryTextChanged(summary); + Q_EMIT SummaryTextChanged(summary); } @@ -274,7 +274,7 @@ void Queue::Clear() { void Queue::Move(const QList &proxy_rows, int pos) { - emit layoutAboutToBeChanged(); + Q_EMIT layoutAboutToBeChanged(); QList moved_items; // Take the items out of the list first, keeping track of whether the insertion point changes @@ -311,7 +311,7 @@ void Queue::Move(const QList &proxy_rows, int pos) { } } - emit layoutChanged(); + Q_EMIT layoutChanged(); } @@ -453,7 +453,7 @@ void Queue::Remove(QList &proxy_rows) { std::stable_sort(proxy_rows.begin(), proxy_rows.end()); // Reflects immediately changes in the playlist - emit layoutAboutToBeChanged(); + Q_EMIT layoutAboutToBeChanged(); int removed_rows = 0; for (int row : proxy_rows) { @@ -465,6 +465,6 @@ void Queue::Remove(QList &proxy_rows) { removed_rows++; } - emit layoutChanged(); + Q_EMIT layoutChanged(); } diff --git a/src/radios/radiobackend.cpp b/src/radios/radiobackend.cpp index 648049210..dffddf98e 100644 --- a/src/radios/radiobackend.cpp +++ b/src/radios/radiobackend.cpp @@ -53,7 +53,7 @@ void RadioBackend::Exit() { Q_ASSERT(QThread::currentThread() == thread()); moveToThread(original_thread_); - emit ExitFinished(); + Q_EMIT ExitFinished(); } @@ -80,7 +80,7 @@ void RadioBackend::AddChannels(const RadioChannelList &channels) { } } - emit NewChannels(channels); + Q_EMIT NewChannels(channels); } @@ -113,7 +113,7 @@ void RadioBackend::GetChannels() { channels << channel; } - emit NewChannels(channels); + Q_EMIT NewChannels(channels); } diff --git a/src/radios/radiomodel.cpp b/src/radios/radiomodel.cpp index 9e0af7928..498468511 100644 --- a/src/radios/radiomodel.cpp +++ b/src/radios/radiomodel.cpp @@ -320,7 +320,7 @@ void RadioModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult const QModelIndex idx = ItemToIndex(item); if (!idx.isValid()) return; - emit dataChanged(idx, idx); + Q_EMIT dataChanged(idx, idx); } diff --git a/src/radios/radioparadiseservice.cpp b/src/radios/radioparadiseservice.cpp index d255a1954..ac396c344 100644 --- a/src/radios/radioparadiseservice.cpp +++ b/src/radios/radioparadiseservice.cpp @@ -76,14 +76,14 @@ void RadioParadiseService::GetChannelsReply(QNetworkReply *reply, const int task QJsonObject object = ExtractJsonObj(reply); if (object.isEmpty()) { app_->task_manager()->SetTaskFinished(task_id); - emit NewChannels(); + Q_EMIT NewChannels(); return; } if (!object.contains(QLatin1String("channels")) || !object[QLatin1String("channels")].isArray()) { Error(QStringLiteral("Missing JSON channels array."), object); app_->task_manager()->SetTaskFinished(task_id); - emit NewChannels(); + Q_EMIT NewChannels(); return; } const QJsonArray array_channels = object[QLatin1String("channels")].toArray(); @@ -123,6 +123,6 @@ void RadioParadiseService::GetChannelsReply(QNetworkReply *reply, const int task app_->task_manager()->SetTaskFinished(task_id); - emit NewChannels(channels); + Q_EMIT NewChannels(channels); } diff --git a/src/radios/radioview.cpp b/src/radios/radioview.cpp index 1e35f7e57..816f9c82b 100644 --- a/src/radios/radioview.cpp +++ b/src/radios/radioview.cpp @@ -57,7 +57,7 @@ RadioView::~RadioView() { delete menu_; } void RadioView::showEvent(QShowEvent*) { if (!initialized_) { - emit GetChannels(); + Q_EMIT GetChannels(); initialized_ = true; } @@ -108,7 +108,7 @@ void RadioView::AddToPlaylist() { const QModelIndexList selected_indexes = selectedIndexes(); if (selected_indexes.isEmpty()) return; - emit AddToPlaylistSignal(model()->mimeData(selected_indexes)); + Q_EMIT AddToPlaylistSignal(model()->mimeData(selected_indexes)); } @@ -122,7 +122,7 @@ void RadioView::ReplacePlaylist() { mimedata->clear_first_ = true; } - emit AddToPlaylistSignal(qmimedata); + Q_EMIT AddToPlaylistSignal(qmimedata); } @@ -139,7 +139,7 @@ void RadioView::OpenInNewPlaylist() { } } - emit AddToPlaylistSignal(qmimedata); + Q_EMIT AddToPlaylistSignal(qmimedata); } diff --git a/src/radios/somafmservice.cpp b/src/radios/somafmservice.cpp index 166acdd9d..f1a14e32f 100644 --- a/src/radios/somafmservice.cpp +++ b/src/radios/somafmservice.cpp @@ -84,14 +84,14 @@ void SomaFMService::GetChannelsReply(QNetworkReply *reply, const int task_id) { QJsonObject object = ExtractJsonObj(reply); if (object.isEmpty()) { app_->task_manager()->SetTaskFinished(task_id); - emit NewChannels(); + Q_EMIT NewChannels(); return; } if (!object.contains(QLatin1String("channels")) || !object[QLatin1String("channels")].isArray()) { Error(QStringLiteral("Missing JSON channels array."), object); app_->task_manager()->SetTaskFinished(task_id); - emit NewChannels(); + Q_EMIT NewChannels(); return; } const QJsonArray array_channels = object[QLatin1String("channels")].toArray(); @@ -128,7 +128,7 @@ void SomaFMService::GetChannelsReply(QNetworkReply *reply, const int task_id) { if (channels.isEmpty()) { app_->task_manager()->SetTaskFinished(task_id); - emit NewChannels(); + Q_EMIT NewChannels(); } else { for (const RadioChannel &channel : std::as_const(channels)) { @@ -162,7 +162,7 @@ void SomaFMService::GetStreamUrlsReply(QNetworkReply *reply, const int task_id, if (replies_.isEmpty()) { app_->task_manager()->SetTaskFinished(task_id); - emit NewChannels(channels_); + Q_EMIT NewChannels(channels_); channels_.clear(); } diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp index b7c28de22..1e0a681df 100644 --- a/src/scrobbler/audioscrobbler.cpp +++ b/src/scrobbler/audioscrobbler.cpp @@ -195,5 +195,5 @@ void AudioScrobbler::WriteCache() { } void AudioScrobbler::ErrorReceived(const QString &error) { - emit ErrorMessage(error); + Q_EMIT ErrorMessage(error); } diff --git a/src/scrobbler/lastfmimport.cpp b/src/scrobbler/lastfmimport.cpp index 62d4244c7..49d6908ce 100644 --- a/src/scrobbler/lastfmimport.cpp +++ b/src/scrobbler/lastfmimport.cpp @@ -386,7 +386,7 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in QString title = obj_track[QLatin1String("name")].toString(); QDateTime datetime = QDateTime::fromString(date, QStringLiteral("dd MMM yyyy, hh:mm")); if (datetime.isValid()) { - emit UpdateLastPlayed(artist, album, title, datetime.toSecsSinceEpoch()); + Q_EMIT UpdateLastPlayed(artist, album, title, datetime.toSecsSinceEpoch()); } UpdateProgressCheck(); @@ -545,7 +545,7 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p if (playcount <= 0) continue; - emit UpdatePlayCount(artist, title, playcount, false); + Q_EMIT UpdatePlayCount(artist, title, playcount, false); UpdateProgressCheck(); } @@ -565,16 +565,16 @@ void LastFMImport::GetTopTracksRequestFinished(QNetworkReply *reply, const int p void LastFMImport::UpdateTotalCheck() { if ((!playcount_ || playcount_total_ > 0) && (!lastplayed_ || lastplayed_total_ > 0)) - emit UpdateTotal(lastplayed_total_, playcount_total_); + Q_EMIT UpdateTotal(lastplayed_total_, playcount_total_); } void LastFMImport::UpdateProgressCheck() { - emit UpdateProgress(lastplayed_received_, playcount_received_); + Q_EMIT UpdateProgress(lastplayed_received_, playcount_received_); } void LastFMImport::FinishCheck() { - if (replies_.isEmpty() && recent_tracks_requests_.isEmpty() && top_tracks_requests_.isEmpty()) emit Finished(); + if (replies_.isEmpty() && recent_tracks_requests_.isEmpty() && top_tracks_requests_.isEmpty()) Q_EMIT Finished(); } void LastFMImport::Error(const QString &error, const QVariant &debug) { @@ -582,7 +582,7 @@ void LastFMImport::Error(const QString &error, const QVariant &debug) { qLog(Error) << error; if (debug.isValid()) qLog(Debug) << debug; - emit FinishedWithError(error); + Q_EMIT FinishedWithError(error); AbortAll(); diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp index 8451bbb13..0322a3d83 100644 --- a/src/scrobbler/listenbrainzscrobbler.cpp +++ b/src/scrobbler/listenbrainzscrobbler.cpp @@ -347,7 +347,7 @@ void ListenBrainzScrobbler::AuthenticateReplyFinished(QNetworkReply *reply) { refresh_login_timer_.start(); } - emit AuthenticationComplete(true); + Q_EMIT AuthenticationComplete(true); qLog(Debug) << "ListenBrainz: Authentication was successful, login expires in" << expires_in_; @@ -667,7 +667,7 @@ void ListenBrainzScrobbler::LoveRequestFinished(QNetworkReply *reply) { void ListenBrainzScrobbler::AuthError(const QString &error) { qLog(Error) << "ListenBrainz" << error; - emit AuthenticationComplete(false, error); + Q_EMIT AuthenticationComplete(false, error); } @@ -677,7 +677,7 @@ void ListenBrainzScrobbler::Error(const QString &error, const QVariant &debug) { if (debug.isValid()) qLog(Debug) << debug; if (settings_->show_error_dialog()) { - emit ErrorMessage(tr("ListenBrainz error: %1").arg(error)); + Q_EMIT ErrorMessage(tr("ListenBrainz error: %1").arg(error)); } } diff --git a/src/scrobbler/scrobblersettings.cpp b/src/scrobbler/scrobblersettings.cpp index c0afe1f75..3bc4e0931 100644 --- a/src/scrobbler/scrobblersettings.cpp +++ b/src/scrobbler/scrobblersettings.cpp @@ -82,9 +82,9 @@ void ScrobblerSettings::ReloadSettings() { } } - emit ScrobblingEnabledChanged(enabled_); - emit ScrobbleButtonVisibilityChanged(scrobble_button_); - emit LoveButtonVisibilityChanged(love_button_); + Q_EMIT ScrobblingEnabledChanged(enabled_); + Q_EMIT ScrobbleButtonVisibilityChanged(scrobble_button_); + Q_EMIT LoveButtonVisibilityChanged(love_button_); } @@ -98,7 +98,7 @@ void ScrobblerSettings::ToggleScrobbling() { s.setValue("enabled", enabled_); s.endGroup(); - if (enabled_ != enabled_old_) emit ScrobblingEnabledChanged(enabled_); + if (enabled_ != enabled_old_) Q_EMIT ScrobblingEnabledChanged(enabled_); } @@ -112,7 +112,7 @@ void ScrobblerSettings::ToggleOffline() { s.setValue("offline", offline_); s.endGroup(); - if (offline_ != offline_old_) { emit ScrobblingOfflineChanged(offline_); } + if (offline_ != offline_old_) { Q_EMIT ScrobblingOfflineChanged(offline_); } } @@ -121,5 +121,5 @@ void ScrobblerSettings::ShowConfig() { } void ScrobblerSettings::ErrorReceived(const QString &error) { - emit ErrorMessage(error); + Q_EMIT ErrorMessage(error); } diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index 36a7c0749..23bd04b99 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -235,7 +235,7 @@ void ScrobblingAPI20::Authenticate() { server_->deleteLater(); server_ = nullptr; } - emit AuthenticationComplete(false); + Q_EMIT AuthenticationComplete(false); break; default: break; @@ -344,7 +344,7 @@ void ScrobblingAPI20::AuthenticateReplyFinished(QNetworkReply *reply) { s.setValue("session_key", session_key_); s.endGroup(); - emit AuthenticationComplete(true); + Q_EMIT AuthenticationComplete(true); StartSubmit(); @@ -460,7 +460,7 @@ void ScrobblingAPI20::Scrobble(const Song &song) { if (!authenticated()) { if (settings_->show_error_dialog()) { - emit ErrorMessage(tr("Scrobbler %1 is not authenticated!").arg(name_)); + Q_EMIT ErrorMessage(tr("Scrobbler %1 is not authenticated!").arg(name_)); } return; } @@ -899,7 +899,7 @@ void ScrobblingAPI20::LoveRequestFinished(QNetworkReply *reply) { void ScrobblingAPI20::AuthError(const QString &error) { qLog(Error) << name_ << error; - emit AuthenticationComplete(false, error); + Q_EMIT AuthenticationComplete(false, error); } @@ -909,7 +909,7 @@ void ScrobblingAPI20::Error(const QString &error, const QVariant &debug) { if (debug.isValid()) qLog(Debug) << debug; if (settings_->show_error_dialog()) { - emit ErrorMessage(tr("Scrobbler %1 error: %2").arg(name_, error)); + Q_EMIT ErrorMessage(tr("Scrobbler %1 error: %2").arg(name_, error)); } } diff --git a/src/settings/notificationssettingspage.cpp b/src/settings/notificationssettingspage.cpp index 0ef9dd3bf..cafedbf21 100644 --- a/src/settings/notificationssettingspage.cpp +++ b/src/settings/notificationssettingspage.cpp @@ -358,7 +358,7 @@ void NotificationsSettingsPage::PrepareNotificationPreview() { } // If user changes timeout or other options, that won't be reflected in the preview - emit NotificationPreview(notificationType, ui_->notifications_custom_text1->text(), ui_->notifications_custom_text2->text()); + Q_EMIT NotificationPreview(notificationType, ui_->notifications_custom_text1->text(), ui_->notifications_custom_text2->text()); } diff --git a/src/settings/qobuzsettingspage.cpp b/src/settings/qobuzsettingspage.cpp index 7c7e3115c..ab40d696d 100644 --- a/src/settings/qobuzsettingspage.cpp +++ b/src/settings/qobuzsettingspage.cpp @@ -140,7 +140,7 @@ void QobuzSettingsPage::LoginClicked() { return; } - emit Login(ui_->app_id->text(), ui_->username->text(), ui_->password->text()); + Q_EMIT Login(ui_->app_id->text(), ui_->username->text(), ui_->password->text()); ui_->button_login->setEnabled(false); } diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index ec29d8c9f..c690e5d8e 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -221,7 +221,7 @@ void SettingsDialog::accept() { for (const PageData &page : pages) { page.page_->Accept(); } - emit ReloadSettings(); + Q_EMIT ReloadSettings(); SaveGeometry(); @@ -324,7 +324,7 @@ void SettingsDialog::Save() { for (const PageData &page : pages) { page.page_->Apply(); } - emit ReloadSettings(); + Q_EMIT ReloadSettings(); } @@ -337,7 +337,7 @@ void SettingsDialog::DialogButtonClicked(QAbstractButton *button) { for (const PageData &page : pages) { page.page_->Apply(); } - emit ReloadSettings(); + Q_EMIT ReloadSettings(); } } diff --git a/src/settings/spotifysettingspage.cpp b/src/settings/spotifysettingspage.cpp index 1898c86ad..e65475be7 100644 --- a/src/settings/spotifysettingspage.cpp +++ b/src/settings/spotifysettingspage.cpp @@ -129,7 +129,7 @@ void SpotifySettingsPage::Save() { void SpotifySettingsPage::LoginClicked() { - emit Authorize(); + Q_EMIT Authorize(); ui_->button_login->setEnabled(false); diff --git a/src/settings/subsonicsettingspage.cpp b/src/settings/subsonicsettingspage.cpp index 725505f83..c3756224d 100644 --- a/src/settings/subsonicsettingspage.cpp +++ b/src/settings/subsonicsettingspage.cpp @@ -138,7 +138,7 @@ void SubsonicSettingsPage::TestClicked() { return; } - emit Test(server_url, ui_->username->text(), ui_->password->text(), ui_->auth_method_hex->isChecked() ? AuthMethod::Hex : AuthMethod::MD5); + Q_EMIT Test(server_url, ui_->username->text(), ui_->password->text(), ui_->auth_method_hex->isChecked() ? AuthMethod::Hex : AuthMethod::MD5); ui_->button_test->setEnabled(false); } diff --git a/src/settings/tidalsettingspage.cpp b/src/settings/tidalsettingspage.cpp index 065fed919..88ff38403 100644 --- a/src/settings/tidalsettingspage.cpp +++ b/src/settings/tidalsettingspage.cpp @@ -152,7 +152,7 @@ void TidalSettingsPage::LoginClicked() { QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing Tidal client ID.")); return; } - emit Authorize(ui_->client_id->text()); + Q_EMIT Authorize(ui_->client_id->text()); } else { if (ui_->api_token->text().isEmpty()) { @@ -167,7 +167,7 @@ void TidalSettingsPage::LoginClicked() { QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing password.")); return; } - emit Login(ui_->api_token->text(), ui_->username->text(), ui_->password->text()); + Q_EMIT Login(ui_->api_token->text(), ui_->username->text(), ui_->password->text()); } ui_->button_login->setEnabled(false); diff --git a/src/smartplaylists/smartplaylistquerywizardplugin.cpp b/src/smartplaylists/smartplaylistquerywizardplugin.cpp index d8c3b4580..db7c3181e 100644 --- a/src/smartplaylists/smartplaylistquerywizardplugin.cpp +++ b/src/smartplaylists/smartplaylistquerywizardplugin.cpp @@ -263,7 +263,7 @@ void SmartPlaylistQueryWizardPlugin::RemoveSearchTerm() { void SmartPlaylistQueryWizardPlugin::UpdateTermPreview() { SmartPlaylistSearch search = MakeSearch(); - emit search_page_->completeChanged(); + Q_EMIT search_page_->completeChanged(); // When removing last term, update anyway the search if (!search.is_valid() && !search_page_->terms_.isEmpty()) return; diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.cpp b/src/smartplaylists/smartplaylistsearchtermwidget.cpp index c0f1bf6ba..5f7241024 100644 --- a/src/smartplaylists/smartplaylistsearchtermwidget.cpp +++ b/src/smartplaylists/smartplaylistsearchtermwidget.cpp @@ -202,7 +202,7 @@ void SmartPlaylistSearchTermWidget::FieldChanged(int index) { ui_->value_text->setCompleter(nullptr); } - emit Changed(); + Q_EMIT Changed(); } @@ -243,7 +243,7 @@ void SmartPlaylistSearchTermWidget::OpChanged(int idx) { ui_->value_stack->setCurrentWidget(page); } - emit Changed(); + Q_EMIT Changed(); } @@ -422,7 +422,7 @@ void SmartPlaylistSearchTermWidget::RelativeValueChanged() { QMessageBox::warning(this, QStringLiteral("Strawberry"), tr("The second value must be greater than the first one!")); } // Emit the signal in any case, so the Next button will be disabled - emit Changed(); + Q_EMIT Changed(); } @@ -502,9 +502,9 @@ void SmartPlaylistSearchTermWidget::Overlay::paintEvent(QPaintEvent*) { } void SmartPlaylistSearchTermWidget::Overlay::mouseReleaseEvent(QMouseEvent*) { - emit parent_->Clicked(); + Q_EMIT parent_->Clicked(); } void SmartPlaylistSearchTermWidget::Overlay::keyReleaseEvent(QKeyEvent *e) { - if (e->key() == Qt::Key_Space) emit parent_->Clicked(); + if (e->key() == Qt::Key_Space) Q_EMIT parent_->Clicked(); } diff --git a/src/smartplaylists/smartplaylistsview.cpp b/src/smartplaylists/smartplaylistsview.cpp index 2270dedc8..a2070fc63 100644 --- a/src/smartplaylists/smartplaylistsview.cpp +++ b/src/smartplaylists/smartplaylistsview.cpp @@ -40,12 +40,12 @@ SmartPlaylistsView::SmartPlaylistsView(QWidget *_parent) : QListView(_parent) { SmartPlaylistsView::~SmartPlaylistsView() = default; void SmartPlaylistsView::selectionChanged(const QItemSelection&, const QItemSelection&) { - emit ItemsSelectedChanged(); + Q_EMIT ItemsSelectedChanged(); } void SmartPlaylistsView::contextMenuEvent(QContextMenuEvent *e) { - emit RightClicked(e->globalPos(), indexAt(e->pos())); + Q_EMIT RightClicked(e->globalPos(), indexAt(e->pos())); e->accept(); } diff --git a/src/smartplaylists/smartplaylistsviewcontainer.cpp b/src/smartplaylists/smartplaylistsviewcontainer.cpp index f4634b4a1..7d56f8f59 100644 --- a/src/smartplaylists/smartplaylistsviewcontainer.cpp +++ b/src/smartplaylists/smartplaylistsviewcontainer.cpp @@ -146,13 +146,13 @@ void SmartPlaylistsViewContainer::ReplaceCurrentPlaylist() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->clear_first_ = true; } - emit AddToPlaylist(q_mimedata); + Q_EMIT AddToPlaylist(q_mimedata); } void SmartPlaylistsViewContainer::AppendToPlaylist() { - emit AddToPlaylist(ui_->view->model()->mimeData(ui_->view->selectionModel()->selectedIndexes())); + Q_EMIT AddToPlaylist(ui_->view->model()->mimeData(ui_->view->selectionModel()->selectedIndexes())); } @@ -162,7 +162,7 @@ void SmartPlaylistsViewContainer::OpenInNewPlaylist() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->open_in_new_playlist_ = true; } - emit AddToPlaylist(q_mimedata); + Q_EMIT AddToPlaylist(q_mimedata); } @@ -172,7 +172,7 @@ void SmartPlaylistsViewContainer::AddToPlaylistEnqueue() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->enqueue_now_ = true; } - emit AddToPlaylist(q_mimedata); + Q_EMIT AddToPlaylist(q_mimedata); } @@ -182,7 +182,7 @@ void SmartPlaylistsViewContainer::AddToPlaylistEnqueueNext() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->enqueue_next_now_ = true; } - emit AddToPlaylist(q_mimedata); + Q_EMIT AddToPlaylist(q_mimedata); } @@ -275,6 +275,6 @@ void SmartPlaylistsViewContainer::ItemDoubleClicked(const QModelIndex &idx) { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->from_doubleclick_ = true; } - emit AddToPlaylist(q_mimedata); + Q_EMIT AddToPlaylist(q_mimedata); } diff --git a/src/spotify/spotifyfavoriterequest.cpp b/src/spotify/spotifyfavoriterequest.cpp index cba013b59..ed9c7d80d 100644 --- a/src/spotify/spotifyfavoriterequest.cpp +++ b/src/spotify/spotifyfavoriterequest.cpp @@ -171,13 +171,13 @@ void SpotifyFavoriteRequest::AddFavoritesReply(QNetworkReply *reply, const Favor switch (type) { case FavoriteType_Artists: - emit ArtistsAdded(songs); + Q_EMIT ArtistsAdded(songs); break; case FavoriteType_Albums: - emit AlbumsAdded(songs); + Q_EMIT AlbumsAdded(songs); break; case FavoriteType_Songs: - emit SongsAdded(songs); + Q_EMIT SongsAdded(songs); break; } @@ -290,13 +290,13 @@ void SpotifyFavoriteRequest::RemoveFavoritesReply(QNetworkReply *reply, const Fa switch (type) { case FavoriteType_Artists: - emit ArtistsRemoved(songs); + Q_EMIT ArtistsRemoved(songs); break; case FavoriteType_Albums: - emit AlbumsRemoved(songs); + Q_EMIT AlbumsRemoved(songs); break; case FavoriteType_Songs: - emit SongsRemoved(songs); + Q_EMIT SongsRemoved(songs); break; } diff --git a/src/spotify/spotifyrequest.cpp b/src/spotify/spotifyrequest.cpp index 240cee219..119b3fde8 100644 --- a/src/spotify/spotifyrequest.cpp +++ b/src/spotify/spotifyrequest.cpp @@ -126,7 +126,7 @@ SpotifyRequest::~SpotifyRequest() { void SpotifyRequest::Process() { if (!service_->authenticated()) { - emit UpdateStatus(query_id_, tr("Authenticating...")); + Q_EMIT UpdateStatus(query_id_, tr("Authenticating...")); return; } @@ -209,8 +209,8 @@ void SpotifyRequest::Search(const int query_id, const QString &search_text) { void SpotifyRequest::GetArtists() { - emit UpdateStatus(query_id_, tr("Receiving artists...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving artists...")); + Q_EMIT UpdateProgress(query_id_, 0); AddArtistsRequest(); } @@ -263,8 +263,8 @@ void SpotifyRequest::FlushArtistsRequests() { void SpotifyRequest::GetAlbums() { - emit UpdateStatus(query_id_, tr("Receiving albums...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving albums...")); + Q_EMIT UpdateProgress(query_id_, 0); AddAlbumsRequest(); } @@ -317,8 +317,8 @@ void SpotifyRequest::FlushAlbumsRequests() { void SpotifyRequest::GetSongs() { - emit UpdateStatus(query_id_, tr("Receiving songs...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving songs...")); + Q_EMIT UpdateProgress(query_id_, 0); AddSongsRequest(); } @@ -372,8 +372,8 @@ void SpotifyRequest::FlushSongsRequests() { void SpotifyRequest::ArtistsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddArtistsSearchRequest(); } @@ -386,8 +386,8 @@ void SpotifyRequest::AddArtistsSearchRequest(const int offset) { void SpotifyRequest::AlbumsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddAlbumsSearchRequest(); } @@ -400,8 +400,8 @@ void SpotifyRequest::AddAlbumsSearchRequest(const int offset) { void SpotifyRequest::SongsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddSongsSearchRequest(); } @@ -474,7 +474,7 @@ void SpotifyRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_ } if (offset_requested == 0) { - emit UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); } QJsonValue value_items = ExtractItems(obj_artists); @@ -528,7 +528,7 @@ void SpotifyRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_ } artists_received_ += artists_received; - if (offset_requested != 0) emit UpdateProgress(query_id_, GetProgress(artists_total_, artists_received_)); + if (offset_requested != 0) Q_EMIT UpdateProgress(query_id_, GetProgress(artists_total_, artists_received_)); ArtistsFinishCheck(limit_requested, offset, artists_received); @@ -556,9 +556,9 @@ void SpotifyRequest::ArtistsFinishCheck(const int limit, const int offset, const artist_albums_requests_pending_.clear(); if (artist_albums_requests_total_ > 0) { - if (artist_albums_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving albums for %1 artist...").arg(artist_albums_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving albums for %1 artists...").arg(artist_albums_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (artist_albums_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving albums for %1 artist...").arg(artist_albums_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving albums for %1 artists...").arg(artist_albums_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); } } @@ -610,7 +610,7 @@ void SpotifyRequest::ArtistAlbumsReplyReceived(QNetworkReply *reply, const Artis --artist_albums_requests_active_; ++artist_albums_requests_received_; - emit UpdateProgress(query_id_, GetProgress(artist_albums_requests_received_, artist_albums_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(artist_albums_requests_received_, artist_albums_requests_total_)); AlbumsReceived(reply, artist, 0, offset_requested); } @@ -813,7 +813,7 @@ void SpotifyRequest::AlbumsReceived(QNetworkReply *reply, const Artist &artist_a if (type_ == Type::FavouriteAlbums || type_ == Type::SearchAlbums) { albums_received_ += albums_received; - emit UpdateProgress(query_id_, GetProgress(albums_received_, albums_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(albums_received_, albums_total_)); } AlbumsFinishCheck(artist_artist, limit_requested, offset, albums_total, albums_received); @@ -862,9 +862,9 @@ void SpotifyRequest::AlbumsFinishCheck(const Artist &artist, const int limit, co album_songs_requests_pending_.clear(); if (album_songs_requests_total_ > 0) { - if (album_songs_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving songs for %1 album...").arg(album_songs_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving songs for %1 albums...").arg(album_songs_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (album_songs_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving songs for %1 album...").arg(album_songs_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving songs for %1 albums...").arg(album_songs_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); } } @@ -922,7 +922,7 @@ void SpotifyRequest::AlbumSongsReplyReceived(QNetworkReply *reply, const Artist --album_songs_requests_active_; ++album_songs_requests_received_; if (offset_requested == 0) { - emit UpdateProgress(query_id_, GetProgress(album_songs_requests_received_, album_songs_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(album_songs_requests_received_, album_songs_requests_total_)); } SongsReceived(reply, artist, album, 0, offset_requested); @@ -1028,7 +1028,7 @@ void SpotifyRequest::SongsReceived(QNetworkReply *reply, const Artist &artist, c if (type_ == Type::FavouriteSongs || type_ == Type::SearchSongs) { songs_received_ += songs_received; - emit UpdateProgress(query_id_, GetProgress(songs_received_, songs_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(songs_received_, songs_total_)); } SongsFinishCheck(artist, album, limit_requested, offset_requested, songs_total, songs_received); @@ -1209,9 +1209,9 @@ void SpotifyRequest::GetAlbumCovers() { AddAlbumCoverRequest(song); } - if (album_covers_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving album cover for %1 album...").arg(album_covers_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving album covers for %1 albums...").arg(album_covers_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (album_covers_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving album cover for %1 album...").arg(album_covers_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving album covers for %1 albums...").arg(album_covers_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); StartRequests(); @@ -1272,7 +1272,7 @@ void SpotifyRequest::AlbumCoverReceived(QNetworkReply *reply, const QString &alb if (finished_) return; - emit UpdateProgress(query_id_, GetProgress(album_covers_requests_received_, album_covers_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(album_covers_requests_received_, album_covers_requests_total_)); if (!album_covers_requests_sent_.contains(album_id)) { AlbumCoverFinishCheck(); @@ -1374,16 +1374,16 @@ void SpotifyRequest::FinishCheck() { finished_ = true; if (no_results_ && songs_.isEmpty()) { if (IsSearch()) - emit Results(query_id_, SongMap(), tr("No match.")); + Q_EMIT Results(query_id_, SongMap(), tr("No match.")); else - emit Results(query_id_, SongMap(), QString()); + Q_EMIT Results(query_id_, SongMap(), QString()); } else { if (songs_.isEmpty() && errors_.isEmpty()) { - emit Results(query_id_, songs_, tr("Data missing error")); + Q_EMIT Results(query_id_, songs_, tr("Data missing error")); } else { - emit Results(query_id_, songs_, ErrorsToHTML(errors_)); + Q_EMIT Results(query_id_, songs_, ErrorsToHTML(errors_)); } } } diff --git a/src/spotify/spotifyservice.cpp b/src/spotify/spotifyservice.cpp index 9d2943a42..d127267d7 100644 --- a/src/spotify/spotifyservice.cpp +++ b/src/spotify/spotifyservice.cpp @@ -194,7 +194,7 @@ void SpotifyService::ExitReceived() { QObject::disconnect(obj, nullptr, this, nullptr); qLog(Debug) << obj << "successfully exited."; wait_for_exit_.removeAll(obj); - if (wait_for_exit_.isEmpty()) emit ExitFinished(); + if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished(); } @@ -496,8 +496,8 @@ void SpotifyService::AccessTokenRequestFinished(QNetworkReply *reply) { qLog(Debug) << "Spotify: Authentication was successful, login expires in" << expires_in_; - emit LoginComplete(true); - emit LoginSuccess(); + Q_EMIT LoginComplete(true); + Q_EMIT LoginSuccess(); } @@ -514,7 +514,7 @@ void SpotifyService::ResetArtistsRequest() { void SpotifyService::GetArtists() { if (!authenticated()) { - emit ArtistsResults(SongMap(), tr("Not authenticated with Spotify.")); + Q_EMIT ArtistsResults(SongMap(), tr("Not authenticated with Spotify.")); ShowConfig(); return; } @@ -533,24 +533,24 @@ void SpotifyService::GetArtists() { void SpotifyService::ArtistsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit ArtistsResults(songs, error); + Q_EMIT ArtistsResults(songs, error); ResetArtistsRequest(); } void SpotifyService::ArtistsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit ArtistsUpdateStatus(text); + Q_EMIT ArtistsUpdateStatus(text); } void SpotifyService::ArtistsProgressSetMaximumReceived(const int id, const int max) { Q_UNUSED(id); - emit ArtistsProgressSetMaximum(max); + Q_EMIT ArtistsProgressSetMaximum(max); } void SpotifyService::ArtistsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit ArtistsUpdateProgress(progress); + Q_EMIT ArtistsUpdateProgress(progress); } void SpotifyService::ResetAlbumsRequest() { @@ -566,7 +566,7 @@ void SpotifyService::ResetAlbumsRequest() { void SpotifyService::GetAlbums() { if (!authenticated()) { - emit AlbumsResults(SongMap(), tr("Not authenticated with Spotify.")); + Q_EMIT AlbumsResults(SongMap(), tr("Not authenticated with Spotify.")); ShowConfig(); return; } @@ -585,24 +585,24 @@ void SpotifyService::GetAlbums() { void SpotifyService::AlbumsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit AlbumsResults(songs, error); + Q_EMIT AlbumsResults(songs, error); ResetAlbumsRequest(); } void SpotifyService::AlbumsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit AlbumsUpdateStatus(text); + Q_EMIT AlbumsUpdateStatus(text); } void SpotifyService::AlbumsProgressSetMaximumReceived(const int id, const int max) { Q_UNUSED(id); - emit AlbumsProgressSetMaximum(max); + Q_EMIT AlbumsProgressSetMaximum(max); } void SpotifyService::AlbumsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit AlbumsUpdateProgress(progress); + Q_EMIT AlbumsUpdateProgress(progress); } void SpotifyService::ResetSongsRequest() { @@ -618,7 +618,7 @@ void SpotifyService::ResetSongsRequest() { void SpotifyService::GetSongs() { if (!authenticated()) { - emit SongsResults(SongMap(), tr("Not authenticated with Spotify.")); + Q_EMIT SongsResults(SongMap(), tr("Not authenticated with Spotify.")); ShowConfig(); return; } @@ -637,24 +637,24 @@ void SpotifyService::GetSongs() { void SpotifyService::SongsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit SongsResults(songs, error); + Q_EMIT SongsResults(songs, error); ResetSongsRequest(); } void SpotifyService::SongsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit SongsUpdateStatus(text); + Q_EMIT SongsUpdateStatus(text); } void SpotifyService::SongsProgressSetMaximumReceived(const int id, const int max) { Q_UNUSED(id); - emit SongsProgressSetMaximum(max); + Q_EMIT SongsProgressSetMaximum(max); } void SpotifyService::SongsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit SongsUpdateProgress(progress); + Q_EMIT SongsUpdateProgress(progress); } int SpotifyService::Search(const QString &text, StreamingSearchView::SearchType type) { @@ -678,7 +678,7 @@ int SpotifyService::Search(const QString &text, StreamingSearchView::SearchType void SpotifyService::StartSearch() { if (!authenticated()) { - emit SearchResults(pending_search_id_, SongMap(), tr("Not authenticated with Spotify.")); + Q_EMIT SearchResults(pending_search_id_, SongMap(), tr("Not authenticated with Spotify.")); ShowConfig(); return; } @@ -726,7 +726,7 @@ void SpotifyService::SendSearch() { void SpotifyService::SearchResultsReceived(const int id, const SongMap &songs, const QString &error) { - emit SearchResults(id, songs, error); + Q_EMIT SearchResults(id, songs, error); search_request_.reset(); } @@ -742,8 +742,8 @@ void SpotifyService::LoginError(const QString &error, const QVariant &debug) { } if (debug.isValid()) qLog(Debug) << debug; - emit LoginFailure(error_html); - emit LoginComplete(false); + Q_EMIT LoginFailure(error_html); + Q_EMIT LoginComplete(false); login_errors_.clear(); diff --git a/src/streaming/streamingcollectionview.cpp b/src/streaming/streamingcollectionview.cpp index c6e506c62..82c1d9f84 100644 --- a/src/streaming/streamingcollectionview.cpp +++ b/src/streaming/streamingcollectionview.cpp @@ -242,7 +242,7 @@ void StreamingCollectionView::TotalSongCountUpdated(int count) { unsetCursor(); } - emit TotalSongCountUpdated_(); + Q_EMIT TotalSongCountUpdated_(); } @@ -259,7 +259,7 @@ void StreamingCollectionView::TotalArtistCountUpdated(int count) { unsetCursor(); } - emit TotalArtistCountUpdated_(); + Q_EMIT TotalArtistCountUpdated_(); } @@ -276,7 +276,7 @@ void StreamingCollectionView::TotalAlbumCountUpdated(int count) { unsetCursor(); } - emit TotalAlbumCountUpdated_(); + Q_EMIT TotalAlbumCountUpdated_(); } @@ -317,7 +317,7 @@ void StreamingCollectionView::mouseReleaseEvent(QMouseEvent *e) { QTreeView::mouseReleaseEvent(e); if (total_song_count_ == 0) { - emit GetSongs(); + Q_EMIT GetSongs(); } } @@ -369,13 +369,13 @@ void StreamingCollectionView::Load() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->clear_first_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } void StreamingCollectionView::AddToPlaylist() { - emit AddToPlaylistSignal(model()->mimeData(selectedIndexes())); + Q_EMIT AddToPlaylistSignal(model()->mimeData(selectedIndexes())); } @@ -385,7 +385,7 @@ void StreamingCollectionView::AddToPlaylistEnqueue() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->enqueue_now_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } @@ -395,7 +395,7 @@ void StreamingCollectionView::AddToPlaylistEnqueueNext() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->enqueue_next_now_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } @@ -405,13 +405,13 @@ void StreamingCollectionView::OpenInNewPlaylist() { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->open_in_new_playlist_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } void StreamingCollectionView::RemoveSelectedSongs() { - emit RemoveSongs(GetSelectedSongs()); + Q_EMIT RemoveSongs(GetSelectedSongs()); } @@ -459,7 +459,7 @@ void StreamingCollectionView::FilterReturnPressed() { if (!currentIndex().isValid()) return; - emit doubleClicked(currentIndex()); + Q_EMIT doubleClicked(currentIndex()); } diff --git a/src/streaming/streamingsearchview.cpp b/src/streaming/streamingsearchview.cpp index 245905497..9945aceaf 100644 --- a/src/streaming/streamingsearchview.cpp +++ b/src/streaming/streamingsearchview.cpp @@ -619,7 +619,7 @@ MimeData *StreamingSearchView::SelectedMimeData() { } void StreamingSearchView::AddSelectedToPlaylist() { - emit AddToPlaylist(SelectedMimeData()); + Q_EMIT AddToPlaylist(SelectedMimeData()); } void StreamingSearchView::LoadSelected() { @@ -628,7 +628,7 @@ void StreamingSearchView::LoadSelected() { if (!mimedata) return; mimedata->clear_first_ = true; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); } @@ -638,7 +638,7 @@ void StreamingSearchView::AddSelectedToPlaylistEnqueue() { if (!mimedata) return; mimedata->enqueue_now_ = true; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); } @@ -648,7 +648,7 @@ void StreamingSearchView::OpenSelectedInNewPlaylist() { if (!mimedata) return; mimedata->open_in_new_playlist_ = true; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); } @@ -762,7 +762,7 @@ void StreamingSearchView::AddArtists() { MimeData *mimedata = SelectedMimeData(); if (!mimedata) return; if (const StreamSongMimeData *streaming_song_data = qobject_cast(mimedata)) { - emit AddArtistsSignal(streaming_song_data->songs); + Q_EMIT AddArtistsSignal(streaming_song_data->songs); } } @@ -772,7 +772,7 @@ void StreamingSearchView::AddAlbums() { MimeData *mimedata = SelectedMimeData(); if (!mimedata) return; if (const StreamSongMimeData *streaming_song_data = qobject_cast(mimedata)) { - emit AddAlbumsSignal(streaming_song_data->songs); + Q_EMIT AddAlbumsSignal(streaming_song_data->songs); } } @@ -782,7 +782,7 @@ void StreamingSearchView::AddSongs() { MimeData *mimedata = SelectedMimeData(); if (!mimedata) return; if (const StreamSongMimeData *streaming_song_data = qobject_cast(mimedata)) { - emit AddSongsSignal(streaming_song_data->songs); + Q_EMIT AddSongsSignal(streaming_song_data->songs); } } diff --git a/src/streaming/streamingservices.cpp b/src/streaming/streamingservices.cpp index cd18befaf..a69824a30 100644 --- a/src/streaming/streamingservices.cpp +++ b/src/streaming/streamingservices.cpp @@ -84,7 +84,7 @@ void StreamingServices::Exit() { QObject::connect(&*service, &StreamingService::ExitFinished, this, &StreamingServices::ExitReceived); service->Exit(); } - if (wait_for_exit_.isEmpty()) emit ExitFinished(); + if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished(); } @@ -92,6 +92,6 @@ void StreamingServices::ExitReceived() { StreamingService *service = qobject_cast(sender()); wait_for_exit_.removeAll(service); - if (wait_for_exit_.isEmpty()) emit ExitFinished(); + if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished(); } diff --git a/src/subsonic/subsonicrequest.cpp b/src/subsonic/subsonicrequest.cpp index 8fb1f298b..0e89be0bb 100644 --- a/src/subsonic/subsonicrequest.cpp +++ b/src/subsonic/subsonicrequest.cpp @@ -124,8 +124,8 @@ void SubsonicRequest::Reset() { void SubsonicRequest::GetAlbums() { - emit UpdateStatus(tr("Retrieving albums...")); - emit UpdateProgress(0); + Q_EMIT UpdateStatus(tr("Retrieving albums...")); + Q_EMIT UpdateProgress(0); AddAlbumsRequest(); } @@ -313,10 +313,10 @@ void SubsonicRequest::AlbumsFinishCheck(const int offset, const int size, const album_songs_requests_pending_.clear(); if (album_songs_requested_ > 0) { - if (album_songs_requested_ == 1) emit UpdateStatus(tr("Retrieving songs for %1 album...").arg(album_songs_requested_)); - else emit UpdateStatus(tr("Retrieving songs for %1 albums...").arg(album_songs_requested_)); - emit ProgressSetMaximum(album_songs_requested_); - emit UpdateProgress(0); + if (album_songs_requested_ == 1) Q_EMIT UpdateStatus(tr("Retrieving songs for %1 album...").arg(album_songs_requested_)); + else Q_EMIT UpdateStatus(tr("Retrieving songs for %1 albums...").arg(album_songs_requested_)); + Q_EMIT ProgressSetMaximum(album_songs_requested_); + Q_EMIT UpdateProgress(0); } } @@ -362,7 +362,7 @@ void SubsonicRequest::AlbumSongsReplyReceived(QNetworkReply *reply, const QStrin --album_songs_requests_active_; ++album_songs_received_; - emit UpdateProgress(album_songs_received_); + Q_EMIT UpdateProgress(album_songs_received_); QByteArray data = GetReplyData(reply); @@ -687,10 +687,10 @@ void SubsonicRequest::GetAlbumCovers() { } FlushAlbumCoverRequests(); - if (album_covers_requested_ == 1) emit UpdateStatus(tr("Retrieving album cover for %1 album...").arg(album_covers_requested_)); - else emit UpdateStatus(tr("Retrieving album covers for %1 albums...").arg(album_covers_requested_)); - emit ProgressSetMaximum(album_covers_requested_); - emit UpdateProgress(0); + if (album_covers_requested_ == 1) Q_EMIT UpdateStatus(tr("Retrieving album cover for %1 album...").arg(album_covers_requested_)); + else Q_EMIT UpdateStatus(tr("Retrieving album covers for %1 albums...").arg(album_covers_requested_)); + Q_EMIT ProgressSetMaximum(album_covers_requested_); + Q_EMIT UpdateProgress(0); } @@ -779,7 +779,7 @@ void SubsonicRequest::AlbumCoverReceived(QNetworkReply *reply, const AlbumCoverR if (finished_) return; - emit UpdateProgress(album_covers_received_); + Q_EMIT UpdateProgress(album_covers_received_); if (!album_covers_requests_sent_.contains(request.cover_id)) { AlbumCoverFinishCheck(); @@ -876,14 +876,14 @@ void SubsonicRequest::FinishCheck() { ) { finished_ = true; if (no_results_ && songs_.isEmpty()) { - emit Results(SongMap(), QString()); + Q_EMIT Results(SongMap(), QString()); } else { if (songs_.isEmpty() && errors_.isEmpty()) { - emit Results(songs_, tr("Unknown error")); + Q_EMIT Results(songs_, tr("Unknown error")); } else { - emit Results(songs_, ErrorsToHTML(errors_)); + Q_EMIT Results(songs_, ErrorsToHTML(errors_)); } } diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp index 990c8315c..476a7c757 100644 --- a/src/subsonic/subsonicservice.cpp +++ b/src/subsonic/subsonicservice.cpp @@ -338,8 +338,8 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply, const QUrl &url, con } //int status = obj_error["code"].toInt(); QString message = obj_error[QLatin1String("message")].toString(); - emit TestComplete(false, message); - emit TestFailure(message); + Q_EMIT TestComplete(false, message); + Q_EMIT TestFailure(message); return; } @@ -352,13 +352,13 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply, const QUrl &url, con QString message = obj_response[QLatin1String("message")].toString(); if (status == QLatin1String("failed")) { - emit TestComplete(false, message); - emit TestFailure(message); + Q_EMIT TestComplete(false, message); + Q_EMIT TestFailure(message); return; } if (status == QLatin1String("ok")) { - emit TestComplete(true); - emit TestSuccess(); + Q_EMIT TestComplete(true); + Q_EMIT TestSuccess(); return; } @@ -369,15 +369,15 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply, const QUrl &url, con void SubsonicService::CheckConfiguration() { if (server_url_.isEmpty()) { - emit TestComplete(false, QStringLiteral("Missing Subsonic server url.")); + Q_EMIT TestComplete(false, QStringLiteral("Missing Subsonic server url.")); return; } if (username_.isEmpty()) { - emit TestComplete(false, QStringLiteral("Missing Subsonic username.")); + Q_EMIT TestComplete(false, QStringLiteral("Missing Subsonic username.")); return; } if (password_.isEmpty()) { - emit TestComplete(false, QStringLiteral("Missing Subsonic password.")); + Q_EMIT TestComplete(false, QStringLiteral("Missing Subsonic password.")); return; } @@ -411,12 +411,12 @@ void SubsonicService::ResetSongsRequest() { void SubsonicService::GetSongs() { if (!server_url().isValid()) { - emit SongsResults(SongMap(), tr("Server URL is invalid.")); + Q_EMIT SongsResults(SongMap(), tr("Server URL is invalid.")); return; } if (username().isEmpty() || password().isEmpty()) { - emit SongsResults(SongMap(), tr("Missing username or password.")); + Q_EMIT SongsResults(SongMap(), tr("Missing username or password.")); return; } @@ -439,7 +439,7 @@ void SubsonicService::DeleteSongs() { void SubsonicService::SongsResultsReceived(const SongMap &songs, const QString &error) { - emit SongsResults(songs, error); + Q_EMIT SongsResults(songs, error); ResetSongsRequest(); @@ -456,8 +456,8 @@ void SubsonicService::PingError(const QString &error, const QVariant &debug) { } if (debug.isValid()) qLog(Debug) << debug; - emit TestFailure(error_html); - emit TestComplete(false, error_html); + Q_EMIT TestFailure(error_html); + Q_EMIT TestComplete(false, error_html); errors_.clear(); diff --git a/src/tidal/tidalbaserequest.cpp b/src/tidal/tidalbaserequest.cpp index da8ac02ca..dbe115b15 100644 --- a/src/tidal/tidalbaserequest.cpp +++ b/src/tidal/tidalbaserequest.cpp @@ -127,7 +127,7 @@ QByteArray TidalBaseRequest::GetReplyData(QNetworkReply *reply, const bool send_ } else { qLog(Info) << "Tidal:" << "Attempting to login."; - emit RequestLogin(); + Q_EMIT RequestLogin(); } } else { diff --git a/src/tidal/tidalfavoriterequest.cpp b/src/tidal/tidalfavoriterequest.cpp index 2c1334a54..3aa56f9cd 100644 --- a/src/tidal/tidalfavoriterequest.cpp +++ b/src/tidal/tidalfavoriterequest.cpp @@ -178,13 +178,13 @@ void TidalFavoriteRequest::AddFavoritesReply(QNetworkReply *reply, const Favorit switch (type) { case FavoriteType::Artists: - emit ArtistsAdded(songs); + Q_EMIT ArtistsAdded(songs); break; case FavoriteType::Albums: - emit AlbumsAdded(songs); + Q_EMIT AlbumsAdded(songs); break; case FavoriteType::Songs: - emit SongsAdded(songs); + Q_EMIT SongsAdded(songs); break; } @@ -286,13 +286,13 @@ void TidalFavoriteRequest::RemoveFavoritesReply(QNetworkReply *reply, const Favo switch (type) { case FavoriteType::Artists: - emit ArtistsRemoved(songs); + Q_EMIT ArtistsRemoved(songs); break; case FavoriteType::Albums: - emit AlbumsRemoved(songs); + Q_EMIT AlbumsRemoved(songs); break; case FavoriteType::Songs: - emit SongsRemoved(songs); + Q_EMIT SongsRemoved(songs); break; } diff --git a/src/tidal/tidalrequest.cpp b/src/tidal/tidalrequest.cpp index 54cb08958..ab0cde024 100644 --- a/src/tidal/tidalrequest.cpp +++ b/src/tidal/tidalrequest.cpp @@ -143,7 +143,7 @@ void TidalRequest::LoginComplete(const bool success, const QString &error) { void TidalRequest::Process() { if (!service_->authenticated()) { - emit UpdateStatus(query_id_, tr("Authenticating...")); + Q_EMIT UpdateStatus(query_id_, tr("Authenticating...")); need_login_ = true; service_->TryLogin(); return; @@ -226,8 +226,8 @@ void TidalRequest::Search(const int query_id, const QString &search_text) { void TidalRequest::GetArtists() { - emit UpdateStatus(query_id_, tr("Receiving artists...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving artists...")); + Q_EMIT UpdateProgress(query_id_, 0); AddArtistsRequest(); } @@ -274,8 +274,8 @@ void TidalRequest::FlushArtistsRequests() { void TidalRequest::GetAlbums() { - emit UpdateStatus(query_id_, tr("Receiving albums...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving albums...")); + Q_EMIT UpdateProgress(query_id_, 0); AddAlbumsRequest(); } @@ -322,8 +322,8 @@ void TidalRequest::FlushAlbumsRequests() { void TidalRequest::GetSongs() { - emit UpdateStatus(query_id_, tr("Receiving songs...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Receiving songs...")); + Q_EMIT UpdateProgress(query_id_, 0); AddSongsRequest(); } @@ -370,8 +370,8 @@ void TidalRequest::FlushSongsRequests() { void TidalRequest::ArtistsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddArtistsSearchRequest(); } @@ -384,8 +384,8 @@ void TidalRequest::AddArtistsSearchRequest(const int offset) { void TidalRequest::AlbumsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddAlbumsSearchRequest(); } @@ -398,8 +398,8 @@ void TidalRequest::AddAlbumsSearchRequest(const int offset) { void TidalRequest::SongsSearch() { - emit UpdateStatus(query_id_, tr("Searching...")); - emit UpdateProgress(query_id_, 0); + Q_EMIT UpdateStatus(query_id_, tr("Searching...")); + Q_EMIT UpdateProgress(query_id_, 0); AddSongsSearchRequest(); } @@ -463,7 +463,7 @@ void TidalRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_re } if (offset_requested == 0) { - emit UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); } QJsonValue value_items = ExtractItems(json_obj); @@ -521,7 +521,7 @@ void TidalRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_re } artists_received_ += artists_received; - if (offset_requested != 0) emit UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); + if (offset_requested != 0) Q_EMIT UpdateProgress(query_id_, GetProgress(artists_received_, artists_total_)); ArtistsFinishCheck(limit_requested, offset, artists_received); @@ -549,9 +549,9 @@ void TidalRequest::ArtistsFinishCheck(const int limit, const int offset, const i artist_albums_requests_pending_.clear(); if (artist_albums_requests_total_ > 0) { - if (artist_albums_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving albums for %1 artist...").arg(artist_albums_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving albums for %1 artists...").arg(artist_albums_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (artist_albums_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving albums for %1 artist...").arg(artist_albums_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving albums for %1 artists...").arg(artist_albums_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); } } @@ -603,7 +603,7 @@ void TidalRequest::ArtistAlbumsReplyReceived(QNetworkReply *reply, const Artist --artist_albums_requests_active_; ++artist_albums_requests_received_; - emit UpdateProgress(query_id_, GetProgress(artist_albums_requests_received_, artist_albums_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(artist_albums_requests_received_, artist_albums_requests_total_)); AlbumsReceived(reply, artist, 0, offset_requested, false); } @@ -770,7 +770,7 @@ void TidalRequest::AlbumsReceived(QNetworkReply *reply, const Artist &artist_req if (query_type_ == Type::FavouriteAlbums || query_type_ == Type::SearchAlbums) { albums_received_ += albums_received; - emit UpdateProgress(query_id_, GetProgress(albums_received_, albums_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(albums_received_, albums_total_)); } AlbumsFinishCheck(artist_requested, limit_requested, offset, albums_total, albums_received); @@ -819,9 +819,9 @@ void TidalRequest::AlbumsFinishCheck(const Artist &artist, const int limit, cons album_songs_requests_pending_.clear(); if (album_songs_requests_total_ > 0) { - if (album_songs_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving songs for %1 album...").arg(album_songs_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving songs for %1 albums...").arg(album_songs_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (album_songs_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving songs for %1 album...").arg(album_songs_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving songs for %1 albums...").arg(album_songs_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); } } @@ -879,7 +879,7 @@ void TidalRequest::AlbumSongsReplyReceived(QNetworkReply *reply, const Artist &a --album_songs_requests_active_; ++album_songs_requests_received_; if (offset_requested == 0) { - emit UpdateProgress(query_id_, GetProgress(album_songs_requests_received_, album_songs_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(album_songs_requests_received_, album_songs_requests_total_)); } SongsReceived(reply, artist, album, 0, offset_requested, false); @@ -976,7 +976,7 @@ void TidalRequest::SongsReceived(QNetworkReply *reply, const Artist &artist, con if (query_type_ == Type::FavouriteSongs || query_type_ == Type::SearchSongs) { songs_received_ += songs_received; - emit UpdateProgress(query_id_, GetProgress(songs_received_, songs_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(songs_received_, songs_total_)); } SongsFinishCheck(artist, album, limit_requested, offset_requested, songs_total, songs_received); @@ -1196,9 +1196,9 @@ void TidalRequest::GetAlbumCovers() { AddAlbumCoverRequest(song); } - if (album_covers_requests_total_ == 1) emit UpdateStatus(query_id_, tr("Receiving album cover for %1 album...").arg(album_covers_requests_total_)); - else emit UpdateStatus(query_id_, tr("Receiving album covers for %1 albums...").arg(album_covers_requests_total_)); - emit UpdateProgress(query_id_, 0); + if (album_covers_requests_total_ == 1) Q_EMIT UpdateStatus(query_id_, tr("Receiving album cover for %1 album...").arg(album_covers_requests_total_)); + else Q_EMIT UpdateStatus(query_id_, tr("Receiving album covers for %1 albums...").arg(album_covers_requests_total_)); + Q_EMIT UpdateProgress(query_id_, 0); StartRequests(); @@ -1259,7 +1259,7 @@ void TidalRequest::AlbumCoverReceived(QNetworkReply *reply, const QString &album if (finished_) return; - emit UpdateProgress(query_id_, GetProgress(album_covers_requests_received_, album_covers_requests_total_)); + Q_EMIT UpdateProgress(query_id_, GetProgress(album_covers_requests_received_, album_covers_requests_total_)); if (!album_covers_requests_sent_.contains(album_id)) { AlbumCoverFinishCheck(); @@ -1363,18 +1363,18 @@ void TidalRequest::FinishCheck() { if (songs_.isEmpty()) { if (errors_.isEmpty()) { if (IsSearch()) { - emit Results(query_id_, SongMap(), tr("No match.")); + Q_EMIT Results(query_id_, SongMap(), tr("No match.")); } else { - emit Results(query_id_); + Q_EMIT Results(query_id_); } } else { - emit Results(query_id_, SongMap(), ErrorsToHTML(errors_)); + Q_EMIT Results(query_id_, SongMap(), ErrorsToHTML(errors_)); } } else { - emit Results(query_id_, songs_); + Q_EMIT Results(query_id_, songs_); } } diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index fb5270f5f..3d012c737 100644 --- a/src/tidal/tidalservice.cpp +++ b/src/tidal/tidalservice.cpp @@ -220,7 +220,7 @@ void TidalService::ExitReceived() { QObject::disconnect(obj, nullptr, this, nullptr); qLog(Debug) << obj << "successfully exited."; wait_for_exit_.removeAll(obj); - if (wait_for_exit_.isEmpty()) emit ExitFinished(); + if (wait_for_exit_.isEmpty()) Q_EMIT ExitFinished(); } @@ -339,8 +339,8 @@ void TidalService::AuthorizationUrlReceived(const QUrl &url) { s.remove("session_id"); s.endGroup(); - emit LoginComplete(true); - emit LoginSuccess(); + Q_EMIT LoginComplete(true); + Q_EMIT LoginSuccess(); } else if (url_query.hasQueryItem(QStringLiteral("code")) && url_query.hasQueryItem(QStringLiteral("state"))) { @@ -510,8 +510,8 @@ void TidalService::AccessTokenRequestFinished(QNetworkReply *reply) { qLog(Debug) << "Tidal: Login successful" << "user id" << user_id_; - emit LoginComplete(true); - emit LoginSuccess(); + Q_EMIT LoginComplete(true); + Q_EMIT LoginSuccess(); } @@ -650,8 +650,8 @@ void TidalService::HandleAuthReply(QNetworkReply *reply) { login_attempts_ = 0; timer_login_attempt_->stop(); - emit LoginComplete(true); - emit LoginSuccess(); + Q_EMIT LoginComplete(true); + Q_EMIT LoginSuccess(); } @@ -687,23 +687,23 @@ void TidalService::TryLogin() { if (authenticated() || login_sent_) return; if (api_token_.isEmpty()) { - emit LoginComplete(false, tr("Missing Tidal API token.")); + Q_EMIT LoginComplete(false, tr("Missing Tidal API token.")); return; } if (username_.isEmpty()) { - emit LoginComplete(false, tr("Missing Tidal username.")); + Q_EMIT LoginComplete(false, tr("Missing Tidal username.")); return; } if (password_.isEmpty()) { - emit LoginComplete(false, tr("Missing Tidal password.")); + Q_EMIT LoginComplete(false, tr("Missing Tidal password.")); return; } if (login_attempts_ >= kLoginAttempts) { - emit LoginComplete(false, tr("Not authenticated with Tidal and reached maximum number of login attempts.")); + Q_EMIT LoginComplete(false, tr("Not authenticated with Tidal and reached maximum number of login attempts.")); return; } - emit RequestLogin(); + Q_EMIT RequestLogin(); } @@ -721,12 +721,12 @@ void TidalService::GetArtists() { if (!authenticated()) { if (oauth_) { - emit ArtistsResults(SongMap(), tr("Not authenticated with Tidal.")); + Q_EMIT ArtistsResults(SongMap(), tr("Not authenticated with Tidal.")); ShowConfig(); return; } else if (api_token_.isEmpty() || username_.isEmpty() || password_.isEmpty()) { - emit ArtistsResults(SongMap(), tr("Missing Tidal API token, username or password.")); + Q_EMIT ArtistsResults(SongMap(), tr("Missing Tidal API token, username or password.")); ShowConfig(); return; } @@ -747,19 +747,19 @@ void TidalService::GetArtists() { void TidalService::ArtistsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit ArtistsResults(songs, error); + Q_EMIT ArtistsResults(songs, error); ResetArtistsRequest(); } void TidalService::ArtistsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit ArtistsUpdateStatus(text); + Q_EMIT ArtistsUpdateStatus(text); } void TidalService::ArtistsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit ArtistsUpdateProgress(progress); + Q_EMIT ArtistsUpdateProgress(progress); } void TidalService::ResetAlbumsRequest() { @@ -776,12 +776,12 @@ void TidalService::GetAlbums() { if (!authenticated()) { if (oauth_) { - emit AlbumsResults(SongMap(), tr("Not authenticated with Tidal.")); + Q_EMIT AlbumsResults(SongMap(), tr("Not authenticated with Tidal.")); ShowConfig(); return; } else if (api_token_.isEmpty() || username_.isEmpty() || password_.isEmpty()) { - emit AlbumsResults(SongMap(), tr("Missing Tidal API token, username or password.")); + Q_EMIT AlbumsResults(SongMap(), tr("Missing Tidal API token, username or password.")); ShowConfig(); return; } @@ -802,19 +802,19 @@ void TidalService::GetAlbums() { void TidalService::AlbumsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit AlbumsResults(songs, error); + Q_EMIT AlbumsResults(songs, error); ResetAlbumsRequest(); } void TidalService::AlbumsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit AlbumsUpdateStatus(text); + Q_EMIT AlbumsUpdateStatus(text); } void TidalService::AlbumsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit AlbumsUpdateProgress(progress); + Q_EMIT AlbumsUpdateProgress(progress); } void TidalService::ResetSongsRequest() { @@ -831,12 +831,12 @@ void TidalService::GetSongs() { if (!authenticated()) { if (oauth_) { - emit SongsResults(SongMap(), tr("Not authenticated with Tidal.")); + Q_EMIT SongsResults(SongMap(), tr("Not authenticated with Tidal.")); ShowConfig(); return; } else if (api_token_.isEmpty() || username_.isEmpty() || password_.isEmpty()) { - emit SongsResults(SongMap(), tr("Missing Tidal API token, username or password.")); + Q_EMIT SongsResults(SongMap(), tr("Missing Tidal API token, username or password.")); ShowConfig(); return; } @@ -857,19 +857,19 @@ void TidalService::GetSongs() { void TidalService::SongsResultsReceived(const int id, const SongMap &songs, const QString &error) { Q_UNUSED(id); - emit SongsResults(songs, error); + Q_EMIT SongsResults(songs, error); ResetSongsRequest(); } void TidalService::SongsUpdateStatusReceived(const int id, const QString &text) { Q_UNUSED(id); - emit SongsUpdateStatus(text); + Q_EMIT SongsUpdateStatus(text); } void TidalService::SongsUpdateProgressReceived(const int id, const int progress) { Q_UNUSED(id); - emit SongsUpdateProgress(progress); + Q_EMIT SongsUpdateProgress(progress); } int TidalService::Search(const QString &text, StreamingSearchView::SearchType type) { @@ -894,12 +894,12 @@ void TidalService::StartSearch() { if (!authenticated()) { if (oauth_) { - emit SearchResults(pending_search_id_, SongMap(), tr("Not authenticated with Tidal.")); + Q_EMIT SearchResults(pending_search_id_, SongMap(), tr("Not authenticated with Tidal.")); ShowConfig(); return; } else if (api_token_.isEmpty() || username_.isEmpty() || password_.isEmpty()) { - emit SearchResults(pending_search_id_, SongMap(), tr("Missing Tidal API token, username or password.")); + Q_EMIT SearchResults(pending_search_id_, SongMap(), tr("Missing Tidal API token, username or password.")); ShowConfig(); return; } @@ -949,7 +949,7 @@ void TidalService::SendSearch() { void TidalService::SearchResultsReceived(const int id, const SongMap &songs, const QString &error) { - emit SearchResults(id, songs, error); + Q_EMIT SearchResults(id, songs, error); search_request_.reset(); } @@ -989,7 +989,7 @@ void TidalService::HandleStreamURLFailure(const uint id, const QUrl &media_url, if (!stream_url_requests_.contains(id)) return; stream_url_requests_.remove(id); - emit StreamURLFailure(id, media_url, error); + Q_EMIT StreamURLFailure(id, media_url, error); } @@ -998,7 +998,7 @@ void TidalService::HandleStreamURLSuccess(const uint id, const QUrl &media_url, if (!stream_url_requests_.contains(id)) return; stream_url_requests_.remove(id); - emit StreamURLSuccess(id, media_url, stream_url, filetype, samplerate, bit_depth, duration); + Q_EMIT StreamURLSuccess(id, media_url, stream_url, filetype, samplerate, bit_depth, duration); } @@ -1013,8 +1013,8 @@ void TidalService::LoginError(const QString &error, const QVariant &debug) { } if (debug.isValid()) qLog(Debug) << debug; - emit LoginFailure(error_html); - emit LoginComplete(false, error_html); + Q_EMIT LoginFailure(error_html); + Q_EMIT LoginComplete(false, error_html); login_errors_.clear(); diff --git a/src/tidal/tidalstreamurlrequest.cpp b/src/tidal/tidalstreamurlrequest.cpp index 4940259ce..14aae8e2b 100644 --- a/src/tidal/tidalstreamurlrequest.cpp +++ b/src/tidal/tidalstreamurlrequest.cpp @@ -68,7 +68,7 @@ void TidalStreamURLRequest::LoginComplete(const bool success, const QString &err need_login_ = false; if (!success) { - emit StreamURLFailure(id_, media_url_, error); + Q_EMIT StreamURLFailure(id_, media_url_, error); return; } @@ -80,15 +80,15 @@ void TidalStreamURLRequest::Process() { if (!authenticated()) { if (oauth()) { - emit StreamURLFailure(id_, media_url_, tr("Not authenticated with Tidal.")); + Q_EMIT StreamURLFailure(id_, media_url_, tr("Not authenticated with Tidal.")); return; } else if (api_token().isEmpty() || username().isEmpty() || password().isEmpty()) { - emit StreamURLFailure(id_, media_url_, tr("Missing Tidal API token, username or password.")); + Q_EMIT StreamURLFailure(id_, media_url_, tr("Missing Tidal API token, username or password.")); return; } need_login_ = true; - emit TryLogin(); + Q_EMIT TryLogin(); return; } @@ -102,7 +102,7 @@ void TidalStreamURLRequest::Cancel() { reply_->abort(); } else { - emit StreamURLFailure(id_, media_url_, tr("Cancelled.")); + Q_EMIT StreamURLFailure(id_, media_url_, tr("Cancelled.")); } } @@ -159,19 +159,19 @@ void TidalStreamURLRequest::StreamURLReceived() { need_login_ = true; return; } - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } QJsonObject json_obj = ExtractJsonObj(data); if (json_obj.isEmpty()) { - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } if (!json_obj.contains(QLatin1String("trackId"))) { Error(QStringLiteral("Invalid Json reply, stream missing trackId."), json_obj); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } int track_id = json_obj[QLatin1String("trackId")].toInt(); @@ -211,7 +211,7 @@ void TidalStreamURLRequest::StreamURLReceived() { json_obj = ExtractJsonObj(data_manifest); if (json_obj.isEmpty()) { - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } @@ -220,14 +220,14 @@ void TidalStreamURLRequest::StreamURLReceived() { QString key_id = json_obj[QLatin1String("keyId")].toString(); if (!encryption_type.isEmpty() && !key_id.isEmpty()) { Error(tr("Received URL with %1 encrypted stream from Tidal. Strawberry does not currently support encrypted streams.").arg(encryption_type)); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } } if (!json_obj.contains(QLatin1String("mimeType"))) { Error(QStringLiteral("Invalid Json reply, stream url reply manifest is missing mimeType."), json_obj); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } @@ -250,7 +250,7 @@ void TidalStreamURLRequest::StreamURLReceived() { QJsonValue json_urls = json_obj[QLatin1String("urls")]; if (!json_urls.isArray()) { Error(QStringLiteral("Invalid Json reply, urls is not an array."), json_urls); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } const QJsonArray json_array_urls = json_urls.toArray(); @@ -273,7 +273,7 @@ void TidalStreamURLRequest::StreamURLReceived() { QString encryption_key = json_obj[QLatin1String("encryptionKey")].toString(); if (!encryption_key.isEmpty()) { Error(tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams.")); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } } @@ -283,18 +283,18 @@ void TidalStreamURLRequest::StreamURLReceived() { QString security_token = json_obj[QLatin1String("securityToken")].toString(); if (!security_type.isEmpty() && !security_token.isEmpty()) { Error(tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams.")); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } } if (urls.isEmpty()) { Error(QStringLiteral("Missing stream urls."), json_obj); - emit StreamURLFailure(id_, media_url_, errors_.constFirst()); + Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst()); return; } - emit StreamURLSuccess(id_, media_url_, urls.first(), filetype); + Q_EMIT StreamURLSuccess(id_, media_url_, urls.first(), filetype); } diff --git a/src/tidal/tidalurlhandler.cpp b/src/tidal/tidalurlhandler.cpp index 30707e217..367d85c13 100644 --- a/src/tidal/tidalurlhandler.cpp +++ b/src/tidal/tidalurlhandler.cpp @@ -65,7 +65,7 @@ void TidalUrlHandler::GetStreamURLFailure(const uint id, const QUrl &media_url, Request req = requests_.take(id); CancelTask(req.task_id); - emit AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::Error, error)); + Q_EMIT AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::Error, error)); } @@ -75,7 +75,7 @@ void TidalUrlHandler::GetStreamURLSuccess(const uint id, const QUrl &media_url, Request req = requests_.take(id); CancelTask(req.task_id); - emit AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::TrackAvailable, stream_url, filetype, samplerate, bit_depth, duration)); + Q_EMIT AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::TrackAvailable, stream_url, filetype, samplerate, bit_depth, duration)); } diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp index e97d6c05b..3c978e565 100644 --- a/src/transcoder/transcoder.cpp +++ b/src/transcoder/transcoder.cpp @@ -70,7 +70,7 @@ GstElement *Transcoder::CreateElement(const QString &factory_name, GstElement *b SetElementProperties(factory_name, G_OBJECT(ret)); } else { - emit LogLine(tr("Could not create the GStreamer element \"%1\" - make sure you have all the required GStreamer plugins installed").arg(factory_name)); + Q_EMIT LogLine(tr("Could not create the GStreamer element \"%1\" - make sure you have all the required GStreamer plugins installed").arg(factory_name)); } return ret; @@ -96,7 +96,7 @@ GstElement *Transcoder::CreateElementForMimeType(GstElementFactoryListType eleme // HACK: Force mp4mux because it doesn't set any useful src caps if (mime_type == QLatin1String("audio/mp4")) { - emit LogLine(QStringLiteral("Using '%1' (rank %2)").arg(QLatin1String("mp4mux")).arg(-1)); + Q_EMIT LogLine(QStringLiteral("Using '%1' (rank %2)").arg(QLatin1String("mp4mux")).arg(-1)); return CreateElement(QStringLiteral("mp4mux"), bin); } @@ -135,12 +135,12 @@ GstElement *Transcoder::CreateElementForMimeType(GstElementFactoryListType eleme std::sort(suitable_elements_.begin(), suitable_elements_.end()); const SuitableElement &best = suitable_elements_.last(); - emit LogLine(QStringLiteral("Using '%1' (rank %2)").arg(best.name_).arg(best.rank_)); + Q_EMIT LogLine(QStringLiteral("Using '%1' (rank %2)").arg(best.name_).arg(best.rank_)); if (best.name_ == QLatin1String("lamemp3enc")) { // Special case: we need to add xingmux and id3v2mux to the pipeline when using lamemp3enc because it doesn't write the VBR or ID3v2 headers itself. - emit LogLine(QStringLiteral("Adding xingmux and id3v2mux to the pipeline")); + Q_EMIT LogLine(QStringLiteral("Adding xingmux and id3v2mux to the pipeline")); // Create the bin GstElement *mp3bin = gst_bin_new("mp3bin"); @@ -181,7 +181,7 @@ Transcoder::JobFinishedEvent::JobFinishedEvent(JobState *state, bool success) void Transcoder::JobState::PostFinished(const bool success) { if (success) { - emit parent_->LogLine(tr("Successfully written %1").arg(QDir::toNativeSeparators(job_.output))); + Q_EMIT parent_->LogLine(tr("Successfully written %1").arg(QDir::toNativeSeparators(job_.output))); } QCoreApplication::postEvent(parent_, new Transcoder::JobFinishedEvent(this, success)); @@ -319,7 +319,7 @@ void Transcoder::AddJob(const QString &input, const TranscoderPreset &preset, co void Transcoder::Start() { - emit LogLine(tr("Transcoding %1 files using %2 threads").arg(queued_jobs_.count()).arg(max_threads())); + Q_EMIT LogLine(tr("Transcoding %1 files using %2 threads").arg(queued_jobs_.count()).arg(max_threads())); forever { StartJobStatus status = MaybeStartNextJob(); @@ -333,7 +333,7 @@ Transcoder::StartJobStatus Transcoder::MaybeStartNextJob() { if (current_jobs_.count() >= max_threads()) return StartJobStatus::AllThreadsBusy; if (queued_jobs_.isEmpty()) { if (current_jobs_.isEmpty()) { - emit AllJobsComplete(); + Q_EMIT AllJobsComplete(); } return StartJobStatus::NoMoreJobs; @@ -344,7 +344,7 @@ Transcoder::StartJobStatus Transcoder::MaybeStartNextJob() { return StartJobStatus::StartedSuccessfully; } - emit JobComplete(job.input, job.output, false); + Q_EMIT JobComplete(job.input, job.output, false); return StartJobStatus::FailedToStart; } @@ -396,7 +396,7 @@ void Transcoder::JobState::ReportError(GstMessage *msg) const { g_error_free(error); g_free(debugs); - emit parent_->LogLine(tr("Error processing %1: %2").arg(QDir::toNativeSeparators(job_.input), message)); + Q_EMIT parent_->LogLine(tr("Error processing %1: %2").arg(QDir::toNativeSeparators(job_.input), message)); } @@ -404,7 +404,7 @@ bool Transcoder::StartJob(const Job &job) { SharedPtr state = make_shared(job, this); - emit LogLine(tr("Starting %1").arg(QDir::toNativeSeparators(job.input))); + Q_EMIT LogLine(tr("Starting %1").arg(QDir::toNativeSeparators(job.input))); // Create the pipeline. // This should be a scoped_ptr, but scoped_ptr doesn't support custom destructors. @@ -423,12 +423,12 @@ bool Transcoder::StartJob(const Job &job) { if (!src || !decode || !convert || !sink) return false; if (!codec && !job.preset.codec_mimetype_.isEmpty()) { - emit LogLine(tr("Couldn't find an encoder for %1, check you have the correct GStreamer plugins installed").arg(job.preset.codec_mimetype_)); + Q_EMIT LogLine(tr("Couldn't find an encoder for %1, check you have the correct GStreamer plugins installed").arg(job.preset.codec_mimetype_)); return false; } if (!muxer && !job.preset.muxer_mimetype_.isEmpty()) { - emit LogLine(tr("Couldn't find a muxer for %1, check you have the correct GStreamer plugins installed").arg(job.preset.muxer_mimetype_)); + Q_EMIT LogLine(tr("Couldn't find a muxer for %1, check you have the correct GStreamer plugins installed").arg(job.preset.muxer_mimetype_)); return false; } @@ -493,7 +493,7 @@ bool Transcoder::event(QEvent *e) { current_jobs_.erase(it); // Emit the finished signal - emit JobComplete(input, output, finished_event->success_); + Q_EMIT JobComplete(input, output, finished_event->success_); // Start some more jobs MaybeStartNextJob(); @@ -570,7 +570,7 @@ void Transcoder::SetElementProperties(const QString &name, GObject *object) { continue; } - emit LogLine(QStringLiteral("Setting %1 property: %2 = %3").arg(name, QString::fromUtf8(property->name), value.toString())); + Q_EMIT LogLine(QStringLiteral("Setting %1 property: %2 = %3").arg(name, QString::fromUtf8(property->name), value.toString())); switch (property->value_type) { case G_TYPE_FLOAT:{ diff --git a/src/widgets/autoexpandingtreeview.cpp b/src/widgets/autoexpandingtreeview.cpp index 5c112e4a0..323c332d9 100644 --- a/src/widgets/autoexpandingtreeview.cpp +++ b/src/widgets/autoexpandingtreeview.cpp @@ -116,7 +116,7 @@ void AutoExpandingTreeView::ItemDoubleClicked(const QModelIndex &idx) { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->from_doubleclick_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } } @@ -135,7 +135,7 @@ void AutoExpandingTreeView::mousePressEvent(QMouseEvent *event) { if (MimeData *mimedata = qobject_cast(q_mimedata)) { mimedata->enqueue_now_ = true; } - emit AddToPlaylistSignal(q_mimedata); + Q_EMIT AddToPlaylistSignal(q_mimedata); } } @@ -150,7 +150,7 @@ void AutoExpandingTreeView::mouseDoubleClickEvent(QMouseEvent *event) { // If the p_state was the "AnimatingState", then the base class's // "mouseDoubleClickEvent" method just did nothing, hence the "doubleClicked" signal is not emitted. So let's do it ourselves. if (idx.isValid() && p_state == AnimatingState) { - emit doubleClicked(idx); + Q_EMIT doubleClicked(idx); } } @@ -160,7 +160,7 @@ void AutoExpandingTreeView::keyPressEvent(QKeyEvent *e) { switch (e->key()) { case Qt::Key_Backspace: case Qt::Key_Escape:{ - emit FocusOnFilterSignal(e); + Q_EMIT FocusOnFilterSignal(e); e->accept(); break; } diff --git a/src/widgets/clickablelabel.cpp b/src/widgets/clickablelabel.cpp index ba4b2bd67..db2dc5614 100644 --- a/src/widgets/clickablelabel.cpp +++ b/src/widgets/clickablelabel.cpp @@ -23,6 +23,6 @@ ClickableLabel::ClickableLabel(QWidget *parent) : QLabel(parent) {} void ClickableLabel::mousePressEvent(QMouseEvent *event) { - emit Clicked(); + Q_EMIT Clicked(); QLabel::mousePressEvent(event); } diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp index 7682e8ea9..d27057c7d 100644 --- a/src/widgets/fancytabwidget.cpp +++ b/src/widgets/fancytabwidget.cpp @@ -225,7 +225,7 @@ void FancyTabWidget::SetMode(const Mode mode) { // There appears to be a bug in QTabBar which causes tabSizeHint to be ignored thus the need for this second shot repaint QTimer::singleShot(1ms, this, &FancyTabWidget::TabBarUpdateGeometry); - emit ModeChanged(mode); + Q_EMIT ModeChanged(mode); } @@ -271,7 +271,7 @@ void FancyTabWidget::CurrentTabChangedSlot(const int idx) { QLayout *layout = currentPage->layout(); if (bottom_widget_) layout->addWidget(bottom_widget_); - emit CurrentTabChanged(idx); + Q_EMIT CurrentTabChanged(idx); } diff --git a/src/widgets/favoritewidget.cpp b/src/widgets/favoritewidget.cpp index a5a5a86a5..29d4b9c61 100644 --- a/src/widgets/favoritewidget.cpp +++ b/src/widgets/favoritewidget.cpp @@ -47,7 +47,7 @@ void FavoriteWidget::SetFavorite(const bool favorite) { if (favorite_ != favorite) { favorite_ = favorite; update(); - emit FavoriteStateChanged(tab_index_, favorite_); + Q_EMIT FavoriteStateChanged(tab_index_, favorite_); } } @@ -85,6 +85,6 @@ void FavoriteWidget::mouseDoubleClickEvent(QMouseEvent*) { favorite_ = !favorite_; update(); - emit FavoriteStateChanged(tab_index_, favorite_); + Q_EMIT FavoriteStateChanged(tab_index_, favorite_); } diff --git a/src/widgets/fileview.cpp b/src/widgets/fileview.cpp index 120d42766..b48678845 100644 --- a/src/widgets/fileview.cpp +++ b/src/widgets/fileview.cpp @@ -182,7 +182,7 @@ void FileView::ChangeFilePathWithoutUndo(const QString &new_path) { QDir dir(new_path); ui_->up->setEnabled(dir.cdUp()); - emit PathChanged(new_path); + Q_EMIT PathChanged(new_path); } @@ -204,7 +204,7 @@ void FileView::ItemDoubleClick(const QModelIndex &idx) { mimedata->setUrls(QList() << QUrl::fromLocalFile(file_path)); mimedata->name_for_new_playlist_ = file_path; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); } diff --git a/src/widgets/fileviewlist.cpp b/src/widgets/fileviewlist.cpp index a9d8a733b..fc2178379 100644 --- a/src/widgets/fileviewlist.cpp +++ b/src/widgets/fileviewlist.cpp @@ -149,50 +149,50 @@ void FileViewList::LoadSlot() { MimeData *mimedata = MimeDataFromSelection(); mimedata->clear_first_ = true; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); } void FileViewList::AddToPlaylistSlot() { - emit AddToPlaylist(MimeDataFromSelection()); + Q_EMIT AddToPlaylist(MimeDataFromSelection()); } void FileViewList::OpenInNewPlaylistSlot() { MimeData *mimedata = MimeDataFromSelection(); mimedata->open_in_new_playlist_ = true; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); } void FileViewList::CopyToCollectionSlot() { - emit CopyToCollection(UrlListFromSelection()); + Q_EMIT CopyToCollection(UrlListFromSelection()); } void FileViewList::MoveToCollectionSlot() { - emit MoveToCollection(UrlListFromSelection()); + Q_EMIT MoveToCollection(UrlListFromSelection()); } void FileViewList::CopyToDeviceSlot() { - emit CopyToDevice(UrlListFromSelection()); + Q_EMIT CopyToDevice(UrlListFromSelection()); } void FileViewList::DeleteSlot() { - emit Delete(FilenamesFromSelection()); + Q_EMIT Delete(FilenamesFromSelection()); } void FileViewList::EditTagsSlot() { - emit EditTags(UrlListFromSelection()); + Q_EMIT EditTags(UrlListFromSelection()); } void FileViewList::mousePressEvent(QMouseEvent *e) { switch (e->button()) { case Qt::XButton1: - emit Back(); + Q_EMIT Back(); break; case Qt::XButton2: - emit Forward(); + Q_EMIT Forward(); break; // enqueue to playlist with middleClick case Qt::MiddleButton:{ @@ -204,7 +204,7 @@ void FileViewList::mousePressEvent(QMouseEvent *e) { MimeData *mimedata = new MimeData; mimedata->setUrls(UrlListFromSelection()); mimedata->enqueue_now_ = true; - emit AddToPlaylist(mimedata); + Q_EMIT AddToPlaylist(mimedata); break; } default: diff --git a/src/widgets/loginstatewidget.cpp b/src/widgets/loginstatewidget.cpp index 75acc3a42..0a725490c 100644 --- a/src/widgets/loginstatewidget.cpp +++ b/src/widgets/loginstatewidget.cpp @@ -61,7 +61,7 @@ LoginStateWidget::~LoginStateWidget() { delete ui_; } void LoginStateWidget::Logout() { SetLoggedIn(State::LoggedOut); - emit LogoutClicked(); + Q_EMIT LogoutClicked(); } void LoginStateWidget::SetAccountTypeText(const QString &text) { @@ -138,7 +138,7 @@ bool LoginStateWidget::eventFilter(QObject *object, QEvent *event) { if (event->type() == QEvent::KeyPress) { QKeyEvent *key_event = static_cast(event); if (key_event->key() == Qt::Key_Enter || key_event->key() == Qt::Key_Return) { - emit LoginClicked(); + Q_EMIT LoginClicked(); return true; } } diff --git a/src/widgets/multiloadingindicator.cpp b/src/widgets/multiloadingindicator.cpp index a7c998507..58efaaf12 100644 --- a/src/widgets/multiloadingindicator.cpp +++ b/src/widgets/multiloadingindicator.cpp @@ -90,7 +90,7 @@ void MultiLoadingIndicator::UpdateText() { text_ += QLatin1String("..."); } - emit TaskCountChange(static_cast(tasks.count())); + Q_EMIT TaskCountChange(static_cast(tasks.count())); update(); updateGeometry(); diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp index 01d966456..5ff3dc061 100644 --- a/src/widgets/playingwidget.cpp +++ b/src/widgets/playingwidget.cpp @@ -261,7 +261,7 @@ void PlayingWidget::ShowAboveStatusBar(const bool above) { s.setValue("above_status_bar", above); s.endGroup(); - emit ShowAboveStatusBarChanged(above); + Q_EMIT ShowAboveStatusBarChanged(above); } diff --git a/src/widgets/ratingwidget.cpp b/src/widgets/ratingwidget.cpp index fde714628..e773071fa 100644 --- a/src/widgets/ratingwidget.cpp +++ b/src/widgets/ratingwidget.cpp @@ -150,7 +150,7 @@ void RatingWidget::paintEvent(QPaintEvent*) { void RatingWidget::mousePressEvent(QMouseEvent *e) { rating_ = RatingPainter::RatingForPos(e->pos(), rect()); - emit RatingChanged(rating_); + Q_EMIT RatingChanged(rating_); } diff --git a/src/widgets/renametablineedit.cpp b/src/widgets/renametablineedit.cpp index c84ebfdd8..9b3730700 100644 --- a/src/widgets/renametablineedit.cpp +++ b/src/widgets/renametablineedit.cpp @@ -32,7 +32,7 @@ void RenameTabLineEdit::keyPressEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Escape) { e->accept(); - emit EditingCanceled(); + Q_EMIT EditingCanceled(); } else { QLineEdit::keyPressEvent(e); @@ -45,7 +45,7 @@ void RenameTabLineEdit::focusOutEvent(QFocusEvent *e) { Q_UNUSED(e); //if the user hasn't explicitly accepted, discard the value - emit EditingCanceled(); + Q_EMIT EditingCanceled(); //we don't call the default event since it will trigger editingFished() } diff --git a/src/widgets/sliderslider.cpp b/src/widgets/sliderslider.cpp index 6dd3e8610..0ac07dac7 100644 --- a/src/widgets/sliderslider.cpp +++ b/src/widgets/sliderslider.cpp @@ -99,7 +99,7 @@ void SliderSlider::mouseMoveEvent(QMouseEvent *e) { else { outside_ = false; slideEvent(e); - emit sliderMoved(value()); + Q_EMIT sliderMoved(value()); } } else { @@ -124,7 +124,7 @@ void SliderSlider::mousePressEvent(QMouseEvent *e) { void SliderSlider::mouseReleaseEvent(QMouseEvent*) { if (!outside_ && QSlider::value() != prev_value_) { - emit SliderReleased(value()); + Q_EMIT SliderReleased(value()); } sliding_ = false; @@ -148,7 +148,7 @@ void SliderSlider::wheelEvent(QWheelEvent *e) { QSlider::setValue(nval); - emit SliderReleased(value()); + Q_EMIT SliderReleased(value()); wheeling_ = false; diff --git a/src/widgets/stretchheaderview.cpp b/src/widgets/stretchheaderview.cpp index adb6d0916..e543214d6 100644 --- a/src/widgets/stretchheaderview.cpp +++ b/src/widgets/stretchheaderview.cpp @@ -163,7 +163,7 @@ bool StretchHeaderView::RestoreState(const QByteArray &state) { ResizeSections(); } - emit StretchEnabledChanged(stretch_enabled_); + Q_EMIT StretchEnabledChanged(stretch_enabled_); return true; @@ -207,7 +207,7 @@ void StretchHeaderView::SetStretchEnabled(const bool enabled) { ResizeSections(); } - emit StretchEnabledChanged(enabled); + Q_EMIT StretchEnabledChanged(enabled); } diff --git a/src/widgets/trackslider.cpp b/src/widgets/trackslider.cpp index 5ffc33911..6fc7465dc 100644 --- a/src/widgets/trackslider.cpp +++ b/src/widgets/trackslider.cpp @@ -188,7 +188,7 @@ void TrackSlider::ValueMaybeChanged(const int value) { if (setting_value_) return; UpdateTimes(static_cast(value / kMsecPerSec)); - emit ValueChangedSeconds(static_cast(value / kMsecPerSec)); + Q_EMIT ValueChangedSeconds(static_cast(value / kMsecPerSec)); } diff --git a/src/widgets/tracksliderslider.cpp b/src/widgets/tracksliderslider.cpp index dbae46d70..b8d48ec36 100644 --- a/src/widgets/tracksliderslider.cpp +++ b/src/widgets/tracksliderslider.cpp @@ -88,10 +88,10 @@ void TrackSliderSlider::mouseReleaseEvent(QMouseEvent *e) { QSlider::mouseReleaseEvent(e); if (e->button() == Qt::XButton1) { - emit Previous(); + Q_EMIT Previous(); } else if (e->button() == Qt::XButton2) { - emit Next(); + Q_EMIT Next(); } e->accept(); @@ -128,10 +128,10 @@ void TrackSliderSlider::wheelEvent(QWheelEvent *e) { wheel_accumulator_ = scroll_state % WHEEL_ROTATION_TO_SEEK; if (steps < 0) { - emit SeekBackward(); + Q_EMIT SeekBackward(); } else if (steps > 0) { - emit SeekForward(); + Q_EMIT SeekForward(); } e->accept(); @@ -166,11 +166,11 @@ void TrackSliderSlider::leaveEvent(QEvent *e) { void TrackSliderSlider::keyPressEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Left || event->key() == Qt::Key_Down) { - emit SeekBackward(); + Q_EMIT SeekBackward(); event->accept(); } else if (event->key() == Qt::Key_Right || event->key() == Qt::Key_Up) { - emit SeekForward(); + Q_EMIT SeekForward(); event->accept(); } else { diff --git a/src/widgets/volumeslider.cpp b/src/widgets/volumeslider.cpp index 4ba9b87f4..26e1b0453 100644 --- a/src/widgets/volumeslider.cpp +++ b/src/widgets/volumeslider.cpp @@ -91,7 +91,7 @@ void VolumeSlider::HandleWheel(const int delta) { wheeling_ = true; QSlider::setValue(SliderSlider::value() + steps); - emit SliderReleased(value()); + Q_EMIT SliderReleased(value()); wheeling_ = false; } @@ -271,7 +271,7 @@ void VolumeSlider::contextMenuEvent(QContextMenuEvent *e) { QAction *ret = menu.exec(mapToGlobal(e->pos())); if (ret) { QSlider::setValue(values[ret]); - emit SliderReleased(values[ret]); + Q_EMIT SliderReleased(values[ret]); } } diff --git a/tests/src/mock_networkaccessmanager.cpp b/tests/src/mock_networkaccessmanager.cpp index 09786a936..b1be83c30 100644 --- a/tests/src/mock_networkaccessmanager.cpp +++ b/tests/src/mock_networkaccessmanager.cpp @@ -131,7 +131,7 @@ qint64 MockNetworkReply::writeData(const char*, qint64) { void MockNetworkReply::Done() { setOpenMode(QIODevice::ReadOnly); - emit finished(); + Q_EMIT finished(); } diff --git a/tests/src/test_utils.cpp b/tests/src/test_utils.cpp index d3520ca01..31428d9cb 100644 --- a/tests/src/test_utils.cpp +++ b/tests/src/test_utils.cpp @@ -79,7 +79,7 @@ TestQObject::TestQObject(QObject *parent) } void TestQObject::Emit() { - emit Emitted(); + Q_EMIT Emitted(); } void TestQObject::Invoke() {