From bf380b858481ef99d7150d322af2c30ac339bcde Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 23 Apr 2021 21:50:04 -0700
Subject: hle: kernel: Remove deprecated Object class.

---
 src/core/hle/service/am/applets/applets.h     | 1 -
 src/core/hle/service/hid/controllers/npad.h   | 1 -
 src/core/hle/service/hid/irs.h                | 1 -
 src/core/hle/service/nvflinger/buffer_queue.h | 1 -
 src/core/hle/service/nvflinger/nvflinger.h    | 1 -
 src/core/hle/service/service.h                | 1 -
 src/core/hle/service/sm/controller.cpp        | 2 +-
 src/core/hle/service/sm/sm.cpp                | 2 +-
 8 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/core/hle/service')

diff --git a/src/core/hle/service/am/applets/applets.h b/src/core/hle/service/am/applets/applets.h
index 229dc7a1e..5c0b4b459 100644
--- a/src/core/hle/service/am/applets/applets.h
+++ b/src/core/hle/service/am/applets/applets.h
@@ -9,7 +9,6 @@
 
 #include "common/swap.h"
 #include "core/hle/kernel/k_event.h"
-#include "core/hle/kernel/object.h"
 
 union ResultCode;
 
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index b0f575561..c050c9a44 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -11,7 +11,6 @@
 #include "common/quaternion.h"
 #include "common/settings.h"
 #include "core/frontend/input.h"
-#include "core/hle/kernel/object.h"
 #include "core/hle/service/hid/controllers/controller_base.h"
 
 namespace Kernel {
diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h
index a1bcb5859..9bc6462b0 100644
--- a/src/core/hle/service/hid/irs.h
+++ b/src/core/hle/service/hid/irs.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "core/hle/kernel/object.h"
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/core/hle/service/nvflinger/buffer_queue.h b/src/core/hle/service/nvflinger/buffer_queue.h
index 044e51d08..4ec0b1506 100644
--- a/src/core/hle/service/nvflinger/buffer_queue.h
+++ b/src/core/hle/service/nvflinger/buffer_queue.h
@@ -15,7 +15,6 @@
 #include "common/swap.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_readable_event.h"
-#include "core/hle/kernel/object.h"
 #include "core/hle/service/nvdrv/nvdata.h"
 
 namespace Kernel {
diff --git a/src/core/hle/service/nvflinger/nvflinger.h b/src/core/hle/service/nvflinger/nvflinger.h
index 1c0aa8ec4..b0febdaec 100644
--- a/src/core/hle/service/nvflinger/nvflinger.h
+++ b/src/core/hle/service/nvflinger/nvflinger.h
@@ -15,7 +15,6 @@
 #include <vector>
 
 #include "common/common_types.h"
-#include "core/hle/kernel/object.h"
 
 namespace Common {
 class Event;
diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index 076f50b0b..884951428 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -11,7 +11,6 @@
 #include "common/common_types.h"
 #include "common/spin_lock.h"
 #include "core/hle/kernel/hle_ipc.h"
-#include "core/hle/kernel/object.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace Service
diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/controller.cpp
index cb397fcc7..ee026e22f 100644
--- a/src/core/hle/service/sm/controller.cpp
+++ b/src/core/hle/service/sm/controller.cpp
@@ -14,7 +14,7 @@ namespace Service::SM {
 
 void Controller::ConvertCurrentObjectToDomain(Kernel::HLERequestContext& ctx) {
     ASSERT_MSG(ctx.Session()->IsSession(), "Session is already a domain");
-    LOG_DEBUG(Service, "called, server_session={}", ctx.Session()->GetObjectId());
+    LOG_DEBUG(Service, "called, server_session={}", ctx.Session()->GetId());
     ctx.Session()->ConvertToDomain();
 
     IPC::ResponseBuilder rb{ctx, 3};
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index 71ab4b6f5..568effbc9 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -140,7 +140,7 @@ void SM::GetService(Kernel::HLERequestContext& ctx) {
         port->EnqueueSession(&session->GetServerSession());
     }
 
-    LOG_DEBUG(Service_SM, "called service={} -> session={}", name, session->GetObjectId());
+    LOG_DEBUG(Service_SM, "called service={} -> session={}", name, session->GetId());
     IPC::ResponseBuilder rb{ctx, 2, 0, 1, IPC::ResponseBuilder::Flags::AlwaysMoveHandles};
     rb.Push(RESULT_SUCCESS);
     rb.PushMoveObjects(session->GetClientSession());
-- 
cgit v1.2.3