diff --git a/src/library/librarywatcher.cpp b/src/library/librarywatcher.cpp index d0355ee8e..7a308f3af 100644 --- a/src/library/librarywatcher.cpp +++ b/src/library/librarywatcher.cpp @@ -119,7 +119,7 @@ LibraryWatcher::ScanTransaction::~ScanTransaction() { watcher_->task_manager_->SetTaskFinished(task_id_); - for (const Subdirectory &subdir : deleted_subdirs) { + for (const Subdirectory& subdir : deleted_subdirs) { if (watcher_->watched_dirs_.contains(dir_)) { watcher_->RemoveWatch(watcher_->watched_dirs_[dir_], subdir); } @@ -417,7 +417,8 @@ void LibraryWatcher::ScanSubdirectory(const QString& path, else t->touched_subdirs << updated_subdir; - if (updated_subdir.mtime == 0) { // Subdirectory deleted, mark it for removal from the watcher. + if (updated_subdir.mtime == + 0) { // Subdirectory deleted, mark it for removal from the watcher. t->deleted_subdirs << updated_subdir; } @@ -595,15 +596,14 @@ void LibraryWatcher::AddWatch(const Directory& dir, const QString& path) { subdir_mapping_[path] = dir; } -void LibraryWatcher::RemoveWatch(const Directory &dir, const Subdirectory &subdir) { - - for (const QString &subdir_path : subdir_mapping_.keys(dir)) { +void LibraryWatcher::RemoveWatch(const Directory& dir, + const Subdirectory& subdir) { + for (const QString& subdir_path : subdir_mapping_.keys(dir)) { if (subdir_path != subdir.path) continue; fs_watcher_->RemovePath(subdir_path); subdir_mapping_.remove(subdir_path); break; } - } void LibraryWatcher::RemoveDirectory(const Directory& dir) { diff --git a/src/library/librarywatcher.h b/src/library/librarywatcher.h index c83f7b220..c598e97f0 100644 --- a/src/library/librarywatcher.h +++ b/src/library/librarywatcher.h @@ -156,7 +156,7 @@ signals: QString ImageForSong(const QString& path, QMap& album_art); void AddWatch(const Directory& dir, const QString& path); - void RemoveWatch(const Directory &dir, const Subdirectory &subdir); + void RemoveWatch(const Directory& dir, const Subdirectory& subdir); uint GetMtimeForCue(const QString& cue_path); void PerformScan(bool incremental, bool ignore_mtimes);