VERY experimental Nintendo Switch 2 emulator
C++
applets/profile_select: Use aliases for callbacks
Lioncash259307a15280
diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cppindex d11fbce0a1..da4cfbf87a 100644--- a/src/core/frontend/applets/profile_select.cpp+++ b/src/core/frontend/applets/profile_select.cpp@@ -9,8 +9,7 @@ namespace Core::Frontend {ProfileSelectApplet::~ProfileSelectApplet() = default;-void DefaultProfileSelectApplet::SelectProfile(- std::function<void(std::optional<Common::UUID>)> callback) const {+void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback) const {Service::Account::ProfileManager manager;callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{}));LOG_INFO(Service_ACC, "called, selecting current user instead of prompting...");diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.hindex 8d6ee52794..138429533d 100644--- a/src/core/frontend/applets/profile_select.h+++ b/src/core/frontend/applets/profile_select.h@@ -11,14 +11,16 @@ namespace Core::Frontend {class ProfileSelectApplet {public:+ using SelectProfileCallback = std::function<void(std::optional<Common::UUID>)>;+virtual ~ProfileSelectApplet();- virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0;+ virtual void SelectProfile(SelectProfileCallback callback) const = 0;};class DefaultProfileSelectApplet final : public ProfileSelectApplet {public:- void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override;+ void SelectProfile(SelectProfileCallback callback) const override;};} // namespace Core::Frontenddiff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cppindex c8bcfb2231..4145c52998 100644--- a/src/yuzu/applets/qt_profile_select.cpp+++ b/src/yuzu/applets/qt_profile_select.cpp@@ -163,8 +163,7 @@ QtProfileSelector::QtProfileSelector(GMainWindow& parent) {QtProfileSelector::~QtProfileSelector() = default;-void QtProfileSelector::SelectProfile(- std::function<void(std::optional<Common::UUID>)> callback_) const {+void QtProfileSelector::SelectProfile(SelectProfileCallback callback_) const {callback = std::move(callback_);emit MainWindowSelectProfile();}diff --git a/src/yuzu/applets/qt_profile_select.h b/src/yuzu/applets/qt_profile_select.hindex 124f2cdbdb..637a3bda2a 100644--- a/src/yuzu/applets/qt_profile_select.h+++ b/src/yuzu/applets/qt_profile_select.h@@ -65,7 +65,7 @@ public:explicit QtProfileSelector(GMainWindow& parent);~QtProfileSelector() override;- void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback_) const override;+ void SelectProfile(SelectProfileCallback callback_) const override;signals:void MainWindowSelectProfile() const;@@ -73,5 +73,5 @@ signals:private:void MainWindowFinishedSelection(std::optional<Common::UUID> uuid);- mutable std::function<void(std::optional<Common::UUID>)> callback;+ mutable SelectProfileCallback callback;};