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

Add const and std::as_const

Browse Source
This commit is contained in:
Jonas Kvinge
2024-04-23 17:15:42 +02:00
parent 24c8d06d41
commit 426de61525
67 changed files with 273 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lyrics/lyricsfetcher.cpp
View File

@@ -79,7 +79,7 @@ void LyricsFetcher::Clear() {
queued_requests_.clear();
QList<LyricsFetcherSearch*> searches = active_requests_.values();
const QList<LyricsFetcherSearch*> searches = active_requests_.values();
for (LyricsFetcherSearch *search : searches) {
search->Cancel();
search->deleteLater();

5
src/lyrics/lyricsfetchersearch.cpp
View File

@@ -20,6 +20,7 @@
#include "config.h"
#include <algorithm>
#include <utility>
#include <QObject>
#include <QTimer>
@@ -49,7 +50,7 @@ LyricsFetcherSearch::LyricsFetcherSearch(const quint64 id, const LyricsSearchReq
void LyricsFetcherSearch::TerminateSearch() {
QList<int> keys = pending_requests_.keys();
const QList<int> keys = pending_requests_.keys();
for (const int id : keys) {
pending_requests_.take(id)->CancelSearch(id);
}
@@ -68,7 +69,7 @@ void LyricsFetcherSearch::Start(SharedPtr<LyricsProviders> lyrics_providers) {
QList<LyricsProvider*> lyrics_providers_sorted = lyrics_providers->List();
std::stable_sort(lyrics_providers_sorted.begin(), lyrics_providers_sorted.end(), ProviderCompareOrder);
for (LyricsProvider *provider : lyrics_providers_sorted) {
for (LyricsProvider *provider : std::as_const(lyrics_providers_sorted)) {
if (!provider->is_enabled() || !provider->IsAuthenticated()) continue;
QObject::connect(provider, &LyricsProvider::SearchFinished, this, &LyricsFetcherSearch::ProviderSearchFinished);
const int id = lyrics_providers->NextId();

10
src/lyrics/lyricsproviders.cpp
View File

@@ -19,6 +19,8 @@
#include "config.h"
#include <utility>
#include <QObject>
#include <QMutex>
#include <QList>
@@ -51,14 +53,14 @@ void LyricsProviders::ReloadSettings() {
QMap<int, QString> all_providers;
QList<LyricsProvider*> old_providers = lyrics_providers_.keys();
for (LyricsProvider *provider : old_providers) {
for (LyricsProvider *provider : std::as_const(old_providers)) {
if (!provider->is_enabled()) continue;
all_providers.insert(provider->order(), provider->name());
}
Settings s;
s.beginGroup(LyricsSettingsPage::kSettingsGroup);
QStringList providers_enabled = s.value("providers", QStringList() << all_providers.values()).toStringList();
const QStringList providers_enabled = s.value("providers", QStringList() << all_providers.values()).toStringList();
s.endGroup();
int i = 0;
@@ -73,7 +75,7 @@ void LyricsProviders::ReloadSettings() {
}
old_providers = lyrics_providers_.keys();
for (LyricsProvider *provider : old_providers) {
for (LyricsProvider *provider : std::as_const(old_providers)) {
if (!new_providers.contains(provider)) {
provider->set_enabled(false);
provider->set_order(++i);
@@ -84,7 +86,7 @@ void LyricsProviders::ReloadSettings() {
LyricsProvider *LyricsProviders::ProviderByName(const QString &name) const {
QList<LyricsProvider*> providers = lyrics_providers_.keys();
const QList<LyricsProvider*> providers = lyrics_providers_.keys();
for (LyricsProvider *provider : providers) {
if (provider->name() == name) return provider;
}