Include the matching header first in .cpp files

This helps ensure that the headers are complete.  I haven't tested
building for non-Linux platforms at this time.

diff --git a/source/graphics/android/display.cpp b/source/graphics/android/display.cpp
index bd2cf273bb93514a9cd9dd14d89ff67c3f6ab19b..d62c877ba9e52bd6ca6e7cf64404a0265a25c9c6 100644 (file)
--- a/source/graphics/android/display.cpp
+++ b/source/graphics/android/display.cpp
@@ -1,7 +1,7 @@
-#include <msp/core/application.h>
-#include <msp/core/mainthread.h>
 #include "display.h"
 #include "display_private.h"
+#include <msp/core/application.h>
+#include <msp/core/mainthread.h>
 
 using namespace std;
 

diff --git a/source/graphics/android/window.cpp b/source/graphics/android/window.cpp
index be1441adcb9ad68ab7e320a8fdc0c99ce15a3ffc..301af2a0533b112476c06b10412daa12594a457c 100644 (file)
--- a/source/graphics/android/window.cpp
+++ b/source/graphics/android/window.cpp
@@ -1,7 +1,7 @@
-#include "display.h"
-#include "display_private.h"
 #include "window.h"
 #include "window_private.h"
+#include "display.h"
+#include "display_private.h"
 
 using namespace std;
 

diff --git a/source/graphics/bmploader.cpp b/source/graphics/bmploader.cpp
index a3394635611ad93254727fbcae46b508ca54322e..582edc6d233afb952eb542aa9cedbec8cb648805 100644 (file)
--- a/source/graphics/bmploader.cpp
+++ b/source/graphics/bmploader.cpp
@@ -1,5 +1,5 @@
-#include <msp/core/inttypes.h>
 #include "bmploader.h"
+#include <msp/core/inttypes.h>
 
 using namespace std;
 

diff --git a/source/graphics/cgl/glcontext.cpp b/source/graphics/cgl/glcontext.cpp
index 02c4d4421a4b0716cc75fb0bcd13d7520ec6a049..d05364e62e2cb3b912d2686f986da1070dc31c84 100644 (file)
--- a/source/graphics/cgl/glcontext.cpp
+++ b/source/graphics/cgl/glcontext.cpp
@@ -1,8 +1,8 @@
+#include "glcontext.h"
 #include <vector>
 #include <OpenGL/gl.h>
 #include "cocoaglcontext.h"
 #include "cocoapixelformat.h"
-#include "glcontext.h"
 #include "window_private.h"
 
 using namespace std;

diff --git a/source/graphics/cocoa/display.cpp b/source/graphics/cocoa/display.cpp
index 31aa9a2a7fdc231462d8085bc2351b9e3d8e6443..367691e222a37ff724af1cd3b87250bf27c027dc 100644 (file)
--- a/source/graphics/cocoa/display.cpp
+++ b/source/graphics/cocoa/display.cpp
@@ -1,7 +1,7 @@
-#include <stdexcept>
-#include "cocoadisplay.h"
 #include "display.h"
 #include "display_private.h"
+#include <stdexcept>
+#include "cocoadisplay.h"
 
 using namespace std;
 

diff --git a/source/graphics/cocoa/errordialog.cpp b/source/graphics/cocoa/errordialog.cpp
index e923586cf2029270e5811c3ce41fa9f7a878f690..5eab7a4faafd4fbe0d3e7807b040d90c1acbb540 100644 (file)
--- a/source/graphics/cocoa/errordialog.cpp
+++ b/source/graphics/cocoa/errordialog.cpp
@@ -1,8 +1,8 @@
+#include "errordialog.h"
 #include <typeinfo>
 #include <msp/core/application.h>
 #include <msp/debug/demangle.h>
 #include "cocoaerrordialog.h"
-#include "errordialog.h"
 
 using namespace std;
 

diff --git a/source/graphics/cocoa/window.cpp b/source/graphics/cocoa/window.cpp
index 796e9695f8d16134abb77c063f4a0381c1aa6984..f372aac3f3741dc062a0447240f8f3b6cea68f27 100644 (file)
--- a/source/graphics/cocoa/window.cpp
+++ b/source/graphics/cocoa/window.cpp
@@ -1,9 +1,9 @@
+#include "window.h"
+#include "window_private.h"
 #include "cocoadisplay.h"
 #include "cocoawindow.h"
 #include "display.h"
 #include "display_private.h"
-#include "window.h"
-#include "window_private.h"
 
 namespace Msp {
 namespace Graphics {

diff --git a/source/graphics/devil/devilloader.cpp b/source/graphics/devil/devilloader.cpp
index d4c7bfffbcc3d11f21e60709c02e00065c442628..34e37ceeacefd865288622ed00d1532679ca74d6 100644 (file)
--- a/source/graphics/devil/devilloader.cpp
+++ b/source/graphics/devil/devilloader.cpp
@@ -1,7 +1,7 @@
+#include "devilloader.h"
 #include <algorithm>
 #include <msp/strings/format.h>
 #include <IL/il.h>
-#include "devilloader.h"
 
 using namespace std;
 

diff --git a/source/graphics/display.cpp b/source/graphics/display.cpp
index f40e02e572f6f7965d17e2a2fcadaf8173a00fa7..92e341aed334b25fa283197d39e2e20dc3766f1e 100644 (file)
--- a/source/graphics/display.cpp
+++ b/source/graphics/display.cpp
@@ -1,6 +1,6 @@
+#include "display.h"
 #include <cmath>
 #include <sigc++/bind.h>
-#include "display.h"
 #include "display_private.h"
 #include "window.h"
 

diff --git a/source/graphics/egl_android/glcontext.cpp b/source/graphics/egl_android/glcontext.cpp
index 7853b217a36df35e76862f5511836786133b0038..26a4063964ab937c436a2e11dd1c5e81c90dd2b6 100644 (file)
--- a/source/graphics/egl_android/glcontext.cpp
+++ b/source/graphics/egl_android/glcontext.cpp
@@ -1,9 +1,9 @@
+#include "glcontext.h"
 #include <vector>
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
 #include <android/native_window.h>
 #include "display.h"
-#include "glcontext.h"
 #include "window_private.h"
 
 using namespace std;

diff --git a/source/graphics/glcontext.cpp b/source/graphics/glcontext.cpp
index ec073cb79c2c9928fc6dece00604807f2aa540dc..16c1a5590663078c035162cabb56bca1af40ea4e 100644 (file)
--- a/source/graphics/glcontext.cpp
+++ b/source/graphics/glcontext.cpp
@@ -1,6 +1,6 @@
+#include "glcontext.h"
 #include <stdexcept>
 #include <msp/strings/format.h>
-#include "glcontext.h"
 #include "window.h"
 
 using namespace std;

diff --git a/source/graphics/glx/glcontext.cpp b/source/graphics/glx/glcontext.cpp
index 34daa08d1ce1e022648626ac9279d1ab771e7f2a..6859e3e1b3ab105fb314ac12690beef83c622fbc 100644 (file)
--- a/source/graphics/glx/glcontext.cpp
+++ b/source/graphics/glx/glcontext.cpp
@@ -1,10 +1,10 @@
+#include "glcontext.h"
 #include <set>
 #include <vector>
 #include <GL/glx.h>
 #include <GL/glxext.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
-#include "glcontext.h"
 #include "display_private.h"
 #include "window_private.h"
 

diff --git a/source/graphics/image.cpp b/source/graphics/image.cpp
index 2835d05e872936d0cc069fa806812ff3ab952661..2903d499f75cfcb815a02f48de869b875bff54ef 100644 (file)
--- a/source/graphics/image.cpp
+++ b/source/graphics/image.cpp
@@ -1,8 +1,8 @@
+#include "image.h"
 #include <msp/core/refptr.h>
 #include <msp/fs/utils.h>
 #include <msp/io/file.h>
 #include <msp/io/memory.h>
-#include "image.h"
 #include "imageloader.h"
 
 using namespace std;

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index 9b8a42def04a6928162000a967bbefe2e71cb226..0746f6fdef5c3bfe07ed486567622996a30033ea 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,9 +1,9 @@
+#include "imageloader.h"
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "bmploader.h"
-#include "imageloader.h"
 #ifdef WITH_LIBPNG
 #include "png/pngloader.h"
 #endif

diff --git a/source/graphics/jpeg/jpegloader.cpp b/source/graphics/jpeg/jpegloader.cpp
index 45689cf65725a032b3020ed62d546be46db4b345..a38cca5ac108a7c1b785dcc405ea45f43299f42d 100644 (file)
--- a/source/graphics/jpeg/jpegloader.cpp
+++ b/source/graphics/jpeg/jpegloader.cpp
@@ -1,7 +1,7 @@
+#include "jpegloader.h"
 #include <stdio.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include "jpegloader.h"
 
 using namespace std;
 

diff --git a/source/graphics/png/pngloader.cpp b/source/graphics/png/pngloader.cpp
index 1dfa77362d2111d88153003f30155a8ff56edd59..aae7015bddf0a49672682e61e1c60ac645a16bdb 100644 (file)
--- a/source/graphics/png/pngloader.cpp
+++ b/source/graphics/png/pngloader.cpp
@@ -1,5 +1,5 @@
-#include <png.h>
 #include "pngloader.h"
+#include <png.h>
 
 using namespace std;
 

diff --git a/source/graphics/quartz/quartzloader.cpp b/source/graphics/quartz/quartzloader.cpp
index 3799bcde6681fe7ccac941f43bc179ceb70392b2..9a74862c590d04b53b0548f5a38b05742e91369c 100644 (file)
--- a/source/graphics/quartz/quartzloader.cpp
+++ b/source/graphics/quartz/quartzloader.cpp
@@ -1,8 +1,6 @@
+#include "quartzloader.h"
 #include <algorithm>
 #include <ApplicationServices/ApplicationServices.h>
-// Avoid messing up sigc++ headers
-#undef nil
-#include "quartzloader.h"
 
 using namespace std;
 

diff --git a/source/graphics/videomode.cpp b/source/graphics/videomode.cpp
index b3ca948fb1f86b5161ed4fd4466eb3f3bd19ca71..dfd002ed83a54798772a8d3b43ee468e7ae00389 100644 (file)
--- a/source/graphics/videomode.cpp
+++ b/source/graphics/videomode.cpp
@@ -1,5 +1,5 @@
-#include <msp/strings/format.h>
 #include "videomode.h"
+#include <msp/strings/format.h>
 
 namespace Msp {
 namespace Graphics {

diff --git a/source/graphics/vkxlib/vulkancontext.cpp b/source/graphics/vkxlib/vulkancontext.cpp
index f25349974c8adfd3d47b1bb44ad5a1a9737d2b4f..0d332b3d25e0ccaacb751482daefff15f0ed5e62 100644 (file)
--- a/source/graphics/vkxlib/vulkancontext.cpp
+++ b/source/graphics/vkxlib/vulkancontext.cpp
@@ -1,3 +1,5 @@
+#include "vulkancontext.h"
+#include "vulkancontext_platform.h"
 #include <stdexcept>
 #include <vector>
 #define VK_USE_PLATFORM_XLIB_KHR
@@ -6,8 +8,6 @@
 #include <msp/debug/debugapi.h>
 #include <msp/io/print.h>
 #include "display_private.h"
-#include "vulkancontext.h"
-#include "vulkancontext_platform.h"
 #include "window_private.h"
 
 using namespace std;

diff --git a/source/graphics/vulkancontext.cpp b/source/graphics/vulkancontext.cpp
index bbf03e3f03aae421e7fa5026f4ef9456e8d18bfa..b279c94f521eefea133a66572f480f56d9d827f3 100644 (file)
--- a/source/graphics/vulkancontext.cpp
+++ b/source/graphics/vulkancontext.cpp
@@ -1,5 +1,5 @@
-#include <msp/strings/format.h>
 #include "vulkancontext.h"
+#include <msp/strings/format.h>
 #include "window.h"
 
 namespace Msp {

diff --git a/source/graphics/wgl/glcontext.cpp b/source/graphics/wgl/glcontext.cpp
index b0f685b582a835e38b9639073c6da8564b855e32..5f9ae42bc777486660a9c375a94428df769ce804 100644 (file)
--- a/source/graphics/wgl/glcontext.cpp
+++ b/source/graphics/wgl/glcontext.cpp
@@ -1,10 +1,10 @@
+#include "glcontext.h"
 #include <vector>
 #include <windows.h>
 #include <GL/gl.h>
 #include <GL/wglext.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
-#include "glcontext.h"
 #include "window_private.h"
 
 using namespace std;

diff --git a/source/graphics/window.cpp b/source/graphics/window.cpp
index 6cadf3ec9f4becb047c35033b7d70be5f919a770..dde92491ee1a1ce8d3035ec7d3bbeaf2dc0ba3ca 100644 (file)
--- a/source/graphics/window.cpp
+++ b/source/graphics/window.cpp
@@ -1,7 +1,7 @@
-#include <msp/core/application.h>
-#include "display.h"
 #include "window.h"
 #include "window_private.h"
+#include <msp/core/application.h>
+#include "display.h"
 
 using namespace std;
 

diff --git a/source/graphics/windows/display.cpp b/source/graphics/windows/display.cpp
index b5f97ad56cee2a4beda4ea0c1f776d55bd23d263..d71f81bbfb49857f268fca12681785e009f02693 100644 (file)
--- a/source/graphics/windows/display.cpp
+++ b/source/graphics/windows/display.cpp
@@ -1,6 +1,6 @@
-#include <windows.h>
 #include "display.h"
 #include "display_private.h"
+#include <windows.h>
 
 using namespace std;
 

diff --git a/source/graphics/windows/errordialog.cpp b/source/graphics/windows/errordialog.cpp
index 7ff4d2552c21cd86734602df8aae044c403594dc..aa05eba3c36ac22359c56c4f88657b3c55b240a4 100644 (file)
--- a/source/graphics/windows/errordialog.cpp
+++ b/source/graphics/windows/errordialog.cpp
@@ -1,7 +1,7 @@
+#include "errordialog.h"
 #include <windows.h>
 #include <typeinfo>
 #include <msp/debug/demangle.h>
-#include "errordialog.h"
 
 using namespace std;
 

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 38e7f730cd5bc6341aaeb00c30ae92fefa4d0374..a92281de8954545d154f242904b68815d838a39c 100644 (file)
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -1,9 +1,9 @@
 #define _WIN32_WINNT 0x0601
+#include "window.h"
+#include "window_private.h"
 #include <windowsx.h>
 #include <msp/core/application.h>
 #include <msp/core/systemerror.h>
-#include "window.h"
-#include "window_private.h"
 
 using namespace std;
 

diff --git a/source/graphics/x11/display.cpp b/source/graphics/x11/display.cpp
index 949509ff52ac62b5a3e3c3a5df20b4c2e19fc1fb..8209deb9848d89538f64feb7abadc9b33c360c6f 100644 (file)
--- a/source/graphics/x11/display.cpp
+++ b/source/graphics/x11/display.cpp
@@ -1,3 +1,5 @@
+#include "display.h"
+#include "display_private.h"
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #ifdef WITH_XRANDR
@@ -6,8 +8,6 @@
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
-#include "display.h"
-#include "display_private.h"
 
 using namespace std;
 

diff --git a/source/graphics/x11/window.cpp b/source/graphics/x11/window.cpp
index 825c049055db86ff31ae7c099b6cedcfecc82e50..fb77c324ecec50477fa333de77bd11aa1446f852 100644 (file)
--- a/source/graphics/x11/window.cpp
+++ b/source/graphics/x11/window.cpp
@@ -1,10 +1,10 @@
+#include "window.h"
+#include "window_private.h"
 #include <vector>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include <msp/core/systemerror.h>
 #include "display_private.h"
-#include "window.h"
-#include "window_private.h"
 
 using namespace std;
 

diff --git a/source/input/android/keyboard.cpp b/source/input/android/keyboard.cpp
index 631b04853f56b896f24addb17033277abe818663..01a5ae1f3cbd0da80bde04b612fc308d81c7609d 100644 (file)
--- a/source/input/android/keyboard.cpp
+++ b/source/input/android/keyboard.cpp
@@ -1,6 +1,6 @@
+#include "keyboard.h"
 #include <android/input.h>
 #include <msp/graphics/window_private.h>
-#include "keyboard.h"
 #include "keys_private.h"
 
 using namespace std;

diff --git a/source/input/android/keys.cpp b/source/input/android/keys.cpp
index 0ed9051f51f56f160a70db8907c3ca29878de136..289fc864ef23e80ca7ad6c2074982bef6bcad571 100644 (file)
--- a/source/input/android/keys.cpp
+++ b/source/input/android/keys.cpp
@@ -1,5 +1,5 @@
-#include <android/keycodes.h>
 #include "keys.h"
+#include <android/keycodes.h>
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/android/mouse.cpp b/source/input/android/mouse.cpp
index 6769d78f8402cd3765dd26e8324322cfd1c3aeed..5c6b72a8eb8fe401b8c3ac523f655d3003ff8182 100644 (file)
--- a/source/input/android/mouse.cpp
+++ b/source/input/android/mouse.cpp
@@ -1,6 +1,6 @@
+#include "mouse.h"
 #include <msp/graphics/window_private.h>
 #include "keys.h"
-#include "mouse.h"
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/android/touchscreen.cpp b/source/input/android/touchscreen.cpp
index 4e443b5e0529eda29fd4a7064cbf8456b245100b..ac205386ee0781f952ec40d5d68d57a95d07829e 100644 (file)
--- a/source/input/android/touchscreen.cpp
+++ b/source/input/android/touchscreen.cpp
@@ -1,5 +1,5 @@
-#include <msp/graphics/window_private.h>
 #include "touchscreen.h"
+#include <msp/graphics/window_private.h>
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/bindings.cpp b/source/input/bindings.cpp
index d6317d8627bdbffe0e2f31447a8dd1668697b908..1c58816ea82a8d636f65d50e21591476c130a561 100644 (file)
--- a/source/input/bindings.cpp
+++ b/source/input/bindings.cpp
@@ -1,6 +1,6 @@
+#include "bindings.h"
 #include <algorithm>
 #include <msp/strings/format.h>
-#include "bindings.h"
 #include "controlscheme.h"
 
 using namespace std;

diff --git a/source/input/cocoa/keyboard.cpp b/source/input/cocoa/keyboard.cpp
index db097aaaa67d9a93c98b1e46f8b177d7256e5fdc..e4f297cdecbb3f9db5a564dae769bc1930a28274 100644 (file)
--- a/source/input/cocoa/keyboard.cpp
+++ b/source/input/cocoa/keyboard.cpp
@@ -1,5 +1,5 @@
-#include <msp/graphics/window_private.h>
 #include "keyboard.h"
+#include <msp/graphics/window_private.h>
 #include "keys_private.h"
 
 using namespace std;

diff --git a/source/input/cocoa/mouse.cpp b/source/input/cocoa/mouse.cpp
index abda35c65e5c3808c98bb448a6114b3257df6dae..f9df53364630767c1b1655566db275b8883b34e1 100644 (file)
--- a/source/input/cocoa/mouse.cpp
+++ b/source/input/cocoa/mouse.cpp
@@ -1,6 +1,6 @@
+#include "mouse.h"
 #include <msp/graphics/window_private.h>
 #include "keys.h"
-#include "mouse.h"
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/control.cpp b/source/input/control.cpp
index 3e2398d15860471dd8dc8eee9cad89ce1596e9c5..f82b9c38cd1946ada7cf0d749b0bae8aa7d5309e 100644 (file)
--- a/source/input/control.cpp
+++ b/source/input/control.cpp
@@ -1,7 +1,7 @@
+#include "control.h"
 #include <sigc++/bind_return.h>
 #include <msp/strings/lexicalcast.h>
 #include "binarycontrol.h"
-#include "control.h"
 #include "device.h"
 
 using namespace std;

diff --git a/source/input/controlscheme.cpp b/source/input/controlscheme.cpp
index 4e5e8deba376c109ea693aebd464d3924d9defe2..515d1de6a5ad5b2590b2a6533ed1996d5eeb4911 100644 (file)
--- a/source/input/controlscheme.cpp
+++ b/source/input/controlscheme.cpp
@@ -1,6 +1,6 @@
+#include "controlscheme.h"
 #include <msp/core/maputils.h>
 #include "control.h"
-#include "controlscheme.h"
 
 using namespace std;
 

diff --git a/source/input/device.cpp b/source/input/device.cpp
index d5b3b864af3c854d42de216196ab42a17952a364..87102f6513453e84a07bf362e8513e35c032c5ea 100644 (file)
--- a/source/input/device.cpp
+++ b/source/input/device.cpp
@@ -1,5 +1,5 @@
-#include <msp/strings/format.h>
 #include "device.h"
+#include <msp/strings/format.h>
 
 using namespace std;
 

diff --git a/source/input/generic/gamecontroller.cpp b/source/input/generic/gamecontroller.cpp
index 8f14e02d92d8ded287de3713e30b04d31d590652..1d97e42c290634c9901b7085e3ebb719fa7c6011 100644 (file)
--- a/source/input/generic/gamecontroller.cpp
+++ b/source/input/generic/gamecontroller.cpp
@@ -1,5 +1,5 @@
-#include <stdexcept>
 #include "gamecontroller.h"
+#include <stdexcept>
 
 using namespace std;
 

diff --git a/source/input/gesturedetector.cpp b/source/input/gesturedetector.cpp
index d53c07f7c47c827142513a0e148f776536dbd039..f6678e8156a2ab8af4a4cf613a39a3d07d5e1f75 100644 (file)
--- a/source/input/gesturedetector.cpp
+++ b/source/input/gesturedetector.cpp
@@ -1,7 +1,7 @@
+#include "gesturedetector.h"
 #define _USE_MATH_DEFINES
 #include <cmath>
 #include <sigc++/bind_return.h>
-#include "gesturedetector.h"
 #include "touchscreen.h"
 
 using namespace std;

diff --git a/source/input/hub.cpp b/source/input/hub.cpp
index 79b42aaaf65c87294401b397889ed63f581d1a52..532512267a10f7ce4041921f49d12d76e058fad3 100644 (file)
--- a/source/input/hub.cpp
+++ b/source/input/hub.cpp
@@ -1,9 +1,9 @@
+#include "hub.h"
 #include <stdexcept>
 #include <sigc++/bind.h>
 #include <sigc++/bind_return.h>
 #include <msp/core/hash.h>
 #include <msp/core/maputils.h>
-#include "hub.h"
 
 using namespace std;
 

diff --git a/source/input/keyboard.cpp b/source/input/keyboard.cpp
index 30a6145618090ea75801f8cceb994ad4bb3f9a9d..a79f0041c615b73250ca6a0b864188426d88f611 100644 (file)
--- a/source/input/keyboard.cpp
+++ b/source/input/keyboard.cpp
@@ -1,5 +1,5 @@
-#include <msp/graphics/window.h>
 #include "keyboard.h"
+#include <msp/graphics/window.h>
 #include "keys.h"
 
 namespace Msp {

diff --git a/source/input/keys.cpp b/source/input/keys.cpp
index f1324a0a82ed338cf9548beb2f227bb4ef2dd4d1..9b3349ac443346ca6e6e5e5867a9c9434e74cc54 100644 (file)
--- a/source/input/keys.cpp
+++ b/source/input/keys.cpp
@@ -1,7 +1,7 @@
+#include "keys.h"
 #include <map>
 #include <stdexcept>
 #include <msp/strings/format.h>
-#include "keys.h"
 
 using namespace std;
 

diff --git a/source/input/linux/gamecontroller.cpp b/source/input/linux/gamecontroller.cpp
index 58e4ef17325d2aa8d3b0a22447ccae4b30ac86da..c6b17c8541bc3c22703cb7b808b7099480cbed50 100644 (file)
--- a/source/input/linux/gamecontroller.cpp
+++ b/source/input/linux/gamecontroller.cpp
@@ -1,3 +1,5 @@
+#include "gamecontroller.h"
+#include "gamecontroller_platform.h"
 #include <fcntl.h>
 #include <linux/joystick.h>
 #include <msp/core/algorithm.h>
@@ -5,8 +7,6 @@
 #include <msp/fs/dir.h>
 #include <msp/io/handle_private.h>
 #include <msp/strings/format.h>
-#include "gamecontroller.h"
-#include "gamecontroller_platform.h"
 
 using namespace std;
 

diff --git a/source/input/mouse.cpp b/source/input/mouse.cpp
index 937a89ea6aa3fbe52cac884de1827904785bf375..e379576363a3d29bff734fcf341036334e89c035 100644 (file)
--- a/source/input/mouse.cpp
+++ b/source/input/mouse.cpp
@@ -1,6 +1,6 @@
+#include "mouse.h"
 #include <msp/graphics/window.h>
 #include "keys.h"
-#include "mouse.h"
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/smoothcontrol.cpp b/source/input/smoothcontrol.cpp
index 3218753157628fc477c968acaa7a692673913b1d..c9d0a3c5d69b8b3b0cce4e7720ca9a4303c6c0bb 100644 (file)
--- a/source/input/smoothcontrol.cpp
+++ b/source/input/smoothcontrol.cpp
@@ -1,5 +1,5 @@
-#include <stdexcept>
 #include "smoothcontrol.h"
+#include <stdexcept>
 
 using namespace std;
 

diff --git a/source/input/windows/gamecontroller.cpp b/source/input/windows/gamecontroller.cpp
index 1d06bfea2fa3652474959682be793f987907b74e..9c6853a41bd15095cbc23d69ba651ce26459f6ec 100644 (file)
--- a/source/input/windows/gamecontroller.cpp
+++ b/source/input/windows/gamecontroller.cpp
@@ -1,7 +1,7 @@
-#include <msp/core/application.h>
-#include <msp/strings/format.h>
 #include "gamecontroller.h"
 #include "gamecontroller_platform.h"
+#include <msp/core/application.h>
+#include <msp/strings/format.h>
 
 using namespace std;
 

diff --git a/source/input/windows/keyboard.cpp b/source/input/windows/keyboard.cpp
index 690ba3a05e7b0e657f59d278dd3c3feee3ddd844..47f2256a20b3eb9f534b84f1b212f3616bad3ba4 100644 (file)
--- a/source/input/windows/keyboard.cpp
+++ b/source/input/windows/keyboard.cpp
@@ -1,6 +1,6 @@
+#include "keyboard.h"
 #include <windows.h>
 #include <msp/graphics/window_private.h>
-#include "keyboard.h"
 #include "keys.h"
 #include "keys_private.h"
 

diff --git a/source/input/windows/keys.cpp b/source/input/windows/keys.cpp
index e4cd0dc9dc9468f61b118dd21de1854104e8b982..9f81dc34df20058c0ea263de6ec8bf93cd355c13 100644 (file)
--- a/source/input/windows/keys.cpp
+++ b/source/input/windows/keys.cpp
@@ -1,5 +1,5 @@
-#include <windows.h>
 #include "keys.h"
+#include <windows.h>
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/windows/mouse.cpp b/source/input/windows/mouse.cpp
index c9cb8a1489b993ca2e553c2d07b10dfe6d678a8f..e5b358213eb2d74477502ab6532f530e4e0f6630 100644 (file)
--- a/source/input/windows/mouse.cpp
+++ b/source/input/windows/mouse.cpp
@@ -1,7 +1,7 @@
+#include "mouse.h"
 #include <windowsx.h>
 #include <msp/graphics/window_private.h>
 #include "keys.h"
-#include "mouse.h"
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/windows/touchscreen.cpp b/source/input/windows/touchscreen.cpp
index ce8e5a2f71270c2278e97a6aba799c985d173907..5820bdad5a7fa25f9f1172e20eee3abce95456ca 100644 (file)
--- a/source/input/windows/touchscreen.cpp
+++ b/source/input/windows/touchscreen.cpp
@@ -1,7 +1,7 @@
 #define _WIN32_WINNT 0x0601
+#include "touchscreen.h"
 #include <windows.h>
 #include <msp/graphics/window_private.h>
-#include "touchscreen.h"
 
 using namespace std;
 

diff --git a/source/input/x11/keyboard.cpp b/source/input/x11/keyboard.cpp
index 68247e4d3cd413880665b204a323818f39a10478..ed959dafe40e9fb643202a2fc7eea0bb9b9b4e2d 100644 (file)
--- a/source/input/x11/keyboard.cpp
+++ b/source/input/x11/keyboard.cpp
@@ -1,7 +1,7 @@
+#include "keyboard.h"
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <msp/graphics/window_private.h>
-#include "keyboard.h"
 #include "keys.h"
 #include "keys_private.h"
 

diff --git a/source/input/x11/keys.cpp b/source/input/x11/keys.cpp
index 1f0e509c75f5a3a20ca7aacc7edd47fdb0741976..ff7be19f86560108a5ee367c2c0184a57fca8c8e 100644 (file)
--- a/source/input/x11/keys.cpp
+++ b/source/input/x11/keys.cpp
@@ -1,6 +1,6 @@
+#include "keys.h"
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
-#include "keys.h"
 
 namespace Msp {
 namespace Input {

diff --git a/source/input/x11/mouse.cpp b/source/input/x11/mouse.cpp
index b8a771786a901a73a6dd8bc2a5d238b1c0b04ba9..84d1ea9f8b76b88e586a8ee1a0bb823c39394809 100644 (file)
--- a/source/input/x11/mouse.cpp
+++ b/source/input/x11/mouse.cpp
@@ -1,6 +1,6 @@
+#include "mouse.h"
 #include <msp/graphics/window_private.h>
 #include "keys.h"
-#include "mouse.h"
 
 namespace Msp {
 namespace Input {