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

Make static

Browse Source
This commit is contained in:
Jonas Kvinge
2021-06-22 13:41:38 +02:00
parent e3ab0c0192
commit 8c2b907ff5
89 changed files with 157 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/organize/organizedialog.cpp
View File

@@ -390,11 +390,7 @@ bool OrganizeDialog::SetUrls(const QList<QUrl> &urls) {
bool OrganizeDialog::SetFilenames(const QStringList &filenames) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
songs_future_ = QtConcurrent::run(&OrganizeDialog::LoadSongsBlocking, this, filenames);
#else
songs_future_ = QtConcurrent::run(this, &OrganizeDialog::LoadSongsBlocking, filenames);
#endif
songs_future_ = QtConcurrent::run(&OrganizeDialog::LoadSongsBlocking, filenames);
QFutureWatcher<SongList> *watcher = new QFutureWatcher<SongList>();
QObject::connect(watcher, &QFutureWatcher<SongList>::finished, this, [this, watcher]() {
SetSongs(watcher->result());

2
src/organize/organizedialog.h
View File

@@ -83,7 +83,7 @@ class OrganizeDialog : public QDialog {
void LoadSettings();
void AdjustSize();
SongList LoadSongsBlocking(const QStringList &filenames);
static SongList LoadSongsBlocking(const QStringList &filenames);
void SetLoadingSongs(const bool loading);
signals: