profile: Migrate to the new UUID implementation

This commit is contained in:
Morph 2022-02-05 12:29:09 -05:00
parent d94dcaefa0
commit dfe11d72e3
14 changed files with 131 additions and 127 deletions

View file

@ -11,10 +11,9 @@ namespace Core::Frontend {
ProfileSelectApplet::~ProfileSelectApplet() = default;
void DefaultProfileSelectApplet::SelectProfile(
std::function<void(std::optional<Common::UUID>)> callback) const {
std::function<void(std::optional<Common::NewUUID>)> callback) const {
Service::Account::ProfileManager manager;
callback(manager.GetUser(Settings::values.current_user.GetValue())
.value_or(Common::UUID{Common::INVALID_UUID}));
callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::NewUUID{}));
LOG_INFO(Service_ACC, "called, selecting current user instead of prompting...");
}

View file

@ -6,7 +6,7 @@
#include <functional>
#include <optional>
#include "common/uuid.h"
#include "common/new_uuid.h"
namespace Core::Frontend {
@ -14,12 +14,13 @@ class ProfileSelectApplet {
public:
virtual ~ProfileSelectApplet();
virtual void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const = 0;
virtual void SelectProfile(
std::function<void(std::optional<Common::NewUUID>)> callback) const = 0;
};
class DefaultProfileSelectApplet final : public ProfileSelectApplet {
public:
void SelectProfile(std::function<void(std::optional<Common::UUID>)> callback) const override;
void SelectProfile(std::function<void(std::optional<Common::NewUUID>)> callback) const override;
};
} // namespace Core::Frontend