From 5f2f995852cfb8cd587fb58295c0982a7eab8e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Brammer?= <gbrammer@gmx.de>
Date: Tue, 1 Nov 2011 23:17:41 +0100
Subject: [PATCH] Unify the #include blocks a little bit

One line for C4Include.h, one for the .h corresponding to the .cpp, one
empty line, the other C4* includes, another empty line, external headers.
---
 src/c4group/C4ComponentHost.cpp      | 1 +
 src/c4group/c4group_ng.cpp           | 1 +
 src/config/C4Config.cpp              | 2 +-
 src/game/landscape/C4Landscape.cpp   | 2 --
 src/gui/C4GameOptions.cpp            | 1 +
 src/gui/C4GuiButton.cpp              | 1 +
 src/gui/C4GuiCheckBox.cpp            | 1 +
 src/gui/C4GuiComboBox.cpp            | 1 +
 src/gui/C4GuiEdit.cpp                | 1 +
 src/gui/C4GuiListBox.cpp             | 1 +
 src/gui/C4GuiMenu.cpp                | 1 +
 src/gui/C4GuiTabular.cpp             | 1 +
 src/gui/C4StartupMainDlg.cpp         | 2 +-
 src/gui/C4StartupNetDlg.cpp          | 2 +-
 src/gui/C4UpdateDlg.cpp              | 3 +--
 src/gui/C4Viewport.cpp               | 2 +-
 src/lib/C4Log.cpp                    | 2 +-
 src/network/C4GameControlNetwork.cpp | 2 +-
 src/network/C4Network2.cpp           | 4 +---
 src/network/C4Network2Dialogs.cpp    | 1 -
 src/network/C4Network2IRC.cpp        | 2 +-
 src/network/C4Network2ResDlg.cpp     | 4 ++--
 src/platform/C4ViewportWindow.cpp    | 2 +-
 src/platform/C4WindowGTK.cpp         | 1 -
 src/platform/C4WindowSDL.cpp         | 1 +
 src/platform/StdD3D.cpp              | 1 +
 src/platform/StdGL.cpp               | 1 +
 src/script/C4AulDebug.cpp            | 4 ++--
 28 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/c4group/C4ComponentHost.cpp b/src/c4group/C4ComponentHost.cpp
index a4f819536..0764a777c 100644
--- a/src/c4group/C4ComponentHost.cpp
+++ b/src/c4group/C4ComponentHost.cpp
@@ -25,6 +25,7 @@
 
 #include <C4Include.h>
 #include <C4ComponentHost.h>
+
 #include <C4Application.h>
 #include <StdRegistry.h>
 
diff --git a/src/c4group/c4group_ng.cpp b/src/c4group/c4group_ng.cpp
index 6ecacf136..a1946a3a5 100644
--- a/src/c4group/c4group_ng.cpp
+++ b/src/c4group/c4group_ng.cpp
@@ -42,6 +42,7 @@
 //         4.95.4 September 2005 Unix-flavour
 
 #include <C4Include.h>
+
 #include <C4Group.h>
 #include <C4Version.h>
 #include <C4Update.h>
diff --git a/src/config/C4Config.cpp b/src/config/C4Config.cpp
index e7618bdd7..2e64cb365 100644
--- a/src/config/C4Config.cpp
+++ b/src/config/C4Config.cpp
@@ -27,8 +27,8 @@
 
 #include <C4Include.h>
 #include <C4Config.h>
-#include <C4Version.h>
 
+#include <C4Version.h>
 #include <C4Log.h>
 #include <C4Components.h>
 #include <C4Network2.h>
diff --git a/src/game/landscape/C4Landscape.cpp b/src/game/landscape/C4Landscape.cpp
index 248878c4f..89641a0bc 100644
--- a/src/game/landscape/C4Landscape.cpp
+++ b/src/game/landscape/C4Landscape.cpp
@@ -39,9 +39,7 @@
 #include <C4Random.h>
 #include <C4Surface.h>
 #include <C4ToolsDlg.h>
-#ifdef DEBUGREC
 #include <C4Record.h>
-#endif
 #include <C4Material.h>
 #include <C4GameMessage.h>
 #include <C4Application.h>
diff --git a/src/gui/C4GameOptions.cpp b/src/gui/C4GameOptions.cpp
index f7391d5b5..e9668f9c5 100644
--- a/src/gui/C4GameOptions.cpp
+++ b/src/gui/C4GameOptions.cpp
@@ -22,6 +22,7 @@
 
 #include "C4Include.h"
 #include "C4GameOptions.h"
+
 #include <C4Game.h>
 #include <C4GameControl.h>
 #include "C4GraphicsResource.h"
diff --git a/src/gui/C4GuiButton.cpp b/src/gui/C4GuiButton.cpp
index d47ffb5d8..714223ee8 100644
--- a/src/gui/C4GuiButton.cpp
+++ b/src/gui/C4GuiButton.cpp
@@ -21,6 +21,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
diff --git a/src/gui/C4GuiCheckBox.cpp b/src/gui/C4GuiCheckBox.cpp
index 2f83e4ec7..ac0b9d889 100644
--- a/src/gui/C4GuiCheckBox.cpp
+++ b/src/gui/C4GuiCheckBox.cpp
@@ -21,6 +21,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
diff --git a/src/gui/C4GuiComboBox.cpp b/src/gui/C4GuiComboBox.cpp
index 37debddb2..ecac715ba 100644
--- a/src/gui/C4GuiComboBox.cpp
+++ b/src/gui/C4GuiComboBox.cpp
@@ -23,6 +23,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
diff --git a/src/gui/C4GuiEdit.cpp b/src/gui/C4GuiEdit.cpp
index a156bfeb0..b51cb7d21 100644
--- a/src/gui/C4GuiEdit.cpp
+++ b/src/gui/C4GuiEdit.cpp
@@ -24,6 +24,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
diff --git a/src/gui/C4GuiListBox.cpp b/src/gui/C4GuiListBox.cpp
index 11998429d..da629ec84 100644
--- a/src/gui/C4GuiListBox.cpp
+++ b/src/gui/C4GuiListBox.cpp
@@ -21,6 +21,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FullScreen.h>
 #include <C4LoaderScreen.h>
 #include <C4Application.h>
diff --git a/src/gui/C4GuiMenu.cpp b/src/gui/C4GuiMenu.cpp
index 1502a0ca6..c01b70c07 100644
--- a/src/gui/C4GuiMenu.cpp
+++ b/src/gui/C4GuiMenu.cpp
@@ -23,6 +23,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4MouseControl.h>
 #include <C4GraphicsResource.h>
diff --git a/src/gui/C4GuiTabular.cpp b/src/gui/C4GuiTabular.cpp
index 54567ed33..1af1c30e8 100644
--- a/src/gui/C4GuiTabular.cpp
+++ b/src/gui/C4GuiTabular.cpp
@@ -24,6 +24,7 @@
 
 #include <C4Include.h>
 #include <C4Gui.h>
+
 #include <C4FacetEx.h>
 #include <C4Game.h>
 #include <C4FullScreen.h>
diff --git a/src/gui/C4StartupMainDlg.cpp b/src/gui/C4StartupMainDlg.cpp
index 5c7620271..3dc88d72c 100644
--- a/src/gui/C4StartupMainDlg.cpp
+++ b/src/gui/C4StartupMainDlg.cpp
@@ -22,9 +22,9 @@
 
 #include <C4Include.h>
 #include <C4StartupMainDlg.h>
+
 #include <C4UpdateDlg.h>
 #include <C4Version.h>
-
 #include <C4StartupNetDlg.h>
 #include <C4StartupScenSelDlg.h>
 #include <C4StartupOptionsDlg.h>
diff --git a/src/gui/C4StartupNetDlg.cpp b/src/gui/C4StartupNetDlg.cpp
index 2f86ef800..6ce721f2c 100644
--- a/src/gui/C4StartupNetDlg.cpp
+++ b/src/gui/C4StartupNetDlg.cpp
@@ -29,8 +29,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <C4Include.h>
 #include <C4StartupNetDlg.h>
-#include <C4UpdateDlg.h>
 
+#include <C4UpdateDlg.h>
 #include <C4StartupScenSelDlg.h>
 #include <C4StartupMainDlg.h>
 #include <C4Game.h>
diff --git a/src/gui/C4UpdateDlg.cpp b/src/gui/C4UpdateDlg.cpp
index 64152b686..519db0619 100644
--- a/src/gui/C4UpdateDlg.cpp
+++ b/src/gui/C4UpdateDlg.cpp
@@ -25,10 +25,9 @@
 
 // Don't compile this class if automatic update is disabled
 #ifdef WITH_AUTOMATIC_UPDATE
-
 #include "C4UpdateDlg.h"
-#include "C4DownloadDlg.h"
 
+#include "C4DownloadDlg.h"
 #include <C4Log.h>
 
 #ifdef _WIN32
diff --git a/src/gui/C4Viewport.cpp b/src/gui/C4Viewport.cpp
index d27c96f06..163c70454 100644
--- a/src/gui/C4Viewport.cpp
+++ b/src/gui/C4Viewport.cpp
@@ -28,8 +28,8 @@
 
 #include <C4Include.h>
 #include <C4Viewport.h>
-#include <C4ViewportWindow.h>
 
+#include <C4ViewportWindow.h>
 #include <C4Console.h>
 #include <C4Object.h>
 #include <C4FullScreen.h>
diff --git a/src/lib/C4Log.cpp b/src/lib/C4Log.cpp
index c6cbbf2d2..9aaaa1505 100644
--- a/src/lib/C4Log.cpp
+++ b/src/lib/C4Log.cpp
@@ -25,8 +25,8 @@
 
 #include <C4Include.h>
 #include <C4Log.h>
-#include <C4AulDebug.h>
 
+#include <C4AulDebug.h>
 #include <C4Console.h>
 #include <C4GameLobby.h>
 #include <C4Game.h>
diff --git a/src/network/C4GameControlNetwork.cpp b/src/network/C4GameControlNetwork.cpp
index 26e37475f..15e5500b5 100644
--- a/src/network/C4GameControlNetwork.cpp
+++ b/src/network/C4GameControlNetwork.cpp
@@ -20,9 +20,9 @@
 /* control managament: network part */
 
 #include "C4Include.h"
+#include <C4GameControlNetwork.h>
 
 #include <C4Application.h>
-#include <C4GameControlNetwork.h>
 #include <C4GameControl.h>
 #include <C4Game.h>
 #include <C4Log.h>
diff --git a/src/network/C4Network2.cpp b/src/network/C4Network2.cpp
index c5dc83128..6e24e0cf3 100644
--- a/src/network/C4Network2.cpp
+++ b/src/network/C4Network2.cpp
@@ -23,11 +23,9 @@
  */
 
 #include <C4Include.h>
-#include <utility>
-
 #include <C4Network2.h>
-#include <C4Version.h>
 
+#include <C4Version.h>
 #include <C4Log.h>
 #include <C4Application.h>
 #include <C4Console.h>
diff --git a/src/network/C4Network2Dialogs.cpp b/src/network/C4Network2Dialogs.cpp
index 37160f58b..63b2277c3 100644
--- a/src/network/C4Network2Dialogs.cpp
+++ b/src/network/C4Network2Dialogs.cpp
@@ -27,7 +27,6 @@
 
 #include "C4Network2.h"
 #include "C4Network2Stats.h"
-
 #include "C4Viewport.h"
 #include "C4GameOptions.h"
 #include <C4Game.h>
diff --git a/src/network/C4Network2IRC.cpp b/src/network/C4Network2IRC.cpp
index 0d9b76b5b..66eee0680 100644
--- a/src/network/C4Network2IRC.cpp
+++ b/src/network/C4Network2IRC.cpp
@@ -22,10 +22,10 @@
 
 #include "C4Include.h"
 #include "C4Network2IRC.h"
+
 #include "C4Config.h"
 #include "C4Version.h"
 #include "C4InteractiveThread.h"
-
 #include "C4Gui.h" // for clearly visi
 
 #include <cctype> // for isdigit
diff --git a/src/network/C4Network2ResDlg.cpp b/src/network/C4Network2ResDlg.cpp
index 61e73cb89..d7dbdfedd 100644
--- a/src/network/C4Network2ResDlg.cpp
+++ b/src/network/C4Network2ResDlg.cpp
@@ -20,13 +20,13 @@
 // resource display list box
 
 #include "C4Include.h"
+#include "C4Network2Dialogs.h"
+
 #include "C4GameLobby.h"
 #include "C4FullScreen.h"
-
 #include "C4Network2.h"
 #include "C4PlayerInfo.h"
 #include "C4Network2Players.h"
-#include "C4Network2Dialogs.h"
 #include <C4GraphicsResource.h>
 
 // ----------- C4Network2ResDlg::ListItem ----------------------------------------------------------------
diff --git a/src/platform/C4ViewportWindow.cpp b/src/platform/C4ViewportWindow.cpp
index dcf21e1fd..d63b5669e 100644
--- a/src/platform/C4ViewportWindow.cpp
+++ b/src/platform/C4ViewportWindow.cpp
@@ -27,8 +27,8 @@
 
 #include <C4Include.h>
 #include <C4ViewportWindow.h>
-#include <C4Viewport.h>
 
+#include <C4Viewport.h>
 #include <C4Console.h>
 #include <C4UserMessages.h>
 #include <C4MouseControl.h>
diff --git a/src/platform/C4WindowGTK.cpp b/src/platform/C4WindowGTK.cpp
index 9847ef2b1..858a4c099 100644
--- a/src/platform/C4WindowGTK.cpp
+++ b/src/platform/C4WindowGTK.cpp
@@ -26,7 +26,6 @@
 #include <C4App.h>
 #include "C4Version.h"
 #include "C4Config.h"
-
 #include <X11/Xlib.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
diff --git a/src/platform/C4WindowSDL.cpp b/src/platform/C4WindowSDL.cpp
index 77cbd8279..4aca7bfe5 100644
--- a/src/platform/C4WindowSDL.cpp
+++ b/src/platform/C4WindowSDL.cpp
@@ -24,6 +24,7 @@
 
 #include <C4Include.h>
 #include <C4Window.h>
+
 #include <StdGL.h>
 #include <StdDDraw2.h>
 #include <StdFile.h>
diff --git a/src/platform/StdD3D.cpp b/src/platform/StdD3D.cpp
index a4cebae1e..304ee731b 100644
--- a/src/platform/StdD3D.cpp
+++ b/src/platform/StdD3D.cpp
@@ -25,6 +25,7 @@
 
 #include "C4Include.h"
 #include <StdD3D.h>
+
 #include <StdD3DShader.h>
 
 #include <C4App.h>
diff --git a/src/platform/StdGL.cpp b/src/platform/StdGL.cpp
index 9b7ab5e5f..5745c066f 100644
--- a/src/platform/StdGL.cpp
+++ b/src/platform/StdGL.cpp
@@ -27,6 +27,7 @@
 
 #include "C4Include.h"
 #include <StdGL.h>
+
 #include <C4Surface.h>
 #include <C4Window.h>
 #include "C4Rect.h"
diff --git a/src/script/C4AulDebug.cpp b/src/script/C4AulDebug.cpp
index 01ca23b19..79822b678 100644
--- a/src/script/C4AulDebug.cpp
+++ b/src/script/C4AulDebug.cpp
@@ -19,14 +19,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
 #include <C4Include.h>
+#include "C4AulDebug.h"
+
 #include <C4Version.h>
 #include <C4GameControl.h>
 #include <C4Game.h>
 #include <C4MessageInput.h>
 #include <C4Log.h>
 #include <C4Object.h>
-
-#include "C4AulDebug.h"
 #include "C4AulExec.h"
 
 #ifndef NOAULDEBUG