diff options
author | bunnei <bunneidev@gmail.com> | 2019-01-21 23:31:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-21 23:31:07 +0100 |
commit | 839c4a8a1c780429f8e63861bc5f5907eddde435 (patch) | |
tree | 84e6b5a1ec89c3a5a41430b322cfdbdedad4e187 | |
parent | Merge pull request #2038 from jroweboy/loading-progress-bar (diff) | |
parent | yuzu/configuration/configure_input_player: Forward declare types where applicable (diff) | |
download | yuzu-839c4a8a1c780429f8e63861bc5f5907eddde435.tar yuzu-839c4a8a1c780429f8e63861bc5f5907eddde435.tar.gz yuzu-839c4a8a1c780429f8e63861bc5f5907eddde435.tar.bz2 yuzu-839c4a8a1c780429f8e63861bc5f5907eddde435.tar.lz yuzu-839c4a8a1c780429f8e63861bc5f5907eddde435.tar.xz yuzu-839c4a8a1c780429f8e63861bc5f5907eddde435.tar.zst yuzu-839c4a8a1c780429f8e63861bc5f5907eddde435.zip |
-rw-r--r-- | src/yuzu/configuration/configure_debug.cpp | 1 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 1 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_input_player.h | 8 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_per_general.cpp | 1 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_per_general.h | 6 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 12 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_touchscreen_advanced.h | 2 |
7 files changed, 14 insertions, 17 deletions
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" 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 <utility> #include <QColorDialog> #include <QGridLayout> +#include <QKeyEvent> #include <QMenu> #include <QMessageBox> #include <QTimer> 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 <string> #include <QDialog> -#include <QKeyEvent> #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; } 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 <QHeaderView> #include <QMenu> -#include <QMessageBox> #include <QStandardItemModel> #include <QString> #include <QTimer> 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 <memory> #include <vector> -#include <QKeyEvent> +#include <QDialog> #include <QList> -#include <QWidget> #include "core/file_sys/vfs_types.h" -class QTreeView; class QGraphicsScene; class QStandardItem; class QStandardItemModel; +class QTreeView; +class QVBoxLayout; namespace Ui { class ConfigurePerGameGeneral; 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 <algorithm> +#include <array> +#include <chrono> +#include <optional> + #include <QFileDialog> #include <QGraphicsItem> -#include <QGraphicsScene> -#include <QHeaderView> #include <QMessageBox> -#include <QStandardItemModel> -#include <QTreeView> -#include <QVBoxLayout> #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<int, 12> days_in_month = {{ 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 <memory> #include <QDialog> -#include <QWidget> -#include "yuzu/configuration/config.h" namespace Ui { class ConfigureTouchscreenAdvanced; |