diff options
| author | 2016-12-10 21:20:34 -0500 | |
|---|---|---|
| committer | 2016-12-11 11:45:50 +0000 | |
| commit | dd4582f85de43806ab3bf904bf13641d5d1aa3ba (patch) | |
| tree | 27390023eb1f0927ad1a3fb2a367c4fb3b04dcb6 /src | |
| parent | game_list: Pass the parent constructor argument to the QWidget base class (diff) | |
| download | yuzu-dd4582f85de43806ab3bf904bf13641d5d1aa3ba.tar.gz yuzu-dd4582f85de43806ab3bf904bf13641d5d1aa3ba.tar.xz yuzu-dd4582f85de43806ab3bf904bf13641d5d1aa3ba.zip | |
game_list: Use QT5's new event connection syntax
Makes for more compact code in most places.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/game_list.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 2863e5da6..df712c14f 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp | |||
| @@ -34,8 +34,7 @@ GameList::GameList(QWidget* parent) : QWidget{parent} { | |||
| 34 | item_model->setHeaderData(COLUMN_FILE_TYPE, Qt::Horizontal, "File type"); | 34 | item_model->setHeaderData(COLUMN_FILE_TYPE, Qt::Horizontal, "File type"); |
| 35 | item_model->setHeaderData(COLUMN_SIZE, Qt::Horizontal, "Size"); | 35 | item_model->setHeaderData(COLUMN_SIZE, Qt::Horizontal, "Size"); |
| 36 | 36 | ||
| 37 | connect(tree_view, SIGNAL(activated(const QModelIndex&)), this, | 37 | connect(tree_view, &QTreeView::activated, this, &GameList::ValidateEntry); |
| 38 | SLOT(ValidateEntry(const QModelIndex&))); | ||
| 39 | 38 | ||
| 40 | // We must register all custom types with the Qt Automoc system so that we are able to use it | 39 | // We must register all custom types with the Qt Automoc system so that we are able to use it |
| 41 | // with | 40 | // with |
| @@ -86,12 +85,13 @@ void GameList::PopulateAsync(const QString& dir_path, bool deep_scan) { | |||
| 86 | emit ShouldCancelWorker(); | 85 | emit ShouldCancelWorker(); |
| 87 | GameListWorker* worker = new GameListWorker(dir_path, deep_scan); | 86 | GameListWorker* worker = new GameListWorker(dir_path, deep_scan); |
| 88 | 87 | ||
| 89 | connect(worker, SIGNAL(EntryReady(QList<QStandardItem*>)), this, | 88 | connect(worker, &GameListWorker::EntryReady, this, &GameList::AddEntry, Qt::QueuedConnection); |
| 90 | SLOT(AddEntry(QList<QStandardItem*>)), Qt::QueuedConnection); | 89 | connect(worker, &GameListWorker::Finished, this, &GameList::DonePopulating, |
| 91 | connect(worker, SIGNAL(Finished()), this, SLOT(DonePopulating()), Qt::QueuedConnection); | 90 | Qt::QueuedConnection); |
| 92 | // Use DirectConnection here because worker->Cancel() is thread-safe and we want it to cancel | 91 | // Use DirectConnection here because worker->Cancel() is thread-safe and we want it to cancel |
| 93 | // without delay. | 92 | // without delay. |
| 94 | connect(this, SIGNAL(ShouldCancelWorker()), worker, SLOT(Cancel()), Qt::DirectConnection); | 93 | connect(this, &GameList::ShouldCancelWorker, worker, &GameListWorker::Cancel, |
| 94 | Qt::DirectConnection); | ||
| 95 | 95 | ||
| 96 | QThreadPool::globalInstance()->start(worker); | 96 | QThreadPool::globalInstance()->start(worker); |
| 97 | current_worker = std::move(worker); | 97 | current_worker = std::move(worker); |