Permalink
Browse files

Merge pull request #6999 from spycrab/qt_includes

Qt: Sort includes properly
  • Loading branch information...
spycrab committed May 28, 2018
2 parents cece179 + 6268c7b commit d3f97debee32178fcd8c2d2b3fa13a2931224b1b
Showing with 139 additions and 31 deletions.
  1. +1 −0 Source/Core/DolphinQt2/AboutDialog.cpp
  2. +1 −0 Source/Core/DolphinQt2/CheatsManager.cpp
  3. +3 −0 Source/Core/DolphinQt2/Config/ARCodeWidget.cpp
  4. +1 −0 Source/Core/DolphinQt2/Config/CheatWarningWidget.cpp
  5. +1 −0 Source/Core/DolphinQt2/Config/ControllersWindow.cpp
  6. +3 −0 Source/Core/DolphinQt2/Config/GameConfigWidget.cpp
  7. +3 −0 Source/Core/DolphinQt2/Config/GeckoCodeWidget.cpp
  8. +1 −0 Source/Core/DolphinQt2/Config/Graphics/AdvancedWidget.cpp
  9. +2 −0 Source/Core/DolphinQt2/Config/Graphics/EnhancementsWidget.cpp
  10. +3 −0 Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp
  11. +1 −0 Source/Core/DolphinQt2/Config/Graphics/GraphicsBool.cpp
  12. +1 −0 Source/Core/DolphinQt2/Config/Graphics/GraphicsChoice.cpp
  13. +1 −0 Source/Core/DolphinQt2/Config/Graphics/GraphicsRadio.cpp
  14. +1 −0 Source/Core/DolphinQt2/Config/Graphics/GraphicsSlider.cpp
  15. +1 −0 Source/Core/DolphinQt2/Config/Graphics/PostProcessingConfigWindow.cpp
  16. +3 −0 Source/Core/DolphinQt2/Config/Graphics/SoftwareRendererWidget.cpp
  17. +3 −0 Source/Core/DolphinQt2/Config/InfoWidget.cpp
  18. +2 −0 Source/Core/DolphinQt2/Config/LogConfigWidget.cpp
  19. +2 −0 Source/Core/DolphinQt2/Config/LogWidget.cpp
  20. +1 −0 Source/Core/DolphinQt2/Config/Mapping/GCKeyboardEmu.cpp
  21. +4 −3 Source/Core/DolphinQt2/Config/Mapping/GCPadEmu.cpp
  22. +3 −2 Source/Core/DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.cpp
  23. +2 −0 Source/Core/DolphinQt2/Config/Mapping/IOWindow.cpp
  24. +3 −2 Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
  25. +5 −2 Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
  26. +3 −2 Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuExtension.cpp
  27. +4 −2 Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuGeneral.cpp
  28. +3 −2 Source/Core/DolphinQt2/Config/Mapping/WiimoteEmuMotionControl.cpp
  29. +1 −0 Source/Core/DolphinQt2/Config/PropertiesDialog.cpp
  30. +4 −1 Source/Core/DolphinQt2/GameList/GameList.cpp
  31. +3 −0 Source/Core/DolphinQt2/GameList/GameListModel.cpp
  32. +1 −0 Source/Core/DolphinQt2/GameList/GameListModel.h
  33. +4 −1 Source/Core/DolphinQt2/GameList/GameTracker.cpp
  34. +2 −1 Source/Core/DolphinQt2/GameList/GridProxyModel.cpp
  35. +3 −0 Source/Core/DolphinQt2/Host.cpp
  36. +2 −1 Source/Core/DolphinQt2/Host.h
  37. +3 −0 Source/Core/DolphinQt2/HotkeyScheduler.cpp
  38. +3 −3 Source/Core/DolphinQt2/NetPlay/MD5Dialog.cpp
  39. +3 −0 Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
  40. +5 −4 Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp
  41. +3 −2 Source/Core/DolphinQt2/RenderWidget.cpp
  42. +2 −0 Source/Core/DolphinQt2/Resources.cpp
  43. +6 −1 Source/Core/DolphinQt2/Settings.cpp
  44. +1 −0 Source/Core/DolphinQt2/Settings/AdvancedPane.cpp
  45. +2 −0 Source/Core/DolphinQt2/Settings/AudioPane.cpp
  46. +2 −0 Source/Core/DolphinQt2/Settings/GameCubePane.cpp
  47. +2 −0 Source/Core/DolphinQt2/Settings/GeneralPane.cpp
  48. +1 −0 Source/Core/DolphinQt2/Settings/InterfacePane.cpp
  49. +1 −0 Source/Core/DolphinQt2/Settings/PathPane.cpp
  50. +5 −1 Source/Core/DolphinQt2/Settings/USBDeviceAddToWhitelistDialog.cpp
  51. +4 −0 Source/Core/DolphinQt2/Settings/WiiPane.cpp
  52. +2 −0 Source/Core/DolphinQt2/TAS/GCTASInputWindow.cpp
  53. +2 −0 Source/Core/DolphinQt2/TAS/Shared.cpp
  54. +1 −1 Source/Core/DolphinQt2/TAS/Shared.h
  55. +3 −0 Source/Core/DolphinQt2/TAS/WiiTASInputWindow.cpp
  56. +2 −0 Source/Core/DolphinQt2/Translation.cpp
  57. +1 −0 Source/Core/DolphinQt2/Updater.cpp
  58. +3 −0 Source/Core/DolphinQt2/WiiUpdate.cpp
@@ -7,6 +7,7 @@
#include <QVBoxLayout>
#include "Common/Version.h"
#include "DolphinQt2/AboutDialog.h"
#include "DolphinQt2/Resources.h"
@@ -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"
@@ -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)
@@ -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,
@@ -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 = {
@@ -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;
@@ -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)
@@ -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)
@@ -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"
@@ -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"
@@ -5,6 +5,7 @@
#include "DolphinQt2/Config/Graphics/GraphicsBool.h"
#include "Common/Config/Config.h"
#include "DolphinQt2/Settings.h"
#include <QFont>
@@ -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)
@@ -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,
@@ -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,
@@ -20,6 +20,7 @@
#include <QWidget>
#include "DolphinQt2/Config/Graphics/EnhancementsWidget.h"
#include "VideoCommon/PostProcessing.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VideoConfig.h"
@@ -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"
@@ -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)
@@ -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)
@@ -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()
@@ -8,6 +8,7 @@
#include <QVBoxLayout>
#include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
#include "InputCommon/InputConfig.h"
#include "Core/HW/GCKeyboard.h"
@@ -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();
@@ -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)
@@ -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"
@@ -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"
@@ -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"
@@ -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)
@@ -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"
@@ -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)
@@ -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)
Oops, something went wrong.

0 comments on commit d3f97de

Please sign in to comment.