Changeset 1062 for code/trunk

Timestamp:

Apr 14, 2008, 5:50:25 PM (17 years ago)

Author:

rgrieder

Message:

• changed header file inclusion order

Location:

code/trunk/src

Files:

• audio/AudioPrereqs.h (modified) (1 diff)
• core/BaseObject.cc (modified) (1 diff)
• core/BaseObject.h (modified) (1 diff)
• core/ClassFactory.h (modified) (1 diff)
• core/ClassManager.h (modified) (1 diff)
• core/ClassTreeMask.h (modified) (1 diff)
• core/CommandExecutor.h (modified) (2 diffs)
• core/ConfigFileManager.h (modified) (2 diffs)
• core/ConfigValueContainer.cc (modified) (1 diff)
• core/ConfigValueContainer.h (modified) (1 diff)
• core/ConfigValueIncludes.h (modified) (1 diff)
• core/ConsoleCommand.h (modified) (1 diff)
• core/CoreIncludes.h (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)
• core/CoreSettings.h (modified) (1 diff)
• core/Debug.h (modified) (1 diff)
• core/Error.cc (modified) (1 diff)
• core/Error.h (modified) (1 diff)
• core/Executor.cc (modified) (1 diff)
• core/Executor.h (modified) (1 diff)
• core/Factory.cc (modified) (1 diff)
• core/Factory.h (modified) (1 diff)
• core/Functor.h (modified) (1 diff)
• core/Identifier.cc (modified) (1 diff)
• core/Identifier.h (modified) (1 diff)
• core/IdentifierDistributor.h (modified) (1 diff)
• core/InputBuffer.cc (modified) (1 diff)
• core/InputBuffer.h (modified) (2 diffs)
• core/InputEventListener.cc (modified) (1 diff)
• core/InputEventListener.h (modified) (1 diff)
• core/InputHandler.cc (modified) (1 diff)
• core/InputHandler.h (modified) (1 diff)
• core/InputManager.cc (modified) (1 diff)
• core/InputManager.h (modified) (1 diff)
• core/Language.cc (modified) (1 diff)
• core/Language.h (modified) (1 diff)
• core/Level.h (modified) (1 diff)
• core/Loader.h (modified) (1 diff)
• core/Namespace.cc (modified) (1 diff)
• core/Namespace.h (modified) (1 diff)
• core/NamespaceNode.h (modified) (1 diff)
• core/ObjectList.h (modified) (1 diff)
• core/OrxonoxClass.h (modified) (1 diff)
• core/OutputHandler.cc (modified) (1 diff)
• core/OutputHandler.h (modified) (1 diff)
• core/SignalHandler.cc (modified) (1 diff)
• core/SignalHandler.h (modified) (1 diff)
• core/Tickable.cc (modified) (1 diff)
• core/Tickable.h (modified) (1 diff)
• core/ToLuaBind.h (modified) (1 diff)
• core/XMLPort.h (modified) (2 diffs)
• network/Client.cc (modified) (1 diff)
• network/Client.h (modified) (1 diff)
• network/ClientConnection.cc (modified) (2 diffs)
• network/ClientConnection.h (modified) (1 diff)
• network/ClientInformation.cc (modified) (1 diff)
• network/ClientInformation.h (modified) (1 diff)
• network/ConnectionManager.h (modified) (2 diffs)
• network/GameStateClient.cc (modified) (1 diff)
• network/GameStateClient.h (modified) (1 diff)
• network/GameStateManager.cc (modified) (2 diffs)
• network/GameStateManager.h (modified) (1 diff)
• network/NetworkFrameListener.h (modified) (1 diff)
• network/NetworkPrereqs.h (modified) (1 diff)
• network/PacketBuffer.cc (modified) (2 diffs)
• network/PacketBuffer.h (modified) (1 diff)
• network/PacketDecoder.cc (modified) (1 diff)
• network/PacketGenerator.cc (modified) (2 diffs)
• network/PacketManager.h (modified) (1 diff)
• network/Server.cc (modified) (2 diffs)
• network/Server.h (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)
• network/Synchronisable.h (modified) (1 diff)
• network/dummyclient3.cc (modified) (2 diffs)
• network/dummyserver3.cc (modified) (2 diffs)
• orxonox/GraphicsEngine.cc (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/objects/weapon/WeaponStation.h (modified) (1 diff)
• orxonox/tools/Timer.cc (modified) (1 diff)
• util/ArgReader.cc (modified) (1 diff)
• util/ArgReader.h (modified) (1 diff)
• util/Clipboard.h (modified) (1 diff)
• util/Convert.h (modified) (1 diff)
• util/Math.h (modified) (1 diff)
• util/MultiTypePrimitive.h (modified) (1 diff)
• util/MultiTypeString.h (modified) (1 diff)
• util/Sleep.h (modified) (1 diff)
• util/String.cc (modified) (1 diff)
• util/String.h (modified) (1 diff)
• util/String2Number.h (modified) (2 diffs)
• util/SubString.h (modified) (1 diff)
• util/UtilPrereqs.h (modified) (1 diff)
• util/XMLIncludes.h (modified) (1 diff)

code/trunk/src/audio/AudioPrereqs.h

@@ -35 +35 @@
 #define _AudioPrereqs_H__
 
-#include "orxonox/OrxonoxPlatform.h"
+#include "OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------

code/trunk/src/core/BaseObject.cc

@@ -32 +32 @@
 */
 
+#include "BaseObject.h"
 #include "util/tinyxml/tinyxml.h"
-
-#include "core/CoreIncludes.h"
-#include "BaseObject.h"
+#include "CoreIncludes.h"
 #include "XMLPort.h"
 #include "Level.h"

code/trunk/src/core/BaseObject.h

@@ -38 +38 @@
 
 #include "CorePrereqs.h"
+
 #include "util/XMLIncludes.h"
-
 #include "OrxonoxClass.h"
 

code/trunk/src/core/ClassFactory.h

@@ -37 +37 @@
 #define _ClassFactory_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
-
-#include "CorePrereqs.h"
 
 #include "Factory.h"

code/trunk/src/core/ClassManager.h

@@ -43 +43 @@
 #define _ClassManager_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
 
 #include "Identifier.h"
 #include "IdentifierDistributor.h"
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/ClassTreeMask.h

@@ -71 +71 @@
 #define _ClassTreeMask_H__
 
+#include "CorePrereqs.h"
+
 #include <list>
 #include <stack>
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/CommandExecutor.h

@@ -30 +30 @@
 #define _CommandExecutor_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
 #include <map>
@@ -36 +38 @@
 #include "util/SubString.h"
 #include "util/MultiTypeMath.h"
-#include "CorePrereqs.h"
 
 #define COMMAND_EXECUTOR_CURSOR "$"

code/trunk/src/core/ConfigFileManager.h

@@ -30 +30 @@
 #define _ConfigFileManager_H__
 
+#include "CorePrereqs.h"
+
 #include <iostream>
 #include <string>
@@ -36 +38 @@
 
 #include "util/Math.h"
-
-#include "CorePrereqs.h"
 
 #define DEFAULT_CONFIG_FILE "default.ini"

code/trunk/src/core/ConfigValueContainer.cc

@@ -32 +32 @@
 */
 
+#include "ConfigValueContainer.h"
+
 #include <fstream>
 
-#include "ConfigValueContainer.h"
+#include "util/SubString.h"
+#include "util/Convert.h"
 #include "Language.h"
 #include "Identifier.h"
-#include "util/SubString.h"
-#include "util/Convert.h"
 
 #define MAX_VECTOR_INDEX 255 // to avoid up to 4*10^9 vector entries in the config file after accidentally using a wrong argument

code/trunk/src/core/ConfigValueContainer.h

@@ -44 +44 @@
 #define _ConfigValueContainer_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
 #include <vector>
-
-#include "CorePrereqs.h"
 
 #include "util/Math.h"

code/trunk/src/core/ConfigValueIncludes.h

@@ -34 +34 @@
 #ifndef _ConfigValueIncludes_H__
 #define _ConfigValueIncludes_H__
+
+#include "CorePrereqs.h"
 
 #include "Identifier.h"

code/trunk/src/core/ConsoleCommand.h

@@ -30 +30 @@
 #define _ConsoleCommand_H__
 
+#include "CorePrereqs.h"
+
 #include "Executor.h"
 #include "ClassManager.h"

code/trunk/src/core/CoreIncludes.h

@@ -40 +40 @@
 #ifndef _CoreIncludes_H__
 #define _CoreIncludes_H__
+
+#include "CorePrereqs.h"
 
 #include "Identifier.h"

code/trunk/src/core/CorePrereqs.h

@@ -35 +35 @@
 #define _CorePrereqs_H__
 
+#include "OrxonoxPlatform.h"
+
 #include <string>
-
-#include "OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------

code/trunk/src/core/CoreSettings.h

@@ -38 +38 @@
 #define _CoreSettings_H__
 
+#include "CorePrereqs.h"
+
 #include "OrxonoxClass.h"
 #include "OutputHandler.h"
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/Debug.h

@@ -37 +37 @@
 #define _Debug_H__
 
+#include "CorePrereqs.h"
+
 #include <stdio.h>
-
-#include "CorePrereqs.h"
 
 #include "OutputHandler.h"

code/trunk/src/core/Error.cc

@@ -32 +32 @@
 */
 
+#include "Error.h"
 #include "Debug.h"
-#include "Error.h"
 
 namespace orxonox

code/trunk/src/core/Error.h

@@ -35 +35 @@
 #define _Error_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/Executor.cc

@@ -29 +29 @@
 
 #include "Executor.h"
+#include "util/Math.h"
 #include "Language.h"
-#include "util/Math.h"
 
 namespace orxonox

code/trunk/src/core/Executor.h

@@ -32 +32 @@
 
 #include "CorePrereqs.h"
+
+#include "util/SubString.h"
+#include "util/String.h"
 #include "Functor.h"
 #include "Debug.h"
-#include "util/SubString.h"
-#include "util/String.h"
 
 

code/trunk/src/core/Factory.cc

@@ -32 +32 @@
 */
 
+#include "Factory.h"
 #include "Identifier.h"
 #include "Debug.h"
 #include "BaseObject.h"
-#include "Factory.h"
 
 namespace orxonox

code/trunk/src/core/Factory.h

@@ -45 +45 @@
 #define _Factory_H__
 
+#include "CorePrereqs.h"
+
 #include <map>
 #include <string>
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/Functor.h

@@ -31 +31 @@
 #define _Functor_H__
 
+#include "CorePrereqs.h"
+
 #include "util/MultiTypeMath.h"
 #include "Debug.h"
-
-#include "CorePrereqs.h"
 
 #define MAX_FUNCTOR_ARGUMENTS 5

code/trunk/src/core/Identifier.cc

@@ -32 +32 @@
 */
 
+#include "Identifier.h"
+
 #include <ostream>
 
-#include "Identifier.h"
 #include "Factory.h"
 #include "Executor.h"

code/trunk/src/core/Identifier.h

@@ -53 +53 @@
 #define _Identifier_H__
 
+#include "CorePrereqs.h"
+
 #include <set>
 #include <map>
 #include <string>
 #include <utility>
-
-#include "CorePrereqs.h"
 
 #include "ObjectList.h"

code/trunk/src/core/IdentifierDistributor.h

@@ -39 +39 @@
 #define _IdentifierDistributor_H__
 
+#include "CorePrereqs.h"
+
 #include <map>
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/InputBuffer.cc

@@ -27 +27 @@
  */
 
+#include "InputBuffer.h"
+
 #include <iostream>
 
-#include "InputBuffer.h"
+#include "util/Clipboard.h"
 #include "InputManager.h"
-#include "util/Clipboard.h"
 
 namespace orxonox

code/trunk/src/core/InputBuffer.h

@@ -30 +30 @@
 #define _InputBuffer_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
 #include <list>
@@ -38 +40 @@
 #include <OISKeyboard.h>
 #endif
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/InputEventListener.cc

@@ -32 +32 @@
  */
 
-#include "core/CoreIncludes.h"
 #include "InputEventListener.h"
+#include "CoreIncludes.h"
 
 namespace orxonox

code/trunk/src/core/InputEventListener.h

@@ -37 +37 @@
 #include "CorePrereqs.h"
 
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 #include "InputEvent.h"
 

code/trunk/src/core/InputHandler.cc

@@ -32 +32 @@
  */
 
+#include "InputHandler.h"
 #include "Debug.h"
 #include "util/Convert.h"
 #include "InputEventListener.h"
 #include "InputEvent.h"
-#include "InputHandler.h"
 
 namespace orxonox

code/trunk/src/core/InputHandler.h

@@ -35 +35 @@
 #define _InputHandler_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
-
 #include <OIS/OIS.h>
 
-#include "CorePrereqs.h"
 #include "InputEvent.h"
 

code/trunk/src/core/InputManager.cc

@@ -33 +33 @@
  */
 
-#include "core/CoreIncludes.h"
-#include "core/Debug.h"
+#include "InputManager.h"
+#include "CoreIncludes.h"
+#include "Debug.h"
 #include "InputEventListener.h"
 #include "InputHandler.h"
-#include "InputManager.h"
 
 namespace orxonox

code/trunk/src/core/InputManager.h

@@ -36 +36 @@
 #define _InputManager_H__
 
+#include "CorePrereqs.h"
+
 #include <OIS/OIS.h>
 
-#include "CorePrereqs.h"
-#include "core/Tickable.h"
+#include "Tickable.h"
 #include "InputEvent.h"
 

code/trunk/src/core/Language.cc

@@ -32 +32 @@
 */
 
+#include "Language.h"
+
 #include <fstream>
 
-#include "Language.h"
 #include "CoreSettings.h"
 

code/trunk/src/core/Language.h

@@ -46 +46 @@
 #define _Language_H__
 
+#include "CorePrereqs.h"
+
 #include <map>
 #include <string>
-
-#include "CorePrereqs.h"
 
 

code/trunk/src/core/Level.h

@@ -30 +30 @@
 #define _Level_H__
 
+#include "CorePrereqs.h"
+
 #include <string>
 
-#include "CorePrereqs.h"
 #include "ClassTreeMask.h"
 

code/trunk/src/core/Loader.h

@@ -30 +30 @@
 #define _Loader_H__
 
+#include "CorePrereqs.h"
+
 #include <vector>
 
 #include "ClassTreeMask.h"
 #include "Level.h"
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/Namespace.cc

@@ -28 +28 @@
 
 #include "Namespace.h"
+#include "NamespaceNode.h"
 #include "CoreIncludes.h"
 #include "XMLPort.h"
 #include "util/SubString.h"
-#include "NamespaceNode.h"
 
 namespace orxonox

code/trunk/src/core/Namespace.h

@@ -30 +30 @@
 #define _Namespace_H__
 
+#include "CorePrereqs.h"
+
 #include <map>
 
+#include "util/XMLIncludes.h"
 #include "BaseObject.h"
-#include "util/XMLIncludes.h"
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/NamespaceNode.h

@@ -30 +30 @@
 #define _NamespaceNode_H__
 
+#include "CorePrereqs.h"
+
 #include <map>
 #include <set>
 #include <string>
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/ObjectList.h

@@ -40 +40 @@
 
 #include "CorePrereqs.h"
+
 #include "Iterator.h"
 #include "ClassManager.h"

code/trunk/src/core/OrxonoxClass.h

@@ -38 +38 @@
 #define _OrxonoxClass_H__
 
+#include "CorePrereqs.h"
+
 #include <set>
 #include <string>
 
-#include "CorePrereqs.h"
 #include "MetaObjectList.h"
 #include "Iterator.h"

code/trunk/src/core/OutputHandler.cc

@@ -32 +32 @@
 */
 
+#include "OutputHandler.h"
 #include "CoreSettings.h"
-#include "OutputHandler.h"
 #include "ConsoleCommand.h"
 

code/trunk/src/core/OutputHandler.h

@@ -38 +38 @@
 #define _OutputHandler_H__
 
+#include "CorePrereqs.h"
+
 #include <iostream>
 #include <fstream>
 #include <string>
-
-#include "CorePrereqs.h"
 
 namespace orxonox

code/trunk/src/core/SignalHandler.cc

@@ -32 +32 @@
 */
 
+#include "SignalHandler.h"
+
 #include <assert.h>
 
 #include "Debug.h"
-#include "SignalHandler.h"
 
 SignalHandler * SignalHandler::singletonRef = NULL;

code/trunk/src/core/SignalHandler.h

@@ -35 +35 @@
 #define _SignalHandler_H__
 
+#include "CorePrereqs.h"
+
 #include <list>
 #include <string>
-
-#include "CorePrereqs.h"
 
 typedef int (*SignalCallback)( void * someData );

code/trunk/src/core/Tickable.cc

@@ -27 +27 @@
  */
 
-#include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
 #include "Tickable.h"
+#include "CoreIncludes.h"
+#include "ConsoleCommand.h"
 
 namespace orxonox

code/trunk/src/core/Tickable.h

@@ -43 +43 @@
 
 #include "CorePrereqs.h"
-#include "core/OrxonoxClass.h"
+
+#include "OrxonoxClass.h"
 
 namespace orxonox

code/trunk/src/core/ToLuaBind.h

@@ -4 +4 @@
 */
 
+#include "CorePrereqs.h"
+
 /* Exported function */
 TOLUA_API int  tolua_orxonox_open (lua_State* tolua_S);

code/trunk/src/core/XMLPort.h

@@ -29 +29 @@
 #ifndef _XMLPort_H__
 #define _XMLPort_H__
+
+#include "CorePrereqs.h"
 
 #include "util/XMLIncludes.h"
@@ -37 +39 @@
 #include "CoreIncludes.h"
 #include "BaseObject.h"
-
-#include "CorePrereqs.h"
 
 

code/trunk/src/network/Client.cc

@@ -39 +39 @@
 //
 
+#include "Client.h"
 #include "core/CoreIncludes.h"
-#include "Client.h"
 
 namespace network

code/trunk/src/network/Client.h

@@ -42 +42 @@
 #define _Client_H__
 
+#include "NetworkPrereqs.h"
+
 #include <string>
-
-#include "NetworkPrereqs.h"
 
 #include "core/Tickable.h"

code/trunk/src/network/ClientConnection.cc

@@ -38 +38 @@
 //
 
+#include "ClientConnection.h"
+
 #include <iostream>
 // boost.thread library for multithreading support
@@ -45 +47 @@
 #include "util/Sleep.h"
 #include "core/Debug.h"
-#include "ClientConnection.h"
 
 namespace network

code/trunk/src/network/ClientConnection.h

@@ -41 +41 @@
 #define _ClientConnection_H__
 
+#include "NetworkPrereqs.h"
+
 #include <string>
 #include <enet/enet.h>
 
-#include "NetworkPrereqs.h"
 #include "PacketBuffer.h"
 

code/trunk/src/network/ClientInformation.cc

@@ -39 +39 @@
 //
 
+#include "ClientInformation.h"
+
 #include <iostream> //debug
-
-#include "ClientInformation.h"
 
 namespace network

code/trunk/src/network/ClientInformation.h

@@ -41 +41 @@
 #define _ClientInformation_H__
 
+#include "NetworkPrereqs.h"
+
 #include <enet/enet.h>
-
-#include "NetworkPrereqs.h"
 
 #define GAMESTATEID_INITIAL -1

code/trunk/src/network/ConnectionManager.h

@@ -41 +41 @@
 #define _ConnectionManager_H__
 
+#include "NetworkPrereqs.h"
+
 #include <string>
 #include <map>
@@ -46 +48 @@
 #include <enet/enet.h>
 
-#include "NetworkPrereqs.h"
 #include "PacketBuffer.h"
 #include "PacketManager.h"

code/trunk/src/network/GameStateClient.cc

@@ -27 +27 @@
  */
 
+#include "GameStateClient.h"
+
 #include <zlib.h>
 
 #include "core/CoreIncludes.h"
 #include "Synchronisable.h"
-#include "GameStateClient.h"
 
 namespace network

code/trunk/src/network/GameStateClient.h

@@ -42 +42 @@
 
 #include "NetworkPrereqs.h"
+#include "core/CorePrereqs.h"
 #include "GameStateManager.h"
 

code/trunk/src/network/GameStateManager.cc

@@ -39 +39 @@
 //
 
+#include "GameStateManager.h"
+
 #include <utility>
 #include <iostream>
@@ -44 +46 @@
 
 #include "core/CoreIncludes.h"
-
 #include "ClientInformation.h"
 #include "Synchronisable.h"
-#include "GameStateManager.h"
 
 namespace network

code/trunk/src/network/GameStateManager.h

@@ -41 +41 @@
 #define _GameStateManager_H__
 
+#include "NetworkPrereqs.h"
+
 #include <map>
 
-#include "NetworkPrereqs.h"
 #include "PacketTypes.h"
 

code/trunk/src/network/NetworkFrameListener.h

@@ -42 +42 @@
 #define _NetworkFrameListener_H__
 
+#include "NetworkPrereqs.h"
+
 #include <OgreFrameListener.h>
 
-#include "NetworkPrereqs.h"
 #include "Server.h"
 #include "Client.h"

code/trunk/src/network/NetworkPrereqs.h

@@ -35 +35 @@
 #define _NetworkPrereqs_H__
 
-#include "orxonox/OrxonoxPlatform.h"
+#include "OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------

code/trunk/src/network/PacketBuffer.cc

@@ -31 +31 @@
 // Author Oliver Scheuss
 
+#include "PacketBuffer.h"
+
 #include <iostream>
 #include <queue>
@@ -36 +38 @@
 #include <boost/bind.hpp>
 #include <boost/thread/mutex.hpp>
-
-#include "PacketBuffer.h"
 
 namespace network

code/trunk/src/network/PacketBuffer.h

@@ -42 +42 @@
 #define _PacketBuffer_H__
 
+#include "NetworkPrereqs.h"
+
 #include <enet/enet.h>
-
-#include "NetworkPrereqs.h"
 
 namespace network

code/trunk/src/network/PacketDecoder.cc

@@ -35 +35 @@
 */
 
-#include <iostream>
-
 #include "PacketTypes.h"
 #include "PacketManager.h"
+
+#include <iostream>
+
 #include "core/Debug.h"
 

code/trunk/src/network/PacketGenerator.cc

@@ -35 +35 @@
 */
 
+#include "PacketManager.h"
+#include "PacketTypes.h"
+
 #include <iostream>
 #include <list>
@@ -40 +43 @@
 #include <cstring>
 
-#include "PacketTypes.h"
-#include "PacketManager.h"
 
 namespace network

code/trunk/src/network/PacketManager.h

@@ -30 +30 @@
 #define _PacketManager_H__
 
+#include "NetworkPrereqs.h"
+
 #include <string>
 #include <enet/enet.h>
 
 #include "core/CoreIncludes.h"
-
-#include "NetworkPrereqs.h"
 
 #define CLIENTID_CLIENT -1

code/trunk/src/network/Server.cc

@@ -38 +38 @@
 //
 //
+
+#include "Server.h"
 
 #include <iostream>
@@ -47 +49 @@
 //#include "NetworkFrameListener.h"
 #include "util/Sleep.h"
-#include "Server.h"
 
 

code/trunk/src/network/Server.h

@@ -42 +42 @@
 #define _Server_H__
 
+#include "NetworkPrereqs.h"
+
 #include <string>
-
-#include "NetworkPrereqs.h"
 
 #include "core/Tickable.h"

code/trunk/src/network/Synchronisable.cc

@@ -39 +39 @@
 //
 
+#include "Synchronisable.h"
+
 #include <string>
 #include <iostream>
 
-#include "Synchronisable.h"
 #include "core/CoreIncludes.h"
 

code/trunk/src/network/Synchronisable.h

@@ -41 +41 @@
 #define _Synchronisable_H__
 
+#include "NetworkPrereqs.h"
+
 #include <list>
-
-#include "NetworkPrereqs.h"
 #include "core/OrxonoxClass.h"
 

code/trunk/src/network/dummyclient3.cc

@@ -27 +27 @@
  */
 
+#include "Client.h"
+
 #include <iostream>
 #include <string>
@@ -33 +35 @@
 #include "PacketManager.h"
 #include "PacketTypes.h"
-#include "Client.h"
 
 using namespace network;

code/trunk/src/network/dummyserver3.cc

@@ -27 +27 @@
  */
 
+#include "Server.h"
+
 #include <iostream>
 
@@ -32 +34 @@
 #include "PacketManager.h"
 #include "PacketTypes.h"
-#include "Server.h"
 
 namespace network

code/trunk/src/orxonox/GraphicsEngine.cc

@@ -133 +133 @@
 
     // create a logManager
-    /*LogManager *logger;
-                if(LogManager::getSingletonPtr() == 0)
-                        logger = new LogManager();
-    else
-      logger = LogManager::getSingletonPtr();
+    Ogre::LogManager *logger;
+                if (Ogre::LogManager::getSingletonPtr() == 0)
+                        logger = new Ogre::LogManager();
+    else
+      logger = Ogre::LogManager::getSingletonPtr();
     COUT(4) << "*** GraphicsEngine: Ogre LogManager created/assigned" << std::endl;
 
     // create our own log that we can listen to
-    Log *myLog;
+    Ogre::Log *myLog;
     if (this->ogreLogfile_ == "")
       myLog = logger->createLog("ogre.log", true, false, true);
@@ -148 +148 @@
     COUT(4) << "*** GraphicsEngine: Ogre Log created" << std::endl;
 
-    myLog->setLogDetail(LL_BOREME);
-    myLog->addListener(this);*/
+    myLog->setLogDetail(Ogre::LL_BOREME);
+    myLog->addListener(this);
 
     // Root will detect that we've already created a Log

code/trunk/src/orxonox/Orxonox.cc

@@ -448 +448 @@
       // Iterate through all Tickables and call their tick(dt) function
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; )
-        (it++)->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+      {
+        (it)->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+         it++;
+     }
 
       // don't forget to call _fireFrameStarted in ogre to make sure

code/trunk/src/orxonox/objects/weapon/WeaponStation.h

@@ -31 +31 @@
 #define _WeaponStation_H__
 
+#include "OrxonoxPrereqs.h"
+
 #include <OgrePrerequisites.h>
-
-#include "OrxonoxPrereqs.h"
 
 

code/trunk/src/orxonox/tools/Timer.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Timer.h"
+
 #include "core/Executor.h"
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
 #include "core/CommandExecutor.h"
-#include "Timer.h"
 
 namespace orxonox

code/trunk/src/util/ArgReader.cc

@@ -32 +32 @@
  */
 
+#include "ArgReader.h"
+
 #include <iostream>
-
-#include "ArgReader.h"
 
 ArgReader::ArgReader(int argc, char** argv)

code/trunk/src/util/ArgReader.h

@@ -36 +36 @@
 #define _ArgReader_H__
 
+#include "UtilPrereqs.h"
+
 #include <string>
-
-#include "UtilPrereqs.h"
 
 class _UtilExport ArgReader

code/trunk/src/util/Clipboard.h

@@ -30 +30 @@
 #define _Clipboard_H__
 
+#include "UtilPrereqs.h"
+
 #include <string>
-
-#include "UtilPrereqs.h"
 
 

code/trunk/src/util/Convert.h

@@ -35 +35 @@
 #define _Convert_H__
 
+#include "UtilPrereqs.h"
+
 #include <string>
 #include <sstream>
 
-#include "UtilPrereqs.h"
 #include "Math.h"
 #include "SubString.h"

code/trunk/src/util/Math.h

@@ -30 +30 @@
 #define _Util_Math_H__
 
+#include "UtilPrereqs.h"
+
 #include <ostream>
-
-#include "UtilPrereqs.h"
 
 #include <OgreMath.h>

code/trunk/src/util/MultiTypePrimitive.h

@@ -31 +31 @@
 #define _MultiTypePrimitive_H__
 
+#include "UtilPrereqs.h"
+
 #include <ostream>
-
-#include "UtilPrereqs.h"
 
 #include "MultiType.h"

code/trunk/src/util/MultiTypeString.h

@@ -31 +31 @@
 #define _MultiTypeString_H__
 
+#include "UtilPrereqs.h"
+
 #include <string>
 #include <iostream>
-#include "UtilPrereqs.h"
 
 #include "MultiTypePrimitive.h"

code/trunk/src/util/Sleep.h

@@ -32 +32 @@
  */
 
-#include "OrxonoxPlatform.h"
+#include "UtilPrereqs.h"
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32

code/trunk/src/util/String.cc

@@ -27 +27 @@
  */
 
+#include "String.h"
+
 #include <cctype>
 #include <iostream>
-#include "String.h"
 
 /**

code/trunk/src/util/String.h

@@ -30 +30 @@
 #define _Util_String_H__
 
+#include "UtilPrereqs.h"
+
 #include <string>
 #include <sstream>
-
-#include "UtilPrereqs.h"
 
 _UtilExport void         strip(std::string* str);

code/trunk/src/util/String2Number.h

@@ -30 +30 @@
 #define _String2Number_H__
 
+#include "UtilPrereqs.h"
+
 #include <string>
 #include <sstream>
@@ -35 +37 @@
 
 #include "core/Debug.h"
-#include "UtilPrereqs.h"
 
 /**

code/trunk/src/util/SubString.h

@@ -59 +59 @@
 #define __SUBSTRING_H__
 
+#include "UtilPrereqs.h"
+
 #include <vector>
 #include <string>
-
-#include "UtilPrereqs.h"
 
 //! A class that can load one string and split it in multipe ones

code/trunk/src/util/UtilPrereqs.h

@@ -35 +35 @@
 #define _UtilPrereqs_H__
 
-#include "orxonox/OrxonoxPlatform.h"
+#include "OrxonoxPlatform.h"
 
 //-----------------------------------------------------------------------

code/trunk/src/util/XMLIncludes.h

@@ -26 +26 @@
  *
  */
+
+#include "UtilPrereqs.h"
 
 //-----------------------------------------------------------------------