diff --git a/Source/Core/DolphinQt2/AboutDialog.cpp b/Source/Core/DolphinQt2/AboutDialog.cpp index 7e835cbda9..78bee03002 100644 --- a/Source/Core/DolphinQt2/AboutDialog.cpp +++ b/Source/Core/DolphinQt2/AboutDialog.cpp @@ -7,6 +7,7 @@ #include #include "Common/Version.h" + #include "DolphinQt2/AboutDialog.h" #include "DolphinQt2/Resources.h" diff --git a/Source/Core/DolphinQt2/CheatsManager.cpp b/Source/Core/DolphinQt2/CheatsManager.cpp index f1b6e904d8..bf5b45825b 100644 --- a/Source/Core/DolphinQt2/CheatsManager.cpp +++ b/Source/Core/DolphinQt2/CheatsManager.cpp @@ -27,6 +27,7 @@ #include "Core/HW/Memmap.h" #include "Core/PowerPC/MMU.h" #include "Core/PowerPC/PowerPC.h" + #include "UICommon/GameFile.h" #include "DolphinQt2/Config/ARCodeWidget.h" diff --git a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp index e1ea8ad50d..086612abb0 100644 --- a/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt2/Config/ARCodeWidget.cpp @@ -12,10 +12,13 @@ #include "Common/FileUtil.h" #include "Common/IniFile.h" + #include "Core/ActionReplay.h" #include "Core/ConfigManager.h" + #include "DolphinQt2/Config/CheatCodeEditor.h" #include "DolphinQt2/Config/CheatWarningWidget.h" + #include "UICommon/GameFile.h" ARCodeWidget::ARCodeWidget(const UICommon::GameFile& game, bool restart_required) diff --git a/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp b/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp index e381f456ec..a44b812750 100755 --- a/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp +++ b/Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp @@ -12,6 +12,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" + #include "DolphinQt2/Settings.h" CheatWarningWidget::CheatWarningWidget(const std::string& game_id, bool restart_required, diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp index b98ee62009..6082875920 100644 --- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp @@ -38,6 +38,7 @@ #include "DolphinQt2/Settings.h" #include "InputCommon/GCAdapter.h" + #include "UICommon/UICommon.h" static const std::map s_gc_types = { diff --git a/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp b/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp index c69e7ef7f9..0f8f83eed0 100644 --- a/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp +++ b/Source/Core/DolphinQt2/Config/GameConfigWidget.cpp @@ -20,9 +20,12 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" + #include "Core/ConfigLoaders/GameConfigLoader.h" #include "Core/ConfigManager.h" + #include "DolphinQt2/Config/Graphics/GraphicsSlider.h" + #include "UICommon/GameFile.h" constexpr int DETERMINISM_NOT_SET_INDEX = 0; diff --git a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp index 19d7de737a..e189508d50 100755 --- a/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp +++ b/Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp @@ -16,10 +16,13 @@ #include "Common/FileUtil.h" #include "Common/IniFile.h" + #include "Core/ConfigManager.h" #include "Core/GeckoCodeConfig.h" + #include "DolphinQt2/Config/CheatCodeEditor.h" #include "DolphinQt2/Config/CheatWarningWidget.h" + #include "UICommon/GameFile.h" GeckoCodeWidget::GeckoCodeWidget(const UICommon::GameFile& game, bool restart_required) diff --git a/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp index c9692cfc4e..65217ef8c2 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp @@ -18,6 +18,7 @@ #include "DolphinQt2/Config/Graphics/GraphicsChoice.h" #include "DolphinQt2/Config/Graphics/GraphicsWindow.h" #include "DolphinQt2/Settings.h" + #include "VideoCommon/VideoConfig.h" AdvancedWidget::AdvancedWidget(GraphicsWindow* parent) : GraphicsWidget(parent) diff --git a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp index 437d7caa43..3203a656f2 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp @@ -14,12 +14,14 @@ #include "Core/Config/GraphicsSettings.h" #include "Core/ConfigManager.h" + #include "DolphinQt2/Config/Graphics/GraphicsBool.h" #include "DolphinQt2/Config/Graphics/GraphicsChoice.h" #include "DolphinQt2/Config/Graphics/GraphicsSlider.h" #include "DolphinQt2/Config/Graphics/GraphicsWindow.h" #include "DolphinQt2/Config/Graphics/PostProcessingConfigWindow.h" #include "DolphinQt2/Settings.h" + #include "UICommon/VideoUtils.h" #include "VideoCommon/PostProcessing.h" diff --git a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp index 0d0d612634..9164df5257 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp @@ -17,12 +17,15 @@ #include "Core/Config/GraphicsSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" + #include "DolphinQt2/Config/Graphics/GraphicsBool.h" #include "DolphinQt2/Config/Graphics/GraphicsChoice.h" #include "DolphinQt2/Config/Graphics/GraphicsRadio.h" #include "DolphinQt2/Config/Graphics/GraphicsWindow.h" #include "DolphinQt2/Settings.h" + #include "UICommon/VideoUtils.h" + #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp index 86e7b62861..7014a01ccc 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp @@ -5,6 +5,7 @@ #include "DolphinQt2/Config/Graphics/GraphicsBool.h" #include "Common/Config/Config.h" + #include "DolphinQt2/Settings.h" #include diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp index 4e7c95ed41..5b10d43804 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp @@ -5,6 +5,7 @@ #include "DolphinQt2/Config/Graphics/GraphicsChoice.h" #include "Common/Config/Config.h" + #include "DolphinQt2/Settings.h" GraphicsChoice::GraphicsChoice(const QStringList& options, const Config::ConfigInfo& setting) diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp index 094d1f941b..4ae17824bc 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp @@ -5,6 +5,7 @@ #include "DolphinQt2/Config/Graphics/GraphicsRadio.h" #include "Common/Config/Config.h" + #include "DolphinQt2/Settings.h" GraphicsRadioInt::GraphicsRadioInt(const QString& label, const Config::ConfigInfo& setting, diff --git a/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp b/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp index b7dcb46dd7..352132e191 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp @@ -5,6 +5,7 @@ #include "DolphinQt2/Config/Graphics/GraphicsSlider.h" #include "Common/Config/Config.h" + #include "DolphinQt2/Settings.h" GraphicsSlider::GraphicsSlider(int minimum, int maximum, const Config::ConfigInfo& setting, diff --git a/Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp b/Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp index 383426ccf2..1e3a686ed8 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp @@ -20,6 +20,7 @@ #include #include "DolphinQt2/Config/Graphics/EnhancementsWidget.h" + #include "VideoCommon/PostProcessing.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp b/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp index 310cbba8f0..b9a6dd0f0b 100644 --- a/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp @@ -13,10 +13,13 @@ #include "Core/Config/GraphicsSettings.h" #include "Core/ConfigManager.h" + #include "DolphinQt2/Config/Graphics/GraphicsBool.h" #include "DolphinQt2/Config/Graphics/GraphicsWindow.h" #include "DolphinQt2/Settings.h" + #include "UICommon/VideoUtils.h" + #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinQt2/Config/InfoWidget.cpp b/Source/Core/DolphinQt2/Config/InfoWidget.cpp index 722d9babb8..f7c0e2b2a7 100644 --- a/Source/Core/DolphinQt2/Config/InfoWidget.cpp +++ b/Source/Core/DolphinQt2/Config/InfoWidget.cpp @@ -15,10 +15,13 @@ #include #include "Core/ConfigManager.h" + #include "DiscIO/Blob.h" #include "DiscIO/Enums.h" + #include "DolphinQt2/Config/InfoWidget.h" #include "DolphinQt2/QtUtils/ImageConverter.h" + #include "UICommon/UICommon.h" InfoWidget::InfoWidget(const UICommon::GameFile& game) : m_game(game) diff --git a/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp b/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp index d3ecdb7f05..c9d4f87e25 100644 --- a/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp +++ b/Source/Core/DolphinQt2/Config/LogConfigWidget.cpp @@ -13,7 +13,9 @@ #include "Common/FileUtil.h" #include "Common/Logging/LogManager.h" + #include "Core/ConfigManager.h" + #include "DolphinQt2/Settings.h" LogConfigWidget::LogConfigWidget(QWidget* parent) : QDockWidget(parent) diff --git a/Source/Core/DolphinQt2/Config/LogWidget.cpp b/Source/Core/DolphinQt2/Config/LogWidget.cpp index aecf182619..cbe36b4f58 100644 --- a/Source/Core/DolphinQt2/Config/LogWidget.cpp +++ b/Source/Core/DolphinQt2/Config/LogWidget.cpp @@ -16,7 +16,9 @@ #include #include "Common/FileUtil.h" + #include "Core/ConfigManager.h" + #include "DolphinQt2/Settings.h" // Delay in ms between calls of UpdateLog() diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp b/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp index 60eb9a4847..70960d9269 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp @@ -8,6 +8,7 @@ #include #include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h" + #include "InputCommon/InputConfig.h" #include "Core/HW/GCKeyboard.h" diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp b/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp index d999e01d06..3038033201 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Config/Mapping/GCPadEmu.h" + #include #include #include #include -#include "DolphinQt2/Config/Mapping/GCPadEmu.h" -#include "InputCommon/InputConfig.h" - #include "Core/HW/GCPad.h" #include "Core/HW/GCPadEmu.h" +#include "InputCommon/InputConfig.h" + GCPadEmu::GCPadEmu(MappingWindow* window) : MappingWidget(window) { CreateMainLayout(); diff --git a/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp b/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp index 2d9d880801..7bbe4c6856 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h" + #include #include #include #include -#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h" - #include "Core/ConfigManager.h" + #include "InputCommon/GCAdapter.h" GCPadWiiUConfigDialog::GCPadWiiUConfigDialog(int port, QWidget* parent) diff --git a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp index 903ce56b33..f09d4a6123 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp @@ -19,9 +19,11 @@ #include #include "Core/Core.h" + #include "DolphinQt2/Config/Mapping/MappingCommon.h" #include "DolphinQt2/Config/Mapping/MappingWindow.h" #include "DolphinQt2/QtUtils/BlockUserInputFilter.h" + #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp index ef3dddeaa1..3ffe0081ff 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp @@ -2,18 +2,19 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Config/Mapping/MappingWidget.h" + #include #include #include -#include "DolphinQt2/Config/Mapping/MappingWidget.h" - #include "DolphinQt2/Config/Mapping/IOWindow.h" #include "DolphinQt2/Config/Mapping/MappingBool.h" #include "DolphinQt2/Config/Mapping/MappingButton.h" #include "DolphinQt2/Config/Mapping/MappingIndicator.h" #include "DolphinQt2/Config/Mapping/MappingNumeric.h" #include "DolphinQt2/Config/Mapping/MappingWindow.h" + #include "InputCommon/ControlReference/ControlReference.h" #include "InputCommon/ControllerEmu/Control/Control.h" #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h" diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp index 3f8fd13d1b..b87c027e01 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Config/Mapping/MappingWindow.h" + #include #include #include @@ -12,13 +14,13 @@ #include #include -#include "DolphinQt2/Config/Mapping/MappingWindow.h" - #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/StringUtil.h" + #include "Core/Core.h" + #include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h" #include "DolphinQt2/Config/Mapping/GCMicrophone.h" #include "DolphinQt2/Config/Mapping/GCPadEmu.h" @@ -34,6 +36,7 @@ #include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h" #include "DolphinQt2/QtUtils/WrapInScrollArea.h" #include "DolphinQt2/Settings.h" + #include "InputCommon/ControllerEmu/ControllerEmu.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/Device.h" diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp index 6446155a5e..db98b32429 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp @@ -2,14 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h" + #include #include #include -#include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h" - #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" + #include "InputCommon/InputConfig.h" WiimoteEmuExtension::WiimoteEmuExtension(MappingWindow* window) : MappingWidget(window) diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp index 83a3a93e78..34e142c344 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp @@ -2,17 +2,19 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h" + #include #include #include #include #include -#include "DolphinQt2/Config/Mapping/WiimoteEmuGeneral.h" - #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" + #include "DolphinQt2/Config/Mapping/WiimoteEmuExtension.h" + #include "InputCommon/ControllerEmu/ControlGroup/Extension.h" #include "InputCommon/InputConfig.h" diff --git a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp index 506f1e4dd7..41ac974743 100644 --- a/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp +++ b/Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp @@ -2,15 +2,16 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h" + #include #include #include #include -#include "DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.h" - #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" + #include "InputCommon/InputConfig.h" WiimoteEmuMotionControl::WiimoteEmuMotionControl(MappingWindow* window) : MappingWidget(window) diff --git a/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp b/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp index a5c31d34d8..93dd08d5d3 100644 --- a/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp +++ b/Source/Core/DolphinQt2/Config/PropertiesDialog.cpp @@ -17,6 +17,7 @@ #include "DolphinQt2/Config/PatchesWidget.h" #include "DolphinQt2/Config/PropertiesDialog.h" #include "DolphinQt2/QtUtils/WrapInScrollArea.h" + #include "UICommon/GameFile.h" PropertiesDialog::PropertiesDialog(QWidget* parent, const UICommon::GameFile& game) diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp index 2f44c4a506..247de05abe 100644 --- a/Source/Core/DolphinQt2/GameList/GameList.cpp +++ b/Source/Core/DolphinQt2/GameList/GameList.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/GameList/GameList.h" + #include #include #include @@ -17,16 +19,17 @@ #include #include "Common/FileUtil.h" + #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/DVD/DVDInterface.h" #include "Core/HW/WiiSave.h" #include "Core/WiiUtils.h" + #include "DiscIO/Blob.h" #include "DiscIO/Enums.h" #include "DolphinQt2/Config/PropertiesDialog.h" -#include "DolphinQt2/GameList/GameList.h" #include "DolphinQt2/GameList/GridProxyModel.h" #include "DolphinQt2/GameList/ListProxyModel.h" #include "DolphinQt2/QtUtils/ActionHelper.h" diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.cpp b/Source/Core/DolphinQt2/GameList/GameListModel.cpp index 62fa5e199c..795290f57d 100644 --- a/Source/Core/DolphinQt2/GameList/GameListModel.cpp +++ b/Source/Core/DolphinQt2/GameList/GameListModel.cpp @@ -7,10 +7,13 @@ #include #include "Core/ConfigManager.h" + #include "DiscIO/Enums.h" + #include "DolphinQt2/QtUtils/ImageConverter.h" #include "DolphinQt2/Resources.h" #include "DolphinQt2/Settings.h" + #include "UICommon/UICommon.h" const QSize GAMECUBE_BANNER_SIZE(96, 32); diff --git a/Source/Core/DolphinQt2/GameList/GameListModel.h b/Source/Core/DolphinQt2/GameList/GameListModel.h index 5fc199427d..137cdc46ad 100644 --- a/Source/Core/DolphinQt2/GameList/GameListModel.h +++ b/Source/Core/DolphinQt2/GameList/GameListModel.h @@ -11,6 +11,7 @@ #include #include "DolphinQt2/GameList/GameTracker.h" + #include "UICommon/GameFile.h" class GameListModel final : public QAbstractTableModel diff --git a/Source/Core/DolphinQt2/GameList/GameTracker.cpp b/Source/Core/DolphinQt2/GameList/GameTracker.cpp index ad6bb686be..0072317072 100644 --- a/Source/Core/DolphinQt2/GameList/GameTracker.cpp +++ b/Source/Core/DolphinQt2/GameList/GameTracker.cpp @@ -2,13 +2,16 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/GameList/GameTracker.h" + #include #include #include #include "Core/ConfigManager.h" + #include "DiscIO/DirectoryBlob.h" -#include "DolphinQt2/GameList/GameTracker.h" + #include "DolphinQt2/QtUtils/QueueOnObject.h" #include "DolphinQt2/Settings.h" diff --git a/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp b/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp index e6af8114be..b842a98b46 100644 --- a/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp +++ b/Source/Core/DolphinQt2/GameList/GridProxyModel.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/GameList/GridProxyModel.h" + #include #include #include "DolphinQt2/GameList/GameListModel.h" -#include "DolphinQt2/GameList/GridProxyModel.h" const QSize LARGE_BANNER_SIZE(144, 48); diff --git a/Source/Core/DolphinQt2/Host.cpp b/Source/Core/DolphinQt2/Host.cpp index 8410fd357c..c687bb74ad 100644 --- a/Source/Core/DolphinQt2/Host.cpp +++ b/Source/Core/DolphinQt2/Host.cpp @@ -9,13 +9,16 @@ #include #include "Common/Common.h" + #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Debugger/PPCDebugInterface.h" #include "Core/Host.h" #include "Core/PowerPC/PowerPC.h" + #include "DolphinQt2/QtUtils/QueueOnObject.h" #include "DolphinQt2/Settings.h" + #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinQt2/Host.h b/Source/Core/DolphinQt2/Host.h index f425d645c1..cd5e5d5c3e 100644 --- a/Source/Core/DolphinQt2/Host.h +++ b/Source/Core/DolphinQt2/Host.h @@ -4,9 +4,10 @@ #pragma once -#include #include +#include + // Singleton that talks to the Core via the interface defined in Core/Host.h. // Because Host_* calls might come from different threads than the MainWindow, // the Host class communicates with it via signals/slots only. diff --git a/Source/Core/DolphinQt2/HotkeyScheduler.cpp b/Source/Core/DolphinQt2/HotkeyScheduler.cpp index b138a4c7cb..65fb24bbc0 100644 --- a/Source/Core/DolphinQt2/HotkeyScheduler.cpp +++ b/Source/Core/DolphinQt2/HotkeyScheduler.cpp @@ -10,7 +10,9 @@ #include #include "AudioCommon/AudioCommon.h" + #include "Common/Thread.h" + #include "Core/Config/GraphicsSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -23,6 +25,7 @@ #include "DolphinQt2/Settings.h" #include "InputCommon/ControllerInterface/ControllerInterface.h" + #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp b/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp index a31220e05a..d3aee5c0b8 100644 --- a/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp @@ -2,9 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "MD5Dialog.h" - -#include "DolphinQt2/Settings.h" +#include "DolphinQt2/NetPlay/MD5Dialog.h" #include #include @@ -12,6 +10,8 @@ #include #include +#include "DolphinQt2/Settings.h" + static QString GetPlayerNameFromPID(int pid) { QString player_name = QObject::tr("Invalid Player ID"); diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp index e6d7c29800..60345b431b 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp @@ -30,10 +30,12 @@ #include "Common/CommonPaths.h" #include "Common/Config/Config.h" #include "Common/TraversalClient.h" + #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/NetPlayServer.h" + #include "DolphinQt2/GameList/GameList.h" #include "DolphinQt2/NetPlay/GameListDialog.h" #include "DolphinQt2/NetPlay/MD5Dialog.h" @@ -41,6 +43,7 @@ #include "DolphinQt2/QtUtils/QueueOnObject.h" #include "DolphinQt2/QtUtils/RunOnObject.h" #include "DolphinQt2/Settings.h" + #include "VideoCommon/VideoConfig.h" NetPlayDialog::NetPlayDialog(QWidget* parent) diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp index 2d07a4b81e..5d26684b48 100644 --- a/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp +++ b/Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp @@ -4,10 +4,6 @@ #include "DolphinQt2/NetPlay/NetPlaySetupDialog.h" -#include "Core/Config/NetplaySettings.h" -#include "DolphinQt2/GameList/GameListModel.h" -#include "DolphinQt2/Settings.h" - #include #include #include @@ -20,6 +16,11 @@ #include #include +#include "Core/Config/NetplaySettings.h" + +#include "DolphinQt2/GameList/GameListModel.h" +#include "DolphinQt2/Settings.h" + NetPlaySetupDialog::NetPlaySetupDialog(QWidget* parent) : QDialog(parent), m_game_list_model(Settings::Instance().GetGameListModel()) { diff --git a/Source/Core/DolphinQt2/RenderWidget.cpp b/Source/Core/DolphinQt2/RenderWidget.cpp index 04372e8e16..0d8e1a9660 100644 --- a/Source/Core/DolphinQt2/RenderWidget.cpp +++ b/Source/Core/DolphinQt2/RenderWidget.cpp @@ -14,14 +14,15 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "VideoCommon/VertexShaderManager.h" -#include "VideoCommon/VideoConfig.h" #include "DolphinQt2/Host.h" #include "DolphinQt2/RenderWidget.h" #include "DolphinQt2/Resources.h" #include "DolphinQt2/Settings.h" +#include "VideoCommon/VertexShaderManager.h" +#include "VideoCommon/VideoConfig.h" + RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent) { setWindowTitle(QStringLiteral("Dolphin")); diff --git a/Source/Core/DolphinQt2/Resources.cpp b/Source/Core/DolphinQt2/Resources.cpp index 1431553b83..eb0172c7bc 100644 --- a/Source/Core/DolphinQt2/Resources.cpp +++ b/Source/Core/DolphinQt2/Resources.cpp @@ -8,7 +8,9 @@ #include #include "Common/FileUtil.h" + #include "Core/ConfigManager.h" + #include "DolphinQt2/Resources.h" #include "DolphinQt2/Settings.h" diff --git a/Source/Core/DolphinQt2/Settings.cpp b/Source/Core/DolphinQt2/Settings.cpp index b0f8869a6f..5e8c15418d 100644 --- a/Source/Core/DolphinQt2/Settings.cpp +++ b/Source/Core/DolphinQt2/Settings.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Settings.h" + #include #include #include @@ -9,14 +11,17 @@ #include #include "AudioCommon/AudioCommon.h" + #include "Common/Config/Config.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" + #include "Core/ConfigManager.h" #include "Core/Core.h" + #include "DolphinQt2/GameList/GameListModel.h" #include "DolphinQt2/QtUtils/QueueOnObject.h" -#include "DolphinQt2/Settings.h" + #include "InputCommon/InputConfig.h" Settings::Settings() diff --git a/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp b/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp index 8c24b9332f..38f555fe9d 100644 --- a/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp +++ b/Source/Core/DolphinQt2/Settings/AdvancedPane.cpp @@ -16,6 +16,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/SystemTimers.h" + #include "DolphinQt2/Settings.h" AdvancedPane::AdvancedPane(QWidget* parent) : QWidget(parent) diff --git a/Source/Core/DolphinQt2/Settings/AudioPane.cpp b/Source/Core/DolphinQt2/Settings/AudioPane.cpp index bbdc7b51fc..aae8a6885a 100644 --- a/Source/Core/DolphinQt2/Settings/AudioPane.cpp +++ b/Source/Core/DolphinQt2/Settings/AudioPane.cpp @@ -18,8 +18,10 @@ #include "AudioCommon/AudioCommon.h" #include "AudioCommon/WASAPIStream.h" + #include "Core/ConfigManager.h" #include "Core/Core.h" + #include "DolphinQt2/Config/SettingsWindow.h" #include "DolphinQt2/Settings.h" diff --git a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp b/Source/Core/DolphinQt2/Settings/GameCubePane.cpp index 78f9450df2..2e6642608c 100644 --- a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp +++ b/Source/Core/DolphinQt2/Settings/GameCubePane.cpp @@ -17,10 +17,12 @@ #include "Common/CommonPaths.h" #include "Common/FileUtil.h" + #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/EXI/EXI.h" #include "Core/HW/GCMemcard/GCMemcard.h" + #include "DolphinQt2/Config/Mapping/MappingWindow.h" constexpr int SLOT_A_INDEX = 0; diff --git a/Source/Core/DolphinQt2/Settings/GeneralPane.cpp b/Source/Core/DolphinQt2/Settings/GeneralPane.cpp index ecc091db23..b3aafa9eea 100644 --- a/Source/Core/DolphinQt2/Settings/GeneralPane.cpp +++ b/Source/Core/DolphinQt2/Settings/GeneralPane.cpp @@ -22,7 +22,9 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/PowerPC/PowerPC.h" + #include "DolphinQt2/Settings.h" + #include "UICommon/AutoUpdate.h" constexpr int AUTO_UPDATE_DISABLE_INDEX = 0; diff --git a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp index eb1d1d22ca..e5df454c67 100644 --- a/Source/Core/DolphinQt2/Settings/InterfacePane.cpp +++ b/Source/Core/DolphinQt2/Settings/InterfacePane.cpp @@ -18,6 +18,7 @@ #include "Common/FileUtil.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" + #include "Core/ConfigManager.h" #include "DolphinQt2/Settings.h" diff --git a/Source/Core/DolphinQt2/Settings/PathPane.cpp b/Source/Core/DolphinQt2/Settings/PathPane.cpp index eb379611a4..69062f6e32 100644 --- a/Source/Core/DolphinQt2/Settings/PathPane.cpp +++ b/Source/Core/DolphinQt2/Settings/PathPane.cpp @@ -13,6 +13,7 @@ #include #include "Common/Config/Config.h" + #include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp b/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp index 7df28c98be..e7a5f81167 100644 --- a/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp +++ b/Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h" + #include #include #include @@ -18,9 +20,11 @@ #include #include "Common/StringUtil.h" + #include "Core/ConfigManager.h" -#include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h" + #include "DolphinQt2/Settings/WiiPane.h" + #include "UICommon/USBUtils.h" static bool IsValidUSBIDString(const std::string& string) diff --git a/Source/Core/DolphinQt2/Settings/WiiPane.cpp b/Source/Core/DolphinQt2/Settings/WiiPane.cpp index f21e5dd86f..186500908b 100644 --- a/Source/Core/DolphinQt2/Settings/WiiPane.cpp +++ b/Source/Core/DolphinQt2/Settings/WiiPane.cpp @@ -15,13 +15,17 @@ #include #include #include + #include "Common/Config/Config.h" #include "Common/StringUtil.h" + #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/IOS/IOS.h" + #include "DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.h" + #include "UICommon/USBUtils.h" // SYSCONF uses 0 for bottom and 1 for top, but we place them in diff --git a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp b/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp index fd9c7f4a45..61d4173dd3 100644 --- a/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp +++ b/Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp @@ -11,7 +11,9 @@ #include #include "Common/CommonTypes.h" + #include "DolphinQt2/TAS/Shared.h" + #include "InputCommon/GCPadStatus.h" GCTASInputWindow::GCTASInputWindow(QWidget* parent, int num) : QDialog(parent) diff --git a/Source/Core/DolphinQt2/TAS/Shared.cpp b/Source/Core/DolphinQt2/TAS/Shared.cpp index ee1f45fe1a..c9c7446bbc 100644 --- a/Source/Core/DolphinQt2/TAS/Shared.cpp +++ b/Source/Core/DolphinQt2/TAS/Shared.cpp @@ -13,8 +13,10 @@ #include #include "Common/CommonTypes.h" + #include "DolphinQt2/QtUtils/AspectRatioWidget.h" #include "DolphinQt2/TAS/StickWidget.h" + #include "InputCommon/GCPadStatus.h" QGroupBox* CreateStickInputs(QDialog* window, QString name, QSpinBox*& x_value, QSpinBox*& y_value, diff --git a/Source/Core/DolphinQt2/TAS/Shared.h b/Source/Core/DolphinQt2/TAS/Shared.h index 72fdac2ff3..ae0f3abad4 100644 --- a/Source/Core/DolphinQt2/TAS/Shared.h +++ b/Source/Core/DolphinQt2/TAS/Shared.h @@ -8,13 +8,13 @@ #include "Common/CommonTypes.h" +struct GCPadStatus; class QDialog; class QString; class QSpinBox; class QCheckBox; class QBoxLayout; class QGroupBox; -struct GCPadStatus; QGroupBox* CreateStickInputs(QDialog* window, QString name, QSpinBox*& x_value, QSpinBox*& y_value, u16 max_x, u16 max_y, Qt::Key x_shortcut_key, Qt::Key y_shortcut_key); diff --git a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp b/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp index 8e8ef58dad..ad2d9565c2 100644 --- a/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp +++ b/Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp @@ -12,15 +12,18 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" + #include "Core/Core.h" #include "Core/HW/WiimoteEmu/Attachment/Classic.h" #include "Core/HW/WiimoteEmu/Attachment/Nunchuk.h" #include "Core/HW/WiimoteEmu/Encryption.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" + #include "DolphinQt2/QtUtils/AspectRatioWidget.h" #include "DolphinQt2/TAS/IRWidget.h" #include "DolphinQt2/TAS/Shared.h" + #include "InputCommon/InputConfig.h" WiiTASInputWindow::WiiTASInputWindow(QWidget* parent, int num) : QDialog(parent), m_num(num) diff --git a/Source/Core/DolphinQt2/Translation.cpp b/Source/Core/DolphinQt2/Translation.cpp index 1fd00e0b2e..cf5decd98e 100644 --- a/Source/Core/DolphinQt2/Translation.cpp +++ b/Source/Core/DolphinQt2/Translation.cpp @@ -17,7 +17,9 @@ #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" + #include "Core/ConfigManager.h" + #include "UICommon/UICommon.h" constexpr u32 MO_MAGIC_NUMBER = 0x950412de; diff --git a/Source/Core/DolphinQt2/Updater.cpp b/Source/Core/DolphinQt2/Updater.cpp index fdff716ed3..3c4dc9d889 100644 --- a/Source/Core/DolphinQt2/Updater.cpp +++ b/Source/Core/DolphinQt2/Updater.cpp @@ -14,6 +14,7 @@ #include #include "Common/Version.h" + #include "DolphinQt2/QtUtils/RunOnObject.h" #include "DolphinQt2/Settings.h" diff --git a/Source/Core/DolphinQt2/WiiUpdate.cpp b/Source/Core/DolphinQt2/WiiUpdate.cpp index 397765f4c9..f09b422824 100644 --- a/Source/Core/DolphinQt2/WiiUpdate.cpp +++ b/Source/Core/DolphinQt2/WiiUpdate.cpp @@ -15,9 +15,12 @@ #include "Common/FileUtil.h" #include "Common/Flag.h" + #include "Core/Core.h" #include "Core/WiiUtils.h" + #include "DiscIO/NANDImporter.h" + #include "DolphinQt2/QtUtils/QueueOnObject.h" namespace WiiUpdate