summaryrefslogtreecommitdiff
path: root/src/core/frontend
diff options
context:
space:
mode:
authorGravatar Morph2022-02-05 12:35:39 -0500
committerGravatar Morph2022-02-05 13:56:21 -0500
commit25db62ce1534cbd8b93b4284869229e4bd7de54d (patch)
treedd74d3fc6ba14a0de5e88778cad5b5c65fcba248 /src/core/frontend
parentprofile: Migrate to the new UUID implementation (diff)
downloadyuzu-25db62ce1534cbd8b93b4284869229e4bd7de54d.tar.gz
yuzu-25db62ce1534cbd8b93b4284869229e4bd7de54d.tar.xz
yuzu-25db62ce1534cbd8b93b4284869229e4bd7de54d.zip
general: Rename NewUUID to UUID, and remove the previous UUID impl
This completes the removal of the old UUID implementation.
Diffstat (limited to 'src/core/frontend')
-rw-r--r--src/core/frontend/applets/profile_select.cpp4
-rw-r--r--src/core/frontend/applets/profile_select.h7
2 files changed, 5 insertions, 6 deletions
diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp
index a7ff2ccf9..4c58c310f 100644
--- a/src/core/frontend/applets/profile_select.cpp
+++ b/src/core/frontend/applets/profile_select.cpp
@@ -11,9 +11,9 @@ namespace Core::Frontend {
11ProfileSelectApplet::~ProfileSelectApplet() = default; 11ProfileSelectApplet::~ProfileSelectApplet() = default;
12 12
13void DefaultProfileSelectApplet::SelectProfile( 13void DefaultProfileSelectApplet::SelectProfile(
14 std::function<void(std::optional<Common::NewUUID>)> callback) const { 14 std::function<void(std::optional<Common::UUID>)> callback) const {
15 Service::Account::ProfileManager manager; 15 Service::Account::ProfileManager manager;
16 callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::NewUUID{})); 16 callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{}));
17 LOG_INFO(Service_ACC, "called, selecting current user instead of prompting..."); 17 LOG_INFO(Service_ACC, "called, selecting current user instead of prompting...");
18} 18}
19 19
diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.h
index 5b2346e72..3506b9885 100644
--- a/src/core/frontend/applets/profile_select.h
+++ b/src/core/frontend/applets/profile_select.h
@@ -6,7 +6,7 @@
6 6
7#include <functional> 7#include <functional>
8#include <optional> 8#include <optional>
9#include "common/new_uuid.h" 9#include "common/uuid.h"
10 10
11namespace Core::Frontend { 11namespace Core::Frontend {
12 12
@@ -14,13 +14,12 @@ class ProfileSelectApplet {
14public: 14public:
15 virtual ~ProfileSelectApplet(); 15 virtual ~ProfileSelectApplet();
16 16
17 virtual void SelectProfile( 17 virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0;
18 std::function<void(std::optional<Common::NewUUID>)> callback) const = 0;
19}; 18};
20 19
21class DefaultProfileSelectApplet final : public ProfileSelectApplet { 20class DefaultProfileSelectApplet final : public ProfileSelectApplet {
22public: 21public:
23 void SelectProfile(std::function<void(std::optional<Common::NewUUID>)> callback) const override; 22 void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override;
24}; 23};
25 24
26} // namespace Core::Frontend 25} // namespace Core::Frontend