From 1ca4b31b8def9d1961b2cc5622c9dfdfc0fa11d0 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 17 Dec 2022 13:58:56 +0100 Subject: [PATCH] Some changes to please codeQL --- .../scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp | 7 +++---- .../scrobbling/impl/listenbrainz/ListensSynchronizer.cpp | 7 +++---- src/lms/ui/explore/ReleaseView.cpp | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp index 1e3e654d..e9265122 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/FeedbacksSynchronizer.cpp @@ -19,6 +19,7 @@ #include "ListenBrainzScrobbler.hpp" +#include #include #include #include @@ -234,8 +235,7 @@ namespace Scrobbling::ListenBrainz auto itContext {_userContexts.find(userId)}; if (itContext == std::cend(_userContexts)) { - [[maybe_unused]] auto [itNewContext, inserted] {_userContexts.emplace(userId, userId)}; - itContext = itNewContext; + std::tie(itContext, std::ignore) = _userContexts.emplace(userId, userId); } return itContext->second; @@ -246,8 +246,7 @@ namespace Scrobbling::ListenBrainz { return std::any_of(std::cbegin(_userContexts), std::cend(_userContexts), [](const auto& contextEntry) { - [[maybe_unused]] const auto& [userId, context] {contextEntry}; - return context.syncing; + return contextEntry.second.syncing; }); } diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp index 2542ede7..f1a79df0 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp @@ -19,6 +19,7 @@ #include "ListenBrainzScrobbler.hpp" +#include #include #include #include @@ -354,8 +355,7 @@ namespace Scrobbling::ListenBrainz auto itContext {_userContexts.find(userId)}; if (itContext == std::cend(_userContexts)) { - [[maybe_unused]] auto [itNewContext, inserted] {_userContexts.emplace(userId, userId)}; - itContext = itNewContext; + std::tie(itContext, std::ignore) = _userContexts.emplace(userId, userId); } return itContext->second; @@ -366,8 +366,7 @@ namespace Scrobbling::ListenBrainz { return std::any_of(std::cbegin(_userContexts), std::cend(_userContexts), [](const auto& contextEntry) { - [[maybe_unused]] const auto& [userId, context] {contextEntry}; - return context.syncing; + return contextEntry.second.syncing; }); } diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index 3c1d4176..1ea63ccd 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -118,7 +118,6 @@ showReleaseInfoModal(Database::ReleaseId releaseId) artistTable->addWidget(std::move(artistsEntry)); } - // TODO: save in DB and mean all this for (TrackId trackId : Track::find(LmsApp->getDbSession(), Track::FindParameters {}.setRelease(releaseId).setRange(Range {0, 1})).results) {