diff options
Diffstat (limited to 'src')
| -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 { | |||
| 9 | 9 | ||
| 10 | ProfileSelectApplet::~ProfileSelectApplet() = default; | 10 | ProfileSelectApplet::~ProfileSelectApplet() = default; |
| 11 | 11 | ||
| 12 | void DefaultProfileSelectApplet::SelectProfile( | 12 | void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback) const { |
| 13 | std::function<void(std::optional<Common::UUID>)> callback) const { | ||
| 14 | Service::Account::ProfileManager manager; | 13 | Service::Account::ProfileManager manager; |
| 15 | callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{})); | 14 | callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{})); |
| 16 | LOG_INFO(Service_ACC, "called, selecting current user instead of prompting..."); | 15 | 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 { | |||
| 11 | 11 | ||
| 12 | class ProfileSelectApplet { | 12 | class ProfileSelectApplet { |
| 13 | public: | 13 | public: |
| 14 | using SelectProfileCallback = std::function<void(std::optional<Common::UUID>)>; | ||
| 15 | |||
| 14 | virtual ~ProfileSelectApplet(); | 16 | virtual ~ProfileSelectApplet(); |
| 15 | 17 | ||
| 16 | virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0; | 18 | virtual void SelectProfile(SelectProfileCallback callback) const = 0; |
| 17 | }; | 19 | }; |
| 18 | 20 | ||
| 19 | class DefaultProfileSelectApplet final : public ProfileSelectApplet { | 21 | class DefaultProfileSelectApplet final : public ProfileSelectApplet { |
| 20 | public: | 22 | public: |
| 21 | void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override; | 23 | void SelectProfile(SelectProfileCallback callback) const override; |
| 22 | }; | 24 | }; |
| 23 | 25 | ||
| 24 | } // namespace Core::Frontend | 26 | } // 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) { | |||
| 163 | 163 | ||
| 164 | QtProfileSelector::~QtProfileSelector() = default; | 164 | QtProfileSelector::~QtProfileSelector() = default; |
| 165 | 165 | ||
| 166 | void QtProfileSelector::SelectProfile( | 166 | void QtProfileSelector::SelectProfile(SelectProfileCallback callback_) const { |
| 167 | std::function<void(std::optional<Common::UUID>)> callback_) const { | ||
| 168 | callback = std::move(callback_); | 167 | callback = std::move(callback_); |
| 169 | emit MainWindowSelectProfile(); | 168 | emit MainWindowSelectProfile(); |
| 170 | } | 169 | } |
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: | |||
| 65 | explicit QtProfileSelector(GMainWindow& parent); | 65 | explicit QtProfileSelector(GMainWindow& parent); |
| 66 | ~QtProfileSelector() override; | 66 | ~QtProfileSelector() override; |
| 67 | 67 | ||
| 68 | void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback_) const override; | 68 | void SelectProfile(SelectProfileCallback callback_) const override; |
| 69 | 69 | ||
| 70 | signals: | 70 | signals: |
| 71 | void MainWindowSelectProfile() const; | 71 | void MainWindowSelectProfile() const; |
| @@ -73,5 +73,5 @@ signals: | |||
| 73 | private: | 73 | private: |
| 74 | void MainWindowFinishedSelection(std::optional<Common::UUID> uuid); | 74 | void MainWindowFinishedSelection(std::optional<Common::UUID> uuid); |
| 75 | 75 | ||
| 76 | mutable std::function<void(std::optional<Common::UUID>)> callback; | 76 | mutable SelectProfileCallback callback; |
| 77 | }; | 77 | }; |