From 592ebc5262f13bc587896e678d389fe831df9af7 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:56:29 +0100 Subject: [PATCH] Fix more header sorting issues in DolphinWX/ (now check-includes clean). --- Source/Core/DolphinWX/ARCodeAddEdit.h | 3 +- Source/Core/DolphinWX/AboutDolphin.h | 8 +-- Source/Core/DolphinWX/CheatsWindow.cpp | 4 +- Source/Core/DolphinWX/CheatsWindow.h | 27 +++++----- Source/Core/DolphinWX/ConfigMain.h | 6 +-- .../Core/DolphinWX/Debugger/BreakpointDlg.cpp | 2 +- .../DolphinWX/Debugger/BreakpointView.cpp | 4 +- .../DolphinWX/Debugger/BreakpointWindow.h | 2 +- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 10 ++-- .../Debugger/CodeWindowFunctions.cpp | 4 +- .../DolphinWX/Debugger/DSPDebugWindow.cpp | 3 +- .../Core/DolphinWX/Debugger/DSPDebugWindow.h | 7 ++- .../Core/DolphinWX/Debugger/DebuggerPanel.h | 2 +- Source/Core/DolphinWX/Debugger/JitWindow.cpp | 9 ++-- Source/Core/DolphinWX/Debugger/MemoryView.cpp | 2 +- .../Core/DolphinWX/Debugger/MemoryWindow.cpp | 6 +-- Source/Core/DolphinWX/Debugger/MemoryWindow.h | 2 +- Source/Core/DolphinWX/FifoPlayerDlg.cpp | 5 +- Source/Core/DolphinWX/FifoPlayerDlg.h | 2 +- Source/Core/DolphinWX/Frame.cpp | 15 +++--- Source/Core/DolphinWX/Frame.h | 13 +++-- Source/Core/DolphinWX/FrameTools.cpp | 46 ++++++++-------- Source/Core/DolphinWX/GLInterface/AGL.cpp | 2 +- Source/Core/DolphinWX/GLInterface/EGL.cpp | 2 +- Source/Core/DolphinWX/GLInterface/GLX.h | 2 +- .../Core/DolphinWX/GLInterface/Wayland_Util.h | 2 +- Source/Core/DolphinWX/GLInterface/X11_Util.h | 2 +- Source/Core/DolphinWX/GameListCtrl.cpp | 19 +++---- Source/Core/DolphinWX/Globals.h | 34 ++++++------ Source/Core/DolphinWX/HotkeyDlg.h | 8 +-- Source/Core/DolphinWX/ISOProperties.cpp | 5 +- Source/Core/DolphinWX/ISOProperties.h | 13 +++-- Source/Core/DolphinWX/InputConfigDiag.h | 11 ++-- Source/Core/DolphinWX/Main.cpp | 5 +- Source/Core/DolphinWX/MainAndroid.cpp | 54 +++++++++---------- Source/Core/DolphinWX/MainNoGUI.cpp | 20 +++---- Source/Core/DolphinWX/MemcardManager.h | 12 ++--- Source/Core/DolphinWX/NetWindow.h | 9 ++-- Source/Core/DolphinWX/PHackSettings.cpp | 2 +- Source/Core/DolphinWX/PHackSettings.h | 2 +- Source/Core/DolphinWX/PatchAddEdit.h | 2 +- Source/Core/DolphinWX/UDPConfigDiag.h | 10 ++-- Source/Core/DolphinWX/VideoConfigDiag.h | 11 ++-- Source/Core/DolphinWX/WiimoteConfigDiag.cpp | 4 +- Source/Core/DolphinWX/WiimoteConfigDiag.h | 11 ++-- Source/Core/DolphinWX/WxUtils.cpp | 2 +- Source/Core/DolphinWX/X11Utils.cpp | 9 ++-- Source/Core/DolphinWX/X11Utils.h | 15 +++--- 48 files changed, 213 insertions(+), 237 deletions(-) diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.h b/Source/Core/DolphinWX/ARCodeAddEdit.h index 93578941a8..9f22a0c2f4 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.h +++ b/Source/Core/DolphinWX/ARCodeAddEdit.h @@ -4,8 +4,9 @@ #pragma once -#include #include +#include + #include "DolphinWX/ISOProperties.h" class CARCodeAddEdit : public wxDialog diff --git a/Source/Core/DolphinWX/AboutDolphin.h b/Source/Core/DolphinWX/AboutDolphin.h index c9fd71495f..4c1f43053d 100644 --- a/Source/Core/DolphinWX/AboutDolphin.h +++ b/Source/Core/DolphinWX/AboutDolphin.h @@ -4,13 +4,13 @@ #pragma once -#include -#include #include -#include -#include +#include #include #include +#include +#include +#include class AboutDolphin : public wxDialog { diff --git a/Source/Core/DolphinWX/CheatsWindow.cpp b/Source/Core/DolphinWX/CheatsWindow.cpp index 75c3de5743..398b981fc4 100644 --- a/Source/Core/DolphinWX/CheatsWindow.cpp +++ b/Source/Core/DolphinWX/CheatsWindow.cpp @@ -3,13 +3,11 @@ // Refer to the license.txt file included. #include "Common/CommonPaths.h" - #include "Core/ActionReplay.h" -#include "Core/Core.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/VolumeHandler.h" #include "Core/HW/Memmap.h" - #include "DolphinWX/CheatsWindow.h" #include "DolphinWX/Frame.h" #include "DolphinWX/Globals.h" diff --git a/Source/Core/DolphinWX/CheatsWindow.h b/Source/Core/DolphinWX/CheatsWindow.h index c8acbbd4b2..d7823a982c 100644 --- a/Source/Core/DolphinWX/CheatsWindow.h +++ b/Source/Core/DolphinWX/CheatsWindow.h @@ -4,24 +4,23 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "Core/ActionReplay.h" #include "Common/IniFile.h" +#include "Core/ActionReplay.h" #include "DiscIO/Filesystem.h" #include "DolphinWX/GeckoCodeDiag.h" diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index 2dde08470c..9aafeedf0e 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -4,12 +4,12 @@ #pragma once -#include +#include #include +#include #include #include -#include -#include +#include #include "Core/ConfigManager.h" #if defined(HAVE_XRANDR) && HAVE_XRANDR diff --git a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp index 0e57992480..047464e044 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp @@ -4,9 +4,9 @@ #include "Common/StringUtil.h" #include "Core/PowerPC/PowerPC.h" +#include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/BreakpointDlg.h" #include "DolphinWX/Debugger/BreakpointWindow.h" -#include "DolphinWX/WxUtils.h" BEGIN_EVENT_TABLE(BreakPointDlg, wxDialog) EVT_BUTTON(wxID_OK, BreakPointDlg::OnOK) diff --git a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp index 8bd12e1110..4934122ee0 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointView.cpp +++ b/Source/Core/DolphinWX/Debugger/BreakpointView.cpp @@ -6,11 +6,11 @@ #include "Core/Debugger/Debugger_SymbolMap.h" #include "Core/HW/Memmap.h" -#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" +#include "Core/PowerPC/PPCSymbolDB.h" +#include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/BreakpointView.h" #include "DolphinWX/Debugger/DebuggerUIUtil.h" -#include "DolphinWX/WxUtils.h" CBreakPointView::CBreakPointView(wxWindow* parent, const wxWindowID id) : wxListCtrl(parent, id, wxDefaultPosition, wxDefaultSize, diff --git a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h index 9efccb7149..6e8235be0a 100644 --- a/Source/Core/DolphinWX/Debugger/BreakpointWindow.h +++ b/Source/Core/DolphinWX/Debugger/BreakpointWindow.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include class CBreakPointView; diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 83bcce660f..8e58eaa152 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -7,12 +7,12 @@ #include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/LogManager.h" +#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Host.h" #include "Core/Boot/Boot.h" -#include "Core/ConfigManager.h" -#include "Core/Debugger/PPCDebugInterface.h" #include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/Debugger/PPCDebugInterface.h" #include "Core/HLE/HLE.h" #include "Core/HW/CPU.h" #include "Core/HW/Memmap.h" @@ -22,19 +22,19 @@ #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PPCTables.h" #include "Core/PowerPC/SignatureDB.h" +#include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/BreakpointWindow.h" #include "DolphinWX/Debugger/CodeView.h" #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/JitWindow.h" #include "DolphinWX/Debugger/MemoryWindow.h" #include "DolphinWX/Debugger/RegisterWindow.h" -#include "DolphinWX/WxUtils.h" extern "C" // Bitmaps { - #include "DolphinWX/resources/toolbar_add_memorycheck.c" - #include "DolphinWX/resources/toolbar_add_breakpoint.c" + #include "DolphinWX/resources/toolbar_add_memorycheck.c" // NOLINT + #include "DolphinWX/resources/toolbar_add_breakpoint.c" // NOLINT } // ------- diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index c7c68458e3..0de5320038 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -13,10 +13,10 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Host.h" -#include "Core/HLE/HLE.h" #include "Core/Boot/Boot.h" -#include "Core/Debugger/PPCDebugInterface.h" #include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/Debugger/PPCDebugInterface.h" +#include "Core/HLE/HLE.h" #include "Core/HW/CPU.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PPCAnalyst.h" diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp index 6dcb0e4e1c..681209c39c 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp @@ -2,10 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include - #include #include "Common/Common.h" diff --git a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h index df51606196..e0bf61f8da 100644 --- a/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h +++ b/Source/Core/DolphinWX/Debugger/DSPDebugWindow.h @@ -10,15 +10,14 @@ #include #include #include - -#include #include #include #include -#include -#include #include +#include #include +#include +#include #include #include "Core/DSP/disassemble.h" diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h index a9be1e5290..cdf5144be3 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.h +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "VideoCommon/Debugger.h" diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index 3e46e98d16..5e3511b8cd 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -2,26 +2,23 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include // Bochs +#include // Bochs #include #include #include #include -#include "PowerPCDisasm.h" // Bochs -#include "disasm.h" // Bochs - #include "Common/LogManager.h" #include "Common/StringUtil.h" - #include "Core/Core.h" -#include "Core/Debugger/PPCDebugInterface.h" #include "Core/Debugger/Debugger_SymbolMap.h" +#include "Core/Debugger/PPCDebugInterface.h" #include "Core/HW/CPU.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/JitCommon/JitCache.h" - #include "DolphinWX/Globals.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/JitWindow.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index 9b09b1becd..832c13ca9f 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include "Common/Common.h" #include "Core/Host.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp index ac66e0d62a..516ab41788 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.cpp @@ -3,22 +3,20 @@ // Refer to the license.txt file included. #include +#include #include -#include #include -#include #include "Common/FileUtil.h" #include "Common/LogManager.h" -#include "Core/Core.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "Core/Debugger/PPCDebugInterface.h" #include "Core/HW/CPU.h" #include "Core/HW/DSP.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PPCSymbolDB.h" - #include "DolphinWX/Globals.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/MemoryWindow.h" diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h index 2da01361e1..19fbe1cb29 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -5,8 +5,8 @@ #pragma once #include -#include #include +#include #include "Common/StringUtil.h" #include "Common/Thread.h" diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/FifoPlayerDlg.cpp index 67281abbc0..5a8a39bbe3 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.cpp +++ b/Source/Core/DolphinWX/FifoPlayerDlg.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include "Common/Common.h" #include "Common/FileUtil.h" @@ -14,9 +16,6 @@ #include "DolphinWX/WxUtils.h" #include "VideoCommon/OpcodeDecoding.h" -#include -#include - DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1) DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT) diff --git a/Source/Core/DolphinWX/FifoPlayerDlg.h b/Source/Core/DolphinWX/FifoPlayerDlg.h index 84675432f2..4e72878fc7 100644 --- a/Source/Core/DolphinWX/FifoPlayerDlg.h +++ b/Source/Core/DolphinWX/FifoPlayerDlg.h @@ -5,8 +5,8 @@ #pragma once #include -#include #include +#include class wxSpinCtrl; class wxSpinEvent; diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 11e444bc8c..2a17f6c21c 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -13,19 +13,12 @@ #ifdef __APPLE__ #include #endif - #include #include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/Timer.h" -#include "DolphinWX/CheatsWindow.h" -#include "DolphinWX/ConfigMain.h" -#include "DolphinWX/Frame.h" -#include "DolphinWX/GameListCtrl.h" -#include "DolphinWX/Globals.h" - #include "Core/BootManager.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -36,6 +29,12 @@ #include "Core/HW/GCPad.h" #include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "DolphinWX/CheatsWindow.h" +#include "DolphinWX/ConfigMain.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/GameListCtrl.h" +#include "DolphinWX/Globals.h" + #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoBackendBase.h" @@ -44,7 +43,7 @@ // Resources extern "C" { -#include "DolphinWX/resources/Dolphin.c" // Dolphin icon +#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon }; #ifdef _WIN32 diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index fb69dd988d..6894f9d733 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -6,20 +6,19 @@ #include #include - -#include -#include -#include -#include #include -#include +#include +#include +#include #include +#include +#include #include "Common/CDUtils.h" #include "Core/Movie.h" #include "DolphinWX/Globals.h" -#include "DolphinWX/LogWindow.h" #include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/LogWindow.h" #include "DolphinWX/TASInputDlg.h" #include "DolphinWX/Debugger/CodeWindow.h" diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index a6b71a6b36..ebb345cb5c 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -16,15 +16,32 @@ Core::GetWindowHandle(). #include +#ifdef __APPLE__ +#include +#endif + #include "Common/Common.h" #include "Common/FileSearch.h" #include "Common/FileUtil.h" #include "Common/Timer.h" -#include "VideoCommon/VideoBackendBase.h" -#ifdef __APPLE__ -#include -#endif +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/Movie.h" +#include "Core/State.h" +#include "Core/VolumeHandler.h" +#include "Core/HW/CPU.h" +#include "Core/HW/DVDInterface.h" +#include "Core/HW/GCPad.h" +#include "Core/HW/ProcessorInterface.h" +#include "Core/HW/Wiimote.h" +//#include "IPC_HLE/WII_IPC_HLE_Device_FileIO.h" +#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" +#include "Core/PowerPC/PowerPC.h" + +#include "DiscIO/NANDContentLoader.h" #include "DolphinWX/AboutDolphin.h" #include "DolphinWX/CheatsWindow.h" @@ -35,8 +52,8 @@ Core::GetWindowHandle(). #include "DolphinWX/Globals.h" #include "DolphinWX/HotkeyDlg.h" #include "DolphinWX/InputConfigDiag.h" -#include "DolphinWX/LogWindow.h" #include "DolphinWX/LogConfigWindow.h" +#include "DolphinWX/LogWindow.h" #include "DolphinWX/MemcardManager.h" #include "DolphinWX/NetWindow.h" #include "DolphinWX/TASInputDlg.h" @@ -44,22 +61,7 @@ Core::GetWindowHandle(). #include "DolphinWX/WXInputBase.h" #include "DolphinWX/WxUtils.h" -#include "Core/BootManager.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/Host.h" -#include "Core/Movie.h" -#include "Core/State.h" -#include "Core/HW/CPU.h" -#include "Core/HW/DVDInterface.h" -#include "Core/HW/GCPad.h" -#include "Core/HW/ProcessorInterface.h" -#include "Core/HW/Wiimote.h" -//#include "IPC_HLE/WII_IPC_HLE_Device_FileIO.h" -#include "Core/IPC_HLE/WII_IPC_HLE_Device_usb.h" -#include "Core/PowerPC/PowerPC.h" -#include "Core/VolumeHandler.h" -#include "DiscIO/NANDContentLoader.h" +#include "VideoCommon/VideoBackendBase.h" #ifdef _WIN32 #ifndef SM_XVIRTUALSCREEN @@ -78,7 +80,7 @@ Core::GetWindowHandle(). // Resources extern "C" { -#include "DolphinWX/resources/Dolphin.c" // Dolphin icon +#include "DolphinWX/resources/Dolphin.c" // NOLINT: Dolphin icon }; bool confirmStop = false; diff --git a/Source/Core/DolphinWX/GLInterface/AGL.cpp b/Source/Core/DolphinWX/GLInterface/AGL.cpp index 4f57c1e9b2..b8e157d819 100644 --- a/Source/Core/DolphinWX/GLInterface/AGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/AGL.cpp @@ -7,8 +7,8 @@ #include "Core/ConfigManager.h" #include "Core/Host.h" -#include "DolphinWX/GLInterface/GLInterface.h" #include "DolphinWX/GLInterface/AGL.h" +#include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinWX/GLInterface/EGL.cpp b/Source/Core/DolphinWX/GLInterface/EGL.cpp index 071fce2cc9..1e75df1c80 100644 --- a/Source/Core/DolphinWX/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/GLInterface/EGL.cpp @@ -3,8 +3,8 @@ // Refer to the license.txt file included. #include "Core/Host.h" -#include "DolphinWX/GLInterface/GLInterface.h" #include "DolphinWX/GLInterface/EGL.h" +#include "DolphinWX/GLInterface/GLInterface.h" #include "VideoCommon/RenderBase.h" // Show the current FPS diff --git a/Source/Core/DolphinWX/GLInterface/GLX.h b/Source/Core/DolphinWX/GLInterface/GLX.h index 6f6a027ad2..3b6639553c 100644 --- a/Source/Core/DolphinWX/GLInterface/GLX.h +++ b/Source/Core/DolphinWX/GLInterface/GLX.h @@ -4,8 +4,8 @@ #pragma once -#include "DolphinWX/GLInterface/X11_Util.h" #include "DolphinWX/GLInterface/InterfaceBase.h" +#include "DolphinWX/GLInterface/X11_Util.h" class cInterfaceGLX : public cInterfaceBase { diff --git a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h index af18fb0e70..9025e00505 100644 --- a/Source/Core/DolphinWX/GLInterface/Wayland_Util.h +++ b/Source/Core/DolphinWX/GLInterface/Wayland_Util.h @@ -5,8 +5,8 @@ #pragma once #include -#include #include +#include #include #define MOD_SHIFT_MASK 0x01 diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.h b/Source/Core/DolphinWX/GLInterface/X11_Util.h index 94ebce38f1..6294df5f9e 100644 --- a/Source/Core/DolphinWX/GLInterface/X11_Util.h +++ b/Source/Core/DolphinWX/GLInterface/X11_Util.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include #if USE_EGL diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 169dc6926f..800cee9694 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -2,13 +2,12 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include -#include -#include - #include #include #include +#include +#include +#include #include "Common/CDUtils.h" #include "Common/FileSearch.h" @@ -19,26 +18,24 @@ #include "Core/Core.h" #include "Core/HW/DVDInterface.h" #include "DiscIO/Blob.h" - #include "DolphinWX/GameListCtrl.h" #include "DolphinWX/Globals.h" #include "DolphinWX/ISOProperties.h" #include "DolphinWX/Main.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/resources/Flag_Europe.xpm" -#include "DolphinWX/resources/Flag_Germany.xpm" #include "DolphinWX/resources/Flag_France.xpm" +#include "DolphinWX/resources/Flag_Germany.xpm" #include "DolphinWX/resources/Flag_Italy.xpm" #include "DolphinWX/resources/Flag_Japan.xpm" -#include "DolphinWX/resources/Flag_USA.xpm" -#include "DolphinWX/resources/Flag_Taiwan.xpm" #include "DolphinWX/resources/Flag_Korea.xpm" -#include "DolphinWX/resources/Flag_Unknown.xpm" #include "DolphinWX/resources/Flag_SDK.xpm" - +#include "DolphinWX/resources/Flag_Taiwan.xpm" +#include "DolphinWX/resources/Flag_Unknown.xpm" +#include "DolphinWX/resources/Flag_USA.xpm" +#include "DolphinWX/resources/Platform_Gamecube.xpm" #include "DolphinWX/resources/Platform_Wad.xpm" #include "DolphinWX/resources/Platform_Wii.xpm" -#include "DolphinWX/resources/Platform_Gamecube.xpm" #include "DolphinWX/resources/rating_gamelist.h" size_t CGameListCtrl::m_currentItem = 0; diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 0798b94c2e..f114b8f8f4 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -7,6 +7,23 @@ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "Common/Common.h" enum @@ -251,23 +268,6 @@ enum LIST_CTRL = 1000 }; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - // custom message macro #define EVT_HOST_COMMAND(id, fn) \ DECLARE_EVENT_TABLE_ENTRY(\ diff --git a/Source/Core/DolphinWX/HotkeyDlg.h b/Source/Core/DolphinWX/HotkeyDlg.h index 34e9f6088e..8ca4fc9af8 100644 --- a/Source/Core/DolphinWX/HotkeyDlg.h +++ b/Source/Core/DolphinWX/HotkeyDlg.h @@ -4,13 +4,13 @@ #pragma once -#include -#include #include -#include -#include #include +#include #include +#include +#include +#include #include "Common/Common.h" #include "Core/CoreParameter.h" diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index cdd946fc5e..e632340a6a 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -12,12 +12,9 @@ #include "Common/Common.h" #include "Common/CommonPaths.h" #include "Common/StringUtil.h" - #include "Core/ConfigManager.h" - #include "DiscIO/Filesystem.h" #include "DiscIO/VolumeCreator.h" - #include "DolphinWX/ARCodeAddEdit.h" #include "DolphinWX/GeckoCodeDiag.h" #include "DolphinWX/Globals.h" @@ -25,9 +22,9 @@ #include "DolphinWX/PatchAddEdit.h" #include "DolphinWX/PHackSettings.h" #include "DolphinWX/WxUtils.h" +#include "DolphinWX/resources/isoprop_disc.xpm" #include "DolphinWX/resources/isoprop_file.xpm" #include "DolphinWX/resources/isoprop_folder.xpm" -#include "DolphinWX/resources/isoprop_disc.xpm" struct WiiPartition { diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 05c9945120..12c709f3be 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -5,17 +5,16 @@ #pragma once #include - -#include -#include #include -#include -#include #include -#include #include -#include +#include #include +#include +#include +#include +#include +#include #include "Common/IniFile.h" #include "Core/ActionReplay.h" diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index ba49e06333..d265e87713 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -13,17 +13,16 @@ #include #include - -#include -#include -#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include #include "Common/FileSearch.h" #include "InputCommon/ControllerEmu.h" diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 02c5febd5e..97cded8c3b 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include "Common/Common.h" #include "Common/CommonPaths.h" @@ -26,8 +28,6 @@ #include "VideoCommon/VideoBackendBase.h" -#include - #if defined HAVE_X11 && HAVE_X11 #include #endif @@ -74,7 +74,6 @@ BEGIN_EVENT_TABLE(DolphinApp, wxApp) EVT_END_SESSION(DolphinApp::OnEndSession) END_EVENT_TABLE() -#include bool wxMsgAlert(const char*, const char*, bool, int); std::string wxStringTranslator(const char *); diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index d235a8a283..7f49b1dc28 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -14,38 +14,36 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include -#include -#include - -#include "Common.h" -#include "FileUtil.h" - -#include "Core.h" -#include "Host.h" -#include "CPUDetect.h" -#include "Thread.h" - -#include "State.h" -#include "PowerPC/PowerPC.h" -#include "HW/Wiimote.h" - -#include "VideoBackendBase.h" -#include "ConfigManager.h" -#include "LogManager.h" -#include "BootManager.h" -#include "OnScreenDisplay.h" - -// Banner loading -#include "Filesystem.h" -#include "BannerLoader.h" -#include "VolumeCreator.h" - -#include "Android/ButtonManager.h" +#include +#include +#include #include #include #include + +#include "Android/ButtonManager.h" +#include "Common/Common.h" +#include "Common/CPUDetect.h" +#include "Common/FileUtil.h" +#include "Common/LogManager.h" +#include "Common/Thread.h" +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/State.h" +#include "Core/HW/Wiimote.h" +#include "Core/PowerPC/PowerPC.h" + +// Banner loading +#include "DiscIO/BannerLoader.h" +#include "DiscIO/Filesystem.h" +#include "DiscIO/VolumeCreator.h" + +#include "VideoCommon/OnScreenDisplay.h" +#include "VideoCommon/VideoBackendBase.h" + ANativeWindow* surf; int g_width, g_height; std::string g_filename; diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 6a1629d014..ac7941d87e 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include #include -#include #include #include "Common/Common.h" @@ -13,6 +13,15 @@ #include "Common/LogManager.h" #include "Common/Thread.h" +#include "Core/BootManager.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" +#include "Core/Host.h" +#include "Core/HW/Wiimote.h" +#include "Core/PowerPC/PowerPC.h" + +#include "VideoCommon/VideoBackendBase.h" + #if HAVE_X11 #include #include "Core/State.h" @@ -28,15 +37,6 @@ #import #endif -#include "Core/BootManager.h" -#include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/Host.h" -#include "Core/HW/Wiimote.h" -#include "Core/PowerPC/PowerPC.h" - -#include "VideoCommon/VideoBackendBase.h" - bool rendererHasFocus = true; bool running = true; diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index 5e4ce3ae6e..775146f4a2 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -4,18 +4,18 @@ #pragma once -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include -#include +#include -#include "Core/HW/GCMemcard.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" +#include "Core/HW/GCMemcard.h" #undef MEMCARD_MANAGER_STYLE #define MEMCARD_MANAGER_STYLE wxCAPTION | wxSYSTEM_MENU | wxDIALOG_NO_PARENT | wxCLOSE_BOX | wxRESIZE_BORDER | wxMAXIMIZE_BOX diff --git a/Source/Core/DolphinWX/NetWindow.h b/Source/Core/DolphinWX/NetWindow.h index e24553b604..b02f735f6c 100644 --- a/Source/Core/DolphinWX/NetWindow.h +++ b/Source/Core/DolphinWX/NetWindow.h @@ -6,15 +6,14 @@ #include #include - -#include -#include -#include #include -#include +#include #include #include +#include +#include #include +#include #include "Common/CommonTypes.h" #include "Common/FifoQueue.h" diff --git a/Source/Core/DolphinWX/PHackSettings.cpp b/Source/Core/DolphinWX/PHackSettings.cpp index 9f63abbdcf..086303ebdf 100644 --- a/Source/Core/DolphinWX/PHackSettings.cpp +++ b/Source/Core/DolphinWX/PHackSettings.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "Core/ConfigManager.h" #include "Common/CommonPaths.h" +#include "Core/ConfigManager.h" #include "DolphinWX/PHackSettings.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/PHackSettings.h b/Source/Core/DolphinWX/PHackSettings.h index 737d161dca..18965b7b5f 100644 --- a/Source/Core/DolphinWX/PHackSettings.h +++ b/Source/Core/DolphinWX/PHackSettings.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "DolphinWX/ISOProperties.h" diff --git a/Source/Core/DolphinWX/PatchAddEdit.h b/Source/Core/DolphinWX/PatchAddEdit.h index f5e58d69f1..e57c80a109 100644 --- a/Source/Core/DolphinWX/PatchAddEdit.h +++ b/Source/Core/DolphinWX/PatchAddEdit.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "DolphinWX/ISOProperties.h" diff --git a/Source/Core/DolphinWX/UDPConfigDiag.h b/Source/Core/DolphinWX/UDPConfigDiag.h index f0d65168f0..97d5f04d3a 100644 --- a/Source/Core/DolphinWX/UDPConfigDiag.h +++ b/Source/Core/DolphinWX/UDPConfigDiag.h @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include #include "InputCommon/UDPWrapper.h" diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index 85c1f0cc30..fca4e1371d 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -3,20 +3,19 @@ #include #include #include - -#include -#include #include -#include -#include #include +#include #include #include #include +#include +#include +#include #include "Common/MsgHandler.h" -#include "Core/Core.h" #include "Core/ConfigManager.h" +#include "Core/Core.h" #include "DolphinWX/WxUtils.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp index 7338a48ca0..2de3bf05a9 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp @@ -1,8 +1,8 @@ -#include "DolphinWX/Frame.h" -#include "DolphinWX/WiimoteConfigDiag.h" #include "Core/NetPlayProto.h" #include "Core/HW/Wiimote.h" #include "Core/HW/WiimoteReal/WiimoteReal.h" +#include "DolphinWX/Frame.h" +#include "DolphinWX/WiimoteConfigDiag.h" WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin) : wxDialog(parent, -1, _("Dolphin Wiimote Configuration"), wxDefaultPosition, wxDefaultSize) diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.h b/Source/Core/DolphinWX/WiimoteConfigDiag.h index 84262afc5b..5ae4d88dfd 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.h +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.h @@ -1,17 +1,16 @@ #pragma once #include - -#include -#include -#include #include -#include -#include #include +#include +#include #include #include #include +#include +#include +#include #include "Core/ConfigManager.h" #include "Core/HW/Wiimote.h" diff --git a/Source/Core/DolphinWX/WxUtils.cpp b/Source/Core/DolphinWX/WxUtils.cpp index 72a9e81542..a7ad6d4852 100644 --- a/Source/Core/DolphinWX/WxUtils.cpp +++ b/Source/Core/DolphinWX/WxUtils.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include #include +#include #include "Common/Common.h" #include "DolphinWX/WxUtils.h" diff --git a/Source/Core/DolphinWX/X11Utils.cpp b/Source/Core/DolphinWX/X11Utils.cpp index 7830b38db2..8b9971d96f 100644 --- a/Source/Core/DolphinWX/X11Utils.cpp +++ b/Source/Core/DolphinWX/X11Utils.cpp @@ -2,17 +2,18 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "DolphinWX/X11Utils.h" - #include -#include #include +#include + +#include "DolphinWX/X11Utils.h" extern char **environ; #if defined(HAVE_WX) && HAVE_WX -#include #include +#include + #include "DolphinWX/WxUtils.h" #endif diff --git a/Source/Core/DolphinWX/X11Utils.h b/Source/Core/DolphinWX/X11Utils.h index c5c84e902c..8139e26884 100644 --- a/Source/Core/DolphinWX/X11Utils.h +++ b/Source/Core/DolphinWX/X11Utils.h @@ -4,29 +4,28 @@ #pragma once -#include "Common/Common.h" - -#include "Core/Core.h" -#include "Core/ConfigManager.h" - // HACK: Xlib.h (included from gtk/gdk headers and directly) uses #defines on // common names such as "Status", "BadRequest" or "Response", causing SFML // headers to be completely broken. // // We work around that issue by including SFML first before X11 headers. This // is terrible, but such is the life with Xlib. -#include +#include // NOLINT #if defined(HAVE_WX) && HAVE_WX -#include #include #include +#include #endif -#include #if defined(HAVE_XRANDR) && HAVE_XRANDR #include #endif +#include + +#include "Common/Common.h" +#include "Core/ConfigManager.h" +#include "Core/Core.h" // EWMH state actions, see