Fix more header sorting issues in DolphinWX/ (now check-includes clean).

Source/Core/DolphinWX/ARCodeAddEdit.h

@@ -4,8 +4,9 @@
 
 #pragma once
 
-#include <wx/wx.h>
 #include <wx/spinctrl.h>
+#include <wx/wx.h>
+
 #include "DolphinWX/ISOProperties.h"
 
 class CARCodeAddEdit : public wxDialog

Source/Core/DolphinWX/AboutDolphin.h

@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include <wx/wx.h>
-#include <wx/dialog.h>
 #include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/statbox.h>
+#include <wx/dialog.h>
 #include <wx/mstream.h>
 #include <wx/statbmp.h>
+#include <wx/statbox.h>
+#include <wx/stattext.h>
+#include <wx/wx.h>
 
 class AboutDolphin : public wxDialog
 {

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"

Source/Core/DolphinWX/CheatsWindow.h

@@ -4,24 +4,23 @@
 
 #pragma once
 
-#include <wx/wx.h>
-#include <wx/sizer.h>
-#include <wx/filepicker.h>
-#include <wx/statbmp.h>
-#include <wx/imaglist.h>
-#include <wx/treectrl.h>
-#include <wx/gbsizer.h>
-#include <wx/textctrl.h>
-#include <wx/notebook.h>
-#include <wx/mimetype.h>
-#include <wx/colour.h>
-#include <wx/listbox.h>
-
 #include <string>
 #include <vector>
+#include <wx/colour.h>
+#include <wx/filepicker.h>
+#include <wx/gbsizer.h>
+#include <wx/imaglist.h>
+#include <wx/listbox.h>
+#include <wx/mimetype.h>
+#include <wx/notebook.h>
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/textctrl.h>
+#include <wx/treectrl.h>
+#include <wx/wx.h>
 
-#include "Core/ActionReplay.h"
 #include "Common/IniFile.h"
+#include "Core/ActionReplay.h"
 #include "DiscIO/Filesystem.h"
 #include "DolphinWX/GeckoCodeDiag.h"
 

Source/Core/DolphinWX/ConfigMain.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include <wx/wx.h>
+#include <wx/filepicker.h>
 #include <wx/gbsizer.h>
+#include <wx/notebook.h>
 #include <wx/spinbutt.h>
 #include <wx/spinctrl.h>
-#include <wx/notebook.h>
-#include <wx/filepicker.h>
+#include <wx/wx.h>
 
 #include "Core/ConfigManager.h"
 #if defined(HAVE_XRANDR) && HAVE_XRANDR

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)

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,

Source/Core/DolphinWX/Debugger/BreakpointWindow.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <wx/wx.h>
 #include <wx/listctrl.h>
+#include <wx/wx.h>
 #include <wx/aui/aui.h>
 
 class CBreakPointView;

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
 }
 
 // -------

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"

Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp

@@ -2,10 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <sstream>
-
 #include <wx/artprov.h>
 
 #include "Common/Common.h"

Source/Core/DolphinWX/Debugger/DSPDebugWindow.h

@@ -10,15 +10,14 @@
 #include <list>
 #include <map>
 #include <vector>
-
-#include <wx/wx.h>
 #include <wx/button.h>
 #include <wx/frame.h>
 #include <wx/listctrl.h>
-#include <wx/statbox.h>
-#include <wx/stattext.h>
 #include <wx/sizer.h>
+#include <wx/statbox.h>
 #include <wx/statline.h>
+#include <wx/stattext.h>
+#include <wx/wx.h>
 #include <wx/aui/aui.h>
 
 #include "Core/DSP/disassemble.h"

Source/Core/DolphinWX/Debugger/DebuggerPanel.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <wx/wx.h>
 #include <wx/notebook.h>
+#include <wx/wx.h>
 
 #include "VideoCommon/Debugger.h"
 

Source/Core/DolphinWX/Debugger/JitWindow.cpp

@@ -2,26 +2,23 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <disasm.h>        // Bochs
+#include <PowerPCDisasm.h> // Bochs
 #include <wx/button.h>
 #include <wx/listctrl.h>
 #include <wx/textctrl.h>
 #include <wx/thread.h>
 
-#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"

Source/Core/DolphinWX/Debugger/MemoryView.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include <wx/event.h>
 #include <wx/clipbrd.h>
+#include <wx/event.h>
 
 #include "Common/Common.h"
 #include "Core/Host.h"

Source/Core/DolphinWX/Debugger/MemoryWindow.cpp

@@ -3,22 +3,20 @@
 // Refer to the license.txt file included.
 
 #include <wx/button.h>
+#include <wx/listctrl.h>
 #include <wx/textctrl.h>
-#include <wx/listctrl.h>
 #include <wx/thread.h>
-#include <wx/listctrl.h>
 
 #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"

Source/Core/DolphinWX/Debugger/MemoryWindow.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <wx/dialog.h>
-#include <wx/textctrl.h>
 #include <wx/listbox.h>
+#include <wx/textctrl.h>
 
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"

Source/Core/DolphinWX/FifoPlayerDlg.cpp

@@ -4,6 +4,8 @@
 
 #include <algorithm>
 #include <vector>
+#include <wx/clipbrd.h>
+#include <wx/spinctrl.h>
 
 #include "Common/Common.h"
 #include "Common/FileUtil.h"
@@ -14,9 +16,6 @@
 #include "DolphinWX/WxUtils.h"
 #include "VideoCommon/OpcodeDecoding.h"
 
-#include <wx/spinctrl.h>
-#include <wx/clipbrd.h>
-
 DECLARE_EVENT_TYPE(RECORDING_FINISHED_EVENT, -1)
 DEFINE_EVENT_TYPE(RECORDING_FINISHED_EVENT)
 

Source/Core/DolphinWX/FifoPlayerDlg.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <vector>
-#include <wx/wx.h>
 #include <wx/notebook.h>
+#include <wx/wx.h>
 
 class wxSpinCtrl;
 class wxSpinEvent;

Source/Core/DolphinWX/Frame.cpp

@@ -13,19 +13,12 @@
 #ifdef __APPLE__
 #include <Cocoa/Cocoa.h>
 #endif
-
 #include <wx/datetime.h>
 
 #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