diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index 4dd928e63..fe0d1edbc 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -859,7 +859,7 @@ void CollectionModel::LazyPopulate(CollectionItem *parent, const bool signal) { } void CollectionModel::ResetAsync() { - QFuture future = QtConcurrent::run(this, &CollectionModel::RunQuery, root_); + QFuture future = QtConcurrent::run(std::bind(&CollectionModel::RunQuery, this, root_)); NewClosure(future, this, SLOT(ResetAsyncQueryFinished(QFuture)), future); } diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp index f8d33243f..92565996d 100644 --- a/src/dialogs/edittagdialog.cpp +++ b/src/dialogs/edittagdialog.cpp @@ -20,6 +20,7 @@ #include "config.h" +#include #include #include #include @@ -286,7 +287,7 @@ void EditTagDialog::SetSongs(const SongList &s, const PlaylistItemList &items) { ui_->song_list->clear(); // Reload tags in the background - QFuture> future = QtConcurrent::run(this, &EditTagDialog::LoadData, s); + QFuture> future = QtConcurrent::run(std::bind(&EditTagDialog::LoadData, this, s)); NewClosure(future, this, SLOT(SetSongsFinished(QFuture>)), future); } diff --git a/src/organise/organisedialog.cpp b/src/organise/organisedialog.cpp index be7528850..44d55ccc1 100644 --- a/src/organise/organisedialog.cpp +++ b/src/organise/organisedialog.cpp @@ -22,6 +22,7 @@ #include "config.h" #include +#include #include #include @@ -344,7 +345,7 @@ bool OrganiseDialog::SetUrls(const QList &urls) { bool OrganiseDialog::SetFilenames(const QStringList &filenames) { - songs_future_ = QtConcurrent::run(this, &OrganiseDialog::LoadSongsBlocking, filenames); + songs_future_ = QtConcurrent::run(std::bind(&OrganiseDialog::LoadSongsBlocking, this, filenames)); NewClosure(songs_future_, [=]() { SetSongs(songs_future_.result()); }); SetLoadingSongs(true); diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index fd9c968c1..5d6cabb48 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -1314,7 +1314,7 @@ void Playlist::Restore() { collection_items_by_id_.clear(); cancel_restore_ = false; - QFuture> future = QtConcurrent::run(backend_, &PlaylistBackend::GetPlaylistItems, id_); + QFuture> future = QtConcurrent::run(std::bind(&PlaylistBackend::GetPlaylistItems, backend_, id_)); NewClosure(future, this, SLOT(ItemsLoaded(QFuture)), future); } @@ -1353,7 +1353,7 @@ void Playlist::ItemsLoaded(QFuture future) { // Should we gray out deleted songs asynchronously on startup? if (greyout) { - QtConcurrent::run(this, &Playlist::InvalidateDeletedSongs); + (void)QtConcurrent::run(std::bind(&Playlist::InvalidateDeletedSongs, this)); } emit PlaylistLoaded(); diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index d9162a0a5..208f124e3 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -21,6 +21,7 @@ #include "config.h" #include +#include #include #include @@ -211,7 +212,7 @@ void PlaylistManager::Save(int id, const QString &filename, Playlist::Path path_ } else { // Playlist is not in the playlist manager: probably save action was triggered from the left side bar and the playlist isn't loaded. - QFuture> future = QtConcurrent::run(playlist_backend_, &PlaylistBackend::GetPlaylistSongs, id); + QFuture> future = QtConcurrent::run(std::bind(&PlaylistBackend::GetPlaylistSongs, playlist_backend_, id)); NewClosure(future, this, SLOT(ItemsLoadedForSavePlaylist(QFuture, QString, Playlist::Path)), future, filename, path_type); } diff --git a/src/playlist/songloaderinserter.cpp b/src/playlist/songloaderinserter.cpp index 67f46460d..7483e9eb3 100644 --- a/src/playlist/songloaderinserter.cpp +++ b/src/playlist/songloaderinserter.cpp @@ -83,7 +83,7 @@ void SongLoaderInserter::Load(Playlist *destination, int row, bool play_now, boo deleteLater(); } else { - QtConcurrent::run(this, &SongLoaderInserter::AsyncLoad); + (void)QtConcurrent::run([=]{ AsyncLoad(); }); } }