Просмотр исходного кода

applets: Append applet_ prefix to backend applets

Morph 5 лет назад
Родитель
Сommit
79824d7d1b

+ 14 - 14
src/core/CMakeLists.txt

@@ -272,22 +272,22 @@ add_library(core STATIC
     hle/service/am/applet_ae.h
     hle/service/am/applet_oe.cpp
     hle/service/am/applet_oe.h
+    hle/service/am/applets/applet_controller.cpp
+    hle/service/am/applets/applet_controller.h
+    hle/service/am/applets/applet_error.cpp
+    hle/service/am/applets/applet_error.h
+    hle/service/am/applets/applet_general_backend.cpp
+    hle/service/am/applets/applet_general_backend.h
+    hle/service/am/applets/applet_profile_select.cpp
+    hle/service/am/applets/applet_profile_select.h
+    hle/service/am/applets/applet_software_keyboard.cpp
+    hle/service/am/applets/applet_software_keyboard.h
+    hle/service/am/applets/applet_software_keyboard_types.h
+    hle/service/am/applets/applet_web_browser.cpp
+    hle/service/am/applets/applet_web_browser.h
+    hle/service/am/applets/applet_web_browser_types.h
     hle/service/am/applets/applets.cpp
     hle/service/am/applets/applets.h
-    hle/service/am/applets/controller.cpp
-    hle/service/am/applets/controller.h
-    hle/service/am/applets/error.cpp
-    hle/service/am/applets/error.h
-    hle/service/am/applets/general_backend.cpp
-    hle/service/am/applets/general_backend.h
-    hle/service/am/applets/profile_select.cpp
-    hle/service/am/applets/profile_select.h
-    hle/service/am/applets/software_keyboard.cpp
-    hle/service/am/applets/software_keyboard.h
-    hle/service/am/applets/software_keyboard_types.h
-    hle/service/am/applets/web_browser.cpp
-    hle/service/am/applets/web_browser.h
-    hle/service/am/applets/web_types.h
     hle/service/am/idle.cpp
     hle/service/am/idle.h
     hle/service/am/omm.cpp

+ 1 - 1
src/core/frontend/applets/software_keyboard.h

@@ -9,7 +9,7 @@
 
 #include "common/common_types.h"
 
-#include "core/hle/service/am/applets/software_keyboard_types.h"
+#include "core/hle/service/am/applets/applet_software_keyboard_types.h"
 
 namespace Core::Frontend {
 

+ 1 - 1
src/core/frontend/applets/web_browser.h

@@ -7,7 +7,7 @@
 #include <functional>
 #include <string_view>
 
-#include "core/hle/service/am/applets/web_types.h"
+#include "core/hle/service/am/applets/applet_web_browser_types.h"
 
 namespace Core::Frontend {
 

+ 3 - 3
src/core/hle/service/am/am.cpp

@@ -24,10 +24,10 @@
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applet_ae.h"
 #include "core/hle/service/am/applet_oe.h"
+#include "core/hle/service/am/applets/applet_profile_select.h"
+#include "core/hle/service/am/applets/applet_software_keyboard.h"
+#include "core/hle/service/am/applets/applet_web_browser.h"
 #include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/am/applets/profile_select.h"
-#include "core/hle/service/am/applets/software_keyboard.h"
-#include "core/hle/service/am/applets/web_browser.h"
 #include "core/hle/service/am/idle.h"
 #include "core/hle/service/am/omm.h"
 #include "core/hle/service/am/spsm.h"

+ 1 - 1
src/core/hle/service/am/applets/controller.cpp → src/core/hle/service/am/applets/applet_controller.cpp

@@ -12,7 +12,7 @@
 #include "core/frontend/applets/controller.h"
 #include "core/hle/result.h"
 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/applets/controller.h"
+#include "core/hle/service/am/applets/applet_controller.h"
 #include "core/hle/service/hid/controllers/npad.h"
 
 namespace Service::AM::Applets {

+ 0 - 0
src/core/hle/service/am/applets/controller.h → src/core/hle/service/am/applets/applet_controller.h


+ 1 - 1
src/core/hle/service/am/applets/error.cpp → src/core/hle/service/am/applets/applet_error.cpp

@@ -11,7 +11,7 @@
 #include "core/frontend/applets/error.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/applets/error.h"
+#include "core/hle/service/am/applets/applet_error.h"
 #include "core/reporter.h"
 
 namespace Service::AM::Applets {

+ 0 - 0
src/core/hle/service/am/applets/error.h → src/core/hle/service/am/applets/applet_error.h


+ 1 - 1
src/core/hle/service/am/applets/general_backend.cpp → src/core/hle/service/am/applets/applet_general_backend.cpp

@@ -12,7 +12,7 @@
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/result.h"
 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/applets/general_backend.h"
+#include "core/hle/service/am/applets/applet_general_backend.h"
 #include "core/reporter.h"
 
 namespace Service::AM::Applets {

+ 0 - 0
src/core/hle/service/am/applets/general_backend.h → src/core/hle/service/am/applets/applet_general_backend.h


+ 1 - 1
src/core/hle/service/am/applets/profile_select.cpp → src/core/hle/service/am/applets/applet_profile_select.cpp

@@ -9,7 +9,7 @@
 #include "core/core.h"
 #include "core/frontend/applets/profile_select.h"
 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/applets/profile_select.h"
+#include "core/hle/service/am/applets/applet_profile_select.h"
 
 namespace Service::AM::Applets {
 

+ 0 - 0
src/core/hle/service/am/applets/profile_select.h → src/core/hle/service/am/applets/applet_profile_select.h


+ 1 - 1
src/core/hle/service/am/applets/software_keyboard.cpp → src/core/hle/service/am/applets/applet_software_keyboard.cpp

@@ -6,7 +6,7 @@
 #include "core/core.h"
 #include "core/frontend/applets/software_keyboard.h"
 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/applets/software_keyboard.h"
+#include "core/hle/service/am/applets/applet_software_keyboard.h"
 
 namespace Service::AM::Applets {
 

+ 1 - 1
src/core/hle/service/am/applets/software_keyboard.h → src/core/hle/service/am/applets/applet_software_keyboard.h

@@ -7,8 +7,8 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "core/hle/result.h"
+#include "core/hle/service/am/applets/applet_software_keyboard_types.h"
 #include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/am/applets/software_keyboard_types.h"
 
 namespace Core {
 class System;

+ 0 - 0
src/core/hle/service/am/applets/software_keyboard_types.h → src/core/hle/service/am/applets/applet_software_keyboard_types.h


+ 1 - 1
src/core/hle/service/am/applets/web_browser.cpp → src/core/hle/service/am/applets/applet_web_browser.cpp

@@ -21,7 +21,7 @@
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/result.h"
 #include "core/hle/service/am/am.h"
-#include "core/hle/service/am/applets/web_browser.h"
+#include "core/hle/service/am/applets/applet_web_browser.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/ns/pl_u.h"
 

+ 1 - 1
src/core/hle/service/am/applets/web_browser.h → src/core/hle/service/am/applets/applet_web_browser.h

@@ -11,8 +11,8 @@
 #include "common/common_types.h"
 #include "core/file_sys/vfs_types.h"
 #include "core/hle/result.h"
+#include "core/hle/service/am/applets/applet_web_browser_types.h"
 #include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/am/applets/web_types.h"
 
 namespace Core {
 class System;

+ 0 - 0
src/core/hle/service/am/applets/web_types.h → src/core/hle/service/am/applets/applet_web_browser_types.h


+ 6 - 6
src/core/hle/service/am/applets/applets.cpp

@@ -17,13 +17,13 @@
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applet_ae.h"
 #include "core/hle/service/am/applet_oe.h"
+#include "core/hle/service/am/applets/applet_controller.h"
+#include "core/hle/service/am/applets/applet_error.h"
+#include "core/hle/service/am/applets/applet_general_backend.h"
+#include "core/hle/service/am/applets/applet_profile_select.h"
+#include "core/hle/service/am/applets/applet_software_keyboard.h"
+#include "core/hle/service/am/applets/applet_web_browser.h"
 #include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/am/applets/controller.h"
-#include "core/hle/service/am/applets/error.h"
-#include "core/hle/service/am/applets/general_backend.h"
-#include "core/hle/service/am/applets/profile_select.h"
-#include "core/hle/service/am/applets/software_keyboard.h"
-#include "core/hle/service/am/applets/web_browser.h"
 #include "core/hle/service/sm/sm.h"
 
 namespace Service::AM::Applets {