eden-emu/eden
25
4
Fork 15
Code Issues 139 Pull requests 48 Projects 1 Releases Packages Wiki Activity Actions

[qt_common] reorg + checkstate abstraction (#2735)

Browse source 
no diff. in functionality, just confirm builds on ubuntu 24.04/debian 12

Signed-off-by: crueter <crueter@eden-emu.dev>

Reviewed-on: #2735
This commit is contained in:
crueter 2025-10-15 05:05:03 +02:00
parent 5f9dba40a0
commit fff8e2026f
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
77 changed files with 174 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/qt_common/CMakeLists.txt
View file

@ -1,36 +1,45 @@
# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
# SPDX-License-Identifier: GPL-3.0-or-later # 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 add_library(qt_common STATIC
qt_common.h qt_common.h
qt_common.cpp qt_common.cpp
uisettings.cpp config/uisettings.cpp
uisettings.h config/uisettings.h
config/qt_config.cpp
config/qt_config.h
config/shared_translation.cpp
config/shared_translation.h
qt_config.cpp util/path.h util/path.cpp
qt_config.h 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_string_lookup.h
qt_compress.h qt_compress.cpp qt_compat.h
discord/discord.h
) )
create_target_directory_groups(qt_common) 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) # TODO(crueter)
if (ENABLE_QT) if (ENABLE_QT)
target_link_libraries(qt_common PRIVATE Qt6::Widgets) target_link_libraries(qt_common PRIVATE Qt6::Widgets)

0
src/qt_common/qt_frontend_util.cpp → src/qt_common/abstract/qt_frontend_util.cpp
View file

0
src/qt_common/qt_frontend_util.h → src/qt_common/abstract/qt_frontend_util.h
View file

0
src/qt_common/qt_progress_dialog.cpp → src/qt_common/abstract/qt_progress_dialog.cpp
View file

0
src/qt_common/qt_progress_dialog.h → src/qt_common/abstract/qt_progress_dialog.h
View file

0
src/qt_common/qt_config.cpp → src/qt_common/config/qt_config.cpp
View file

0
src/qt_common/qt_config.h → src/qt_common/config/qt_config.h
View file

2
src/qt_common/shared_translation.cpp → src/qt_common/config/shared_translation.cpp
View file

@ -14,7 +14,7 @@
#include "common/settings_enums.h" #include "common/settings_enums.h"
#include "common/settings_setting.h" #include "common/settings_setting.h"
#include "common/time_zone.h" #include "common/time_zone.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include <map> #include <map>
#include <memory> #include <memory>
#include <utility> #include <utility>

0
src/qt_common/shared_translation.h → src/qt_common/config/shared_translation.h
View file

2
src/qt_common/uisettings.cpp → src/qt_common/config/uisettings.cpp
View file

@ -7,7 +7,7 @@
#include <QSettings> #include <QSettings>
#include "common/fs/fs.h" #include "common/fs/fs.h"
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#ifndef CANNOT_EXPLICITLY_INSTANTIATE #ifndef CANNOT_EXPLICITLY_INSTANTIATE
namespace Settings { namespace Settings {

2
src/qt_common/uisettings.h → src/qt_common/config/uisettings.h
View file

@ -17,7 +17,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_enums.h" #include "common/settings_enums.h"
#include "qt_common/qt_config.h" #include "qt_common/config/qt_config.h"
using Settings::Category; using Settings::Category;
using Settings::ConfirmStop; using Settings::ConfirmStop;

3
src/yuzu/discord.h → src/qt_common/discord/discord.h
View file

@ -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-FileCopyrightText: 2018 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later

11
src/yuzu/discord_impl.cpp → src/qt_common/discord/discord_impl.cpp
View file

@ -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-FileCopyrightText: 2018 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -15,13 +18,13 @@
#include "common/string_util.h" #include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "yuzu/discord_impl.h" #include "qt_common/discord/discord_impl.h"
namespace DiscordRPC { namespace DiscordRPC {
DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} { DiscordImpl::DiscordImpl(Core::System& system_) : system{system_} {
DiscordEventHandlers handlers{}; 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 // application name
Discord_Initialize("1397286652128264252", &handlers, 1, nullptr); Discord_Initialize("1397286652128264252", &handlers, 1, nullptr);
} }
@ -61,7 +64,7 @@ std::string DiscordImpl::GetGameString(const std::string& title) {
} }
void DiscordImpl::UpdateGameStatus(bool use_default) { 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/" 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"; "dist/qt_themes/default/icons/256x256/eden_named.png";
const std::string url = use_default ? default_image : game_url; const std::string url = use_default ? default_image : game_url;
@ -81,7 +84,7 @@ void DiscordImpl::UpdateGameStatus(bool use_default) {
} }
void DiscordImpl::Update() { 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/" 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"; "dist/qt_themes/default/icons/256x256/eden_named.png";

7
src/yuzu/discord_impl.h → src/qt_common/discord/discord_impl.h
View file

@ -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-FileCopyrightText: 2018 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include "yuzu/discord.h" #include "discord.h"
#include <string>
namespace Core { namespace Core {
class System; class System;

14
src/qt_common/qt_compat.h Normal file
View file

@ -0,0 +1,14 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include <QtVersionChecks>
#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

2
src/qt_common/qt_applet_util.cpp → src/qt_common/util/applet.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include "qt_applet_util.h" #include "qt_common/util/applet.h"

0
src/qt_common/qt_applet_util.h → src/qt_common/util/applet.h
View file

4
src/qt_common/qt_compress.cpp → src/qt_common/util/compress.cpp
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include "qt_compress.h" #include "compress.h"
#include "quazipfileinfo.h" #include "quazipfileinfo.h"
#include <QDirIterator> #include <QDirIterator>
@ -24,7 +24,7 @@ bool compressDir(QString fileCompressed,
// See how big the overall fs structure is // See how big the overall fs structure is
// good approx. of total progress // good approx. of total progress
// TODO(crueter): QDirListing impl // TODO(crueter): QDirListing impl... or fs::recursive_dir_iterator
QDirIterator iter(dir, QDirIterator iter(dir,
QDir::NoDotAndDotDot | QDir::Hidden | QDir::Files, QDir::NoDotAndDotDot | QDir::Hidden | QDir::Files,
QDirIterator::Subdirectories); QDirIterator::Subdirectories);

0
src/qt_common/qt_compress.h → src/qt_common/util/compress.h
View file

15
src/qt_common/qt_content_util.cpp → src/qt_common/util/content.cpp
View file

@ -1,22 +1,24 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // 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 "common/fs/fs.h"
#include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/acc/profile_manager.h"
#include "frontend_common/content_manager.h" #include "frontend_common/content_manager.h"
#include "frontend_common/data_manager.h" #include "frontend_common/data_manager.h"
#include "frontend_common/firmware_manager.h" #include "frontend_common/firmware_manager.h"
#include "qt_common/qt_common.h" #include "qt_common/qt_common.h"
#include "qt_common/qt_compress.h" #include "compress.h"
#include "qt_common/qt_game_util.h" #include "qt_common/abstract/qt_progress_dialog.h"
#include "qt_common/qt_progress_dialog.h" #include "qt_common/abstract/qt_frontend_util.h"
#include "qt_frontend_util.h"
#include <QFuture> #include <QFuture>
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include <JlCompress.h> #include <JlCompress.h>
#include <qfuturewatcher.h> #include <QFutureWatcher>
namespace QtCommon::Content { namespace QtCommon::Content {
@ -208,6 +210,7 @@ QString UnzipFirmwareToTmp(const QString& location)
QFile zip(location); QFile zip(location);
// TODO(crueter): use QtCompress
QStringList result = JlCompress::extractDir(&zip, qCacheDir); QStringList result = JlCompress::extractDir(&zip, qCacheDir);
if (result.isEmpty()) { if (result.isEmpty()) {
return QString(); return QString();

0
src/qt_common/qt_content_util.h → src/qt_common/util/content.h
View file

9
src/qt_common/qt_game_util.cpp → src/qt_common/util/game.cpp
View file

@ -1,15 +1,16 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // 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/fs.h"
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
#include "core/file_sys/savedata_factory.h" #include "core/file_sys/savedata_factory.h"
#include "core/hle/service/am/am_types.h" #include "core/hle/service/am/am_types.h"
#include "frontend_common/content_manager.h" #include "frontend_common/content_manager.h"
#include "qt_common.h" #include "qt_common/qt_common.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "qt_frontend_util.h" #include "qt_common/abstract/qt_frontend_util.h"
#include "yuzu/util/util.h" #include "yuzu/util/util.h"
#include <QDesktopServices> #include <QDesktopServices>

0
src/qt_common/qt_game_util.h → src/qt_common/util/game.h
View file

2
src/qt_common/qt_meta.cpp → src/qt_common/util/meta.cpp
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include "qt_meta.h" #include "qt_common/util/meta.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "core/core.h" #include "core/core.h"
#include "core/frontend/applets/cabinet.h" #include "core/frontend/applets/cabinet.h"

0
src/qt_common/qt_meta.h → src/qt_common/util/meta.h
View file

4
src/qt_common/qt_path_util.cpp → src/qt_common/util/path.cpp
View file

@ -1,13 +1,13 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include "qt_path_util.h" #include "qt_common/util/path.h"
#include <QDesktopServices> #include <QDesktopServices>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
#include "common/fs/fs.h" #include "common/fs/fs.h"
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
#include "qt_common/qt_frontend_util.h" #include "qt_common/abstract/qt_frontend_util.h"
#include <fmt/format.h> #include <fmt/format.h>
namespace QtCommon::Path { namespace QtCommon::Path {

0
src/qt_common/qt_path_util.h → src/qt_common/util/path.h
View file

2
src/qt_common/qt_rom_util.cpp → src/qt_common/util/rom.cpp
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include "qt_rom_util.h" #include "qt_common/util/rom.h"
#include <QCoreApplication> #include <QCoreApplication>

0
src/qt_common/qt_rom_util.h → src/qt_common/util/rom.h
View file

11
src/yuzu/CMakeLists.txt
View file

@ -158,7 +158,7 @@ add_executable(yuzu
debugger/controller.h debugger/controller.h
debugger/wait_tree.cpp debugger/wait_tree.cpp
debugger/wait_tree.h debugger/wait_tree.h
discord.h
game_list.cpp game_list.cpp
game_list.h game_list.h
game_list_p.h game_list_p.h
@ -404,15 +404,6 @@ if (YUZU_ENABLE_COMPATIBILITY_REPORTING)
target_compile_definitions(yuzu PRIVATE YUZU_ENABLE_COMPATIBILITY_REPORTING) target_compile_definitions(yuzu PRIVATE YUZU_ENABLE_COMPATIBILITY_REPORTING)
endif() 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) if (ENABLE_WEB_SERVICE)
target_compile_definitions(yuzu PRIVATE ENABLE_WEB_SERVICE) target_compile_definitions(yuzu PRIVATE ENABLE_WEB_SERVICE)
endif() endif()

6
src/yuzu/applets/qt_controller.cpp
View file

@ -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-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -15,6 +18,7 @@
#include "hid_core/hid_types.h" #include "hid_core/hid_types.h"
#include "hid_core/resources/npad/npad.h" #include "hid_core/resources/npad/npad.h"
#include "ui_qt_controller.h" #include "ui_qt_controller.h"
#include "qt_common/qt_compat.h"
#include "yuzu/applets/qt_controller.h" #include "yuzu/applets/qt_controller.h"
#include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input.h"
#include "yuzu/configuration/configure_input_profile_dialog.h" #include "yuzu/configuration/configure_input_profile_dialog.h"
@ -184,7 +188,7 @@ QtControllerSelectorDialog::QtControllerSelectorDialog(
CheckIfParametersMet(); 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); player_groupboxes[i]->setChecked(state == Qt::Checked);
UpdateControllerIcon(i); UpdateControllerIcon(i);
UpdateControllerState(i); UpdateControllerState(i);

2
src/yuzu/bootmanager.cpp
View file

@ -12,7 +12,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include "common/settings_enums.h" #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 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
#include <QCamera> #include <QCamera>
#include <QCameraImageCapture> #include <QCameraImageCapture>

4
src/yuzu/configuration/configure_audio.cpp
View file

@ -19,9 +19,9 @@
#include "ui_configure_audio.h" #include "ui_configure_audio.h"
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_audio.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 "yuzu/configuration/shared_widget.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
ConfigureAudio::ConfigureAudio(const Core::System& system_, ConfigureAudio::ConfigureAudio(const Core::System& system_,
std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

2
src/yuzu/configuration/configure_cpu.h
View file

@ -10,7 +10,7 @@
#include <vector> #include <vector>
#include <QWidget> #include <QWidget>
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "qt_common/shared_translation.h" #include "qt_common/config/shared_translation.h"
class QComboBox; class QComboBox;

2
src/yuzu/configuration/configure_debug.cpp
View file

@ -15,7 +15,7 @@
#include "ui_configure_debug.h" #include "ui_configure_debug.h"
#include "yuzu/configuration/configure_debug.h" #include "yuzu/configuration/configure_debug.h"
#include "yuzu/debugger/console.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) ConfigureDebug::ConfigureDebug(const Core::System& system_, QWidget* parent)
: QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} { : QScrollArea(parent), ui{std::make_unique<Ui::ConfigureDebug>()}, system{system_} {

2
src/yuzu/configuration/configure_dialog.cpp
View file

@ -30,7 +30,7 @@
#include "yuzu/configuration/configure_ui.h" #include "yuzu/configuration/configure_ui.h"
#include "yuzu/configuration/configure_web.h" #include "yuzu/configuration/configure_web.h"
#include "yuzu/hotkeys.h" #include "yuzu/hotkeys.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
InputCommon::InputSubsystem* input_subsystem, InputCommon::InputSubsystem* input_subsystem,

2
src/yuzu/configuration/configure_dialog.h
View file

@ -11,7 +11,7 @@
#include <QDialog> #include <QDialog>
#include "configuration/shared_widget.h" #include "configuration/shared_widget.h"
#include "yuzu/configuration/configuration_shared.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" #include "yuzu/vk_device_info.h"
namespace Core { namespace Core {

10
src/yuzu/configuration/configure_filesystem.cpp
View file

@ -10,9 +10,9 @@
#include "common/fs/fs.h" #include "common/fs/fs.h"
#include "common/fs/path_util.h" #include "common/fs/path_util.h"
#include "common/settings.h" #include "common/settings.h"
#include "qt_common/qt_common.h" #include "qt_common/qt_compat.h"
#include "qt_common/qt_game_util.h" #include "qt_common/util/game.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "ui_configure_filesystem.h" #include "ui_configure_filesystem.h"
ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
@ -34,9 +34,9 @@ ConfigureFilesystem::ConfigureFilesystem(QWidget* parent)
connect(ui->reset_game_list_cache, &QPushButton::pressed, this, connect(ui->reset_game_list_cache, &QPushButton::pressed, this,
&ConfigureFilesystem::ResetMetadata); &ConfigureFilesystem::ResetMetadata);
connect(ui->gamecard_inserted, &QCheckBox::stateChanged, this, connect(ui->gamecard_inserted, &QCheckBox::STATE_CHANGED, this,
&ConfigureFilesystem::UpdateEnabledControls); &ConfigureFilesystem::UpdateEnabledControls);
connect(ui->gamecard_current_game, &QCheckBox::stateChanged, this, connect(ui->gamecard_current_game, &QCheckBox::STATE_CHANGED, this,
&ConfigureFilesystem::UpdateEnabledControls); &ConfigureFilesystem::UpdateEnabledControls);
} }

2
src/yuzu/configuration/configure_general.cpp
View file

@ -14,7 +14,7 @@
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_general.h" #include "yuzu/configuration/configure_general.h"
#include "yuzu/configuration/shared_widget.h" #include "yuzu/configuration/shared_widget.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
ConfigureGeneral::ConfigureGeneral(const Core::System& system_, ConfigureGeneral::ConfigureGeneral(const Core::System& system_,
std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_, std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,

2
src/yuzu/configuration/configure_graphics.cpp
View file

@ -44,7 +44,7 @@
#include "yuzu/configuration/configure_graphics.h" #include "yuzu/configuration/configure_graphics.h"
#include "yuzu/configuration/shared_widget.h" #include "yuzu/configuration/shared_widget.h"
#include "qt_common/qt_common.h" #include "qt_common/qt_common.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "yuzu/vk_device_info.h" #include "yuzu/vk_device_info.h"
static const std::vector<VkPresentModeKHR> default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR, static const std::vector<VkPresentModeKHR> default_present_modes{VK_PRESENT_MODE_IMMEDIATE_KHR,

2
src/yuzu/configuration/configure_graphics.h
View file

@ -18,7 +18,7 @@
#include <vulkan/vulkan_core.h> #include <vulkan/vulkan_core.h>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/settings_enums.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 "vk_device_info.h"
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"

2
src/yuzu/configuration/configure_graphics_advanced.cpp
View file

@ -12,7 +12,7 @@
#include "ui_configure_graphics_advanced.h" #include "ui_configure_graphics_advanced.h"
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_graphics_advanced.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" #include "yuzu/configuration/shared_widget.h"
ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced( ConfigureGraphicsAdvanced::ConfigureGraphicsAdvanced(

2
src/yuzu/configuration/configure_graphics_extensions.cpp
View file

@ -14,7 +14,7 @@
#include "ui_configure_graphics_extensions.h" #include "ui_configure_graphics_extensions.h"
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_graphics_extensions.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" #include "yuzu/configuration/shared_widget.h"
ConfigureGraphicsExtensions::ConfigureGraphicsExtensions( ConfigureGraphicsExtensions::ConfigureGraphicsExtensions(

2
src/yuzu/configuration/configure_hotkeys.cpp
View file

@ -16,7 +16,7 @@
#include "ui_configure_hotkeys.h" #include "ui_configure_hotkeys.h"
#include "yuzu/configuration/configure_hotkeys.h" #include "yuzu/configuration/configure_hotkeys.h"
#include "yuzu/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" #include "yuzu/util/sequence_dialog/sequence_dialog.h"
constexpr int name_column = 0; constexpr int name_column = 0;

3
src/yuzu/configuration/configure_input.cpp
View file

@ -18,6 +18,7 @@
#include "ui_configure_input.h" #include "ui_configure_input.h"
#include "ui_configure_input_advanced.h" #include "ui_configure_input_advanced.h"
#include "ui_configure_input_player.h" #include "ui_configure_input_player.h"
#include "qt_common/qt_compat.h"
#include "yuzu/configuration/configure_camera.h" #include "yuzu/configuration/configure_camera.h"
#include "yuzu/configuration/configure_debug_controller.h" #include "yuzu/configuration/configure_debug_controller.h"
#include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input.h"
@ -124,7 +125,7 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
&ConfigureInput::UpdateAllInputDevices); &ConfigureInput::UpdateAllInputDevices);
connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this, connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this,
&ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection); &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 // Keep activated controllers synced with the "Connected Controllers" checkboxes
player_controllers[i]->ConnectPlayer(state == Qt::Checked); player_controllers[i]->ConnectPlayer(state == Qt::Checked);
}); });

12
src/yuzu/configuration/configure_input_advanced.cpp
View file

@ -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-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -7,6 +10,7 @@
#include "hid_core/frontend/emulated_controller.h" #include "hid_core/frontend/emulated_controller.h"
#include "hid_core/hid_core.h" #include "hid_core/hid_core.h"
#include "ui_configure_input_advanced.h" #include "ui_configure_input_advanced.h"
#include "qt_common/qt_compat.h"
#include "yuzu/configuration/configure_input_advanced.h" #include "yuzu/configuration/configure_input_advanced.h"
ConfigureInputAdvanced::ConfigureInputAdvanced(Core::HID::HIDCore& hid_core_, QWidget* parent) 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); &ConfigureInputAdvanced::UpdateUIEnabled);
connect(ui->debug_enabled, &QCheckBox::stateChanged, this, connect(ui->debug_enabled, &QCheckBox::STATE_CHANGED, this,
&ConfigureInputAdvanced::UpdateUIEnabled); &ConfigureInputAdvanced::UpdateUIEnabled);
connect(ui->touchscreen_enabled, &QCheckBox::stateChanged, this, connect(ui->touchscreen_enabled, &QCheckBox::STATE_CHANGED, this,
&ConfigureInputAdvanced::UpdateUIEnabled); &ConfigureInputAdvanced::UpdateUIEnabled);
connect(ui->enable_ring_controller, &QCheckBox::stateChanged, this, connect(ui->enable_ring_controller, &QCheckBox::STATE_CHANGED, this,
&ConfigureInputAdvanced::UpdateUIEnabled); &ConfigureInputAdvanced::UpdateUIEnabled);
connect(ui->debug_configure, &QPushButton::clicked, this, connect(ui->debug_configure, &QPushButton::clicked, this,

2
src/yuzu/configuration/configure_input_per_game.h
View file

@ -12,7 +12,7 @@
#include "ui_configure_input_per_game.h" #include "ui_configure_input_per_game.h"
#include "yuzu/configuration/input_profiles.h" #include "yuzu/configuration/input_profiles.h"
#include "qt_common/qt_config.h" #include "qt_common/config/qt_config.h"
class QComboBox; class QComboBox;

2
src/yuzu/configuration/configure_input_player.cpp
View file

@ -14,7 +14,7 @@
#include <QTimer> #include <QTimer>
#include "common/assert.h" #include "common/assert.h"
#include "common/param_package.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/frontend/emulated_controller.h"
#include "hid_core/hid_core.h" #include "hid_core/hid_core.h"
#include "hid_core/hid_types.h" #include "hid_core/hid_types.h"

2
src/yuzu/configuration/configure_per_game.cpp
View file

@ -41,7 +41,7 @@
#include "yuzu/configuration/configure_per_game.h" #include "yuzu/configuration/configure_per_game.h"
#include "yuzu/configuration/configure_per_game_addons.h" #include "yuzu/configuration/configure_per_game_addons.h"
#include "yuzu/configuration/configure_system.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/util/util.h"
#include "yuzu/vk_device_info.h" #include "yuzu/vk_device_info.h"

4
src/yuzu/configuration/configure_per_game.h
View file

@ -18,8 +18,8 @@
#include "frontend_common/config.h" #include "frontend_common/config.h"
#include "vk_device_info.h" #include "vk_device_info.h"
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "qt_common/qt_config.h" #include "qt_common/config/qt_config.h"
#include "qt_common/shared_translation.h" #include "qt_common/config/shared_translation.h"
namespace Core { namespace Core {
class System; class System;

2
src/yuzu/configuration/configure_per_game_addons.cpp
View file

@ -24,7 +24,7 @@
#include "ui_configure_per_game_addons.h" #include "ui_configure_per_game_addons.h"
#include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input.h"
#include "yuzu/configuration/configure_per_game_addons.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) ConfigurePerGameAddons::ConfigurePerGameAddons(Core::System& system_, QWidget* parent)
: QWidget(parent), ui{std::make_unique<Ui::ConfigurePerGameAddons>()}, system{system_} { : QWidget(parent), ui{std::make_unique<Ui::ConfigurePerGameAddons>()}, system{system_} {

2
src/yuzu/configuration/configure_ringcon.cpp
View file

@ -11,7 +11,7 @@
#include <QTimer> #include <QTimer>
#include <fmt/ranges.h> #include <fmt/ranges.h>
#include "qt_common/qt_config.h" #include "qt_common/config/qt_config.h"
#include "hid_core/frontend/emulated_controller.h" #include "hid_core/frontend/emulated_controller.h"
#include "hid_core/hid_core.h" #include "hid_core/hid_core.h"
#include "input_common/drivers/keyboard.h" #include "input_common/drivers/keyboard.h"

8
src/yuzu/configuration/configure_system.cpp
View file

@ -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-FileCopyrightText: 2016 Citra Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -17,6 +20,7 @@
#include "common/settings.h" #include "common/settings.h"
#include "core/core.h" #include "core/core.h"
#include "ui_configure_system.h" #include "ui_configure_system.h"
#include "qt_common/qt_compat.h"
#include "yuzu/configuration/configuration_shared.h" #include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_system.h" #include "yuzu/configuration/configure_system.h"
#include "yuzu/configuration/shared_widget.h" #include "yuzu/configuration/shared_widget.h"
@ -79,11 +83,11 @@ ConfigureSystem::ConfigureSystem(Core::System& system_,
previous_time = date_rtc->dateTime().toSecsSinceEpoch(); previous_time = date_rtc->dateTime().toSecsSinceEpoch();
date_rtc_offset->setValue(offset); date_rtc_offset->setValue(offset);
}; };
const auto update_rtc_date = [this]() { UpdateRtcTime(); }; const auto update_rtc_date = [this](int _) { UpdateRtcTime(); };
connect(combo_language, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check); connect(combo_language, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
connect(combo_region, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check); connect(combo_region, qOverload<int>(&QComboBox::currentIndexChanged), this, locale_check);
connect(checkbox_rtc, qOverload<int>(&QCheckBox::stateChanged), this, update_rtc_date); connect(checkbox_rtc, qOverload<CHECKSTATE_TYPE>(&QCheckBox::STATE_CHANGED), this, update_rtc_date);
connect(date_rtc_offset, qOverload<int>(&QSpinBox::valueChanged), this, update_rtc_date); connect(date_rtc_offset, qOverload<int>(&QSpinBox::valueChanged), this, update_rtc_date);
connect(date_rtc, &QDateTimeEdit::dateTimeChanged, this, update_date_offset); connect(date_rtc, &QDateTimeEdit::dateTimeChanged, this, update_date_offset);

2
src/yuzu/configuration/configure_tas.cpp
View file

@ -11,7 +11,7 @@
#include "common/settings.h" #include "common/settings.h"
#include "ui_configure_tas.h" #include "ui_configure_tas.h"
#include "yuzu/configuration/configure_tas.h" #include "yuzu/configuration/configure_tas.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
ConfigureTasDialog::ConfigureTasDialog(QWidget* parent) ConfigureTasDialog::ConfigureTasDialog(QWidget* parent)
: QDialog(parent), ui(std::make_unique<Ui::ConfigureTas>()) { : QDialog(parent), ui(std::make_unique<Ui::ConfigureTas>()) {

14
src/yuzu/configuration/configure_ui.cpp
View file

@ -27,7 +27,9 @@
#include "core/core.h" #include "core/core.h"
#include "core/frontend/framebuffer_layout.h" #include "core/frontend/framebuffer_layout.h"
#include "ui_configure_ui.h" #include "ui_configure_ui.h"
#include "qt_common/uisettings.h"
#include "qt_common/qt_compat.h"
#include "qt_common/config/uisettings.h"
namespace { namespace {
constexpr std::array default_game_icon_sizes{ constexpr std::array default_game_icon_sizes{
@ -119,11 +121,11 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
SetConfiguration(); SetConfiguration();
// Force game list reload if any of the relevant settings are changed. // 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_add_ons, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate);
connect(ui->show_compat, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); connect(ui->show_compat, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate);
connect(ui->show_size, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); connect(ui->show_size, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate);
connect(ui->show_types, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); connect(ui->show_types, &QCheckBox::STATE_CHANGED, this, &ConfigureUi::RequestGameListUpdate);
connect(ui->show_play_time, &QCheckBox::stateChanged, this, connect(ui->show_play_time, &QCheckBox::STATE_CHANGED, this,
&ConfigureUi::RequestGameListUpdate); &ConfigureUi::RequestGameListUpdate);
connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&ConfigureUi::RequestGameListUpdate); &ConfigureUi::RequestGameListUpdate);

2
src/yuzu/configuration/configure_web.cpp
View file

@ -17,7 +17,7 @@
#include <QtConcurrentRun> #include <QtConcurrentRun>
#include "common/settings.h" #include "common/settings.h"
#include "ui_configure_web.h" #include "ui_configure_web.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
ConfigureWeb::ConfigureWeb(QWidget* parent) ConfigureWeb::ConfigureWeb(QWidget* parent)
: QWidget(parent) : QWidget(parent)

2
src/yuzu/configuration/input_profiles.h
View file

@ -9,7 +9,7 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include "qt_common/qt_config.h" #include "qt_common/config/qt_config.h"
namespace Core { namespace Core {
class System; class System;

5
src/yuzu/configuration/shared_widget.cpp
View file

@ -45,7 +45,8 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/settings.h" #include "common/settings.h"
#include "common/settings_common.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 { namespace ConfigurationShared {
@ -700,7 +701,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
restore_func(); restore_func();
} }
}; };
connect(checkbox, &QCheckBox::stateChanged, reset); connect(checkbox, &QCheckBox::STATE_CHANGED, reset);
reset(checkbox->checkState()); reset(checkbox->checkState());
} }
} }

2
src/yuzu/configuration/shared_widget.h
View file

@ -15,7 +15,7 @@
#include <QWidget> #include <QWidget>
#include <QObject> #include <QObject>
#include <qobjectdefs.h> #include <qobjectdefs.h>
#include "qt_common/shared_translation.h" #include "qt_common/config/shared_translation.h"
class QCheckBox; class QCheckBox;
class QComboBox; class QComboBox;

2
src/yuzu/data_dialog.cpp
View file

@ -5,7 +5,7 @@
#include "core/hle/service/acc/profile_manager.h" #include "core/hle/service/acc/profile_manager.h"
#include "frontend_common/data_manager.h" #include "frontend_common/data_manager.h"
#include "qt_common/qt_common.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 "qt_common/qt_string_lookup.h"
#include "ui_data_dialog.h" #include "ui_data_dialog.h"

2
src/yuzu/debugger/console.cpp
View file

@ -12,7 +12,7 @@
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "yuzu/debugger/console.h" #include "yuzu/debugger/console.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
namespace Debugger { namespace Debugger {
void ToggleConsole() { void ToggleConsole() {

2
src/yuzu/debugger/wait_tree.cpp
View file

@ -8,7 +8,7 @@
#include <fmt/ranges.h> #include <fmt/ranges.h>
#include "yuzu/debugger/wait_tree.h" #include "yuzu/debugger/wait_tree.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "core/arm/debug.h" #include "core/arm/debug.h"
#include "core/core.h" #include "core/core.h"

4
src/yuzu/game_list.cpp
View file

@ -18,8 +18,8 @@
#include "core/core.h" #include "core/core.h"
#include "core/file_sys/patch_manager.h" #include "core/file_sys/patch_manager.h"
#include "core/file_sys/registered_cache.h" #include "core/file_sys/registered_cache.h"
#include "qt_common/qt_game_util.h" #include "qt_common/util/game.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "yuzu/compatibility_list.h" #include "yuzu/compatibility_list.h"
#include "yuzu/game_list_p.h" #include "yuzu/game_list_p.h"
#include "yuzu/game_list_worker.h" #include "yuzu/game_list_worker.h"

4
src/yuzu/game_list.h
View file

@ -20,8 +20,8 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "core/core.h" #include "core/core.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "qt_common/qt_game_util.h" #include "qt_common/util/game.h"
#include "yuzu/compatibility_list.h" #include "yuzu/compatibility_list.h"
#include "yuzu/play_time_manager.h" #include "yuzu/play_time_manager.h"

2
src/yuzu/game_list_p.h
View file

@ -22,7 +22,7 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "yuzu/play_time_manager.h" #include "yuzu/play_time_manager.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "yuzu/util/util.h" #include "yuzu/util/util.h"
enum class GameListItemType { enum class GameListItemType {

2
src/yuzu/game_list_worker.cpp
View file

@ -30,7 +30,7 @@
#include "yuzu/game_list.h" #include "yuzu/game_list.h"
#include "yuzu/game_list_p.h" #include "yuzu/game_list_p.h"
#include "yuzu/game_list_worker.h" #include "yuzu/game_list_worker.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
namespace { namespace {

2
src/yuzu/game_list_worker.h
View file

@ -18,7 +18,7 @@
#include "common/thread.h" #include "common/thread.h"
#include "core/file_sys/registered_cache.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/compatibility_list.h"
#include "yuzu/play_time_manager.h" #include "yuzu/play_time_manager.h"

2
src/yuzu/hotkeys.cpp
View file

@ -11,7 +11,7 @@
#include "hid_core/frontend/emulated_controller.h" #include "hid_core/frontend/emulated_controller.h"
#include "yuzu/hotkeys.h" #include "yuzu/hotkeys.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
HotkeyRegistry::HotkeyRegistry() = default; HotkeyRegistry::HotkeyRegistry() = default;
HotkeyRegistry::~HotkeyRegistry() = default; HotkeyRegistry::~HotkeyRegistry() = default;

2
src/yuzu/install_dialog.cpp
View file

@ -11,7 +11,7 @@
#include <QListWidget> #include <QListWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
#include "yuzu/install_dialog.h" #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) { InstallDialog::InstallDialog(QWidget* parent, const QStringList& files) : QDialog(parent) {
file_list = new QListWidget(this); file_list = new QListWidget(this);

18
src/yuzu/main.cpp
View file

@ -6,10 +6,10 @@
#include "core/tools/renderdoc.h" #include "core/tools/renderdoc.h"
#include "frontend_common/firmware_manager.h" #include "frontend_common/firmware_manager.h"
#include "qt_common/qt_common.h" #include "qt_common/qt_common.h"
#include "qt_common/qt_content_util.h" #include "qt_common/util/content.h"
#include "qt_common/qt_game_util.h" #include "qt_common/util/game.h"
#include "qt_common/qt_meta.h" #include "qt_common/util/meta.h"
#include "qt_common/qt_path_util.h" #include "qt_common/util/path.h"
#include <clocale> #include <clocale>
#include <cmath> #include <cmath>
#include <memory> #include <memory>
@ -143,7 +143,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
#include "input_common/drivers/virtual_amiibo.h" #include "input_common/drivers/virtual_amiibo.h"
#include "input_common/main.h" #include "input_common/main.h"
#include "ui_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/gpu.h"
#include "video_core/renderer_base.h" #include "video_core/renderer_base.h"
#include "video_core/shader_notify.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/compatibility_list.h"
#include "yuzu/configuration/configure_dialog.h" #include "yuzu/configuration/configure_dialog.h"
#include "yuzu/configuration/configure_input_per_game.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/console.h"
#include "yuzu/debugger/controller.h" #include "yuzu/debugger/controller.h"
#include "yuzu/debugger/wait_tree.h" #include "yuzu/debugger/wait_tree.h"
#include "yuzu/data_dialog.h" #include "yuzu/data_dialog.h"
#include "yuzu/deps_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.h"
#include "yuzu/game_list_p.h" #include "yuzu/game_list_p.h"
#include "yuzu/install_dialog.h" #include "yuzu/install_dialog.h"
@ -166,7 +166,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
#include "yuzu/main.h" #include "yuzu/main.h"
#include "yuzu/play_time_manager.h" #include "yuzu/play_time_manager.h"
#include "yuzu/startup_checks.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/util/clickable_label.h"
#include "yuzu/vk_device_info.h" #include "yuzu/vk_device_info.h"
@ -264,7 +264,7 @@ static void RemoveTitlebarFilter() {
using namespace Common::Literals; using namespace Common::Literals;
#ifdef USE_DISCORD_PRESENCE #ifdef USE_DISCORD_PRESENCE
#include "yuzu/discord_impl.h" #include "qt_common/discord/discord_impl.h"
#endif #endif
#ifdef QT_STATICPLUGIN #ifdef QT_STATICPLUGIN

6
src/yuzu/main.h
View file

@ -19,9 +19,9 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "frontend_common/content_manager.h" #include "frontend_common/content_manager.h"
#include "input_common/drivers/tas_input.h" #include "input_common/drivers/tas_input.h"
#include "qt_common/qt_config.h" #include "qt_common/config/qt_config.h"
#include "qt_common/qt_game_util.h" #include "qt_common/util/game.h"
#include "user_data_migration.h" #include "yuzu/user_data_migration.h"
#include "yuzu/compatibility_list.h" #include "yuzu/compatibility_list.h"
#include "yuzu/hotkeys.h" #include "yuzu/hotkeys.h"

2
src/yuzu/multiplayer/direct_connect.cpp
View file

@ -21,7 +21,7 @@
#include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/message.h"
#include "yuzu/multiplayer/state.h" #include "yuzu/multiplayer/state.h"
#include "yuzu/multiplayer/validation.h" #include "yuzu/multiplayer/validation.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
enum class ConnectionType : u8 { TraversalServer, IP }; enum class ConnectionType : u8 { TraversalServer, IP };

2
src/yuzu/multiplayer/host_room.cpp
View file

@ -25,7 +25,7 @@
#include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/message.h"
#include "yuzu/multiplayer/state.h" #include "yuzu/multiplayer/state.h"
#include "yuzu/multiplayer/validation.h" #include "yuzu/multiplayer/validation.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#ifdef ENABLE_WEB_SERVICE #ifdef ENABLE_WEB_SERVICE
#include "web_service/verify_user_jwt.h" #include "web_service/verify_user_jwt.h"
#endif #endif

2
src/yuzu/multiplayer/lobby.cpp
View file

@ -22,7 +22,7 @@
#include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/message.h"
#include "yuzu/multiplayer/state.h" #include "yuzu/multiplayer/state.h"
#include "yuzu/multiplayer/validation.h" #include "yuzu/multiplayer/validation.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#ifdef ENABLE_WEB_SERVICE #ifdef ENABLE_WEB_SERVICE
#include "web_service/web_backend.h" #include "web_service/web_backend.h"
#endif #endif

2
src/yuzu/multiplayer/state.cpp
View file

@ -18,7 +18,7 @@
#include "yuzu/multiplayer/lobby.h" #include "yuzu/multiplayer/lobby.h"
#include "yuzu/multiplayer/message.h" #include "yuzu/multiplayer/message.h"
#include "yuzu/multiplayer/state.h" #include "yuzu/multiplayer/state.h"
#include "qt_common/uisettings.h" #include "qt_common/config/uisettings.h"
#include "yuzu/util/clickable_label.h" #include "yuzu/util/clickable_label.h"
MultiplayerState::MultiplayerState(QWidget* parent, QStandardItemModel* game_list_model_, MultiplayerState::MultiplayerState(QWidget* parent, QStandardItemModel* game_list_model_,

4
src/yuzu/user_data_migration.cpp
View file

@ -11,10 +11,10 @@
#include <QString> #include <QString>
#include <QTranslator> #include <QTranslator>
#include "common/fs/path_util.h" #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 // Needs to be included at the end due to https://bugreports.qt.io/browse/QTBUG-73263
#include <QApplication> #include <QGuiApplication>
#include <QButtonGroup> #include <QButtonGroup>
#include <QCheckBox> #include <QCheckBox>
#include <QProgressDialog> #include <QProgressDialog>

2
src/yuzu/user_data_migration.h
View file

@ -8,7 +8,7 @@
#pragma once #pragma once
#include <QMainWindow> #include <QMainWindow>
#include "migration_worker.h" #include "../yuzu/migration_worker.h"
// TODO(crueter): Quick implementation // TODO(crueter): Quick implementation
class UserDataMigrator { class UserDataMigrator {