diff options
author | Zach Hilman <zachhilman@gmail.com> | 2019-01-11 03:53:07 +0100 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2019-04-25 14:13:11 +0200 |
commit | 851c01c45eac863359869ab82eea976cc365104d (patch) | |
tree | 03883d80754d5d7beb1b9f45e6bb5c28d5fbc33b /src/core/hle/service | |
parent | mii: Implement Delete and Destroy file (diff) | |
download | yuzu-851c01c45eac863359869ab82eea976cc365104d.tar yuzu-851c01c45eac863359869ab82eea976cc365104d.tar.gz yuzu-851c01c45eac863359869ab82eea976cc365104d.tar.bz2 yuzu-851c01c45eac863359869ab82eea976cc365104d.tar.lz yuzu-851c01c45eac863359869ab82eea976cc365104d.tar.xz yuzu-851c01c45eac863359869ab82eea976cc365104d.tar.zst yuzu-851c01c45eac863359869ab82eea976cc365104d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/am/applets/profile_select.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/service/am/applets/profile_select.h | 4 | ||||
-rw-r--r-- | src/core/hle/service/mii/mii_manager.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/am/applets/profile_select.cpp b/src/core/hle/service/am/applets/profile_select.cpp index d113bd2eb..3c184859d 100644 --- a/src/core/hle/service/am/applets/profile_select.cpp +++ b/src/core/hle/service/am/applets/profile_select.cpp @@ -56,16 +56,16 @@ void ProfileSelect::Execute() { frontend.SelectProfile([this](std::optional<Account::UUID> uuid) { SelectionComplete(uuid); }); } -void ProfileSelect::SelectionComplete(std::optional<Account::UUID> uuid) { +void ProfileSelect::SelectionComplete(std::optional<Common::UUID> uuid) { UserSelectionOutput output{}; - if (uuid.has_value() && uuid->uuid != Account::INVALID_UUID) { + if (uuid.has_value() && uuid->uuid != Common::INVALID_UUID) { output.result = 0; output.uuid_selected = uuid->uuid; } else { status = ERR_USER_CANCELLED_SELECTION; output.result = ERR_USER_CANCELLED_SELECTION.raw; - output.uuid_selected = Account::INVALID_UUID; + output.uuid_selected = Common::INVALID_UUID; } final_data = std::vector<u8>(sizeof(UserSelectionOutput)); diff --git a/src/core/hle/service/am/applets/profile_select.h b/src/core/hle/service/am/applets/profile_select.h index a2ac6cf50..f99630158 100644 --- a/src/core/hle/service/am/applets/profile_select.h +++ b/src/core/hle/service/am/applets/profile_select.h @@ -7,7 +7,7 @@ #include <vector> #include "common/common_funcs.h" -#include "core/hle/service/acc/profile_manager.h" +#include "common/uuid.h" #include "core/hle/service/am/applets/applets.h" namespace Service::AM::Applets { @@ -38,7 +38,7 @@ public: void ExecuteInteractive() override; void Execute() override; - void SelectionComplete(std::optional<Account::UUID> uuid); + void SelectionComplete(std::optional<Common::UUID> uuid); private: const Core::Frontend::ProfileSelectApplet& frontend; diff --git a/src/core/hle/service/mii/mii_manager.cpp b/src/core/hle/service/mii/mii_manager.cpp index 04fc2180b..a526e4440 100644 --- a/src/core/hle/service/mii/mii_manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -174,7 +174,7 @@ MiiStoreData ConvertInfoToStoreData(const MiiInfo& info) { } // namespace -std::ostream& operator<<(std::ostream& os,Source source) { +std::ostream& operator<<(std::ostream& os, Source source) { os << SOURCE_NAMES.at(static_cast<std::size_t>(source)); return os; } |