From 3629fcf3e60d85d1f486db2220d5b19a2adf7353 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jan 2019 11:50:57 -0500 Subject: [PATCH 1/5] yuzu/configuration/configure_system: Remove unused header inclusions --- src/yuzu/configuration/configure_system.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 94e27349d..10645a2b3 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -2,23 +2,19 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include +#include +#include +#include + #include #include -#include -#include #include -#include -#include -#include #include "common/assert.h" #include "common/file_util.h" -#include "common/string_util.h" #include "core/core.h" #include "core/settings.h" #include "ui_configure_system.h" #include "yuzu/configuration/configure_system.h" -#include "yuzu/util/limitable_input_dialog.h" namespace { constexpr std::array days_in_month = {{ From ac754a57d270187ffc82eec64cdfab531572b8f4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jan 2019 11:51:47 -0500 Subject: [PATCH 2/5] yuzu/configuration/configure_debug: Remove unused header inclusions --- src/yuzu/configuration/configure_debug.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/yuzu/configuration/configure_debug.cpp b/src/yuzu/configuration/configure_debug.cpp index aa7de7b54..550cf9dca 100644 --- a/src/yuzu/configuration/configure_debug.cpp +++ b/src/yuzu/configuration/configure_debug.cpp @@ -7,7 +7,6 @@ #include "common/file_util.h" #include "common/logging/backend.h" #include "common/logging/filter.h" -#include "common/logging/log.h" #include "core/core.h" #include "core/settings.h" #include "ui_configure_debug.h" From a0f615f2325d2960315356992a4cab727e62bd84 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jan 2019 11:55:52 -0500 Subject: [PATCH 3/5] yuzu/configuration/configure_per_general: Remove unused header inclusions --- src/yuzu/configuration/configure_per_general.cpp | 1 - src/yuzu/configuration/configure_per_general.h | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/yuzu/configuration/configure_per_general.cpp b/src/yuzu/configuration/configure_per_general.cpp index e13d2eac8..022b94609 100644 --- a/src/yuzu/configuration/configure_per_general.cpp +++ b/src/yuzu/configuration/configure_per_general.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include #include diff --git a/src/yuzu/configuration/configure_per_general.h b/src/yuzu/configuration/configure_per_general.h index a4494446c..f8a7d5326 100644 --- a/src/yuzu/configuration/configure_per_general.h +++ b/src/yuzu/configuration/configure_per_general.h @@ -7,16 +7,16 @@ #include #include -#include +#include #include -#include #include "core/file_sys/vfs_types.h" -class QTreeView; class QGraphicsScene; class QStandardItem; class QStandardItemModel; +class QTreeView; +class QVBoxLayout; namespace Ui { class ConfigurePerGameGeneral; From 609e98bc63611af1f893738007db3f8675a87737 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jan 2019 12:02:01 -0500 Subject: [PATCH 4/5] yuzu/configuration/configure_touchscreen_advanced: Remove unnecessary header inclusions --- src/yuzu/configuration/configure_touchscreen_advanced.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/yuzu/configuration/configure_touchscreen_advanced.h b/src/yuzu/configuration/configure_touchscreen_advanced.h index 41cd255fb..3d0772c87 100644 --- a/src/yuzu/configuration/configure_touchscreen_advanced.h +++ b/src/yuzu/configuration/configure_touchscreen_advanced.h @@ -6,8 +6,6 @@ #include #include -#include -#include "yuzu/configuration/config.h" namespace Ui { class ConfigureTouchscreenAdvanced; From faf69a22d421fa522006a4b13d5713f40013e6c3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 17 Jan 2019 12:06:38 -0500 Subject: [PATCH 5/5] yuzu/configuration/configure_input_player: Forward declare types where applicable Allows removing the inclusion of the main input common header from the UI config header. --- src/yuzu/configuration/configure_input_player.cpp | 1 + src/yuzu/configuration/configure_input_player.h | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index ba2b32c4f..c5a245ebe 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index 7a53f6715..ade8d4435 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h @@ -11,17 +11,21 @@ #include #include -#include #include "common/param_package.h" #include "core/settings.h" -#include "input_common/main.h" #include "ui_configure_input.h" +class QKeyEvent; class QPushButton; class QString; class QTimer; +namespace InputCommon::Polling { +class DevicePoller; +enum class DeviceType; +} // namespace InputCommon::Polling + namespace Ui { class ConfigureInputPlayer; }