diff options
| author | 2021-07-14 00:29:12 -0400 | |
|---|---|---|
| committer | 2021-07-14 01:07:09 -0400 | |
| commit | 9a48f252ae7b4471286a7d8899a0c70dff354b1a (patch) | |
| tree | dfa4adf6aaaf460f7822188b5fc96dbe89f91e09 | |
| parent | Merge pull request #6599 from german77/disable_rumble (diff) | |
| download | yuzu-9a48f252ae7b4471286a7d8899a0c70dff354b1a.tar.gz yuzu-9a48f252ae7b4471286a7d8899a0c70dff354b1a.tar.xz yuzu-9a48f252ae7b4471286a7d8899a0c70dff354b1a.zip | |
applets: Append qt_ prefix to Qt frontend applets
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_controller.cpp (renamed from src/yuzu/applets/controller.cpp) | 4 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_controller.h (renamed from src/yuzu/applets/controller.h) | 0 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_controller.ui (renamed from src/yuzu/applets/controller.ui) | 0 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_error.cpp (renamed from src/yuzu/applets/error.cpp) | 2 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_error.h (renamed from src/yuzu/applets/error.h) | 0 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_profile_select.cpp (renamed from src/yuzu/applets/profile_select.cpp) | 2 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_profile_select.h (renamed from src/yuzu/applets/profile_select.h) | 0 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_software_keyboard.cpp (renamed from src/yuzu/applets/software_keyboard.cpp) | 4 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_software_keyboard.h (renamed from src/yuzu/applets/software_keyboard.h) | 0 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_software_keyboard.ui (renamed from src/yuzu/applets/software_keyboard.ui) | 0 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_web_browser.cpp (renamed from src/yuzu/applets/web_browser.cpp) | 4 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_web_browser.h (renamed from src/yuzu/applets/web_browser.h) | 0 | ||||
| -rw-r--r-- | src/yuzu/applets/qt_web_browser_scripts.h (renamed from src/yuzu/applets/web_browser_scripts.h) | 0 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 10 |
15 files changed, 26 insertions, 25 deletions
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index f870b33b1..cb4bdcc7e 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt | |||
| @@ -15,18 +15,19 @@ add_executable(yuzu | |||
| 15 | about_dialog.cpp | 15 | about_dialog.cpp |
| 16 | about_dialog.h | 16 | about_dialog.h |
| 17 | aboutdialog.ui | 17 | aboutdialog.ui |
| 18 | applets/controller.cpp | 18 | applets/qt_controller.cpp |
| 19 | applets/controller.h | 19 | applets/qt_controller.h |
| 20 | applets/controller.ui | 20 | applets/qt_controller.ui |
| 21 | applets/error.cpp | 21 | applets/qt_error.cpp |
| 22 | applets/error.h | 22 | applets/qt_error.h |
| 23 | applets/profile_select.cpp | 23 | applets/qt_profile_select.cpp |
| 24 | applets/profile_select.h | 24 | applets/qt_profile_select.h |
| 25 | applets/software_keyboard.cpp | 25 | applets/qt_software_keyboard.cpp |
| 26 | applets/software_keyboard.h | 26 | applets/qt_software_keyboard.h |
| 27 | applets/software_keyboard.ui | 27 | applets/qt_software_keyboard.ui |
| 28 | applets/web_browser.cpp | 28 | applets/qt_web_browser.cpp |
| 29 | applets/web_browser.h | 29 | applets/qt_web_browser.h |
| 30 | applets/qt_web_browser_scripts.h | ||
| 30 | bootmanager.cpp | 31 | bootmanager.cpp |
| 31 | bootmanager.h | 32 | bootmanager.h |
| 32 | compatdb.ui | 33 | compatdb.ui |
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/qt_controller.cpp index 836d90fda..97106d2cc 100644 --- a/src/yuzu/applets/controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | #include "core/hle/service/hid/controllers/npad.h" | 12 | #include "core/hle/service/hid/controllers/npad.h" |
| 13 | #include "core/hle/service/hid/hid.h" | 13 | #include "core/hle/service/hid/hid.h" |
| 14 | #include "core/hle/service/sm/sm.h" | 14 | #include "core/hle/service/sm/sm.h" |
| 15 | #include "ui_controller.h" | 15 | #include "ui_qt_controller.h" |
| 16 | #include "yuzu/applets/controller.h" | 16 | #include "yuzu/applets/qt_controller.h" |
| 17 | #include "yuzu/configuration/configure_input.h" | 17 | #include "yuzu/configuration/configure_input.h" |
| 18 | #include "yuzu/configuration/configure_input_profile_dialog.h" | 18 | #include "yuzu/configuration/configure_input_profile_dialog.h" |
| 19 | #include "yuzu/configuration/configure_motion_touch.h" | 19 | #include "yuzu/configuration/configure_motion_touch.h" |
diff --git a/src/yuzu/applets/controller.h b/src/yuzu/applets/qt_controller.h index 9b57aea1a..9b57aea1a 100644 --- a/src/yuzu/applets/controller.h +++ b/src/yuzu/applets/qt_controller.h | |||
diff --git a/src/yuzu/applets/controller.ui b/src/yuzu/applets/qt_controller.ui index c8cb6bcf3..c8cb6bcf3 100644 --- a/src/yuzu/applets/controller.ui +++ b/src/yuzu/applets/qt_controller.ui | |||
diff --git a/src/yuzu/applets/error.cpp b/src/yuzu/applets/qt_error.cpp index 085688cd4..45cf64603 100644 --- a/src/yuzu/applets/error.cpp +++ b/src/yuzu/applets/qt_error.cpp | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <QDateTime> | 5 | #include <QDateTime> |
| 6 | #include "core/hle/lock.h" | 6 | #include "core/hle/lock.h" |
| 7 | #include "yuzu/applets/error.h" | 7 | #include "yuzu/applets/qt_error.h" |
| 8 | #include "yuzu/main.h" | 8 | #include "yuzu/main.h" |
| 9 | 9 | ||
| 10 | QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { | 10 | QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { |
diff --git a/src/yuzu/applets/error.h b/src/yuzu/applets/qt_error.h index 8bd895a32..8bd895a32 100644 --- a/src/yuzu/applets/error.h +++ b/src/yuzu/applets/qt_error.h | |||
diff --git a/src/yuzu/applets/profile_select.cpp b/src/yuzu/applets/qt_profile_select.cpp index 62fd1141c..a56638e21 100644 --- a/src/yuzu/applets/profile_select.cpp +++ b/src/yuzu/applets/qt_profile_select.cpp | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include "common/string_util.h" | 14 | #include "common/string_util.h" |
| 15 | #include "core/constants.h" | 15 | #include "core/constants.h" |
| 16 | #include "core/hle/lock.h" | 16 | #include "core/hle/lock.h" |
| 17 | #include "yuzu/applets/profile_select.h" | 17 | #include "yuzu/applets/qt_profile_select.h" |
| 18 | #include "yuzu/main.h" | 18 | #include "yuzu/main.h" |
| 19 | 19 | ||
| 20 | namespace { | 20 | namespace { |
diff --git a/src/yuzu/applets/profile_select.h b/src/yuzu/applets/qt_profile_select.h index 4e9037488..4e9037488 100644 --- a/src/yuzu/applets/profile_select.h +++ b/src/yuzu/applets/qt_profile_select.h | |||
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/qt_software_keyboard.cpp index aa453a79f..848801cec 100644 --- a/src/yuzu/applets/software_keyboard.cpp +++ b/src/yuzu/applets/qt_software_keyboard.cpp | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | #include "common/string_util.h" | 11 | #include "common/string_util.h" |
| 12 | #include "core/core.h" | 12 | #include "core/core.h" |
| 13 | #include "core/frontend/input_interpreter.h" | 13 | #include "core/frontend/input_interpreter.h" |
| 14 | #include "ui_software_keyboard.h" | 14 | #include "ui_qt_software_keyboard.h" |
| 15 | #include "yuzu/applets/software_keyboard.h" | 15 | #include "yuzu/applets/qt_software_keyboard.h" |
| 16 | #include "yuzu/main.h" | 16 | #include "yuzu/main.h" |
| 17 | #include "yuzu/util/overlay_dialog.h" | 17 | #include "yuzu/util/overlay_dialog.h" |
| 18 | 18 | ||
diff --git a/src/yuzu/applets/software_keyboard.h b/src/yuzu/applets/qt_software_keyboard.h index 1a03c098c..1a03c098c 100644 --- a/src/yuzu/applets/software_keyboard.h +++ b/src/yuzu/applets/qt_software_keyboard.h | |||
diff --git a/src/yuzu/applets/software_keyboard.ui b/src/yuzu/applets/qt_software_keyboard.ui index b0a1fcde9..b0a1fcde9 100644 --- a/src/yuzu/applets/software_keyboard.ui +++ b/src/yuzu/applets/qt_software_keyboard.ui | |||
diff --git a/src/yuzu/applets/web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp index 34d3feb55..b112dd7b0 100644 --- a/src/yuzu/applets/web_browser.cpp +++ b/src/yuzu/applets/qt_web_browser.cpp | |||
| @@ -17,8 +17,8 @@ | |||
| 17 | #include "core/frontend/input_interpreter.h" | 17 | #include "core/frontend/input_interpreter.h" |
| 18 | #include "input_common/keyboard.h" | 18 | #include "input_common/keyboard.h" |
| 19 | #include "input_common/main.h" | 19 | #include "input_common/main.h" |
| 20 | #include "yuzu/applets/web_browser.h" | 20 | #include "yuzu/applets/qt_web_browser.h" |
| 21 | #include "yuzu/applets/web_browser_scripts.h" | 21 | #include "yuzu/applets/qt_web_browser_scripts.h" |
| 22 | #include "yuzu/main.h" | 22 | #include "yuzu/main.h" |
| 23 | #include "yuzu/util/url_request_interceptor.h" | 23 | #include "yuzu/util/url_request_interceptor.h" |
| 24 | 24 | ||
diff --git a/src/yuzu/applets/web_browser.h b/src/yuzu/applets/qt_web_browser.h index 7ad07409f..7ad07409f 100644 --- a/src/yuzu/applets/web_browser.h +++ b/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 index 992837a85..992837a85 100644 --- a/src/yuzu/applets/web_browser_scripts.h +++ b/src/yuzu/applets/qt_web_browser_scripts.h | |||
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index fbd5001e9..b7fd33ae7 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -11,11 +11,11 @@ | |||
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
| 13 | // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. | 13 | // VFS includes must be before glad as they will conflict with Windows file api, which uses defines. |
| 14 | #include "applets/controller.h" | 14 | #include "applets/qt_controller.h" |
| 15 | #include "applets/error.h" | 15 | #include "applets/qt_error.h" |
| 16 | #include "applets/profile_select.h" | 16 | #include "applets/qt_profile_select.h" |
| 17 | #include "applets/software_keyboard.h" | 17 | #include "applets/qt_software_keyboard.h" |
| 18 | #include "applets/web_browser.h" | 18 | #include "applets/qt_web_browser.h" |
| 19 | #include "common/nvidia_flags.h" | 19 | #include "common/nvidia_flags.h" |
| 20 | #include "configuration/configure_input.h" | 20 | #include "configuration/configure_input.h" |
| 21 | #include "configuration/configure_per_game.h" | 21 | #include "configuration/configure_per_game.h" |