From 7f812a7a03d803e91c60c75102f4580196bbff28 Mon Sep 17 00:00:00 2001 From: Michael M Date: Fri, 15 Sep 2017 09:08:09 -0700 Subject: [PATCH] RunOnObject: accept pointers to member functions --- Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp | 2 +- Source/Core/DolphinQt2/QtUtils/RunOnObject.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp index afd00662ac..77a17486b5 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp @@ -524,7 +524,7 @@ void NetPlayDialog::OnTraversalError(TraversalClient::FailureReason error) bool NetPlayDialog::IsRecording() { - return RunOnObject(this, [this] { return m_record_input_box->isChecked(); }); + return RunOnObject(m_record_input_box, &QCheckBox::isChecked); } std::string NetPlayDialog::FindGame(const std::string& game) diff --git a/Source/Core/DolphinQt2/QtUtils/RunOnObject.h b/Source/Core/DolphinQt2/QtUtils/RunOnObject.h index d1ebcd22cc..bd0b2ca556 100644 --- a/Source/Core/DolphinQt2/QtUtils/RunOnObject.h +++ b/Source/Core/DolphinQt2/QtUtils/RunOnObject.h @@ -33,3 +33,9 @@ auto RunOnObject(QObject* object, F&& functor) event.Wait(); return result; } + +template +auto RunOnObject(Receiver* obj, Type Base::*func) +{ + return RunOnObject(obj, [obj, func] { return (obj->*func)(); }); +}