From 4e9b2c6464b74cad4780afcec129930517dfc10a Mon Sep 17 00:00:00 2001 From: Phil Hoffmann Date: Sun, 17 Dec 2023 20:46:51 +0100 Subject: [PATCH] Added explicit namespaces to usages of file and service options to fix compilation issues --- src/services/nextcloud/nextcloud.cpp | 2 +- src/services/nextcloud/nextcloudconnector.cpp | 2 +- src/services/rest/restserviceconnector.cpp | 2 +- .../rest/restserviceconnectorlocal.cpp | 2 +- src/services/spotify/api/albumapi.cpp | 16 +++++++--- src/services/spotify/api/playerapi.cpp | 31 ++++++++++--------- src/services/spotify/api/playlistsapi.cpp | 12 +++++-- src/services/spotify/api/tracksapi.cpp | 8 +++-- .../spotify/spotifyconnectorserver.cpp | 4 +-- src/tools/audio/audiosaveload.cpp | 4 +-- .../audio/playlist/resolvingaudioplaylist.cpp | 8 ++--- .../thumbnails/loaders/fileimageloader.cpp | 2 +- .../thumbnails/loaders/spotifyimageloader.cpp | 8 ++--- .../thumbnails/loaders/youtubeimageloader.cpp | 4 +-- 14 files changed, 62 insertions(+), 43 deletions(-) diff --git a/src/services/nextcloud/nextcloud.cpp b/src/services/nextcloud/nextcloud.cpp index 4658e9f8..0a7a1dd6 100644 --- a/src/services/nextcloud/nextcloud.cpp +++ b/src/services/nextcloud/nextcloud.cpp @@ -94,7 +94,7 @@ auto NextCloud::sendDavRequest(const QByteArray &method, const QString &path, co } } - return m_connector.customRequest(request, method, data, Option::Authenticated | options); + return m_connector.customRequest(request, method, data, Services::Option::Authenticated | options); } auto NextCloud::getPathUrl(const QString &path) const -> QString diff --git a/src/services/nextcloud/nextcloudconnector.cpp b/src/services/nextcloud/nextcloudconnector.cpp index d3195bce..18392bcf 100644 --- a/src/services/nextcloud/nextcloudconnector.cpp +++ b/src/services/nextcloud/nextcloudconnector.cpp @@ -129,7 +129,7 @@ void NextCloudConnector::sendRequest(RestRequest &&container, QPromiseloginName(), m_appPassword)); } diff --git a/src/services/rest/restserviceconnector.cpp b/src/services/rest/restserviceconnector.cpp index c621762d..b72a37b7 100644 --- a/src/services/rest/restserviceconnector.cpp +++ b/src/services/rest/restserviceconnector.cpp @@ -168,7 +168,7 @@ auto RESTServiceConnector::enqueueRequest(RestRequest &&request, QPromise QFutureget(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto AlbumAPI::getAlbumTracks(const QString &id, Options options) -> QFuture @@ -80,7 +82,9 @@ auto AlbumAPI::getAlbumTracks(const QString &id, Options options) -> QFutureget(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto AlbumAPI::getAlbumTracks(SpotifyAlbum &&album, Options options) -> QFuture @@ -104,7 +108,9 @@ auto AlbumAPI::getAlbumTracks(SpotifyAlbum &&album, Options options) -> QFuture< return QtFuture::makeReadyFuture(album); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto AlbumAPI::getAlbumTracks(SpotifyTrackList &&tracklist, Options options) -> QFuture @@ -126,5 +132,7 @@ auto AlbumAPI::getAlbumTracks(SpotifyTrackList &&tracklist, Options options) -> return QtFuture::makeReadyFuture(tracklist); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } diff --git a/src/services/spotify/api/playerapi.cpp b/src/services/spotify/api/playerapi.cpp index acb428a8..702c95d2 100644 --- a/src/services/spotify/api/playerapi.cpp +++ b/src/services/spotify/api/playerapi.cpp @@ -21,7 +21,7 @@ PlayerAPI::PlayerAPI(Spotify *parent) : m_spotify(parent) auto PlayerAPI::play() const -> QFuture { - return m_spotify->put(QUrl(u"https://api.spotify.com/v1/me/player/play"_s), {}, Option::Authenticated); + return m_spotify->put(QUrl(u"https://api.spotify.com/v1/me/player/play"_s), {}, Services::Option::Authenticated); } auto PlayerAPI::play(const QString &deviceId, const QJsonObject &body) const -> QFuture @@ -36,7 +36,7 @@ auto PlayerAPI::play(const QString &deviceId, const QJsonObject &body) const -> const QJsonDocument content(body); return m_spotify->put(NetworkUtils::makeJsonRequest(url), content.toJson(QJsonDocument::JsonFormat::Compact), - Option::Authenticated); + Services::Option::Authenticated); } auto PlayerAPI::play(const QString &uri) const -> QFuture @@ -99,7 +99,7 @@ auto PlayerAPI::pause(const QString &deviceId) const -> QFuture url.setQuery(query); } - return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } auto PlayerAPI::next() const -> QFuture @@ -117,7 +117,7 @@ auto PlayerAPI::next(const QString &deviceId) const -> QFuture url.setQuery(query); } - return m_spotify->post(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->post(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } auto PlayerAPI::previous() const -> QFuture @@ -135,7 +135,7 @@ auto PlayerAPI::previous(const QString &deviceId) const -> QFuture url.setQuery(query); } - return m_spotify->post(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->post(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } auto PlayerAPI::seek(int positionMs) const -> QFuture @@ -155,7 +155,7 @@ auto PlayerAPI::seek(int positionMs, const QString &deviceId) const -> QFutureput(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } auto PlayerAPI::getState() -> QFuture @@ -190,7 +190,7 @@ auto PlayerAPI::getState(const QStringList &additionalTypes, const QString &mark return QtFuture::makeReadyFuture(SpotifyPlaybackState::fromJson(QJsonDocument::fromJson(reply.data()))); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated).then(callback).unwrap(); } auto PlayerAPI::getCurrentlyPlaying() -> QFuture @@ -227,7 +227,7 @@ auto PlayerAPI::getCurrentlyPlaying(const QStringList &additionalTypes, const QS return QtFuture::makeReadyFuture(SpotifyCurrentTrack::fromJson(reply.data())); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated).then(callback).unwrap(); } auto PlayerAPI::transfer(const QStringList &deviceIds) const -> QFuture @@ -243,7 +243,7 @@ auto PlayerAPI::transfer(const QStringList &deviceIds, bool play) const -> QFutu const auto doc = QJsonDocument(body); return m_spotify->put(NetworkUtils::makeJsonRequest(url), doc.toJson(QJsonDocument::Compact), - Option::Authenticated); + Services::Option::Authenticated); } auto PlayerAPI::devices() -> QFuture @@ -256,7 +256,7 @@ auto PlayerAPI::devices() -> QFuture return SpotifyDevice::fromJson(devices); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated).then(callback); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated).then(callback); } auto PlayerAPI::repeat(SpotifyRepeatMode mode) const -> QFuture @@ -291,7 +291,7 @@ auto PlayerAPI::repeat(const QString &state, const QString &deviceId) const -> Q } url.setQuery(query); - return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } auto PlayerAPI::volume(int volumePercent) const -> QFuture @@ -310,7 +310,7 @@ auto PlayerAPI::volume(int volumePercent, const QString &deviceId) const -> QFut } url.setQuery(query); - return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } auto PlayerAPI::shuffle(bool state) const -> QFuture @@ -329,7 +329,7 @@ auto PlayerAPI::shuffle(bool state, const QString &deviceId) const -> QFutureput(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->put(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } auto PlayerAPI::getRecentlyPlayed(int limit) const -> QFuture @@ -364,7 +364,8 @@ auto PlayerAPI::getRecentlyPlayed(const QDateTime &after, const QDateTime &befor query.addQueryItem(u"limit"_s, QString::number(std::clamp(limit, 0, MAX_RECENTLY_PLAYED))); url.setQuery(query); - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated | Option::LowPriority); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), + Services::Option::Authenticated | Services::Option::LowPriority); } auto PlayerAPI::addToQueue(const QString &uri) const -> QFuture @@ -390,5 +391,5 @@ auto PlayerAPI::addToQueue(const QString &uri, const QString &deviceId) const -> } url.setQuery(query); - return m_spotify->post(NetworkUtils::makeJsonRequest(url), {}, Option::Authenticated); + return m_spotify->post(NetworkUtils::makeJsonRequest(url), {}, Services::Option::Authenticated); } diff --git a/src/services/spotify/api/playlistsapi.cpp b/src/services/spotify/api/playlistsapi.cpp index 59ddcacd..6daee3eb 100644 --- a/src/services/spotify/api/playlistsapi.cpp +++ b/src/services/spotify/api/playlistsapi.cpp @@ -40,7 +40,9 @@ auto PlaylistsAPI::getPlaylist(const QString &id, Options options) -> QFutureget(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto PlaylistsAPI::getPlaylistTracks(const QString &id, Options options) -> QFuture @@ -73,7 +75,9 @@ auto PlaylistsAPI::getPlaylistTracks(const QString &id, Options options) -> QFut return QtFuture::makeReadyFuture(tracklist); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto PlaylistsAPI::getPlaylistTracks(SpotifyTrackList &&tracklist, Options options) -> QFuture @@ -95,7 +99,9 @@ auto PlaylistsAPI::getPlaylistTracks(SpotifyTrackList &&tracklist, Options optio return QtFuture::makeReadyFuture(tracklist); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto PlaylistsAPI::updatePlaylist(const PlaylistConfig &config, Options options) const -> QFuture diff --git a/src/services/spotify/api/tracksapi.cpp b/src/services/spotify/api/tracksapi.cpp index 912c9b28..d23047d0 100644 --- a/src/services/spotify/api/tracksapi.cpp +++ b/src/services/spotify/api/tracksapi.cpp @@ -39,7 +39,9 @@ auto TracksAPI::getTrack(const QString &id, Options options) -> QFutureget(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto TracksAPI::getTracks(const QStringList &ids, Options options) -> QFuture> @@ -88,7 +90,9 @@ auto TracksAPI::getTracks(const QStringList &ids, std::vector &&pr return QtFuture::makeReadyFuture(previous); }; - return m_spotify->get(NetworkUtils::makeJsonRequest(url), Option::Authenticated | options).then(callback).unwrap(); + return m_spotify->get(NetworkUtils::makeJsonRequest(url), Services::Option::Authenticated | options) + .then(callback) + .unwrap(); } auto TracksAPI::getNextBatch(const QStringList &ids, const std::vector &previous) -> QStringList diff --git a/src/services/spotify/spotifyconnectorserver.cpp b/src/services/spotify/spotifyconnectorserver.cpp index e75fa8b1..416ceeb0 100644 --- a/src/services/spotify/spotifyconnectorserver.cpp +++ b/src/services/spotify/spotifyconnectorserver.cpp @@ -53,8 +53,8 @@ void SpotifyConnectorServer::disconnectService() void SpotifyConnectorServer::sendRequest(RestRequest &&container, QPromise &&promise) { - auto request = - container.options().testFlag(Option::Authenticated) ? addAuthHeader(container.request()) : container.request(); + auto request = container.options().testFlag(Services::Option::Authenticated) ? addAuthHeader(container.request()) + : container.request(); QNetworkReply *reply = nullptr; switch (container.type()) diff --git a/src/tools/audio/audiosaveload.cpp b/src/tools/audio/audiosaveload.cpp index e741cb02..c140a03b 100644 --- a/src/tools/audio/audiosaveload.cpp +++ b/src/tools/audio/audiosaveload.cpp @@ -54,7 +54,7 @@ auto AudioSaveLoad::loadProjects(const QObject *context, FileListResult &&files) } } - auto futureContents = File::getDataAsync(fileNames, Option::AllowCache); + auto futureContents = File::getDataAsync(fileNames, Files::Option::AllowCache); return futureContents.then([context](const std::vector &contents) { qCDebug(gmAudioSaveLoad()) << "Found audio projects."; @@ -79,7 +79,7 @@ auto AudioSaveLoad::findMissingFilesAsync(const QList &audioFiles, const auto filePaths = getFilePathsToCheck(audioFiles, basePath); - auto futureCheckResult = File::checkAsync(filePaths, Option::AllowCache); + auto futureCheckResult = File::checkAsync(filePaths, Files::Option::AllowCache); return futureCheckResult .then([audioFiles, basePath](const FileMultiCheckResult &multiResult) { const auto foundPaths = multiResult.existing(); diff --git a/src/tools/audio/playlist/resolvingaudioplaylist.cpp b/src/tools/audio/playlist/resolvingaudioplaylist.cpp index 609d74a1..4ecc35a9 100644 --- a/src/tools/audio/playlist/resolvingaudioplaylist.cpp +++ b/src/tools/audio/playlist/resolvingaudioplaylist.cpp @@ -150,9 +150,9 @@ auto ResolvingAudioPlaylist::unwrapSpotify(qsizetype index, const AudioFile &fil switch (type) { case SpotifyUtils::SpotifyType::Playlist: - return Spotify::instance()->playlists.getPlaylistTracks(id, Option::None).then(callback); + return Spotify::instance()->playlists.getPlaylistTracks(id, Services::Option::None).then(callback); case SpotifyUtils::SpotifyType::Album: - return Spotify::instance()->albums.getAlbumTracks(id, Option::None).then(callback); + return Spotify::instance()->albums.getAlbumTracks(id, Services::Option::None).then(callback); default: qCCritical(gmAudioPlaylistResolving()) << "loadPlaylistRecursiveSpotify(): not implemented for container type" << (int)type; @@ -166,7 +166,7 @@ auto ResolvingAudioPlaylist::unwrapYouTube(qsizetype index, const AudioFile &fil if (!id.isValid()) return QtFuture::makeReadyFuture(); return YouTube::instance() - ->getPlaylistInfoAsync(id, Option::None) + ->getPlaylistInfoAsync(id, Services::Option::None) .then([this, index](const YouTubePlaylist &playlist) { QList files; files.reserve(playlist.streams.size()); @@ -226,7 +226,7 @@ void ResolvingAudioPlaylist::loadSpotifyTitles(const QList &tracks) } }; - Spotify::instance()->tracks.getTracks(trackIds, Option::LowPriority).then(callback); + Spotify::instance()->tracks.getTracks(trackIds, Services::Option::LowPriority).then(callback); } auto ResolvingAudioPlaylist::isPlaylist(const QString &file) -> bool diff --git a/src/tools/audio/thumbnails/loaders/fileimageloader.cpp b/src/tools/audio/thumbnails/loaders/fileimageloader.cpp index f97e3c92..c600c1c3 100755 --- a/src/tools/audio/thumbnails/loaders/fileimageloader.cpp +++ b/src/tools/audio/thumbnails/loaders/fileimageloader.cpp @@ -15,7 +15,7 @@ auto FileImageLoader::loadImageAsync(const QString &path) -> QFuture return QtFuture::makeReadyFuture(pixmap); } - auto future = File::getDataAsync(path, Option::AllowCache | Option::LowPriority); + auto future = File::getDataAsync(path, Files::Option::AllowCache | Files::Option::LowPriority); const auto callback = [path](const FileDataResult &result) { return QtConcurrent::run(loadFromFileResult, path, result); diff --git a/src/tools/audio/thumbnails/loaders/spotifyimageloader.cpp b/src/tools/audio/thumbnails/loaders/spotifyimageloader.cpp index e0052ba8..a053096e 100755 --- a/src/tools/audio/thumbnails/loaders/spotifyimageloader.cpp +++ b/src/tools/audio/thumbnails/loaders/spotifyimageloader.cpp @@ -82,7 +82,7 @@ auto SpotifyImageLoader::loadPlaylistImageAsync(const QString &id) -> QFutureget(url, Option::LowPriority); + auto future = Services::Spotify::instance()->get(url, Services::Option::LowPriority); const auto imageCallback = [id, url](const RestReply &reply) { QPixmap image; @@ -99,7 +99,7 @@ auto SpotifyImageLoader::loadPlaylistImageAsync(const QString &id) -> QFutureplaylists.getPlaylist(id, Option::LowPriority); + auto future = Spotify::instance()->playlists.getPlaylist(id, Services::Option::LowPriority); return future.then(playlistCallback).unwrap(); } @@ -114,7 +114,7 @@ void SpotifyImageLoader::startRequest(SpotifyUtils::SpotifyType type) qCDebug(gmAudioSpotifyImageLoader()) << "Sending batch request:" << url; - auto future = Spotify::instance()->get(url, Option::Authenticated | Option::LowPriority); + auto future = Spotify::instance()->get(url, Services::Option::Authenticated | Services::Option::LowPriority); future.then([type](RestReply &&reply) { receivedRequest(std::move(reply), type); }); // Start timer again if there still are ids in the queue @@ -158,7 +158,7 @@ void SpotifyImageLoader::receivedRequest(RestReply &&reply, SpotifyUtils::Spotif } const auto request = QNetworkRequest(url); - auto future = Spotify::instance()->get(request, Option::LowPriority); + auto future = Spotify::instance()->get(request, Services::Option::LowPriority); const auto callback = [id, url](const RestReply &imageReply) { QPixmap image; diff --git a/src/tools/audio/thumbnails/loaders/youtubeimageloader.cpp b/src/tools/audio/thumbnails/loaders/youtubeimageloader.cpp index f0f2560c..2a510c28 100644 --- a/src/tools/audio/thumbnails/loaders/youtubeimageloader.cpp +++ b/src/tools/audio/thumbnails/loaders/youtubeimageloader.cpp @@ -22,7 +22,7 @@ auto YouTubeImageLoader::loadImageAsync(const VideoId &id, QNetworkAccessManager // Get video info return YouTube::instance() - ->getStreamInfoAsync(id, Option::LowPriority) + ->getStreamInfoAsync(id, Services::Option::LowPriority) .then([networkManager](const YouTubeVideo &video) { return loadImageAsync(video, networkManager); }) .unwrap(); } @@ -61,7 +61,7 @@ auto YouTubeImageLoader::loadImageAsync(const PlaylistId &id, QNetworkAccessMana // Get video info return YouTube::instance() - ->getPlaylistInfoAsync(id, Option::LowPriority) + ->getPlaylistInfoAsync(id, Services::Option::LowPriority) .then([networkManager](const YouTubePlaylist &playlist) { return loadImageAsync(playlist, networkManager); }) .unwrap();