dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing const

Browse Source
This commit is contained in:
Jonas Kvinge
2024-08-12 18:12:26 +02:00
parent 8d9c135498
commit bdca60c0ad
69 changed files with 413 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/scrobbler/audioscrobbler.cpp
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include <utility>
#include <memory>
#include <QList>
@@ -98,8 +99,8 @@ void AudioScrobbler::ReloadSettings() {
settings_->ReloadSettings();
QList<ScrobblerServicePtr> services = services_.values();
for (ScrobblerServicePtr service : services) {
const QList<ScrobblerServicePtr> services = services_.values();
for (ScrobblerServicePtr service : std::as_const(services)) {
service->ReloadSettings();
}
@@ -131,7 +132,7 @@ void AudioScrobbler::UpdateNowPlaying(const Song &song) {
qLog(Debug) << "Sending now playing for song" << song.artist() << song.album() << song.title();
QList<ScrobblerServicePtr> services = GetAll();
const QList<ScrobblerServicePtr> services = GetAll();
for (ScrobblerServicePtr service : services) {
if (!service->enabled()) continue;
service->UpdateNowPlaying(song);
@@ -141,7 +142,7 @@ void AudioScrobbler::UpdateNowPlaying(const Song &song) {
void AudioScrobbler::ClearPlaying() {
QList<ScrobblerServicePtr> services = GetAll();
const QList<ScrobblerServicePtr> services = GetAll();
for (ScrobblerServicePtr service : services) {
if (!service->enabled()) continue;
service->ClearPlaying();
@@ -155,7 +156,7 @@ void AudioScrobbler::Scrobble(const Song &song, const qint64 scrobble_point) {
qLog(Debug) << "Scrobbling song" << song.artist() << song.album() << song.title() << "at" << scrobble_point;
QList<ScrobblerServicePtr> services = GetAll();
const QList<ScrobblerServicePtr> services = GetAll();
for (ScrobblerServicePtr service : services) {
if (!service->enabled()) continue;
service->Scrobble(song);
@@ -165,7 +166,7 @@ void AudioScrobbler::Scrobble(const Song &song, const qint64 scrobble_point) {
void AudioScrobbler::Love() {
QList<ScrobblerServicePtr> services = GetAll();
const QList<ScrobblerServicePtr> services = GetAll();
for (ScrobblerServicePtr service : services) {
if (!service->enabled() || !service->authenticated()) continue;
service->Love();
@@ -175,7 +176,7 @@ void AudioScrobbler::Love() {
void AudioScrobbler::Submit() {
QList<ScrobblerServicePtr> services = GetAll();
const QList<ScrobblerServicePtr> services = GetAll();
for (ScrobblerServicePtr service : services) {
if (!service->enabled() || !service->authenticated() || service->submitted()) continue;
service->StartSubmit();
@@ -185,7 +186,7 @@ void AudioScrobbler::Submit() {
void AudioScrobbler::WriteCache() {
QList<ScrobblerServicePtr> services = GetAll();
const QList<ScrobblerServicePtr> services = GetAll();
for (ScrobblerServicePtr service : services) {
if (!service->enabled()) continue;
service->WriteCache();

6
src/scrobbler/lastfmimport.cpp
View File

@@ -116,7 +116,7 @@ QNetworkReply *LastFMImport::CreateRequest(const ParamList &request_params) {
std::sort(params.begin(), params.end());
QUrlQuery url_query;
for (const Param &param : params) {
for (const Param &param : std::as_const(params)) {
url_query.addQueryItem(QString::fromLatin1(QUrl::toPercentEncoding(param.first)), QString::fromLatin1(QUrl::toPercentEncoding(param.second)));
}
@@ -351,9 +351,9 @@ void LastFMImport::GetRecentTracksRequestFinished(QNetworkReply *reply, const in
}
else {
QJsonArray array_track = json_obj[QLatin1String("track")].toArray();
const QJsonArray array_track = json_obj[QLatin1String("track")].toArray();
for (const QJsonValueRef value_track : array_track) {
for (const QJsonValue &value_track : array_track) {
++lastplayed_received_;

7
src/scrobbler/listenbrainzscrobbler.cpp
View File

@@ -20,6 +20,7 @@
#include "config.h"
#include <algorithm>
#include <utility>
#include <QCoreApplication>
#include <QtGlobal>
@@ -289,7 +290,7 @@ void ListenBrainzScrobbler::RequestAccessToken(const QUrl &redirect_url, const Q
}
QUrlQuery url_query;
for (const Param &param : params) {
for (const Param &param : std::as_const(params)) {
url_query.addQueryItem(QString::fromLatin1(QUrl::toPercentEncoding(param.first)), QString::fromLatin1(QUrl::toPercentEncoding(param.second)));
}
@@ -412,7 +413,7 @@ QJsonObject ListenBrainzScrobbler::JsonTrackMetadata(const ScrobbleMetadata &met
}
if (!artist_mbids_list.isEmpty()) {
QJsonArray artist_mbids_array;
for (const QString &musicbrainz_artist_id : artist_mbids_list) {
for (const QString &musicbrainz_artist_id : std::as_const(artist_mbids_list)) {
if (!musicbrainz_artist_id.isEmpty() && !artist_mbids_array.contains(musicbrainz_artist_id)) {
artist_mbids_array.append(musicbrainz_artist_id);
}
@@ -545,7 +546,7 @@ void ListenBrainzScrobbler::Submit() {
QJsonArray array;
ScrobblerCacheItemPtrList cache_items_sent;
ScrobblerCacheItemPtrList all_cache_items = cache_->List();
const ScrobblerCacheItemPtrList all_cache_items = cache_->List();
for (ScrobblerCacheItemPtr cache_item : all_cache_items) {
if (cache_item->sent) continue;
if (cache_item->error && cache_items_sent.count() > 0) break;

7
src/scrobbler/scrobblercache.cpp
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include <utility>
#include <functional>
#include <chrono>
#include <memory>
@@ -108,12 +109,12 @@ void ScrobblerCache::ReadCache() {
qLog(Error) << "Scrobbler cache JSON tracks is not an array.";
return;
}
QJsonArray json_array = json_tracks.toArray();
const QJsonArray json_array = json_tracks.toArray();
if (json_array.isEmpty()) {
return;
}
for (const QJsonValueRef value : json_array) {
for (const QJsonValue &value : json_array) {
if (!value.isObject()) {
qLog(Error) << "Scrobbler cache JSON tracks array value is not an object.";
qLog(Debug) << value;
@@ -203,7 +204,7 @@ void ScrobblerCache::WriteCache() {
}
QJsonArray array;
for (ScrobblerCacheItemPtr cache_item : scrobbler_cache_) {
for (ScrobblerCacheItemPtr cache_item : std::as_const(scrobbler_cache_)) {
QJsonObject object;
object.insert(QLatin1String("timestamp"), QJsonValue::fromVariant(cache_item->timestamp));
object.insert(QLatin1String("artist"), QJsonValue::fromVariant(cache_item->metadata.artist));

10
src/scrobbler/scrobblingapi20.cpp
View File

@@ -20,6 +20,7 @@
#include "config.h"
#include <algorithm>
#include <utility>
#include <QApplication>
#include <QDesktopServices>
@@ -279,7 +280,8 @@ void ScrobblingAPI20::RequestSession(const QString &token) {
session_url_query.addQueryItem(QStringLiteral("method"), QStringLiteral("auth.getSession"));
session_url_query.addQueryItem(QStringLiteral("token"), token);
QString data_to_sign;
for (const Param &param : session_url_query.queryItems()) {
const ParamList params = session_url_query.queryItems();
for (const Param &param : params) {
data_to_sign += param.first + param.second;
}
data_to_sign += QLatin1String(kSecret);
@@ -360,7 +362,7 @@ QNetworkReply *ScrobblingAPI20::CreateRequest(const ParamList &request_params) {
QUrlQuery url_query;
QString data_to_sign;
for (const Param &param : params) {
for (const Param &param : std::as_const(params)) {
EncodedParam encoded_param(QUrl::toPercentEncoding(param.first), QUrl::toPercentEncoding(param.second));
url_query.addQueryItem(QString::fromLatin1(encoded_param.first), QString::fromLatin1(encoded_param.second));
data_to_sign += param.first + param.second;
@@ -493,7 +495,7 @@ void ScrobblingAPI20::Submit() {
ParamList params = ParamList() << Param(QStringLiteral("method"), QStringLiteral("track.scrobble"));
int i = 0;
ScrobblerCacheItemPtrList all_cache_items = cache_->List();
const ScrobblerCacheItemPtrList all_cache_items = cache_->List();
ScrobblerCacheItemPtrList cache_items_sent;
for (ScrobblerCacheItemPtr cache_item : all_cache_items) {
if (cache_item->sent) continue;
@@ -623,7 +625,7 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
return;
}
for (const QJsonValueRef value : array_scrobble) {
for (const QJsonValue &value : std::as_const(array_scrobble)) {
if (!value.isObject()) {
Error(QStringLiteral("Json scrobbles scrobble array value is not an object."));