diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 06:40:48 +0100 |
---|---|---|
committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-02-05 19:18:46 +0100 |
commit | ee0547e4c4d38d681d9cd3b9f7071c4dade9110d (patch) | |
tree | 9833fb69b1bd34105ea7d43dc74977c0c88e9fb3 /src/core/hle/service/friend | |
parent | input/hid: Migrate to the new UUID implementation (diff) | |
download | yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.gz yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.bz2 yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.lz yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.xz yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.tar.zst yuzu-ee0547e4c4d38d681d9cd3b9f7071c4dade9110d.zip |
Diffstat (limited to 'src/core/hle/service/friend')
-rw-r--r-- | src/core/hle/service/friend/friend.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 9f9cea1e0..3c621f7f0 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -4,7 +4,7 @@ #include <queue> #include "common/logging/log.h" -#include "common/uuid.h" +#include "common/new_uuid.h" #include "core/core.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_event.h" @@ -170,10 +170,10 @@ private: void GetPlayHistoryRegistrationKey(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto local_play = rp.Pop<bool>(); - const auto uuid = rp.PopRaw<Common::UUID>(); + const auto uuid = rp.PopRaw<Common::NewUUID>(); LOG_WARNING(Service_Friend, "(STUBBED) called, local_play={}, uuid=0x{}", local_play, - uuid.Format()); + uuid.RawString()); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(ResultSuccess); @@ -182,11 +182,11 @@ private: void GetFriendList(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto friend_offset = rp.Pop<u32>(); - const auto uuid = rp.PopRaw<Common::UUID>(); + const auto uuid = rp.PopRaw<Common::NewUUID>(); [[maybe_unused]] const auto filter = rp.PopRaw<SizedFriendFilter>(); const auto pid = rp.Pop<u64>(); LOG_WARNING(Service_Friend, "(STUBBED) called, offset={}, uuid=0x{}, pid={}", friend_offset, - uuid.Format(), pid); + uuid.RawString(), pid); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); @@ -202,7 +202,7 @@ private: class INotificationService final : public ServiceFramework<INotificationService> { public: - explicit INotificationService(Core::System& system_, Common::UUID uuid_) + explicit INotificationService(Core::System& system_, Common::NewUUID uuid_) : ServiceFramework{system_, "INotificationService"}, uuid{uuid_}, service_context{system_, "INotificationService"} { // clang-format off @@ -293,7 +293,7 @@ private: bool has_received_friend_request; }; - Common::UUID uuid; + Common::NewUUID uuid; KernelHelpers::ServiceContext service_context; Kernel::KEvent* notification_event; @@ -310,9 +310,9 @@ void Module::Interface::CreateFriendService(Kernel::HLERequestContext& ctx) { void Module::Interface::CreateNotificationService(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - auto uuid = rp.PopRaw<Common::UUID>(); + auto uuid = rp.PopRaw<Common::NewUUID>(); - LOG_DEBUG(Service_Friend, "called, uuid=0x{}", uuid.Format()); + LOG_DEBUG(Service_Friend, "called, uuid=0x{}", uuid.RawString()); IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(ResultSuccess); |