ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QueueOnObject: accept pointers to member functions

This commit is contained in:
Michael M 2017-09-15 08:51:08 -07:00
parent 7cb8d6612c
commit 1e27e87d93
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -877,7 +877,7 @@ void MainWindow::OnImportNANDBackup()
.arg((QDateTime::currentDateTime().toMSecsSinceEpoch() - beginning) / 1000));
});
});
QueueOnObject(dialog, [dialog] { dialog->close(); });
QueueOnObject(dialog, &QProgressDialog::close);
});
dialog->exec();

2
Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
View File

@ -405,7 +405,7 @@ void NetPlayDialog::StopGame()
void NetPlayDialog::Update()
{
QueueOnObject(this, [this] { UpdateGUI(); });
QueueOnObject(this, &NetPlayDialog::UpdateGUI);
}
void NetPlayDialog::DisplayMessage(const QString& msg, const std::string& color, int duration)

4
Source/Core/DolphinQt2/QtUtils/QueueOnObject.h
View File

@ -12,8 +12,8 @@
// arbitrary code from non-GUI threads. For more information, see:
// https://stackoverflow.com/questions/21646467/
template <typename F>
static void QueueOnObject(QObject* obj, F&& func)
template <typename T, typename F>
static void QueueOnObject(T* obj, F&& func)
{
QObject src;
QObject::connect(&src, &QObject::destroyed, obj, std::forward<F>(func), Qt::QueuedConnection);