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] 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"