From 823d58ac9ba8527e64cb2d4c755156dbd17c5cd0 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 9 Dec 2016 01:01:35 -0500
Subject: service: Drop '_Interface' from cfg service names

---
 src/core/hle/service/cfg/cfg.cpp   | 6 +++---
 src/core/hle/service/cfg/cfg_i.cpp | 2 +-
 src/core/hle/service/cfg/cfg_i.h   | 4 ++--
 src/core/hle/service/cfg/cfg_s.cpp | 2 +-
 src/core/hle/service/cfg/cfg_s.h   | 4 ++--
 src/core/hle/service/cfg/cfg_u.cpp | 2 +-
 src/core/hle/service/cfg/cfg_u.h   | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index d554c3f54..8f1ec47cc 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -528,9 +528,9 @@ ResultCode LoadConfigNANDSaveFile() {
 }
 
 void Init() {
-    AddService(new CFG_I_Interface);
-    AddService(new CFG_S_Interface);
-    AddService(new CFG_U_Interface);
+    AddService(new CFG_I);
+    AddService(new CFG_S);
+    AddService(new CFG_U);
 
     LoadConfigNANDSaveFile();
 }
diff --git a/src/core/hle/service/cfg/cfg_i.cpp b/src/core/hle/service/cfg/cfg_i.cpp
index 46312da4b..e8db0fc42 100644
--- a/src/core/hle/service/cfg/cfg_i.cpp
+++ b/src/core/hle/service/cfg/cfg_i.cpp
@@ -56,7 +56,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x08180042, nullptr, "SecureInfoGetSerialNo"},
 };
 
-CFG_I_Interface::CFG_I_Interface() {
+CFG_I::CFG_I() {
     Register(FunctionTable);
 }
 
diff --git a/src/core/hle/service/cfg/cfg_i.h b/src/core/hle/service/cfg/cfg_i.h
index d0a2cce39..8cfd47633 100644
--- a/src/core/hle/service/cfg/cfg_i.h
+++ b/src/core/hle/service/cfg/cfg_i.h
@@ -9,9 +9,9 @@
 namespace Service {
 namespace CFG {
 
-class CFG_I_Interface : public Service::Interface {
+class CFG_I final : public Interface {
 public:
-    CFG_I_Interface();
+    CFG_I();
 
     std::string GetPortName() const override {
         return "cfg:i";
diff --git a/src/core/hle/service/cfg/cfg_s.cpp b/src/core/hle/service/cfg/cfg_s.cpp
index 564a9bb08..9386fe33d 100644
--- a/src/core/hle/service/cfg/cfg_s.cpp
+++ b/src/core/hle/service/cfg/cfg_s.cpp
@@ -33,7 +33,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x04090000, nullptr, "UpdateConfigBlk00040003"},
 };
 
-CFG_S_Interface::CFG_S_Interface() {
+CFG_S::CFG_S() {
     Register(FunctionTable);
 }
 
diff --git a/src/core/hle/service/cfg/cfg_s.h b/src/core/hle/service/cfg/cfg_s.h
index 5568d6485..99fea46ee 100644
--- a/src/core/hle/service/cfg/cfg_s.h
+++ b/src/core/hle/service/cfg/cfg_s.h
@@ -9,9 +9,9 @@
 namespace Service {
 namespace CFG {
 
-class CFG_S_Interface : public Service::Interface {
+class CFG_S final : public Interface {
 public:
-    CFG_S_Interface();
+    CFG_S();
 
     std::string GetPortName() const override {
         return "cfg:s";
diff --git a/src/core/hle/service/cfg/cfg_u.cpp b/src/core/hle/service/cfg/cfg_u.cpp
index 4c82846c0..7b66fee22 100644
--- a/src/core/hle/service/cfg/cfg_u.cpp
+++ b/src/core/hle/service/cfg/cfg_u.cpp
@@ -23,7 +23,7 @@ const Interface::FunctionInfo FunctionTable[] = {
     {0x000B0000, nullptr, "IsFangateSupported"},
 };
 
-CFG_U_Interface::CFG_U_Interface() {
+CFG_U::CFG_U() {
     Register(FunctionTable);
 }
 
diff --git a/src/core/hle/service/cfg/cfg_u.h b/src/core/hle/service/cfg/cfg_u.h
index 5303d8ac6..fc7844714 100644
--- a/src/core/hle/service/cfg/cfg_u.h
+++ b/src/core/hle/service/cfg/cfg_u.h
@@ -9,9 +9,9 @@
 namespace Service {
 namespace CFG {
 
-class CFG_U_Interface : public Service::Interface {
+class CFG_U final : public Interface {
 public:
-    CFG_U_Interface();
+    CFG_U();
 
     std::string GetPortName() const override {
         return "cfg:u";
-- 
cgit v1.2.3