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

More const detach fixes

Browse Source
This commit is contained in:
Jonas Kvinge
2024-08-23 20:30:59 +02:00
parent be09011bb7
commit 7ebcc73a49
54 changed files with 195 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/streaming/streamingsearchmodel.cpp
View File

@@ -258,7 +258,7 @@ QStandardItem *StreamingSearchModel::BuildContainers(const Song &s, QStandardIte
key->group_[level] = display_text + unique_tag;
QStandardItem *container = nullptr;
if (containers_.contains(*key)) {
container = containers_[*key];
container = containers_.value(*key);
}
else {
container = new QStandardItem(display_text);

13
src/streaming/streamingsearchview.cpp
View File

@@ -366,7 +366,7 @@ void StreamingSearchView::timerEvent(QTimerEvent *e) {
QMap<int, DelayedSearch>::iterator it = delayed_searches_.find(e->timerId());
if (it != delayed_searches_.end()) {
SearchAsync(it.value().id_, it.value().query_, it.value().type_);
delayed_searches_.erase(it); // clazy:exclude=strict-iterators
delayed_searches_.erase(it);
return;
}
@@ -517,11 +517,10 @@ void StreamingSearchView::SearchDone(const int service_id, const SongMap &songs,
void StreamingSearchView::CancelSearch(const int id) {
QMap<int, DelayedSearch>::iterator it;
for (it = delayed_searches_.begin(); it != delayed_searches_.end(); ++it) {
for (QMap<int, DelayedSearch>::iterator it = delayed_searches_.begin(); it != delayed_searches_.end(); ++it) {
if (it.value().id_ == id) {
killTimer(it.key());
delayed_searches_.erase(it); // clazy:exclude=strict-iterators
delayed_searches_.erase(it);
return;
}
}
@@ -556,7 +555,7 @@ void StreamingSearchView::SearchError(const int id, const QString &error) {
void StreamingSearchView::UpdateStatus(const int service_id, const QString &text) {
if (!pending_searches_.contains(service_id)) return;
const PendingState state = pending_searches_[service_id];
const PendingState state = pending_searches_.value(service_id);
const int search_id = state.orig_id_;
if (search_id != last_search_id_) return;
ui_->progressbar->show();
@@ -567,7 +566,7 @@ void StreamingSearchView::UpdateStatus(const int service_id, const QString &text
void StreamingSearchView::ProgressSetMaximum(const int service_id, const int max) {
if (!pending_searches_.contains(service_id)) return;
const PendingState state = pending_searches_[service_id];
const PendingState state = pending_searches_.value(service_id);
const int search_id = state.orig_id_;
if (search_id != last_search_id_) return;
ui_->progressbar->setMaximum(max);
@@ -577,7 +576,7 @@ void StreamingSearchView::ProgressSetMaximum(const int service_id, const int max
void StreamingSearchView::UpdateProgress(const int service_id, const int progress) {
if (!pending_searches_.contains(service_id)) return;
const PendingState state = pending_searches_[service_id];
const PendingState state = pending_searches_.value(service_id);
const int search_id = state.orig_id_;
if (search_id != last_search_id_) return;
ui_->progressbar->setValue(progress);

2
src/streaming/streamingservices.cpp
View File

@@ -34,7 +34,7 @@ StreamingServices::StreamingServices(QObject *parent) : QObject(parent) {}
StreamingServices::~StreamingServices() {
while (!services_.isEmpty()) {
StreamingServicePtr service = services_.first();
StreamingServicePtr service = services_.value(services_.firstKey());
RemoveService(service);
}