From a1c36f2f1807bc31cf72af2edc35c6939cbeee47 Mon Sep 17 00:00:00 2001 From: "Herman S." <429230+has207@users.noreply.github.com> Date: Tue, 28 Oct 2025 08:50:57 +0900 Subject: [PATCH] [UI] Move all the Qt stuff to src/xenia/ui Prevents having weird Qt dependencies in test and util executables as they depend on xenia-app --- src/xenia/app/emulator_window.cc | 12 ++++++------ src/xenia/app/emulator_window.h | 2 +- src/xenia/kernel/xam/achievement_manager.cc | 2 +- src/xenia/{app => ui}/config_dialog_qt.cc | 2 +- src/xenia/{app => ui}/config_dialog_qt.h | 4 ++-- src/xenia/{app => ui}/context_menu_widget_qt.cc | 2 +- src/xenia/{app => ui}/context_menu_widget_qt.h | 4 ++-- src/xenia/{app => ui}/game_list_dialog_qt.cc | 6 +++--- src/xenia/{app => ui}/game_list_dialog_qt.h | 4 ++-- src/xenia/{app => ui}/moc_config_dialog_qt.cc | 0 src/xenia/{app => ui}/moc_context_menu_widget_qt.cc | 0 src/xenia/{app => ui}/moc_game_list_dialog_qt.cc | 0 src/xenia/{app => ui}/moc_notification_widget_qt.cc | 0 .../{app => ui}/moc_postprocessing_dialog_qt.cc | 0 src/xenia/{app => ui}/moc_profile_dialog_qt.cc | 0 .../{app => ui}/moc_profile_editor_dialog_qt.cc | 0 src/xenia/{app => ui}/notification_widget_qt.cc | 2 +- src/xenia/{app => ui}/notification_widget_qt.h | 4 ++-- src/xenia/{app => ui}/postprocessing_dialog_qt.cc | 2 +- src/xenia/{app => ui}/postprocessing_dialog_qt.h | 4 ++-- src/xenia/{app => ui}/profile_dialog_qt.cc | 4 ++-- src/xenia/{app => ui}/profile_dialog_qt.h | 4 ++-- src/xenia/{app => ui}/profile_dialogs.cc | 2 +- src/xenia/{app => ui}/profile_dialogs.h | 4 ++-- src/xenia/{app => ui}/profile_editor_dialog_qt.cc | 2 +- src/xenia/{app => ui}/profile_editor_dialog_qt.h | 4 ++-- 26 files changed, 35 insertions(+), 35 deletions(-) rename src/xenia/{app => ui}/config_dialog_qt.cc (99%) rename src/xenia/{app => ui}/config_dialog_qt.h (97%) rename src/xenia/{app => ui}/context_menu_widget_qt.cc (98%) rename src/xenia/{app => ui}/context_menu_widget_qt.h (93%) rename src/xenia/{app => ui}/game_list_dialog_qt.cc (99%) rename src/xenia/{app => ui}/game_list_dialog_qt.h (97%) rename src/xenia/{app => ui}/moc_config_dialog_qt.cc (100%) rename src/xenia/{app => ui}/moc_context_menu_widget_qt.cc (100%) rename src/xenia/{app => ui}/moc_game_list_dialog_qt.cc (100%) rename src/xenia/{app => ui}/moc_notification_widget_qt.cc (100%) rename src/xenia/{app => ui}/moc_postprocessing_dialog_qt.cc (100%) rename src/xenia/{app => ui}/moc_profile_dialog_qt.cc (100%) rename src/xenia/{app => ui}/moc_profile_editor_dialog_qt.cc (100%) rename src/xenia/{app => ui}/notification_widget_qt.cc (98%) rename src/xenia/{app => ui}/notification_widget_qt.h (91%) rename src/xenia/{app => ui}/postprocessing_dialog_qt.cc (99%) rename src/xenia/{app => ui}/postprocessing_dialog_qt.h (96%) rename src/xenia/{app => ui}/profile_dialog_qt.cc (99%) rename src/xenia/{app => ui}/profile_dialog_qt.h (95%) rename src/xenia/{app => ui}/profile_dialogs.cc (99%) rename src/xenia/{app => ui}/profile_dialogs.h (95%) rename src/xenia/{app => ui}/profile_editor_dialog_qt.cc (99%) rename src/xenia/{app => ui}/profile_editor_dialog_qt.h (97%) diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index d49f0b4fe..a4add576c 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -22,12 +22,6 @@ #include "third_party/imgui/imgui.h" #include "third_party/stb/stb_image_write.h" #include "third_party/tomlplusplus/toml.hpp" -#include "xenia/app/config_dialog_qt.h" -#include "xenia/app/context_menu_widget_qt.h" -#include "xenia/app/game_list_dialog_qt.h" -#include "xenia/app/notification_widget_qt.h" -#include "xenia/app/postprocessing_dialog_qt.h" -#include "xenia/app/profile_dialog_qt.h" #include "xenia/base/assert.h" #include "xenia/base/clock.h" #include "xenia/base/cvar.h" @@ -39,6 +33,12 @@ #include "xenia/base/system.h" #include "xenia/base/threading.h" #include "xenia/config.h" +#include "xenia/ui/config_dialog_qt.h" +#include "xenia/ui/context_menu_widget_qt.h" +#include "xenia/ui/game_list_dialog_qt.h" +#include "xenia/ui/notification_widget_qt.h" +#include "xenia/ui/postprocessing_dialog_qt.h" +#include "xenia/ui/profile_dialog_qt.h" #if XE_PLATFORM_WIN32 #include diff --git a/src/xenia/app/emulator_window.h b/src/xenia/app/emulator_window.h index b302b1655..4bea01b28 100644 --- a/src/xenia/app/emulator_window.h +++ b/src/xenia/app/emulator_window.h @@ -15,7 +15,6 @@ #include -#include "xenia/app/profile_dialogs.h" #include "xenia/emulator.h" #include "xenia/gpu/command_processor.h" #include "xenia/ui/imgui_dialog.h" @@ -23,6 +22,7 @@ #include "xenia/ui/immediate_drawer.h" #include "xenia/ui/menu_item.h" #include "xenia/ui/presenter.h" +#include "xenia/ui/profile_dialogs.h" #include "xenia/ui/window.h" #include "xenia/ui/window_listener.h" #include "xenia/ui/windowed_app_context.h" diff --git a/src/xenia/kernel/xam/achievement_manager.cc b/src/xenia/kernel/xam/achievement_manager.cc index bc60f341c..c3af4b009 100644 --- a/src/xenia/kernel/xam/achievement_manager.cc +++ b/src/xenia/kernel/xam/achievement_manager.cc @@ -8,13 +8,13 @@ */ #include "xenia/kernel/xam/achievement_manager.h" -#include "xenia/app/notification_widget_qt.h" #include "xenia/emulator.h" #include "xenia/gpu/graphics_system.h" #include "xenia/kernel/kernel_state.h" #include "xenia/kernel/util/shim_utils.h" #include "xenia/kernel/xam/achievement_backends/gpd_achievement_backend.h" #include "xenia/kernel/xam/xdbf/gpd_info.h" +#include "xenia/ui/notification_widget_qt.h" #include "xenia/ui/window_qt.h" DEFINE_bool(show_achievement_notification, true, diff --git a/src/xenia/app/config_dialog_qt.cc b/src/xenia/ui/config_dialog_qt.cc similarity index 99% rename from src/xenia/app/config_dialog_qt.cc rename to src/xenia/ui/config_dialog_qt.cc index 9f6a02460..470ead1b3 100644 --- a/src/xenia/app/config_dialog_qt.cc +++ b/src/xenia/ui/config_dialog_qt.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include "xenia/app/config_dialog_qt.h" +#include "xenia/ui/config_dialog_qt.h" #include #include diff --git a/src/xenia/app/config_dialog_qt.h b/src/xenia/ui/config_dialog_qt.h similarity index 97% rename from src/xenia/app/config_dialog_qt.h rename to src/xenia/ui/config_dialog_qt.h index 0f64b90c8..fae35d9a1 100644 --- a/src/xenia/app/config_dialog_qt.h +++ b/src/xenia/ui/config_dialog_qt.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_CONFIG_DIALOG_QT_H_ -#define XENIA_APP_CONFIG_DIALOG_QT_H_ +#ifndef XENIA_UI_CONFIG_DIALOG_QT_H_ +#define XENIA_UI_CONFIG_DIALOG_QT_H_ #include #include diff --git a/src/xenia/app/context_menu_widget_qt.cc b/src/xenia/ui/context_menu_widget_qt.cc similarity index 98% rename from src/xenia/app/context_menu_widget_qt.cc rename to src/xenia/ui/context_menu_widget_qt.cc index 5caac948c..7d0104680 100644 --- a/src/xenia/app/context_menu_widget_qt.cc +++ b/src/xenia/ui/context_menu_widget_qt.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include "xenia/app/context_menu_widget_qt.h" +#include "xenia/ui/context_menu_widget_qt.h" #include #include diff --git a/src/xenia/app/context_menu_widget_qt.h b/src/xenia/ui/context_menu_widget_qt.h similarity index 93% rename from src/xenia/app/context_menu_widget_qt.h rename to src/xenia/ui/context_menu_widget_qt.h index ba3c96761..188d8004b 100644 --- a/src/xenia/app/context_menu_widget_qt.h +++ b/src/xenia/ui/context_menu_widget_qt.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_CONTEXT_MENU_WIDGET_QT_H_ -#define XENIA_APP_CONTEXT_MENU_WIDGET_QT_H_ +#ifndef XENIA_UI_CONTEXT_MENU_WIDGET_QT_H_ +#define XENIA_UI_CONTEXT_MENU_WIDGET_QT_H_ #include #include diff --git a/src/xenia/app/game_list_dialog_qt.cc b/src/xenia/ui/game_list_dialog_qt.cc similarity index 99% rename from src/xenia/app/game_list_dialog_qt.cc rename to src/xenia/ui/game_list_dialog_qt.cc index 4d942ec0d..47788afd9 100644 --- a/src/xenia/app/game_list_dialog_qt.cc +++ b/src/xenia/ui/game_list_dialog_qt.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include "xenia/app/game_list_dialog_qt.h" +#include "xenia/ui/game_list_dialog_qt.h" #include #include @@ -27,8 +27,6 @@ #include "third_party/fmt/include/fmt/format.h" #include "xenia/app/emulator_window.h" -#include "xenia/app/profile_dialog_qt.h" -#include "xenia/app/profile_editor_dialog_qt.h" #include "xenia/base/chrono.h" #include "xenia/base/filesystem.h" #include "xenia/base/logging.h" @@ -47,6 +45,8 @@ #include "xenia/kernel/xam/xdbf/gpd_info_profile.h" #include "xenia/kernel/xam/xdbf/gpd_info_title.h" #include "xenia/ui/achievements_dialog_qt.h" +#include "xenia/ui/profile_dialog_qt.h" +#include "xenia/ui/profile_editor_dialog_qt.h" namespace xe { namespace app { diff --git a/src/xenia/app/game_list_dialog_qt.h b/src/xenia/ui/game_list_dialog_qt.h similarity index 97% rename from src/xenia/app/game_list_dialog_qt.h rename to src/xenia/ui/game_list_dialog_qt.h index 8ede96349..c2d70f836 100644 --- a/src/xenia/app/game_list_dialog_qt.h +++ b/src/xenia/ui/game_list_dialog_qt.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_GAME_LIST_DIALOG_QT_H_ -#define XENIA_APP_GAME_LIST_DIALOG_QT_H_ +#ifndef XENIA_UI_GAME_LIST_DIALOG_QT_H_ +#define XENIA_UI_GAME_LIST_DIALOG_QT_H_ #include #include diff --git a/src/xenia/app/moc_config_dialog_qt.cc b/src/xenia/ui/moc_config_dialog_qt.cc similarity index 100% rename from src/xenia/app/moc_config_dialog_qt.cc rename to src/xenia/ui/moc_config_dialog_qt.cc diff --git a/src/xenia/app/moc_context_menu_widget_qt.cc b/src/xenia/ui/moc_context_menu_widget_qt.cc similarity index 100% rename from src/xenia/app/moc_context_menu_widget_qt.cc rename to src/xenia/ui/moc_context_menu_widget_qt.cc diff --git a/src/xenia/app/moc_game_list_dialog_qt.cc b/src/xenia/ui/moc_game_list_dialog_qt.cc similarity index 100% rename from src/xenia/app/moc_game_list_dialog_qt.cc rename to src/xenia/ui/moc_game_list_dialog_qt.cc diff --git a/src/xenia/app/moc_notification_widget_qt.cc b/src/xenia/ui/moc_notification_widget_qt.cc similarity index 100% rename from src/xenia/app/moc_notification_widget_qt.cc rename to src/xenia/ui/moc_notification_widget_qt.cc diff --git a/src/xenia/app/moc_postprocessing_dialog_qt.cc b/src/xenia/ui/moc_postprocessing_dialog_qt.cc similarity index 100% rename from src/xenia/app/moc_postprocessing_dialog_qt.cc rename to src/xenia/ui/moc_postprocessing_dialog_qt.cc diff --git a/src/xenia/app/moc_profile_dialog_qt.cc b/src/xenia/ui/moc_profile_dialog_qt.cc similarity index 100% rename from src/xenia/app/moc_profile_dialog_qt.cc rename to src/xenia/ui/moc_profile_dialog_qt.cc diff --git a/src/xenia/app/moc_profile_editor_dialog_qt.cc b/src/xenia/ui/moc_profile_editor_dialog_qt.cc similarity index 100% rename from src/xenia/app/moc_profile_editor_dialog_qt.cc rename to src/xenia/ui/moc_profile_editor_dialog_qt.cc diff --git a/src/xenia/app/notification_widget_qt.cc b/src/xenia/ui/notification_widget_qt.cc similarity index 98% rename from src/xenia/app/notification_widget_qt.cc rename to src/xenia/ui/notification_widget_qt.cc index 02612faa8..3dd4afc62 100644 --- a/src/xenia/app/notification_widget_qt.cc +++ b/src/xenia/ui/notification_widget_qt.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include "xenia/app/notification_widget_qt.h" +#include "xenia/ui/notification_widget_qt.h" #include diff --git a/src/xenia/app/notification_widget_qt.h b/src/xenia/ui/notification_widget_qt.h similarity index 91% rename from src/xenia/app/notification_widget_qt.h rename to src/xenia/ui/notification_widget_qt.h index 0835029bb..dd0bec006 100644 --- a/src/xenia/app/notification_widget_qt.h +++ b/src/xenia/ui/notification_widget_qt.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_NOTIFICATION_WIDGET_QT_H_ -#define XENIA_APP_NOTIFICATION_WIDGET_QT_H_ +#ifndef XENIA_UI_NOTIFICATION_WIDGET_QT_H_ +#define XENIA_UI_NOTIFICATION_WIDGET_QT_H_ #include #include diff --git a/src/xenia/app/postprocessing_dialog_qt.cc b/src/xenia/ui/postprocessing_dialog_qt.cc similarity index 99% rename from src/xenia/app/postprocessing_dialog_qt.cc rename to src/xenia/ui/postprocessing_dialog_qt.cc index 2a360b3ac..0360bbca8 100644 --- a/src/xenia/app/postprocessing_dialog_qt.cc +++ b/src/xenia/ui/postprocessing_dialog_qt.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include "xenia/app/postprocessing_dialog_qt.h" +#include "xenia/ui/postprocessing_dialog_qt.h" #include #include diff --git a/src/xenia/app/postprocessing_dialog_qt.h b/src/xenia/ui/postprocessing_dialog_qt.h similarity index 96% rename from src/xenia/app/postprocessing_dialog_qt.h rename to src/xenia/ui/postprocessing_dialog_qt.h index e9472ca2f..af51ad7fd 100644 --- a/src/xenia/app/postprocessing_dialog_qt.h +++ b/src/xenia/ui/postprocessing_dialog_qt.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_POSTPROCESSING_DIALOG_QT_H_ -#define XENIA_APP_POSTPROCESSING_DIALOG_QT_H_ +#ifndef XENIA_UI_POSTPROCESSING_DIALOG_QT_H_ +#define XENIA_UI_POSTPROCESSING_DIALOG_QT_H_ #include #include diff --git a/src/xenia/app/profile_dialog_qt.cc b/src/xenia/ui/profile_dialog_qt.cc similarity index 99% rename from src/xenia/app/profile_dialog_qt.cc rename to src/xenia/ui/profile_dialog_qt.cc index 2ff6fa4a9..1008a2e3d 100644 --- a/src/xenia/app/profile_dialog_qt.cc +++ b/src/xenia/ui/profile_dialog_qt.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include "xenia/app/profile_dialog_qt.h" +#include "xenia/ui/profile_dialog_qt.h" #include #include @@ -17,7 +17,6 @@ #include "third_party/fmt/include/fmt/format.h" #include "xenia/app/emulator_window.h" -#include "xenia/app/profile_editor_dialog_qt.h" #include "xenia/base/logging.h" #include "xenia/base/system.h" #include "xenia/emulator.h" @@ -25,6 +24,7 @@ #include "xenia/kernel/xam/profile_manager.h" #include "xenia/kernel/xam/ui/title_info_ui.h" #include "xenia/kernel/xam/xam_state.h" +#include "xenia/ui/profile_editor_dialog_qt.h" #include "xenia/ui/window_qt.h" namespace xe { diff --git a/src/xenia/app/profile_dialog_qt.h b/src/xenia/ui/profile_dialog_qt.h similarity index 95% rename from src/xenia/app/profile_dialog_qt.h rename to src/xenia/ui/profile_dialog_qt.h index 103a1f875..2700a67c1 100644 --- a/src/xenia/app/profile_dialog_qt.h +++ b/src/xenia/ui/profile_dialog_qt.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_PROFILE_DIALOG_QT_H_ -#define XENIA_APP_PROFILE_DIALOG_QT_H_ +#ifndef XENIA_UI_PROFILE_DIALOG_QT_H_ +#define XENIA_UI_PROFILE_DIALOG_QT_H_ #include #include diff --git a/src/xenia/app/profile_dialogs.cc b/src/xenia/ui/profile_dialogs.cc similarity index 99% rename from src/xenia/app/profile_dialogs.cc rename to src/xenia/ui/profile_dialogs.cc index 67148cc6b..ab204d492 100644 --- a/src/xenia/app/profile_dialogs.cc +++ b/src/xenia/ui/profile_dialogs.cc @@ -6,7 +6,7 @@ * Released under the BSD license - see LICENSE in the root for more details. * ****************************************************************************** */ -#include "xenia/app/profile_dialogs.h" +#include "xenia/ui/profile_dialogs.h" #include "xenia/app/emulator_window.h" #include "xenia/base/png_utils.h" #include "xenia/base/system.h" diff --git a/src/xenia/app/profile_dialogs.h b/src/xenia/ui/profile_dialogs.h similarity index 95% rename from src/xenia/app/profile_dialogs.h rename to src/xenia/ui/profile_dialogs.h index 23a880ba5..3542f81b2 100644 --- a/src/xenia/app/profile_dialogs.h +++ b/src/xenia/ui/profile_dialogs.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_PROFILE_DIALOGS_H_ -#define XENIA_APP_PROFILE_DIALOGS_H_ +#ifndef XENIA_UI_PROFILE_DIALOGS_H_ +#define XENIA_UI_PROFILE_DIALOGS_H_ #include "xenia/ui/imgui_dialog.h" #include "xenia/ui/imgui_drawer.h" diff --git a/src/xenia/app/profile_editor_dialog_qt.cc b/src/xenia/ui/profile_editor_dialog_qt.cc similarity index 99% rename from src/xenia/app/profile_editor_dialog_qt.cc rename to src/xenia/ui/profile_editor_dialog_qt.cc index 11ef82532..bb90fef0c 100644 --- a/src/xenia/app/profile_editor_dialog_qt.cc +++ b/src/xenia/ui/profile_editor_dialog_qt.cc @@ -7,7 +7,7 @@ ****************************************************************************** */ -#include "xenia/app/profile_editor_dialog_qt.h" +#include "xenia/ui/profile_editor_dialog_qt.h" #include #include diff --git a/src/xenia/app/profile_editor_dialog_qt.h b/src/xenia/ui/profile_editor_dialog_qt.h similarity index 97% rename from src/xenia/app/profile_editor_dialog_qt.h rename to src/xenia/ui/profile_editor_dialog_qt.h index 751afed0a..5f2a0b4a0 100644 --- a/src/xenia/app/profile_editor_dialog_qt.h +++ b/src/xenia/ui/profile_editor_dialog_qt.h @@ -7,8 +7,8 @@ ****************************************************************************** */ -#ifndef XENIA_APP_PROFILE_EDITOR_DIALOG_QT_H_ -#define XENIA_APP_PROFILE_EDITOR_DIALOG_QT_H_ +#ifndef XENIA_UI_PROFILE_EDITOR_DIALOG_QT_H_ +#define XENIA_UI_PROFILE_EDITOR_DIALOG_QT_H_ #include #include