From 9a48f252ae7b4471286a7d8899a0c70dff354b1a Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 14 Jul 2021 00:29:12 -0400 Subject: [PATCH 1/3] applets: Append qt_ prefix to Qt frontend applets --- src/yuzu/CMakeLists.txt | 25 ++++++++++--------- .../{controller.cpp => qt_controller.cpp} | 4 +-- .../applets/{controller.h => qt_controller.h} | 0 .../{controller.ui => qt_controller.ui} | 0 src/yuzu/applets/{error.cpp => qt_error.cpp} | 2 +- src/yuzu/applets/{error.h => qt_error.h} | 0 ...ofile_select.cpp => qt_profile_select.cpp} | 2 +- .../{profile_select.h => qt_profile_select.h} | 0 ..._keyboard.cpp => qt_software_keyboard.cpp} | 4 +-- ...ware_keyboard.h => qt_software_keyboard.h} | 0 ...re_keyboard.ui => qt_software_keyboard.ui} | 0 .../{web_browser.cpp => qt_web_browser.cpp} | 4 +-- .../{web_browser.h => qt_web_browser.h} | 0 ...ser_scripts.h => qt_web_browser_scripts.h} | 0 src/yuzu/main.cpp | 10 ++++---- 15 files changed, 26 insertions(+), 25 deletions(-) rename src/yuzu/applets/{controller.cpp => qt_controller.cpp} (99%) rename src/yuzu/applets/{controller.h => qt_controller.h} (100%) rename src/yuzu/applets/{controller.ui => qt_controller.ui} (100%) rename src/yuzu/applets/{error.cpp => qt_error.cpp} (98%) rename src/yuzu/applets/{error.h => qt_error.h} (100%) rename src/yuzu/applets/{profile_select.cpp => qt_profile_select.cpp} (99%) rename src/yuzu/applets/{profile_select.h => qt_profile_select.h} (100%) rename src/yuzu/applets/{software_keyboard.cpp => qt_software_keyboard.cpp} (99%) rename src/yuzu/applets/{software_keyboard.h => qt_software_keyboard.h} (100%) rename src/yuzu/applets/{software_keyboard.ui => qt_software_keyboard.ui} (100%) rename src/yuzu/applets/{web_browser.cpp => qt_web_browser.cpp} (99%) rename src/yuzu/applets/{web_browser.h => qt_web_browser.h} (100%) rename src/yuzu/applets/{web_browser_scripts.h => qt_web_browser_scripts.h} (100%) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index f870b33b1c..cb4bdcc7e9 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -15,18 +15,19 @@ add_executable(yuzu about_dialog.cpp about_dialog.h aboutdialog.ui - applets/controller.cpp - applets/controller.h - applets/controller.ui - applets/error.cpp - applets/error.h - applets/profile_select.cpp - applets/profile_select.h - applets/software_keyboard.cpp - applets/software_keyboard.h - applets/software_keyboard.ui - applets/web_browser.cpp - applets/web_browser.h + applets/qt_controller.cpp + applets/qt_controller.h + applets/qt_controller.ui + applets/qt_error.cpp + applets/qt_error.h + applets/qt_profile_select.cpp + applets/qt_profile_select.h + applets/qt_software_keyboard.cpp + applets/qt_software_keyboard.h + applets/qt_software_keyboard.ui + applets/qt_web_browser.cpp + applets/qt_web_browser.h + applets/qt_web_browser_scripts.h bootmanager.cpp bootmanager.h compatdb.ui diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/qt_controller.cpp similarity index 99% rename from src/yuzu/applets/controller.cpp rename to src/yuzu/applets/qt_controller.cpp index 836d90fda8..97106d2ccc 100644 --- a/src/yuzu/applets/controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp @@ -12,8 +12,8 @@ #include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/hid.h" #include "core/hle/service/sm/sm.h" -#include "ui_controller.h" -#include "yuzu/applets/controller.h" +#include "ui_qt_controller.h" +#include "yuzu/applets/qt_controller.h" #include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input_profile_dialog.h" #include "yuzu/configuration/configure_motion_touch.h" diff --git a/src/yuzu/applets/controller.h b/src/yuzu/applets/qt_controller.h similarity index 100% rename from src/yuzu/applets/controller.h rename to src/yuzu/applets/qt_controller.h diff --git a/src/yuzu/applets/controller.ui b/src/yuzu/applets/qt_controller.ui similarity index 100% rename from src/yuzu/applets/controller.ui rename to src/yuzu/applets/qt_controller.ui diff --git a/src/yuzu/applets/error.cpp b/src/yuzu/applets/qt_error.cpp similarity index 98% rename from src/yuzu/applets/error.cpp rename to src/yuzu/applets/qt_error.cpp index 085688cd47..45cf646033 100644 --- a/src/yuzu/applets/error.cpp +++ b/src/yuzu/applets/qt_error.cpp @@ -4,7 +4,7 @@ #include #include "core/hle/lock.h" -#include "yuzu/applets/error.h" +#include "yuzu/applets/qt_error.h" #include "yuzu/main.h" QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { diff --git a/src/yuzu/applets/error.h b/src/yuzu/applets/qt_error.h similarity index 100% rename from src/yuzu/applets/error.h rename to src/yuzu/applets/qt_error.h diff --git a/src/yuzu/applets/profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp similarity index 99% rename from src/yuzu/applets/profile_select.cpp rename to src/yuzu/applets/qt_profile_select.cpp index 62fd1141c8..a56638e211 100644 --- a/src/yuzu/applets/profile_select.cpp +++ b/src/yuzu/applets/qt_profile_select.cpp @@ -14,7 +14,7 @@ #include "common/string_util.h" #include "core/constants.h" #include "core/hle/lock.h" -#include "yuzu/applets/profile_select.h" +#include "yuzu/applets/qt_profile_select.h" #include "yuzu/main.h" namespace { diff --git a/src/yuzu/applets/profile_select.h b/src/yuzu/applets/qt_profile_select.h similarity index 100% rename from src/yuzu/applets/profile_select.h rename to src/yuzu/applets/qt_profile_select.h diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/qt_software_keyboard.cpp similarity index 99% rename from src/yuzu/applets/software_keyboard.cpp rename to src/yuzu/applets/qt_software_keyboard.cpp index aa453a79fb..848801cec7 100644 --- a/src/yuzu/applets/software_keyboard.cpp +++ b/src/yuzu/applets/qt_software_keyboard.cpp @@ -11,8 +11,8 @@ #include "common/string_util.h" #include "core/core.h" #include "core/frontend/input_interpreter.h" -#include "ui_software_keyboard.h" -#include "yuzu/applets/software_keyboard.h" +#include "ui_qt_software_keyboard.h" +#include "yuzu/applets/qt_software_keyboard.h" #include "yuzu/main.h" #include "yuzu/util/overlay_dialog.h" diff --git a/src/yuzu/applets/software_keyboard.h b/src/yuzu/applets/qt_software_keyboard.h similarity index 100% rename from src/yuzu/applets/software_keyboard.h rename to src/yuzu/applets/qt_software_keyboard.h diff --git a/src/yuzu/applets/software_keyboard.ui b/src/yuzu/applets/qt_software_keyboard.ui similarity index 100% rename from src/yuzu/applets/software_keyboard.ui rename to src/yuzu/applets/qt_software_keyboard.ui diff --git a/src/yuzu/applets/web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp similarity index 99% rename from src/yuzu/applets/web_browser.cpp rename to src/yuzu/applets/qt_web_browser.cpp index 34d3feb550..b112dd7b07 100644 --- a/src/yuzu/applets/web_browser.cpp +++ b/src/yuzu/applets/qt_web_browser.cpp @@ -17,8 +17,8 @@ #include "core/frontend/input_interpreter.h" #include "input_common/keyboard.h" #include "input_common/main.h" -#include "yuzu/applets/web_browser.h" -#include "yuzu/applets/web_browser_scripts.h" +#include "yuzu/applets/qt_web_browser.h" +#include "yuzu/applets/qt_web_browser_scripts.h" #include "yuzu/main.h" #include "yuzu/util/url_request_interceptor.h" diff --git a/src/yuzu/applets/web_browser.h b/src/yuzu/applets/qt_web_browser.h similarity index 100% rename from src/yuzu/applets/web_browser.h rename to src/yuzu/applets/qt_web_browser.h diff --git a/src/yuzu/applets/web_browser_scripts.h b/src/yuzu/applets/qt_web_browser_scripts.h similarity index 100% rename from src/yuzu/applets/web_browser_scripts.h rename to src/yuzu/applets/qt_web_browser_scripts.h diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index fbd5001e99..b7fd33ae7f 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -11,11 +11,11 @@ #endif // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. -#include "applets/controller.h" -#include "applets/error.h" -#include "applets/profile_select.h" -#include "applets/software_keyboard.h" -#include "applets/web_browser.h" +#include "applets/qt_controller.h" +#include "applets/qt_error.h" +#include "applets/qt_profile_select.h" +#include "applets/qt_software_keyboard.h" +#include "applets/qt_web_browser.h" #include "common/nvidia_flags.h" #include "configuration/configure_input.h" #include "configuration/configure_per_game.h" From 79824d7d1b69382571e5c05fe3e66485212d06f5 Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 14 Jul 2021 00:38:24 -0400 Subject: [PATCH 2/3] applets: Append applet_ prefix to backend applets --- src/core/CMakeLists.txt | 28 +++++++++---------- src/core/frontend/applets/software_keyboard.h | 2 +- src/core/frontend/applets/web_browser.h | 2 +- src/core/hle/service/am/am.cpp | 6 ++-- .../{controller.cpp => applet_controller.cpp} | 2 +- .../{controller.h => applet_controller.h} | 0 .../applets/{error.cpp => applet_error.cpp} | 2 +- .../am/applets/{error.h => applet_error.h} | 0 ...backend.cpp => applet_general_backend.cpp} | 2 +- ...ral_backend.h => applet_general_backend.h} | 0 ...e_select.cpp => applet_profile_select.cpp} | 2 +- ...ofile_select.h => applet_profile_select.h} | 0 ...board.cpp => applet_software_keyboard.cpp} | 2 +- ..._keyboard.h => applet_software_keyboard.h} | 2 +- ...pes.h => applet_software_keyboard_types.h} | 0 ...web_browser.cpp => applet_web_browser.cpp} | 2 +- .../{web_browser.h => applet_web_browser.h} | 2 +- ...web_types.h => applet_web_browser_types.h} | 0 src/core/hle/service/am/applets/applets.cpp | 12 ++++---- 19 files changed, 33 insertions(+), 33 deletions(-) rename src/core/hle/service/am/applets/{controller.cpp => applet_controller.cpp} (99%) rename src/core/hle/service/am/applets/{controller.h => applet_controller.h} (100%) rename src/core/hle/service/am/applets/{error.cpp => applet_error.cpp} (99%) rename src/core/hle/service/am/applets/{error.h => applet_error.h} (100%) rename src/core/hle/service/am/applets/{general_backend.cpp => applet_general_backend.cpp} (99%) rename src/core/hle/service/am/applets/{general_backend.h => applet_general_backend.h} (100%) rename src/core/hle/service/am/applets/{profile_select.cpp => applet_profile_select.cpp} (97%) rename src/core/hle/service/am/applets/{profile_select.h => applet_profile_select.h} (100%) rename src/core/hle/service/am/applets/{software_keyboard.cpp => applet_software_keyboard.cpp} (99%) rename src/core/hle/service/am/applets/{software_keyboard.h => applet_software_keyboard.h} (98%) rename src/core/hle/service/am/applets/{software_keyboard_types.h => applet_software_keyboard_types.h} (100%) rename src/core/hle/service/am/applets/{web_browser.cpp => applet_web_browser.cpp} (99%) rename src/core/hle/service/am/applets/{web_browser.h => applet_web_browser.h} (97%) rename src/core/hle/service/am/applets/{web_types.h => applet_web_browser_types.h} (100%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index b2b0dbe051..48b16f8f76 100644 --- a/src/core/CMakeLists.txt +++ b/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 diff --git a/src/core/frontend/applets/software_keyboard.h b/src/core/frontend/applets/software_keyboard.h index 506eb35bb1..228a548d45 100644 --- a/src/core/frontend/applets/software_keyboard.h +++ b/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 { diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h index d7bd44c277..915dde6779 100644 --- a/src/core/frontend/applets/web_browser.h +++ b/src/core/frontend/applets/web_browser.h @@ -7,7 +7,7 @@ #include #include -#include "core/hle/service/am/applets/web_types.h" +#include "core/hle/service/am/applets/applet_web_browser_types.h" namespace Core::Frontend { diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 23ebc11382..41f1e6b686 100644 --- a/src/core/hle/service/am/am.cpp +++ b/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" diff --git a/src/core/hle/service/am/applets/controller.cpp b/src/core/hle/service/am/applets/applet_controller.cpp similarity index 99% rename from src/core/hle/service/am/applets/controller.cpp rename to src/core/hle/service/am/applets/applet_controller.cpp index 218c8d1e41..12682effe6 100644 --- a/src/core/hle/service/am/applets/controller.cpp +++ b/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 { diff --git a/src/core/hle/service/am/applets/controller.h b/src/core/hle/service/am/applets/applet_controller.h similarity index 100% rename from src/core/hle/service/am/applets/controller.h rename to src/core/hle/service/am/applets/applet_controller.h diff --git a/src/core/hle/service/am/applets/error.cpp b/src/core/hle/service/am/applets/applet_error.cpp similarity index 99% rename from src/core/hle/service/am/applets/error.cpp rename to src/core/hle/service/am/applets/applet_error.cpp index c724e5d5bf..ef6854d620 100644 --- a/src/core/hle/service/am/applets/error.cpp +++ b/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 { diff --git a/src/core/hle/service/am/applets/error.h b/src/core/hle/service/am/applets/applet_error.h similarity index 100% rename from src/core/hle/service/am/applets/error.h rename to src/core/hle/service/am/applets/applet_error.h diff --git a/src/core/hle/service/am/applets/general_backend.cpp b/src/core/hle/service/am/applets/applet_general_backend.cpp similarity index 99% rename from src/core/hle/service/am/applets/general_backend.cpp rename to src/core/hle/service/am/applets/applet_general_backend.cpp index 9fcb9f95bd..0f413f9a00 100644 --- a/src/core/hle/service/am/applets/general_backend.cpp +++ b/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 { diff --git a/src/core/hle/service/am/applets/general_backend.h b/src/core/hle/service/am/applets/applet_general_backend.h similarity index 100% rename from src/core/hle/service/am/applets/general_backend.h rename to src/core/hle/service/am/applets/applet_general_backend.h diff --git a/src/core/hle/service/am/applets/profile_select.cpp b/src/core/hle/service/am/applets/applet_profile_select.cpp similarity index 97% rename from src/core/hle/service/am/applets/profile_select.cpp rename to src/core/hle/service/am/applets/applet_profile_select.cpp index 37048be264..bdc21778e7 100644 --- a/src/core/hle/service/am/applets/profile_select.cpp +++ b/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 { diff --git a/src/core/hle/service/am/applets/profile_select.h b/src/core/hle/service/am/applets/applet_profile_select.h similarity index 100% rename from src/core/hle/service/am/applets/profile_select.h rename to src/core/hle/service/am/applets/applet_profile_select.h diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp similarity index 99% rename from src/core/hle/service/am/applets/software_keyboard.cpp rename to src/core/hle/service/am/applets/applet_software_keyboard.cpp index 00dfe16751..7cae906090 100644 --- a/src/core/hle/service/am/applets/software_keyboard.cpp +++ b/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 { diff --git a/src/core/hle/service/am/applets/software_keyboard.h b/src/core/hle/service/am/applets/applet_software_keyboard.h similarity index 98% rename from src/core/hle/service/am/applets/software_keyboard.h rename to src/core/hle/service/am/applets/applet_software_keyboard.h index e3fc733d0d..9aef1bf110 100644 --- a/src/core/hle/service/am/applets/software_keyboard.h +++ b/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; diff --git a/src/core/hle/service/am/applets/software_keyboard_types.h b/src/core/hle/service/am/applets/applet_software_keyboard_types.h similarity index 100% rename from src/core/hle/service/am/applets/software_keyboard_types.h rename to src/core/hle/service/am/applets/applet_software_keyboard_types.h diff --git a/src/core/hle/service/am/applets/web_browser.cpp b/src/core/hle/service/am/applets/applet_web_browser.cpp similarity index 99% rename from src/core/hle/service/am/applets/web_browser.cpp rename to src/core/hle/service/am/applets/applet_web_browser.cpp index 3b28e829be..f96f0fee38 100644 --- a/src/core/hle/service/am/applets/web_browser.cpp +++ b/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" diff --git a/src/core/hle/service/am/applets/web_browser.h b/src/core/hle/service/am/applets/applet_web_browser.h similarity index 97% rename from src/core/hle/service/am/applets/web_browser.h rename to src/core/hle/service/am/applets/applet_web_browser.h index 9f81214b66..4f9e81b790 100644 --- a/src/core/hle/service/am/applets/web_browser.h +++ b/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; diff --git a/src/core/hle/service/am/applets/web_types.h b/src/core/hle/service/am/applets/applet_web_browser_types.h similarity index 100% rename from src/core/hle/service/am/applets/web_types.h rename to src/core/hle/service/am/applets/applet_web_browser_types.h diff --git a/src/core/hle/service/am/applets/applets.cpp b/src/core/hle/service/am/applets/applets.cpp index ae995df6b0..2b7685d42f 100644 --- a/src/core/hle/service/am/applets/applets.cpp +++ b/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 { From c6d7da88c7ab125279ea4ccad0e3e839632b2f7a Mon Sep 17 00:00:00 2001 From: Morph <39850852+Morph1984@users.noreply.github.com> Date: Wed, 14 Jul 2021 00:52:17 -0400 Subject: [PATCH 3/3] service: Append service name prefix to common filenames --- src/core/CMakeLists.txt | 44 +++++++++---------- src/core/core.cpp | 4 +- src/core/hardware_interrupt_manager.cpp | 2 +- src/core/hle/service/acc/acc.cpp | 2 +- src/core/hle/service/acc/acc.h | 2 +- src/core/hle/service/am/am.cpp | 4 +- src/core/hle/service/apm/apm.cpp | 2 +- .../{controller.cpp => apm_controller.cpp} | 2 +- .../apm/{controller.h => apm_controller.h} | 0 .../apm/{interface.cpp => apm_interface.cpp} | 4 +- .../apm/{interface.h => apm_interface.h} | 0 src/core/hle/service/bcat/bcat.h | 2 +- .../bcat/{module.cpp => bcat_module.cpp} | 2 +- .../service/bcat/{module.h => bcat_module.h} | 0 src/core/hle/service/friend/friend.cpp | 2 +- .../{interface.cpp => friend_interface.cpp} | 2 +- .../{interface.h => friend_interface.h} | 0 src/core/hle/service/glue/arp.cpp | 2 +- .../glue/{manager.cpp => glue_manager.cpp} | 2 +- .../glue/{manager.h => glue_manager.h} | 0 src/core/hle/service/mii/mii.cpp | 2 +- .../mii/{manager.cpp => mii_manager.cpp} | 2 +- .../service/mii/{manager.h => mii_manager.h} | 0 src/core/hle/service/mii/raw_data.h | 2 +- src/core/hle/service/nvdrv/nvdrv.cpp | 2 +- .../{interface.cpp => nvdrv_interface.cpp} | 2 +- .../nvdrv/{interface.h => nvdrv_interface.h} | 0 src/core/hle/service/pctl/pctl.h | 2 +- .../pctl/{module.cpp => pctl_module.cpp} | 2 +- .../service/pctl/{module.h => pctl_module.h} | 0 src/core/hle/service/service.cpp | 6 +-- src/core/hle/service/sm/sm.cpp | 2 +- .../sm/{controller.cpp => sm_controller.cpp} | 2 +- .../sm/{controller.h => sm_controller.h} | 0 src/core/hle/service/spl/csrng.h | 2 +- src/core/hle/service/spl/spl.h | 2 +- .../spl/{module.cpp => spl_module.cpp} | 2 +- .../service/spl/{module.h => spl_module.h} | 0 src/core/hle/service/time/time.cpp | 2 +- .../{interface.cpp => time_interface.cpp} | 2 +- .../time/{interface.h => time_interface.h} | 0 41 files changed, 56 insertions(+), 56 deletions(-) rename src/core/hle/service/apm/{controller.cpp => apm_controller.cpp} (98%) rename src/core/hle/service/apm/{controller.h => apm_controller.h} (100%) rename src/core/hle/service/apm/{interface.cpp => apm_interface.cpp} (97%) rename src/core/hle/service/apm/{interface.h => apm_interface.h} (100%) rename src/core/hle/service/bcat/{module.cpp => bcat_module.cpp} (99%) rename src/core/hle/service/bcat/{module.h => bcat_module.h} (100%) rename src/core/hle/service/friend/{interface.cpp => friend_interface.cpp} (92%) rename src/core/hle/service/friend/{interface.h => friend_interface.h} (100%) rename src/core/hle/service/glue/{manager.cpp => glue_manager.cpp} (97%) rename src/core/hle/service/glue/{manager.h => glue_manager.h} (100%) rename src/core/hle/service/mii/{manager.cpp => mii_manager.cpp} (99%) rename src/core/hle/service/mii/{manager.h => mii_manager.h} (100%) rename src/core/hle/service/nvdrv/{interface.cpp => nvdrv_interface.cpp} (99%) rename src/core/hle/service/nvdrv/{interface.h => nvdrv_interface.h} (100%) rename src/core/hle/service/pctl/{module.cpp => pctl_module.cpp} (99%) rename src/core/hle/service/pctl/{module.h => pctl_module.h} (100%) rename src/core/hle/service/sm/{controller.cpp => sm_controller.cpp} (98%) rename src/core/hle/service/sm/{controller.h => sm_controller.h} (100%) rename src/core/hle/service/spl/{module.cpp => spl_module.cpp} (99%) rename src/core/hle/service/spl/{module.h => spl_module.h} (100%) rename src/core/hle/service/time/{interface.cpp => time_interface.cpp} (97%) rename src/core/hle/service/time/{interface.h => time_interface.h} (100%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 48b16f8f76..c7b8991315 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -300,10 +300,10 @@ add_library(core STATIC hle/service/aoc/aoc_u.h hle/service/apm/apm.cpp hle/service/apm/apm.h - hle/service/apm/controller.cpp - hle/service/apm/controller.h - hle/service/apm/interface.cpp - hle/service/apm/interface.h + hle/service/apm/apm_controller.cpp + hle/service/apm/apm_controller.h + hle/service/apm/apm_interface.cpp + hle/service/apm/apm_interface.h hle/service/audio/audctl.cpp hle/service/audio/audctl.h hle/service/audio/auddbg.cpp @@ -335,8 +335,8 @@ add_library(core STATIC hle/service/bcat/backend/backend.h hle/service/bcat/bcat.cpp hle/service/bcat/bcat.h - hle/service/bcat/module.cpp - hle/service/bcat/module.h + hle/service/bcat/bcat_module.cpp + hle/service/bcat/bcat_module.h hle/service/bpc/bpc.cpp hle/service/bpc/bpc.h hle/service/btdrv/btdrv.cpp @@ -382,8 +382,8 @@ add_library(core STATIC hle/service/friend/errors.h hle/service/friend/friend.cpp hle/service/friend/friend.h - hle/service/friend/interface.cpp - hle/service/friend/interface.h + hle/service/friend/friend_interface.cpp + hle/service/friend/friend_interface.h hle/service/glue/arp.cpp hle/service/glue/arp.h hle/service/glue/bgtc.cpp @@ -393,8 +393,8 @@ add_library(core STATIC hle/service/glue/errors.h hle/service/glue/glue.cpp hle/service/glue/glue.h - hle/service/glue/manager.cpp - hle/service/glue/manager.h + hle/service/glue/glue_manager.cpp + hle/service/glue/glue_manager.h hle/service/grc/grc.cpp hle/service/grc/grc.h hle/service/hid/hid.cpp @@ -435,10 +435,10 @@ add_library(core STATIC hle/service/lm/lm.h hle/service/mig/mig.cpp hle/service/mig/mig.h - hle/service/mii/manager.cpp - hle/service/mii/manager.h hle/service/mii/mii.cpp hle/service/mii/mii.h + hle/service/mii/mii_manager.cpp + hle/service/mii/mii_manager.h hle/service/mii/raw_data.cpp hle/service/mii/raw_data.h hle/service/mii/types.h @@ -486,11 +486,11 @@ add_library(core STATIC hle/service/nvdrv/devices/nvhost_vic.h hle/service/nvdrv/devices/nvmap.cpp hle/service/nvdrv/devices/nvmap.h - hle/service/nvdrv/interface.cpp - hle/service/nvdrv/interface.h hle/service/nvdrv/nvdata.h hle/service/nvdrv/nvdrv.cpp hle/service/nvdrv/nvdrv.h + hle/service/nvdrv/nvdrv_interface.cpp + hle/service/nvdrv/nvdrv_interface.h hle/service/nvdrv/nvmemp.cpp hle/service/nvdrv/nvmemp.h hle/service/nvdrv/syncpoint_manager.cpp @@ -503,10 +503,10 @@ add_library(core STATIC hle/service/olsc/olsc.h hle/service/pcie/pcie.cpp hle/service/pcie/pcie.h - hle/service/pctl/module.cpp - hle/service/pctl/module.h hle/service/pctl/pctl.cpp hle/service/pctl/pctl.h + hle/service/pctl/pctl_module.cpp + hle/service/pctl/pctl_module.h hle/service/pcv/pcv.cpp hle/service/pcv/pcv.h hle/service/pm/pm.cpp @@ -529,10 +529,10 @@ add_library(core STATIC hle/service/set/set_sys.h hle/service/set/settings.cpp hle/service/set/settings.h - hle/service/sm/controller.cpp - hle/service/sm/controller.h hle/service/sm/sm.cpp hle/service/sm/sm.h + hle/service/sm/sm_controller.cpp + hle/service/sm/sm_controller.h hle/service/sockets/bsd.cpp hle/service/sockets/bsd.h hle/service/sockets/ethc.cpp @@ -547,10 +547,10 @@ add_library(core STATIC hle/service/sockets/sockets_translate.h hle/service/spl/csrng.cpp hle/service/spl/csrng.h - hle/service/spl/module.cpp - hle/service/spl/module.h hle/service/spl/spl.cpp hle/service/spl/spl.h + hle/service/spl/spl_module.cpp + hle/service/spl/spl_module.h hle/service/spl/spl_results.h hle/service/spl/spl_types.h hle/service/ssl/ssl.cpp @@ -559,8 +559,6 @@ add_library(core STATIC hle/service/time/ephemeral_network_system_clock_context_writer.h hle/service/time/ephemeral_network_system_clock_core.h hle/service/time/errors.h - hle/service/time/interface.cpp - hle/service/time/interface.h hle/service/time/local_system_clock_context_writer.h hle/service/time/network_system_clock_context_writer.h hle/service/time/standard_local_system_clock_core.h @@ -578,6 +576,8 @@ add_library(core STATIC hle/service/time/tick_based_steady_clock_core.h hle/service/time/time.cpp hle/service/time/time.h + hle/service/time/time_interface.cpp + hle/service/time/time_interface.h hle/service/time/time_manager.cpp hle/service/time/time_manager.h hle/service/time/time_sharedmemory.cpp diff --git a/src/core/core.cpp b/src/core/core.cpp index 891f1cb491..406320ed6b 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -35,9 +35,9 @@ #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/physical_core.h" #include "core/hle/service/am/applets/applets.h" -#include "core/hle/service/apm/controller.h" +#include "core/hle/service/apm/apm_controller.h" #include "core/hle/service/filesystem/filesystem.h" -#include "core/hle/service/glue/manager.h" +#include "core/hle/service/glue/glue_manager.h" #include "core/hle/service/hid/hid.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" diff --git a/src/core/hardware_interrupt_manager.cpp b/src/core/hardware_interrupt_manager.cpp index 645f26e913..290db505ee 100644 --- a/src/core/hardware_interrupt_manager.cpp +++ b/src/core/hardware_interrupt_manager.cpp @@ -5,7 +5,7 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/hardware_interrupt_manager.h" -#include "core/hle/service/nvdrv/interface.h" +#include "core/hle/service/nvdrv/nvdrv_interface.h" #include "core/hle/service/sm/sm.h" namespace Core::Hardware { diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index d1c1fb71de..2e969f2a8c 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -26,7 +26,7 @@ #include "core/hle/service/acc/errors.h" #include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/glue/arp.h" -#include "core/hle/service/glue/manager.h" +#include "core/hle/service/glue/glue_manager.h" #include "core/hle/service/sm/sm.h" #include "core/loader/loader.h" diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h index 0e3ad8ec6f..a83a480cd4 100644 --- a/src/core/hle/service/acc/acc.h +++ b/src/core/hle/service/acc/acc.h @@ -5,7 +5,7 @@ #pragma once #include "common/uuid.h" -#include "core/hle/service/glue/manager.h" +#include "core/hle/service/glue/glue_manager.h" #include "core/hle/service/service.h" namespace Service::Account { diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 41f1e6b686..a538f82e34 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -32,8 +32,8 @@ #include "core/hle/service/am/omm.h" #include "core/hle/service/am/spsm.h" #include "core/hle/service/am/tcap.h" -#include "core/hle/service/apm/controller.h" -#include "core/hle/service/apm/interface.h" +#include "core/hle/service/apm/apm_controller.h" +#include "core/hle/service/apm/apm_interface.h" #include "core/hle/service/bcat/backend/backend.h" #include "core/hle/service/filesystem/filesystem.h" #include "core/hle/service/ns/ns.h" diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp index 97d6619dd9..f5ebfe8d64 100644 --- a/src/core/hle/service/apm/apm.cpp +++ b/src/core/hle/service/apm/apm.cpp @@ -5,7 +5,7 @@ #include "core/core.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/apm/apm.h" -#include "core/hle/service/apm/interface.h" +#include "core/hle/service/apm/apm_interface.h" namespace Service::APM { diff --git a/src/core/hle/service/apm/controller.cpp b/src/core/hle/service/apm/apm_controller.cpp similarity index 98% rename from src/core/hle/service/apm/controller.cpp rename to src/core/hle/service/apm/apm_controller.cpp index 8bfa7c0e4f..98839fe978 100644 --- a/src/core/hle/service/apm/controller.cpp +++ b/src/core/hle/service/apm/apm_controller.cpp @@ -9,7 +9,7 @@ #include "common/logging/log.h" #include "common/settings.h" #include "core/core_timing.h" -#include "core/hle/service/apm/controller.h" +#include "core/hle/service/apm/apm_controller.h" namespace Service::APM { diff --git a/src/core/hle/service/apm/controller.h b/src/core/hle/service/apm/apm_controller.h similarity index 100% rename from src/core/hle/service/apm/controller.h rename to src/core/hle/service/apm/apm_controller.h diff --git a/src/core/hle/service/apm/interface.cpp b/src/core/hle/service/apm/apm_interface.cpp similarity index 97% rename from src/core/hle/service/apm/interface.cpp rename to src/core/hle/service/apm/apm_interface.cpp index d69ddd135a..e58bad0833 100644 --- a/src/core/hle/service/apm/interface.cpp +++ b/src/core/hle/service/apm/apm_interface.cpp @@ -5,8 +5,8 @@ #include "common/logging/log.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/apm/apm.h" -#include "core/hle/service/apm/controller.h" -#include "core/hle/service/apm/interface.h" +#include "core/hle/service/apm/apm_controller.h" +#include "core/hle/service/apm/apm_interface.h" namespace Service::APM { diff --git a/src/core/hle/service/apm/interface.h b/src/core/hle/service/apm/apm_interface.h similarity index 100% rename from src/core/hle/service/apm/interface.h rename to src/core/hle/service/apm/apm_interface.h diff --git a/src/core/hle/service/bcat/bcat.h b/src/core/hle/service/bcat/bcat.h index d72798980f..1eba477dad 100644 --- a/src/core/hle/service/bcat/bcat.h +++ b/src/core/hle/service/bcat/bcat.h @@ -4,7 +4,7 @@ #pragma once -#include "core/hle/service/bcat/module.h" +#include "core/hle/service/bcat/bcat_module.h" namespace Core { class System; diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/bcat_module.cpp similarity index 99% rename from src/core/hle/service/bcat/module.cpp rename to src/core/hle/service/bcat/bcat_module.cpp index f85444da80..72294eb2e3 100644 --- a/src/core/hle/service/bcat/module.cpp +++ b/src/core/hle/service/bcat/bcat_module.cpp @@ -17,7 +17,7 @@ #include "core/hle/kernel/k_writable_event.h" #include "core/hle/service/bcat/backend/backend.h" #include "core/hle/service/bcat/bcat.h" -#include "core/hle/service/bcat/module.h" +#include "core/hle/service/bcat/bcat_module.h" #include "core/hle/service/filesystem/filesystem.h" namespace Service::BCAT { diff --git a/src/core/hle/service/bcat/module.h b/src/core/hle/service/bcat/bcat_module.h similarity index 100% rename from src/core/hle/service/bcat/module.h rename to src/core/hle/service/bcat/bcat_module.h diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index c5f88bce78..a3c939c0cd 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -12,7 +12,7 @@ #include "core/hle/kernel/k_writable_event.h" #include "core/hle/service/friend/errors.h" #include "core/hle/service/friend/friend.h" -#include "core/hle/service/friend/interface.h" +#include "core/hle/service/friend/friend_interface.h" namespace Service::Friend { diff --git a/src/core/hle/service/friend/interface.cpp b/src/core/hle/service/friend/friend_interface.cpp similarity index 92% rename from src/core/hle/service/friend/interface.cpp rename to src/core/hle/service/friend/friend_interface.cpp index 7368ccec2d..9b18b2a322 100644 --- a/src/core/hle/service/friend/interface.cpp +++ b/src/core/hle/service/friend/friend_interface.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/hle/service/friend/interface.h" +#include "core/hle/service/friend/friend_interface.h" namespace Service::Friend { diff --git a/src/core/hle/service/friend/interface.h b/src/core/hle/service/friend/friend_interface.h similarity index 100% rename from src/core/hle/service/friend/interface.h rename to src/core/hle/service/friend/friend_interface.h diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index ca25df67eb..5a3b54cc11 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -13,7 +13,7 @@ #include "core/hle/kernel/kernel.h" #include "core/hle/service/glue/arp.h" #include "core/hle/service/glue/errors.h" -#include "core/hle/service/glue/manager.h" +#include "core/hle/service/glue/glue_manager.h" #include "core/hle/service/service.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/manager.cpp b/src/core/hle/service/glue/glue_manager.cpp similarity index 97% rename from src/core/hle/service/glue/manager.cpp rename to src/core/hle/service/glue/glue_manager.cpp index 9b1754cf8c..aa9d48c0ce 100644 --- a/src/core/hle/service/glue/manager.cpp +++ b/src/core/hle/service/glue/glue_manager.cpp @@ -3,7 +3,7 @@ // Refer to the license.txt file included. #include "core/hle/service/glue/errors.h" -#include "core/hle/service/glue/manager.h" +#include "core/hle/service/glue/glue_manager.h" namespace Service::Glue { diff --git a/src/core/hle/service/glue/manager.h b/src/core/hle/service/glue/glue_manager.h similarity index 100% rename from src/core/hle/service/glue/manager.h rename to src/core/hle/service/glue/glue_manager.h diff --git a/src/core/hle/service/mii/mii.cpp b/src/core/hle/service/mii/mii.cpp index bbd81a88ac..9d863486ae 100644 --- a/src/core/hle/service/mii/mii.cpp +++ b/src/core/hle/service/mii/mii.cpp @@ -7,8 +7,8 @@ #include "common/logging/log.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/hle_ipc.h" -#include "core/hle/service/mii/manager.h" #include "core/hle/service/mii/mii.h" +#include "core/hle/service/mii/mii_manager.h" #include "core/hle/service/service.h" #include "core/hle/service/sm/sm.h" diff --git a/src/core/hle/service/mii/manager.cpp b/src/core/hle/service/mii/mii_manager.cpp similarity index 99% rename from src/core/hle/service/mii/manager.cpp rename to src/core/hle/service/mii/mii_manager.cpp index 869d2763f0..4fef2aea48 100644 --- a/src/core/hle/service/mii/manager.cpp +++ b/src/core/hle/service/mii/mii_manager.cpp @@ -10,7 +10,7 @@ #include "common/string_util.h" #include "core/hle/service/acc/profile_manager.h" -#include "core/hle/service/mii/manager.h" +#include "core/hle/service/mii/mii_manager.h" #include "core/hle/service/mii/raw_data.h" #include "core/hle/service/mii/types.h" diff --git a/src/core/hle/service/mii/manager.h b/src/core/hle/service/mii/mii_manager.h similarity index 100% rename from src/core/hle/service/mii/manager.h rename to src/core/hle/service/mii/mii_manager.h diff --git a/src/core/hle/service/mii/raw_data.h b/src/core/hle/service/mii/raw_data.h index 0e35d69d2b..a0d2b9d3a7 100644 --- a/src/core/hle/service/mii/raw_data.h +++ b/src/core/hle/service/mii/raw_data.h @@ -7,7 +7,7 @@ #include #include "common/common_types.h" -#include "core/hle/service/mii/manager.h" +#include "core/hle/service/mii/mii_manager.h" namespace Service::Mii::RawData { diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 74796dce1c..03992af5e6 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -20,8 +20,8 @@ #include "core/hle/service/nvdrv/devices/nvhost_nvjpg.h" #include "core/hle/service/nvdrv/devices/nvhost_vic.h" #include "core/hle/service/nvdrv/devices/nvmap.h" -#include "core/hle/service/nvdrv/interface.h" #include "core/hle/service/nvdrv/nvdrv.h" +#include "core/hle/service/nvdrv/nvdrv_interface.h" #include "core/hle/service/nvdrv/nvmemp.h" #include "core/hle/service/nvdrv/syncpoint_manager.h" #include "core/hle/service/nvflinger/nvflinger.h" diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cpp similarity index 99% rename from src/core/hle/service/nvdrv/interface.cpp rename to src/core/hle/service/nvdrv/nvdrv_interface.cpp index e4d495000b..d61fb73dcb 100644 --- a/src/core/hle/service/nvdrv/interface.cpp +++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp @@ -10,9 +10,9 @@ #include "core/hle/kernel/k_thread.h" #include "core/hle/kernel/k_writable_event.h" #include "core/hle/kernel/kernel.h" -#include "core/hle/service/nvdrv/interface.h" #include "core/hle/service/nvdrv/nvdata.h" #include "core/hle/service/nvdrv/nvdrv.h" +#include "core/hle/service/nvdrv/nvdrv_interface.h" namespace Service::Nvidia { diff --git a/src/core/hle/service/nvdrv/interface.h b/src/core/hle/service/nvdrv/nvdrv_interface.h similarity index 100% rename from src/core/hle/service/nvdrv/interface.h rename to src/core/hle/service/nvdrv/nvdrv_interface.h diff --git a/src/core/hle/service/pctl/pctl.h b/src/core/hle/service/pctl/pctl.h index ea3b978235..1d28900b2d 100644 --- a/src/core/hle/service/pctl/pctl.h +++ b/src/core/hle/service/pctl/pctl.h @@ -4,7 +4,7 @@ #pragma once -#include "core/hle/service/pctl/module.h" +#include "core/hle/service/pctl/pctl_module.h" namespace Core { class System; diff --git a/src/core/hle/service/pctl/module.cpp b/src/core/hle/service/pctl/pctl_module.cpp similarity index 99% rename from src/core/hle/service/pctl/module.cpp rename to src/core/hle/service/pctl/pctl_module.cpp index 1e31d05a69..6949fcf3bf 100644 --- a/src/core/hle/service/pctl/module.cpp +++ b/src/core/hle/service/pctl/pctl_module.cpp @@ -8,8 +8,8 @@ #include "core/file_sys/patch_manager.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/k_process.h" -#include "core/hle/service/pctl/module.h" #include "core/hle/service/pctl/pctl.h" +#include "core/hle/service/pctl/pctl_module.h" namespace Service::PCTL { diff --git a/src/core/hle/service/pctl/module.h b/src/core/hle/service/pctl/pctl_module.h similarity index 100% rename from src/core/hle/service/pctl/module.h rename to src/core/hle/service/pctl/pctl_module.h diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 663b83cd37..e6fba88b2e 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -21,7 +21,7 @@ #include "core/hle/service/aoc/aoc_u.h" #include "core/hle/service/apm/apm.h" #include "core/hle/service/audio/audio.h" -#include "core/hle/service/bcat/module.h" +#include "core/hle/service/bcat/bcat_module.h" #include "core/hle/service/bpc/bpc.h" #include "core/hle/service/btdrv/btdrv.h" #include "core/hle/service/btm/btm.h" @@ -54,7 +54,7 @@ #include "core/hle/service/nvflinger/nvflinger.h" #include "core/hle/service/olsc/olsc.h" #include "core/hle/service/pcie/pcie.h" -#include "core/hle/service/pctl/module.h" +#include "core/hle/service/pctl/pctl_module.h" #include "core/hle/service/pcv/pcv.h" #include "core/hle/service/pm/pm.h" #include "core/hle/service/prepo/prepo.h" @@ -64,7 +64,7 @@ #include "core/hle/service/set/settings.h" #include "core/hle/service/sm/sm.h" #include "core/hle/service/sockets/sockets.h" -#include "core/hle/service/spl/module.h" +#include "core/hle/service/spl/spl_module.h" #include "core/hle/service/ssl/ssl.h" #include "core/hle/service/time/time.h" #include "core/hle/service/usb/usb.h" diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index c7828c3bda..15034abed9 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -14,8 +14,8 @@ #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_session.h" #include "core/hle/result.h" -#include "core/hle/service/sm/controller.h" #include "core/hle/service/sm/sm.h" +#include "core/hle/service/sm/sm_controller.h" namespace Service::SM { diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/sm_controller.cpp similarity index 98% rename from src/core/hle/service/sm/controller.cpp rename to src/core/hle/service/sm/sm_controller.cpp index 8b9418e0fe..b5fbc4569e 100644 --- a/src/core/hle/service/sm/controller.cpp +++ b/src/core/hle/service/sm/sm_controller.cpp @@ -13,7 +13,7 @@ #include "core/hle/kernel/k_server_port.h" #include "core/hle/kernel/k_server_session.h" #include "core/hle/kernel/k_session.h" -#include "core/hle/service/sm/controller.h" +#include "core/hle/service/sm/sm_controller.h" namespace Service::SM { diff --git a/src/core/hle/service/sm/controller.h b/src/core/hle/service/sm/sm_controller.h similarity index 100% rename from src/core/hle/service/sm/controller.h rename to src/core/hle/service/sm/sm_controller.h diff --git a/src/core/hle/service/spl/csrng.h b/src/core/hle/service/spl/csrng.h index 5c0bd21991..0d03cc6cbc 100644 --- a/src/core/hle/service/spl/csrng.h +++ b/src/core/hle/service/spl/csrng.h @@ -4,7 +4,7 @@ #pragma once -#include "core/hle/service/spl/module.h" +#include "core/hle/service/spl/spl_module.h" namespace Core { class System; diff --git a/src/core/hle/service/spl/spl.h b/src/core/hle/service/spl/spl.h index 9b35012edd..5599c0c010 100644 --- a/src/core/hle/service/spl/spl.h +++ b/src/core/hle/service/spl/spl.h @@ -4,7 +4,7 @@ #pragma once -#include "core/hle/service/spl/module.h" +#include "core/hle/service/spl/spl_module.h" namespace Core { class System; diff --git a/src/core/hle/service/spl/module.cpp b/src/core/hle/service/spl/spl_module.cpp similarity index 99% rename from src/core/hle/service/spl/module.cpp rename to src/core/hle/service/spl/spl_module.cpp index ebb179aa8a..918633af58 100644 --- a/src/core/hle/service/spl/module.cpp +++ b/src/core/hle/service/spl/spl_module.cpp @@ -13,8 +13,8 @@ #include "core/hle/api_version.h" #include "core/hle/ipc_helpers.h" #include "core/hle/service/spl/csrng.h" -#include "core/hle/service/spl/module.h" #include "core/hle/service/spl/spl.h" +#include "core/hle/service/spl/spl_module.h" namespace Service::SPL { diff --git a/src/core/hle/service/spl/module.h b/src/core/hle/service/spl/spl_module.h similarity index 100% rename from src/core/hle/service/spl/module.h rename to src/core/hle/service/spl/spl_module.h diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index d6f710eba1..8fdd5076fb 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -11,8 +11,8 @@ #include "core/hle/kernel/k_client_port.h" #include "core/hle/kernel/k_scheduler.h" #include "core/hle/kernel/kernel.h" -#include "core/hle/service/time/interface.h" #include "core/hle/service/time/time.h" +#include "core/hle/service/time/time_interface.h" #include "core/hle/service/time/time_sharedmemory.h" #include "core/hle/service/time/time_zone_service.h" diff --git a/src/core/hle/service/time/interface.cpp b/src/core/hle/service/time/time_interface.cpp similarity index 97% rename from src/core/hle/service/time/interface.cpp rename to src/core/hle/service/time/time_interface.cpp index 53a2047967..bb7b6b5c1a 100644 --- a/src/core/hle/service/time/interface.cpp +++ b/src/core/hle/service/time/time_interface.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/hle/service/time/interface.h" +#include "core/hle/service/time/time_interface.h" namespace Service::Time { diff --git a/src/core/hle/service/time/interface.h b/src/core/hle/service/time/time_interface.h similarity index 100% rename from src/core/hle/service/time/interface.h rename to src/core/hle/service/time/time_interface.h