diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt index cdad6679d9..a8206b8345 100644 --- a/src/qt_common/CMakeLists.txt +++ b/src/qt_common/CMakeLists.txt @@ -1,36 +1,45 @@ # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2023 yuzu Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - add_library(qt_common STATIC qt_common.h qt_common.cpp - uisettings.cpp - uisettings.h + config/uisettings.cpp + config/uisettings.h + config/qt_config.cpp + config/qt_config.h + config/shared_translation.cpp + config/shared_translation.h - qt_config.cpp - qt_config.h + util/path.h util/path.cpp + util/game.h util/game.cpp + util/meta.h util/meta.cpp + util/content.h util/content.cpp + util/rom.h util/rom.cpp + util/applet.h util/applet.cpp + util/compress.h util/compress.cpp + + abstract/qt_frontend_util.h abstract/qt_frontend_util.cpp + abstract/qt_progress_dialog.h abstract/qt_progress_dialog.cpp - shared_translation.cpp - shared_translation.h - qt_path_util.h qt_path_util.cpp - qt_game_util.h qt_game_util.cpp - qt_frontend_util.h qt_frontend_util.cpp - qt_meta.h qt_meta.cpp - qt_content_util.h qt_content_util.cpp - qt_rom_util.h qt_rom_util.cpp - qt_applet_util.h qt_applet_util.cpp - qt_progress_dialog.h qt_progress_dialog.cpp qt_string_lookup.h - qt_compress.h qt_compress.cpp + qt_compat.h + discord/discord.h ) create_target_directory_groups(qt_common) +if (USE_DISCORD_PRESENCE) + target_sources(qt_common PRIVATE + discord/discord_impl.cpp + discord/discord_impl.h + ) + target_link_libraries(qt_common PUBLIC DiscordRPC::discord-rpc Qt6::Network) + target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE) +endif() + # TODO(crueter) if (ENABLE_QT) target_link_libraries(qt_common PRIVATE Qt6::Widgets) diff --git a/src/qt_common/qt_frontend_util.cpp b/src/qt_common/abstract/qt_frontend_util.cpp similarity index 100% rename from src/qt_common/qt_frontend_util.cpp rename to src/qt_common/abstract/qt_frontend_util.cpp diff --git a/src/qt_common/qt_frontend_util.h b/src/qt_common/abstract/qt_frontend_util.h similarity index 100% rename from src/qt_common/qt_frontend_util.h rename to src/qt_common/abstract/qt_frontend_util.h diff --git a/src/qt_common/qt_progress_dialog.cpp b/src/qt_common/abstract/qt_progress_dialog.cpp similarity index 100% rename from src/qt_common/qt_progress_dialog.cpp rename to src/qt_common/abstract/qt_progress_dialog.cpp diff --git a/src/qt_common/qt_progress_dialog.h b/src/qt_common/abstract/qt_progress_dialog.h similarity index 100% rename from src/qt_common/qt_progress_dialog.h rename to src/qt_common/abstract/qt_progress_dialog.h diff --git a/src/qt_common/qt_config.cpp b/src/qt_common/config/qt_config.cpp similarity index 100% rename from src/qt_common/qt_config.cpp rename to src/qt_common/config/qt_config.cpp diff --git a/src/qt_common/qt_config.h b/src/qt_common/config/qt_config.h similarity index 100% rename from src/qt_common/qt_config.h rename to src/qt_common/config/qt_config.h diff --git a/src/qt_common/shared_translation.cpp b/src/qt_common/config/shared_translation.cpp similarity index 99% rename from src/qt_common/shared_translation.cpp rename to src/qt_common/config/shared_translation.cpp index 054d28e8e2..9bd2fa6868 100644 --- a/src/qt_common/shared_translation.cpp +++ b/src/qt_common/config/shared_translation.cpp @@ -14,7 +14,7 @@ #include "common/settings_enums.h" #include "common/settings_setting.h" #include "common/time_zone.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include #include #include diff --git a/src/qt_common/shared_translation.h b/src/qt_common/config/shared_translation.h similarity index 100% rename from src/qt_common/shared_translation.h rename to src/qt_common/config/shared_translation.h diff --git a/src/qt_common/uisettings.cpp b/src/qt_common/config/uisettings.cpp similarity index 99% rename from src/qt_common/uisettings.cpp rename to src/qt_common/config/uisettings.cpp index a17f3c0a4a..0b668c4bb1 100644 --- a/src/qt_common/uisettings.cpp +++ b/src/qt_common/config/uisettings.cpp @@ -7,7 +7,7 @@ #include #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #ifndef CANNOT_EXPLICITLY_INSTANTIATE namespace Settings { diff --git a/src/qt_common/uisettings.h b/src/qt_common/config/uisettings.h similarity index 99% rename from src/qt_common/uisettings.h rename to src/qt_common/config/uisettings.h index 3362dc47bd..f3d6b581f2 100644 --- a/src/qt_common/uisettings.h +++ b/src/qt_common/config/uisettings.h @@ -17,7 +17,7 @@ #include "common/common_types.h" #include "common/settings.h" #include "common/settings_enums.h" -#include "qt_common/qt_config.h" +#include "qt_common/config/qt_config.h" using Settings::Category; using Settings::ConfirmStop; diff --git a/src/yuzu/discord.h b/src/qt_common/discord/discord.h similarity index 80% rename from src/yuzu/discord.h rename to src/qt_common/discord/discord.h index e08784498a..3f73eae058 100644 --- a/src/yuzu/discord.h +++ b/src/qt_common/discord/discord.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2018 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/yuzu/discord_impl.cpp b/src/qt_common/discord/discord_impl.cpp similarity index 92% rename from src/yuzu/discord_impl.cpp rename to src/qt_common/discord/discord_impl.cpp index 497fa0f115..217da77097 100644 --- a/src/yuzu/discord_impl.cpp +++ b/src/qt_common/discord/discord_impl.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2018 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -15,13 +18,13 @@ #include "common/string_util.h" #include "core/core.h" #include "core/loader/loader.h" -#include "yuzu/discord_impl.h" +#include "qt_common/discord/discord_impl.h" namespace DiscordRPC { DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} { DiscordEventHandlers handlers{}; - // The number is the client ID for yuzu, it's used for images and the + // The number is the client ID for Eden, it's used for images and the // application name Discord_Initialize("1397286652128264252", &handlers, 1, nullptr); } @@ -61,7 +64,7 @@ std::string DiscordImpl::GetGameString(const std::string& title) { } void DiscordImpl::UpdateGameStatus(bool use_default) { - const std::string default_text = "eden is an emulator for the Nintendo Switch"; + const std::string default_text = "Eden is an emulator for the Nintendo Switch"; const std::string default_image = "https://git.eden-emu.dev/eden-emu/eden/raw/branch/master/" "dist/qt_themes/default/icons/256x256/eden_named.png"; const std::string url = use_default ? default_image : game_url; @@ -81,7 +84,7 @@ void DiscordImpl::UpdateGameStatus(bool use_default) { } void DiscordImpl::Update() { - const std::string default_text = "eden is an emulator for the Nintendo Switch"; + const std::string default_text = "Eden is an emulator for the Nintendo Switch"; const std::string default_image = "https://git.eden-emu.dev/eden-emu/eden/raw/branch/master/" "dist/qt_themes/default/icons/256x256/eden_named.png"; diff --git a/src/yuzu/discord_impl.h b/src/qt_common/discord/discord_impl.h similarity index 79% rename from src/yuzu/discord_impl.h rename to src/qt_common/discord/discord_impl.h index eb6cf9ae0f..919717664c 100644 --- a/src/yuzu/discord_impl.h +++ b/src/qt_common/discord/discord_impl.h @@ -1,9 +1,14 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2018 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "yuzu/discord.h" +#include "discord.h" + +#include namespace Core { class System; diff --git a/src/qt_common/qt_compat.h b/src/qt_common/qt_compat.h new file mode 100644 index 0000000000..447cd2ffb4 --- /dev/null +++ b/src/qt_common/qt_compat.h @@ -0,0 +1,14 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include + +#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) +#define STATE_CHANGED stateChanged +#define CHECKSTATE_TYPE int +#else +#define STATE_CHANGED checkStateChanged +#define CHECKSTATE_TYPE Qt::CheckState +#endif diff --git a/src/qt_common/qt_applet_util.cpp b/src/qt_common/util/applet.cpp similarity index 75% rename from src/qt_common/qt_applet_util.cpp rename to src/qt_common/util/applet.cpp index 1b0189392e..2caab9c2f8 100644 --- a/src/qt_common/qt_applet_util.cpp +++ b/src/qt_common/util/applet.cpp @@ -1,4 +1,4 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "qt_applet_util.h" +#include "qt_common/util/applet.h" diff --git a/src/qt_common/qt_applet_util.h b/src/qt_common/util/applet.h similarity index 100% rename from src/qt_common/qt_applet_util.h rename to src/qt_common/util/applet.h diff --git a/src/qt_common/qt_compress.cpp b/src/qt_common/util/compress.cpp similarity index 99% rename from src/qt_common/qt_compress.cpp rename to src/qt_common/util/compress.cpp index 1fc5c4bb2c..323b888faa 100644 --- a/src/qt_common/qt_compress.cpp +++ b/src/qt_common/util/compress.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "qt_compress.h" +#include "compress.h" #include "quazipfileinfo.h" #include @@ -24,7 +24,7 @@ bool compressDir(QString fileCompressed, // See how big the overall fs structure is // good approx. of total progress - // TODO(crueter): QDirListing impl + // TODO(crueter): QDirListing impl... or fs::recursive_dir_iterator QDirIterator iter(dir, QDir::NoDotAndDotDot | QDir::Hidden | QDir::Files, QDirIterator::Subdirectories); diff --git a/src/qt_common/qt_compress.h b/src/qt_common/util/compress.h similarity index 100% rename from src/qt_common/qt_compress.h rename to src/qt_common/util/compress.h diff --git a/src/qt_common/qt_content_util.cpp b/src/qt_common/util/content.cpp similarity index 98% rename from src/qt_common/qt_content_util.cpp rename to src/qt_common/util/content.cpp index f0a6a3ad80..8f28df5bee 100644 --- a/src/qt_common/qt_content_util.cpp +++ b/src/qt_common/util/content.cpp @@ -1,22 +1,24 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "qt_content_util.h" +#include "qt_common/util/content.h" +#include "qt_common/util/game.h" + #include "common/fs/fs.h" #include "core/hle/service/acc/profile_manager.h" #include "frontend_common/content_manager.h" #include "frontend_common/data_manager.h" #include "frontend_common/firmware_manager.h" + #include "qt_common/qt_common.h" -#include "qt_common/qt_compress.h" -#include "qt_common/qt_game_util.h" -#include "qt_common/qt_progress_dialog.h" -#include "qt_frontend_util.h" +#include "compress.h" +#include "qt_common/abstract/qt_progress_dialog.h" +#include "qt_common/abstract/qt_frontend_util.h" #include #include #include -#include +#include namespace QtCommon::Content { @@ -208,6 +210,7 @@ QString UnzipFirmwareToTmp(const QString& location) QFile zip(location); + // TODO(crueter): use QtCompress QStringList result = JlCompress::extractDir(&zip, qCacheDir); if (result.isEmpty()) { return QString(); diff --git a/src/qt_common/qt_content_util.h b/src/qt_common/util/content.h similarity index 100% rename from src/qt_common/qt_content_util.h rename to src/qt_common/util/content.h diff --git a/src/qt_common/qt_game_util.cpp b/src/qt_common/util/game.cpp similarity index 99% rename from src/qt_common/qt_game_util.cpp rename to src/qt_common/util/game.cpp index 0eddd10fe1..767b5fc31f 100644 --- a/src/qt_common/qt_game_util.cpp +++ b/src/qt_common/util/game.cpp @@ -1,15 +1,16 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "qt_game_util.h" +#include "qt_common/util/game.h" + #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "core/file_sys/savedata_factory.h" #include "core/hle/service/am/am_types.h" #include "frontend_common/content_manager.h" -#include "qt_common.h" -#include "qt_common/uisettings.h" -#include "qt_frontend_util.h" +#include "qt_common/qt_common.h" +#include "qt_common/config/uisettings.h" +#include "qt_common/abstract/qt_frontend_util.h" #include "yuzu/util/util.h" #include diff --git a/src/qt_common/qt_game_util.h b/src/qt_common/util/game.h similarity index 100% rename from src/qt_common/qt_game_util.h rename to src/qt_common/util/game.h diff --git a/src/qt_common/qt_meta.cpp b/src/qt_common/util/meta.cpp similarity index 98% rename from src/qt_common/qt_meta.cpp rename to src/qt_common/util/meta.cpp index 67ae659771..4c7f1409e3 100644 --- a/src/qt_common/qt_meta.cpp +++ b/src/qt_common/util/meta.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "qt_meta.h" +#include "qt_common/util/meta.h" #include "common/common_types.h" #include "core/core.h" #include "core/frontend/applets/cabinet.h" diff --git a/src/qt_common/qt_meta.h b/src/qt_common/util/meta.h similarity index 100% rename from src/qt_common/qt_meta.h rename to src/qt_common/util/meta.h diff --git a/src/qt_common/qt_path_util.cpp b/src/qt_common/util/path.cpp similarity index 94% rename from src/qt_common/qt_path_util.cpp rename to src/qt_common/util/path.cpp index 632424e0ca..93e8007eb9 100644 --- a/src/qt_common/qt_path_util.cpp +++ b/src/qt_common/util/path.cpp @@ -1,13 +1,13 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "qt_path_util.h" +#include "qt_common/util/path.h" #include #include #include #include "common/fs/fs.h" #include "common/fs/path_util.h" -#include "qt_common/qt_frontend_util.h" +#include "qt_common/abstract/qt_frontend_util.h" #include namespace QtCommon::Path { diff --git a/src/qt_common/qt_path_util.h b/src/qt_common/util/path.h similarity index 100% rename from src/qt_common/qt_path_util.h rename to src/qt_common/util/path.h diff --git a/src/qt_common/qt_rom_util.cpp b/src/qt_common/util/rom.cpp similarity index 98% rename from src/qt_common/qt_rom_util.cpp rename to src/qt_common/util/rom.cpp index 08ccb05a97..1617548db3 100644 --- a/src/qt_common/qt_rom_util.cpp +++ b/src/qt_common/util/rom.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later -#include "qt_rom_util.h" +#include "qt_common/util/rom.h" #include diff --git a/src/qt_common/qt_rom_util.h b/src/qt_common/util/rom.h similarity index 100% rename from src/qt_common/qt_rom_util.h rename to src/qt_common/util/rom.h diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 481d7c2f48..9d584f1ac9 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -158,7 +158,7 @@ add_executable(yuzu debugger/controller.h debugger/wait_tree.cpp debugger/wait_tree.h - discord.h + game_list.cpp game_list.h game_list_p.h @@ -404,15 +404,6 @@ if (YUZU_ENABLE_COMPATIBILITY_REPORTING) target_compile_definitions(yuzu PRIVATE YUZU_ENABLE_COMPATIBILITY_REPORTING) endif() -if (USE_DISCORD_PRESENCE) - target_sources(yuzu PUBLIC - discord_impl.cpp - discord_impl.h - ) - target_link_libraries(yuzu PRIVATE DiscordRPC::discord-rpc Qt6::Network) - target_compile_definitions(yuzu PRIVATE USE_DISCORD_PRESENCE) -endif() - if (ENABLE_WEB_SERVICE) target_compile_definitions(yuzu PRIVATE ENABLE_WEB_SERVICE) endif() diff --git a/src/yuzu/applets/qt_controller.cpp b/src/yuzu/applets/qt_controller.cpp index 48ce860ad7..7977d75ca0 100644 --- a/src/yuzu/applets/qt_controller.cpp +++ b/src/yuzu/applets/qt_controller.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -15,6 +18,7 @@ #include "hid_core/hid_types.h" #include "hid_core/resources/npad/npad.h" #include "ui_qt_controller.h" +#include "qt_common/qt_compat.h" #include "yuzu/applets/qt_controller.h" #include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input_profile_dialog.h" @@ -184,7 +188,7 @@ QtControllerSelectorDialog::QtControllerSelectorDialog( CheckIfParametersMet(); }); - connect(connected_controller_checkboxes[i], &QCheckBox::stateChanged, [this, i](int state) { + connect(connected_controller_checkboxes[i], &QCheckBox::STATE_CHANGED, [this, i](int state) { player_groupboxes[i]->setChecked(state == Qt::Checked); UpdateControllerIcon(i); UpdateControllerState(i); diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index cdc4e4024a..30ac18d139 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -12,7 +12,7 @@ #include #include "common/settings_enums.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA #include #include diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index af81ef552e..58478059a4 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp @@ -19,9 +19,9 @@ #include "ui_configure_audio.h" #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_audio.h" -#include "qt_common/shared_translation.h" +#include "qt_common/config/shared_translation.h" #include "yuzu/configuration/shared_widget.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" ConfigureAudio::ConfigureAudio(const Core::System& system_, std::shared_ptr> group_, diff --git a/src/yuzu/configuration/configure_cpu.h b/src/yuzu/configuration/configure_cpu.h index bbc6096f9b..461ca7f85e 100644 --- a/src/yuzu/configuration/configure_cpu.h +++ b/src/yuzu/configuration/configure_cpu.h @@ -10,7 +10,7 @@ #include #include #include "yuzu/configuration/configuration_shared.h" -#include "qt_common/shared_translation.h" +#include "qt_common/config/shared_translation.h" class QComboBox; diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index a1a3d94dbc..1953bd4f38 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -15,7 +15,7 @@ #include "ui_configure_debug.h" #include "yuzu/configuration/configure_debug.h" #include "yuzu/debugger/console.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent) : QScrollArea(parent), ui{std::make_unique()}, system{system_} { diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 0816782282..239e78a4d8 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp @@ -30,7 +30,7 @@ #include "yuzu/configuration/configure_ui.h" #include "yuzu/configuration/configure_web.h" #include "yuzu/hotkeys.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, InputCommon::InputSubsystem* input_subsystem, diff --git a/src/yuzu/configuration/configure_dialog.h b/src/yuzu/configuration/configure_dialog.h index c1e148fc8e..4f9cf79645 100644 --- a/src/yuzu/configuration/configure_dialog.h +++ b/src/yuzu/configuration/configure_dialog.h @@ -11,7 +11,7 @@ #include #include "configuration/shared_widget.h" #include "yuzu/configuration/configuration_shared.h" -#include "qt_common/shared_translation.h" +#include "qt_common/config/shared_translation.h" #include "yuzu/vk_device_info.h" namespace Core { diff --git a/src/yuzu/configuration/configure_filesystem.cpp b/src/yuzu/configuration/configure_filesystem.cpp index d461bd2cc9..aae954d21e 100644 --- a/src/yuzu/configuration/configure_filesystem.cpp +++ b/src/yuzu/configuration/configure_filesystem.cpp @@ -10,9 +10,9 @@ #include "common/fs/fs.h" #include "common/fs/path_util.h" #include "common/settings.h" -#include "qt_common/qt_common.h" -#include "qt_common/qt_game_util.h" -#include "qt_common/uisettings.h" +#include "qt_common/qt_compat.h" +#include "qt_common/util/game.h" +#include "qt_common/config/uisettings.h" #include "ui_configure_filesystem.h" ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) @@ -34,9 +34,9 @@ ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) connect(ui->reset_game_list_cache, &QPushButton::pressed, this, &ConfigureFilesystem::ResetMetadata); - connect(ui->gamecard_inserted, &QCheckBox::stateChanged, this, + connect(ui->gamecard_inserted, &QCheckBox::STATE_CHANGED, this, &ConfigureFilesystem::UpdateEnabledControls); - connect(ui->gamecard_current_game, &QCheckBox::stateChanged, this, + connect(ui->gamecard_current_game, &QCheckBox::STATE_CHANGED, this, &ConfigureFilesystem::UpdateEnabledControls); } diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 18c2c9cb77..29168ed79e 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -14,7 +14,7 @@ #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_general.h" #include "yuzu/configuration/shared_widget.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" ConfigureGeneral::ConfigureGeneral(const Core::System& system_, std::shared_ptr> group_, diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index cd806e5ef8..76b6153b1a 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -44,7 +44,7 @@ #include "yuzu/configuration/configure_graphics.h" #include "yuzu/configuration/shared_widget.h" #include "qt_common/qt_common.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "yuzu/vk_device_info.h" static const std::vector default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR, diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.h index 38d97aae80..7142b2d36c 100644 --- a/src/yuzu/configuration/configure_graphics.h +++ b/src/yuzu/configuration/configure_graphics.h @@ -18,7 +18,7 @@ #include #include "common/common_types.h" #include "common/settings_enums.h" -#include "qt_common/shared_translation.h" +#include "qt_common/config/shared_translation.h" #include "vk_device_info.h" #include "yuzu/configuration/configuration_shared.h" diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index e07ad8c466..8288e2d755 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -12,7 +12,7 @@ #include "ui_configure_graphics_advanced.h" #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_graphics_advanced.h" -#include "qt_common/shared_translation.h" +#include "qt_common/config/shared_translation.h" #include "yuzu/configuration/shared_widget.h" ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced( diff --git a/src/yuzu/configuration/configure_graphics_extensions.cpp b/src/yuzu/configuration/configure_graphics_extensions.cpp index f165e703d9..cc10d874fd 100644 --- a/src/yuzu/configuration/configure_graphics_extensions.cpp +++ b/src/yuzu/configuration/configure_graphics_extensions.cpp @@ -14,7 +14,7 @@ #include "ui_configure_graphics_extensions.h" #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_graphics_extensions.h" -#include "qt_common/shared_translation.h" +#include "qt_common/config/shared_translation.h" #include "yuzu/configuration/shared_widget.h" ConfigureGraphicsExtensions::ConfigureGraphicsExtensions( diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp index a5c1ee009a..dfd3727120 100644 --- a/src/yuzu/configuration/configure_hotkeys.cpp +++ b/src/yuzu/configuration/configure_hotkeys.cpp @@ -16,7 +16,7 @@ #include "ui_configure_hotkeys.h" #include "yuzu/configuration/configure_hotkeys.h" #include "yuzu/hotkeys.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "yuzu/util/sequence_dialog/sequence_dialog.h" constexpr int name_column = 0; diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index c066c5f21c..1a2d36efe6 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -18,6 +18,7 @@ #include "ui_configure_input.h" #include "ui_configure_input_advanced.h" #include "ui_configure_input_player.h" +#include "qt_common/qt_compat.h" #include "yuzu/configuration/configure_camera.h" #include "yuzu/configuration/configure_debug_controller.h" #include "yuzu/configuration/configure_input.h" @@ -124,7 +125,7 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, &ConfigureInput::UpdateAllInputDevices); connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this, &ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection); - connect(connected_controller_checkboxes[i], &QCheckBox::stateChanged, [this, i](int state) { + connect(connected_controller_checkboxes[i], &QCheckBox::STATE_CHANGED, [this, i](int state) { // Keep activated controllers synced with the "Connected Controllers" checkboxes player_controllers[i]->ConnectPlayer(state == Qt::Checked); }); diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp index d6c4e09ec0..241d445cea 100644 --- a/src/yuzu/configuration/configure_input_advanced.cpp +++ b/src/yuzu/configuration/configure_input_advanced.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -7,6 +10,7 @@ #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" #include "ui_configure_input_advanced.h" +#include "qt_common/qt_compat.h" #include "yuzu/configuration/configure_input_advanced.h" ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QWidget* parent) @@ -74,13 +78,13 @@ ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QW } } - connect(ui->mouse_enabled, &QCheckBox::stateChanged, this, + connect(ui->mouse_enabled, &QCheckBox::STATE_CHANGED, this, &ConfigureInputAdvanced::UpdateUIEnabled); - connect(ui->debug_enabled, &QCheckBox::stateChanged, this, + connect(ui->debug_enabled, &QCheckBox::STATE_CHANGED, this, &ConfigureInputAdvanced::UpdateUIEnabled); - connect(ui->touchscreen_enabled, &QCheckBox::stateChanged, this, + connect(ui->touchscreen_enabled, &QCheckBox::STATE_CHANGED, this, &ConfigureInputAdvanced::UpdateUIEnabled); - connect(ui->enable_ring_controller, &QCheckBox::stateChanged, this, + connect(ui->enable_ring_controller, &QCheckBox::STATE_CHANGED, this, &ConfigureInputAdvanced::UpdateUIEnabled); connect(ui->debug_configure, &QPushButton::clicked, this, diff --git a/src/yuzu/configuration/configure_input_per_game.h b/src/yuzu/configuration/configure_input_per_game.h index dcd6dd841b..a1b6098dca 100644 --- a/src/yuzu/configuration/configure_input_per_game.h +++ b/src/yuzu/configuration/configure_input_per_game.h @@ -12,7 +12,7 @@ #include "ui_configure_input_per_game.h" #include "yuzu/configuration/input_profiles.h" -#include "qt_common/qt_config.h" +#include "qt_common/config/qt_config.h" class QComboBox; diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 6afa8320a2..6bc37d4347 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -14,7 +14,7 @@ #include #include "common/assert.h" #include "common/param_package.h" -#include "qt_common/qt_config.h" +#include "qt_common/config/qt_config.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" #include "hid_core/hid_types.h" diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index b51ede0de8..d175724288 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/src/yuzu/configuration/configure_per_game.cpp @@ -41,7 +41,7 @@ #include "yuzu/configuration/configure_per_game.h" #include "yuzu/configuration/configure_per_game_addons.h" #include "yuzu/configuration/configure_system.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "yuzu/util/util.h" #include "yuzu/vk_device_info.h" diff --git a/src/yuzu/configuration/configure_per_game.h b/src/yuzu/configuration/configure_per_game.h index 83afc27f3d..f75d9c0ae4 100644 --- a/src/yuzu/configuration/configure_per_game.h +++ b/src/yuzu/configuration/configure_per_game.h @@ -18,8 +18,8 @@ #include "frontend_common/config.h" #include "vk_device_info.h" #include "yuzu/configuration/configuration_shared.h" -#include "qt_common/qt_config.h" -#include "qt_common/shared_translation.h" +#include "qt_common/config/qt_config.h" +#include "qt_common/config/shared_translation.h" namespace Core { class System; diff --git a/src/yuzu/configuration/configure_per_game_addons.cpp b/src/yuzu/configuration/configure_per_game_addons.cpp index ed4cbc1147..ee2db55a5d 100644 --- a/src/yuzu/configuration/configure_per_game_addons.cpp +++ b/src/yuzu/configuration/configure_per_game_addons.cpp @@ -24,7 +24,7 @@ #include "ui_configure_per_game_addons.h" #include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_per_game_addons.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" ConfigurePerGameAddons::ConfigurePerGameAddons(Core::System& system_, QWidget* parent) : QWidget(parent), ui{std::make_unique()}, system{system_} { diff --git a/src/yuzu/configuration/configure_ringcon.cpp b/src/yuzu/configuration/configure_ringcon.cpp index 795ad1a85e..dfb1540584 100644 --- a/src/yuzu/configuration/configure_ringcon.cpp +++ b/src/yuzu/configuration/configure_ringcon.cpp @@ -11,7 +11,7 @@ #include #include -#include "qt_common/qt_config.h" +#include "qt_common/config/qt_config.h" #include "hid_core/frontend/emulated_controller.h" #include "hid_core/hid_core.h" #include "input_common/drivers/keyboard.h" diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index e193b5f95b..56e3e29f90 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2016 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -17,6 +20,7 @@ #include "common/settings.h" #include "core/core.h" #include "ui_configure_system.h" +#include "qt_common/qt_compat.h" #include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configure_system.h" #include "yuzu/configuration/shared_widget.h" @@ -79,11 +83,11 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, previous_time = date_rtc->dateTime().toSecsSinceEpoch(); date_rtc_offset->setValue(offset); }; - const auto update_rtc_date = [this]() { UpdateRtcTime(); }; + const auto update_rtc_date = [this](int _) { UpdateRtcTime(); }; connect(combo_language, qOverload(&QComboBox::currentIndexChanged), this, locale_check); connect(combo_region, qOverload(&QComboBox::currentIndexChanged), this, locale_check); - connect(checkbox_rtc, qOverload(&QCheckBox::stateChanged), this, update_rtc_date); + connect(checkbox_rtc, qOverload(&QCheckBox::STATE_CHANGED), this, update_rtc_date); connect(date_rtc_offset, qOverload(&QSpinBox::valueChanged), this, update_rtc_date); connect(date_rtc, &QDateTimeEdit::dateTimeChanged, this, update_date_offset); diff --git a/src/yuzu/configuration/configure_tas.cpp b/src/yuzu/configuration/configure_tas.cpp index 898a1a3e59..8bdb987426 100644 --- a/src/yuzu/configuration/configure_tas.cpp +++ b/src/yuzu/configuration/configure_tas.cpp @@ -11,7 +11,7 @@ #include "common/settings.h" #include "ui_configure_tas.h" #include "yuzu/configuration/configure_tas.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" ConfigureTasDialog::ConfigureTasDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique()) { diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp index ac6d6e34aa..b88f41b756 100644 --- a/src/yuzu/configuration/configure_ui.cpp +++ b/src/yuzu/configuration/configure_ui.cpp @@ -27,7 +27,9 @@ #include "core/core.h" #include "core/frontend/framebuffer_layout.h" #include "ui_configure_ui.h" -#include "qt_common/uisettings.h" + +#include "qt_common/qt_compat.h" +#include "qt_common/config/uisettings.h" namespace { constexpr std::array default_game_icon_sizes{ @@ -119,11 +121,11 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent) SetConfiguration(); // Force game list reload if any of the relevant settings are changed. - connect(ui->show_add_ons, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); - connect(ui->show_compat, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); - connect(ui->show_size, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); - connect(ui->show_types, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); - connect(ui->show_play_time, &QCheckBox::stateChanged, this, + connect(ui->show_add_ons, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate); + connect(ui->show_compat, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate); + connect(ui->show_size, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate); + connect(ui->show_types, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate); + connect(ui->show_play_time, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate); connect(ui->game_icon_size_combobox, QOverload::of(&QComboBox::currentIndexChanged), this, &ConfigureUi::RequestGameListUpdate); diff --git a/src/yuzu/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cpp index 7a693be10c..c5e9256a48 100644 --- a/src/yuzu/configuration/configure_web.cpp +++ b/src/yuzu/configuration/configure_web.cpp @@ -17,7 +17,7 @@ #include #include "common/settings.h" #include "ui_configure_web.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" ConfigureWeb::ConfigureWeb(QWidget* parent) : QWidget(parent) diff --git a/src/yuzu/configuration/input_profiles.h b/src/yuzu/configuration/input_profiles.h index dba5ce1318..67f823ec83 100644 --- a/src/yuzu/configuration/input_profiles.h +++ b/src/yuzu/configuration/input_profiles.h @@ -9,7 +9,7 @@ #include #include -#include "qt_common/qt_config.h" +#include "qt_common/config/qt_config.h" namespace Core { class System; diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp index e30ecc4848..b7fc98d637 100644 --- a/src/yuzu/configuration/shared_widget.cpp +++ b/src/yuzu/configuration/shared_widget.cpp @@ -45,7 +45,8 @@ #include "common/logging/log.h" #include "common/settings.h" #include "common/settings_common.h" -#include "qt_common/shared_translation.h" +#include "qt_common/qt_compat.h" +#include "qt_common/config/shared_translation.h" namespace ConfigurationShared { @@ -700,7 +701,7 @@ void Widget::SetupComponent(const QString& label, std::function& load_fu restore_func(); } }; - connect(checkbox, &QCheckBox::stateChanged, reset); + connect(checkbox, &QCheckBox::STATE_CHANGED, reset); reset(checkbox->checkState()); } } diff --git a/src/yuzu/configuration/shared_widget.h b/src/yuzu/configuration/shared_widget.h index dd5d5b7257..b07804ac00 100644 --- a/src/yuzu/configuration/shared_widget.h +++ b/src/yuzu/configuration/shared_widget.h @@ -15,7 +15,7 @@ #include #include #include -#include "qt_common/shared_translation.h" +#include "qt_common/config/shared_translation.h" class QCheckBox; class QComboBox; diff --git a/src/yuzu/data_dialog.cpp b/src/yuzu/data_dialog.cpp index bae49ff351..dc3e06f89f 100644 --- a/src/yuzu/data_dialog.cpp +++ b/src/yuzu/data_dialog.cpp @@ -5,7 +5,7 @@ #include "core/hle/service/acc/profile_manager.h" #include "frontend_common/data_manager.h" #include "qt_common/qt_common.h" -#include "qt_common/qt_content_util.h" +#include "qt_common/util/content.h" #include "qt_common/qt_string_lookup.h" #include "ui_data_dialog.h" diff --git a/src/yuzu/debugger/console.cpp b/src/yuzu/debugger/console.cpp index 8fb22db192..e93a8b9265 100644 --- a/src/yuzu/debugger/console.cpp +++ b/src/yuzu/debugger/console.cpp @@ -12,7 +12,7 @@ #include "common/logging/backend.h" #include "yuzu/debugger/console.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" namespace Debugger { void ToggleConsole() { diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index feb814b25e..f06665fc33 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp @@ -8,7 +8,7 @@ #include #include "yuzu/debugger/wait_tree.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "core/arm/debug.h" #include "core/core.h" diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index fa61cdfb1f..523071eef5 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -18,8 +18,8 @@ #include "core/core.h" #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" -#include "qt_common/qt_game_util.h" -#include "qt_common/uisettings.h" +#include "qt_common/util/game.h" +#include "qt_common/config/uisettings.h" #include "yuzu/compatibility_list.h" #include "yuzu/game_list_p.h" #include "yuzu/game_list_worker.h" diff --git a/src/yuzu/game_list.h b/src/yuzu/game_list.h index cd71fb2139..802c26f971 100644 --- a/src/yuzu/game_list.h +++ b/src/yuzu/game_list.h @@ -20,8 +20,8 @@ #include "common/common_types.h" #include "core/core.h" -#include "qt_common/uisettings.h" -#include "qt_common/qt_game_util.h" +#include "qt_common/config/uisettings.h" +#include "qt_common/util/game.h" #include "yuzu/compatibility_list.h" #include "yuzu/play_time_manager.h" diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h index 5a3b5829f5..21bb9238a9 100644 --- a/src/yuzu/game_list_p.h +++ b/src/yuzu/game_list_p.h @@ -22,7 +22,7 @@ #include "common/logging/log.h" #include "common/string_util.h" #include "yuzu/play_time_manager.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "yuzu/util/util.h" enum class GameListItemType { diff --git a/src/yuzu/game_list_worker.cpp b/src/yuzu/game_list_worker.cpp index 2914c275a8..4542b63100 100644 --- a/src/yuzu/game_list_worker.cpp +++ b/src/yuzu/game_list_worker.cpp @@ -30,7 +30,7 @@ #include "yuzu/game_list.h" #include "yuzu/game_list_p.h" #include "yuzu/game_list_worker.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" namespace { diff --git a/src/yuzu/game_list_worker.h b/src/yuzu/game_list_worker.h index f5d5f6341b..edcb3e531c 100644 --- a/src/yuzu/game_list_worker.h +++ b/src/yuzu/game_list_worker.h @@ -18,7 +18,7 @@ #include "common/thread.h" #include "core/file_sys/registered_cache.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "yuzu/compatibility_list.h" #include "yuzu/play_time_manager.h" diff --git a/src/yuzu/hotkeys.cpp b/src/yuzu/hotkeys.cpp index 31932e6f43..10e407402b 100644 --- a/src/yuzu/hotkeys.cpp +++ b/src/yuzu/hotkeys.cpp @@ -11,7 +11,7 @@ #include "hid_core/frontend/emulated_controller.h" #include "yuzu/hotkeys.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" HotkeyRegistry::HotkeyRegistry() = default; HotkeyRegistry::~HotkeyRegistry() = default; diff --git a/src/yuzu/install_dialog.cpp b/src/yuzu/install_dialog.cpp index e6f1392ce0..1b772a0eba 100644 --- a/src/yuzu/install_dialog.cpp +++ b/src/yuzu/install_dialog.cpp @@ -11,7 +11,7 @@ #include #include #include "yuzu/install_dialog.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" InstallDialog::InstallDialog(QWidget* parent, const QStringList& files) : QDialog(parent) { file_list = new QListWidget(this); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 77bfe5db9f..8c96a94e0b 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -6,10 +6,10 @@ #include "core/tools/renderdoc.h" #include "frontend_common/firmware_manager.h" #include "qt_common/qt_common.h" -#include "qt_common/qt_content_util.h" -#include "qt_common/qt_game_util.h" -#include "qt_common/qt_meta.h" -#include "qt_common/qt_path_util.h" +#include "qt_common/util/content.h" +#include "qt_common/util/game.h" +#include "qt_common/util/meta.h" +#include "qt_common/util/path.h" #include #include #include @@ -143,7 +143,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "input_common/drivers/virtual_amiibo.h" #include "input_common/main.h" #include "ui_main.h" -#include "util/overlay_dialog.h" +#include "yuzu/util/overlay_dialog.h" #include "video_core/gpu.h" #include "video_core/renderer_base.h" #include "video_core/shader_notify.h" @@ -152,13 +152,13 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "yuzu/compatibility_list.h" #include "yuzu/configuration/configure_dialog.h" #include "yuzu/configuration/configure_input_per_game.h" -#include "qt_common/qt_config.h" +#include "qt_common/config/qt_config.h" #include "yuzu/debugger/console.h" #include "yuzu/debugger/controller.h" #include "yuzu/debugger/wait_tree.h" #include "yuzu/data_dialog.h" #include "yuzu/deps_dialog.h" -#include "yuzu/discord.h" +#include "qt_common/discord/discord.h" #include "yuzu/game_list.h" #include "yuzu/game_list_p.h" #include "yuzu/install_dialog.h" @@ -166,7 +166,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "yuzu/main.h" #include "yuzu/play_time_manager.h" #include "yuzu/startup_checks.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "yuzu/util/clickable_label.h" #include "yuzu/vk_device_info.h" @@ -264,7 +264,7 @@ static void RemoveTitlebarFilter() { using namespace Common::Literals; #ifdef USE_DISCORD_PRESENCE -#include "yuzu/discord_impl.h" +#include "qt_common/discord/discord_impl.h" #endif #ifdef QT_STATICPLUGIN diff --git a/src/yuzu/main.h b/src/yuzu/main.h index a3e99c05fe..d1f47f42e2 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -19,9 +19,9 @@ #include "common/common_types.h" #include "frontend_common/content_manager.h" #include "input_common/drivers/tas_input.h" -#include "qt_common/qt_config.h" -#include "qt_common/qt_game_util.h" -#include "user_data_migration.h" +#include "qt_common/config/qt_config.h" +#include "qt_common/util/game.h" +#include "yuzu/user_data_migration.h" #include "yuzu/compatibility_list.h" #include "yuzu/hotkeys.h" diff --git a/src/yuzu/multiplayer/direct_connect.cpp b/src/yuzu/multiplayer/direct_connect.cpp index 6291979fe6..992e9a1ee6 100644 --- a/src/yuzu/multiplayer/direct_connect.cpp +++ b/src/yuzu/multiplayer/direct_connect.cpp @@ -21,7 +21,7 @@ #include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/state.h" #include "yuzu/multiplayer/validation.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" enum class ConnectionType : u8 { TraversalServer, IP }; diff --git a/src/yuzu/multiplayer/host_room.cpp b/src/yuzu/multiplayer/host_room.cpp index cc163a5420..5c74c4b87e 100644 --- a/src/yuzu/multiplayer/host_room.cpp +++ b/src/yuzu/multiplayer/host_room.cpp @@ -25,7 +25,7 @@ #include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/state.h" #include "yuzu/multiplayer/validation.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/verify_user_jwt.h" #endif diff --git a/src/yuzu/multiplayer/lobby.cpp b/src/yuzu/multiplayer/lobby.cpp index e8daa0c6eb..3bf2825098 100644 --- a/src/yuzu/multiplayer/lobby.cpp +++ b/src/yuzu/multiplayer/lobby.cpp @@ -22,7 +22,7 @@ #include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/state.h" #include "yuzu/multiplayer/validation.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #ifdef ENABLE_WEB_SERVICE #include "web_service/web_backend.h" #endif diff --git a/src/yuzu/multiplayer/state.cpp b/src/yuzu/multiplayer/state.cpp index 8cbb63d660..7549194848 100644 --- a/src/yuzu/multiplayer/state.cpp +++ b/src/yuzu/multiplayer/state.cpp @@ -18,7 +18,7 @@ #include "yuzu/multiplayer/lobby.h" #include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/state.h" -#include "qt_common/uisettings.h" +#include "qt_common/config/uisettings.h" #include "yuzu/util/clickable_label.h" MultiplayerState::MultiplayerState(QWidget* parent, QStandardItemModel* game_list_model_, diff --git a/src/yuzu/user_data_migration.cpp b/src/yuzu/user_data_migration.cpp index df6b7be434..22cf1a188c 100644 --- a/src/yuzu/user_data_migration.cpp +++ b/src/yuzu/user_data_migration.cpp @@ -11,10 +11,10 @@ #include #include #include "common/fs/path_util.h" -#include "migration_dialog.h" +#include "../yuzu/migration_dialog.h" // Needs to be included at the end due to https://bugreports.qt.io/browse/QTBUG-73263 -#include +#include #include #include #include diff --git a/src/yuzu/user_data_migration.h b/src/yuzu/user_data_migration.h index a3ac2c15d3..a18dd27ddb 100644 --- a/src/yuzu/user_data_migration.h +++ b/src/yuzu/user_data_migration.h @@ -8,7 +8,7 @@ #pragma once #include -#include "migration_worker.h" +#include "../yuzu/migration_worker.h" // TODO(crueter): Quick implementation class UserDataMigrator {