Merge pull request #6999 from spycrab/qt_includes

Qt: Sort includes properly

Source/Core/DolphinQt2/AboutDialog.cpp

@@ -7,6 +7,7 @@
 #include <QVBoxLayout>
 
 #include "Common/Version.h"
+
 #include "DolphinQt2/AboutDialog.h"
 #include "DolphinQt2/Resources.h"
 

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"

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)

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,

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<SerialInterface::SIDevices, int> s_gc_types = {

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;

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)

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)

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"

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"
 

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 <QFont>

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<int>& setting)

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<int>& setting,

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<int>& setting,

Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp

@@ -20,6 +20,7 @@
 #include <QWidget>
 
 #include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
+
 #include "VideoCommon/PostProcessing.h"
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"

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"
 

Source/Core/DolphinQt2/Config/InfoWidget.cpp

@@ -15,10 +15,13 @@
 #include <QTextEdit>
 
 #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)

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)

Source/Core/DolphinQt2/Config/LogWidget.cpp

@@ -16,7 +16,9 @@
 #include <QVBoxLayout>
 
 #include "Common/FileUtil.h"
+
 #include "Core/ConfigManager.h"
+
 #include "DolphinQt2/Settings.h"
 
 // Delay in ms between calls of UpdateLog()

Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp

@@ -8,6 +8,7 @@
 #include <QVBoxLayout>
 
 #include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
+
 #include "InputCommon/InputConfig.h"
 
 #include "Core/HW/GCKeyboard.h"

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 <QFormLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#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();

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 <QCheckBox>
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QVBoxLayout>
 
-#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h"
-
 #include "Core/ConfigManager.h"
+
 #include "InputCommon/GCAdapter.h"
 
 GCPadWiiUConfigDialog::GCPadWiiUConfigDialog(int port, QWidget* parent)

Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp

@@ -19,9 +19,11 @@
 #include <QVBoxLayout>
 
 #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"

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 <QFormLayout>
 #include <QGroupBox>
 #include <QPushButton>
 
-#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"

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 <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
@@ -12,13 +14,13 @@
 #include <QTabWidget>
 #include <QVBoxLayout>
 
-#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"

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 <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
 
-#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)

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 <QComboBox>
 #include <QFormLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#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"
 

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 <QFormLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#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)

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)

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 <QDesktopServices>
 #include <QDir>
 #include <QErrorMessage>
@@ -17,16 +19,17 @@
 #include <QUrl>
 
 #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"

Source/Core/DolphinQt2/GameList/GameListModel.cpp

@@ -7,10 +7,13 @@
 #include <QPixmap>
 
 #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);

Source/Core/DolphinQt2/GameList/GameListModel.h

@@ -11,6 +11,7 @@
 #include <QString>
 
 #include "DolphinQt2/GameList/GameTracker.h"
+
 #include "UICommon/GameFile.h"
 
 class GameListModel final : public QAbstractTableModel

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 <QDir>
 #include <QDirIterator>
 #include <QFile>
 
 #include "Core/ConfigManager.h"
+
 #include "DiscIO/DirectoryBlob.h"
-#include "DolphinQt2/GameList/GameTracker.h"
+
 #include "DolphinQt2/QtUtils/QueueOnObject.h"
 #include "DolphinQt2/Settings.h"
 

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 <QPixmap>
 #include <QSize>
 
 #include "DolphinQt2/GameList/GameListModel.h"
-#include "DolphinQt2/GameList/GridProxyModel.h"
 
 const QSize LARGE_BANNER_SIZE(144, 48);
 

Source/Core/DolphinQt2/Host.cpp

@@ -9,13 +9,16 @@
 #include <QProgressDialog>
 
 #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"
 

Source/Core/DolphinQt2/Host.h

@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include <QObject>
 #include <atomic>
 
+#include <QObject>
+
 // 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.

Source/Core/DolphinQt2/HotkeyScheduler.cpp

@@ -10,7 +10,9 @@
 #include <QCoreApplication>
 
 #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"

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/NetPlay/MD5Dialog.h"
-
-#include "DolphinQt2/Settings.h"
 
 #include <QDialogButtonBox>
 #include <QGroupBox>
@@ -12,6 +10,8 @@
 #include <QProgressBar>
 #include <QVBoxLayout>
 
+#include "DolphinQt2/Settings.h"
+
 static QString GetPlayerNameFromPID(int pid)
 {
   QString player_name = QObject::tr("Invalid Player ID");

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)

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 <QCheckBox>
 #include <QComboBox>
 #include <QDialogButtonBox>
@@ -20,6 +16,11 @@
 #include <QSpinBox>
 #include <QTabWidget>
 
+#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())
 {

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"));

Source/Core/DolphinQt2/Resources.cpp

@@ -8,7 +8,9 @@
 #include <QScreen>
 
 #include "Common/FileUtil.h"
+
 #include "Core/ConfigManager.h"
+
 #include "DolphinQt2/Resources.h"
 #include "DolphinQt2/Settings.h"
 

Source/Core/DolphinQt2/Settings.cpp

@@ -2,6 +2,8 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "DolphinQt2/Settings.h"
+
 #include <QApplication>
 #include <QDir>
 #include <QFile>
@@ -9,14 +11,17 @@
 #include <QSize>
 
 #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()

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)

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"
 

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;

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;

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"

Source/Core/DolphinQt2/Settings/PathPane.cpp

@@ -13,6 +13,7 @@
 #include <QVBoxLayout>
 
 #include "Common/Config/Config.h"
+
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 

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 <QButtonGroup>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -18,9 +20,11 @@
 #include <QWidget>
 
 #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)

Source/Core/DolphinQt2/Settings/WiiPane.cpp

@@ -15,13 +15,17 @@
 #include <QSlider>
 #include <QSpacerItem>
 #include <QStringList>
+
 #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

Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp

@@ -11,7 +11,9 @@
 #include <QVBoxLayout>
 
 #include "Common/CommonTypes.h"
+
 #include "DolphinQt2/TAS/Shared.h"
+
 #include "InputCommon/GCPadStatus.h"
 
 GCTASInputWindow::GCTASInputWindow(QWidget* parent, int num) : QDialog(parent)

Source/Core/DolphinQt2/TAS/Shared.cpp

@@ -13,8 +13,10 @@
 #include <QVBoxLayout>
 
 #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,

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);

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)

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;

Source/Core/DolphinQt2/Updater.cpp

@@ -14,6 +14,7 @@
 #include <QVBoxLayout>
 
 #include "Common/Version.h"
+
 #include "DolphinQt2/QtUtils/RunOnObject.h"
 #include "DolphinQt2/Settings.h"
 

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