diff options
| author | Lioncash <mathew1800@gmail.com> | 2022-12-05 18:50:59 -0500 | 
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2022-12-05 19:06:04 -0500 | 
| commit | a84676c2aab058946aa9c1eb974c5dbebcb05402 (patch) | |
| tree | 297dff718ad8e40fd28553f5cfd5131be0eb682b | |
| parent | e26c86a6e78f00ce6641fc65e7076cacc91e2137 (diff) | |
applets/profile_select: Use aliases for callbacks
Deduplicates callback definitions and situates it in one place.
| -rw-r--r-- | src/core/frontend/applets/profile_select.cpp | 3 | ||||
| -rw-r--r-- | src/core/frontend/applets/profile_select.h | 6 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_profile_select.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_profile_select.h | 4 | 
4 files changed, 8 insertions, 8 deletions
diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp index d11fbce0a..da4cfbf87 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.h index 8d6ee5279..138429533 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::Frontend diff --git a/src/yuzu/applets/qt_profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp index c8bcfb223..4145c5299 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.h index 124f2cdbd..637a3bda2 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;  };  | 
