More const detach fixes

src/core/database.cpp

@@ -161,7 +161,7 @@ QSqlDatabase Database::Connect() {
   // Attach external databases
   QStringList keys = attached_databases_.keys();
   for (const QString &key : std::as_const(keys)) {
-    QString filename = attached_databases_[key].filename_;
+    QString filename = attached_databases_.value(key).filename_;
 
     if (!injected_database_name_.isNull()) filename = injected_database_name_;
 
@@ -182,7 +182,7 @@ QSqlDatabase Database::Connect() {
   // We might have to initialize the schema in some attached databases now, if they were deleted and don't match up with the main schema version.
   keys = attached_databases_.keys();
   for (const QString &key : std::as_const(keys)) {
-    if (attached_databases_[key].is_temporary_ && attached_databases_[key].schema_.isEmpty()) {
+    if (attached_databases_.value(key).is_temporary_ && attached_databases_.value(key).schema_.isEmpty()) {
       continue;
     }
     // Find out if there are any tables in this database
@@ -258,7 +258,7 @@ void Database::RecreateAttachedDb(const QString &database_name) {
     return;
   }
 
-  const QString filename = attached_databases_[database_name].filename_;
+  const QString filename = attached_databases_.value(database_name).filename_;
 
   QMutexLocker l(&mutex_);
   {

src/core/deletefiles.cpp

@@ -116,7 +116,7 @@ void DeleteFiles::ProcessSomeFiles() {
   for (; progress_ < n; ++progress_) {
     task_manager_->SetTaskProgress(task_id_, progress_, songs_.count());
 
-    const Song &song = songs_[progress_];
+    const Song song = songs_.value(progress_);
 
     MusicStorage::DeleteJob job;
     job.metadata_ = song;

src/core/mergedproxymodel.cpp

@@ -535,8 +535,8 @@ void MergedProxyModel::LayoutChanged() {
   for (QAbstractItemModel *model : models) {
     if (!old_merge_points_.contains(model)) continue;
 
-    const int old_row = old_merge_points_[model].row();
-    const int new_row = merge_points_[model].row();
+    const int old_row = old_merge_points_.value(model).row();
+    const int new_row = merge_points_.value(model).row();
 
     if (old_row != new_row) {
       beginResetModel();

src/core/player.cpp

@@ -618,7 +618,8 @@ void Player::UnPause() {
       if (time >= 30) {  // Stream URL might be expired.
         qLog(Debug) << "Re-requesting stream URL for" << song.url();
         play_offset_nanosec_ = engine_->position_nanosec();
-        HandleLoadResult(url_handlers_[song.url().scheme()]->StartLoading(song.url()));
+        UrlHandler *url_handler = url_handlers_.value(song.url().scheme());
+        HandleLoadResult(url_handler->StartLoading(song.url()));
         return;
       }
     }
@@ -826,7 +827,8 @@ void Player::PlayAt(const int index, const bool pause, const quint64 offset_nano
     pause_ = pause;
     stream_change_type_ = change;
     autoscroll_ = autoscroll;
-    HandleLoadResult(url_handlers_[url.scheme()]->StartLoading(url));
+    UrlHandler *url_handler = url_handlers_.value(url.scheme());
+    HandleLoadResult(url_handler->StartLoading(url));
   }
   else {
     qLog(Debug) << "Playing song" << current_item_->Metadata().title() << url << "position" << offset_nanosec;
@@ -1003,7 +1005,8 @@ void Player::TrackAboutToEnd() {
   if (url_handlers_.contains(url.scheme())) {
     if (loading_async_.contains(url)) return;
     autoscroll_ = Playlist::AutoScroll::Maybe;
-    UrlHandler::LoadResult result = url_handlers_[url.scheme()]->StartLoading(url);
+    UrlHandler *url_handler = url_handlers_.value(url.scheme());
+    const UrlHandler::LoadResult result = url_handler->StartLoading(url);
     switch (result.type_) {
       case UrlHandler::LoadResult::Type::Error:
         emit Error(result.error_);

src/core/taskmanager.cpp

@@ -70,8 +70,7 @@ void TaskManager::SetTaskBlocksCollectionScans(const int id) {
     QMutexLocker l(&mutex_);
     if (!tasks_.contains(id)) return;
 
-    Task &t = tasks_[id];
-    t.blocks_collection_scans = true;
+    tasks_[id].blocks_collection_scans = true;
   }
 
   emit TasksChanged();
@@ -85,9 +84,10 @@ void TaskManager::SetTaskProgress(const int id, const quint64 progress, const qu
     QMutexLocker l(&mutex_);
     if (!tasks_.contains(id)) return;
 
-    Task &t = tasks_[id];
+    Task t = tasks_.value(id);
     t.progress = progress;
     if (max > 0) t.progress_max = max;
+    tasks_[id] = t;
   }
 
   emit TasksChanged();
@@ -99,9 +99,10 @@ void TaskManager::IncreaseTaskProgress(const int id, const quint64 progress, con
     QMutexLocker l(&mutex_);
     if (!tasks_.contains(id)) return;
 
-    Task &t = tasks_[id];
+    Task t = tasks_.value(id);
     t.progress += progress;
     if (max > 0) t.progress_max = max;
+    tasks_[id] = t;
   }
 
   emit TasksChanged();
@@ -116,7 +117,7 @@ void TaskManager::SetTaskFinished(const int id) {
     QMutexLocker l(&mutex_);
     if (!tasks_.contains(id)) return;
 
-    if (tasks_[id].blocks_collection_scans) {
+    if (tasks_.value(id).blocks_collection_scans) {
       resume_collection_watchers = true;
       QList<Task> tasks = tasks_.values();
 
@@ -139,7 +140,7 @@ quint64 TaskManager::GetTaskProgress(int id) {
   {
     QMutexLocker l(&mutex_);
     if (!tasks_.contains(id)) return 0;
-    return tasks_[id].progress;
+    return tasks_.value(id).progress;
   }
 
 }