Changeset 1062 for code/trunk/src/core

Timestamp:

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

Author:

rgrieder

Message:

• changed header file inclusion order

Location:

code/trunk/src/core

Files:

• BaseObject.cc (modified) (1 diff)
• BaseObject.h (modified) (1 diff)
• ClassFactory.h (modified) (1 diff)
• ClassManager.h (modified) (1 diff)
• ClassTreeMask.h (modified) (1 diff)
• CommandExecutor.h (modified) (2 diffs)
• ConfigFileManager.h (modified) (2 diffs)
• ConfigValueContainer.cc (modified) (1 diff)
• ConfigValueContainer.h (modified) (1 diff)
• ConfigValueIncludes.h (modified) (1 diff)
• ConsoleCommand.h (modified) (1 diff)
• CoreIncludes.h (modified) (1 diff)
• CorePrereqs.h (modified) (1 diff)
• CoreSettings.h (modified) (1 diff)
• Debug.h (modified) (1 diff)
• Error.cc (modified) (1 diff)
• Error.h (modified) (1 diff)
• Executor.cc (modified) (1 diff)
• Executor.h (modified) (1 diff)
• Factory.cc (modified) (1 diff)
• Factory.h (modified) (1 diff)
• Functor.h (modified) (1 diff)
• Identifier.cc (modified) (1 diff)
• Identifier.h (modified) (1 diff)
• IdentifierDistributor.h (modified) (1 diff)
• InputBuffer.cc (modified) (1 diff)
• InputBuffer.h (modified) (2 diffs)
• InputEventListener.cc (modified) (1 diff)
• InputEventListener.h (modified) (1 diff)
• InputHandler.cc (modified) (1 diff)
• InputHandler.h (modified) (1 diff)
• InputManager.cc (modified) (1 diff)
• InputManager.h (modified) (1 diff)
• Language.cc (modified) (1 diff)
• Language.h (modified) (1 diff)
• Level.h (modified) (1 diff)
• Loader.h (modified) (1 diff)
• Namespace.cc (modified) (1 diff)
• Namespace.h (modified) (1 diff)
• NamespaceNode.h (modified) (1 diff)
• ObjectList.h (modified) (1 diff)
• OrxonoxClass.h (modified) (1 diff)
• OutputHandler.cc (modified) (1 diff)
• OutputHandler.h (modified) (1 diff)
• SignalHandler.cc (modified) (1 diff)
• SignalHandler.h (modified) (1 diff)
• Tickable.cc (modified) (1 diff)
• Tickable.h (modified) (1 diff)
• ToLuaBind.h (modified) (1 diff)
• XMLPort.h (modified) (2 diffs)

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"