Changeset 8672

Timestamp:

May 29, 2011, 11:02:17 PM (13 years ago)

Author:

rgrieder

Message:

Removed some includes in the Core header files.
Also removed SubclassIdentifier.h from CoreIncludes (if you ever need an SCI, you will probably use it in a class definition anyway).

Location:

code/branches/unity_build/src

Files:

• libraries/core/Core.h (modified) (1 diff)
• libraries/core/CoreIncludes.h (modified) (1 diff)
• libraries/core/EventIncludes.h (modified) (1 diff)
• libraries/core/LuaState.h (modified) (1 diff)
• libraries/core/ObjectListBase.h (modified) (1 diff)
• libraries/core/OrxonoxClass.h (modified) (1 diff)
• libraries/core/Super.h (modified) (1 diff)
• libraries/core/ToluaInterface.h (modified) (1 diff)
• libraries/core/ViewportEventListener.h (modified) (1 diff)
• libraries/core/command/Functor.h (modified) (1 diff)
• libraries/core/command/IOConsoleWindows.h (modified) (1 diff)
• libraries/core/input/InputManager.h (modified) (1 diff)
• libraries/core/input/InputPrereqs.h (modified) (1 diff)
• libraries/core/input/JoyStick.h (modified) (1 diff)
• libraries/core/input/JoyStickQuantityListener.h (modified) (1 diff)
• libraries/core/input/KeyBinderManager.h (modified) (1 diff)
• libraries/core/input/KeyDetector.h (modified) (1 diff)
• libraries/core/input/Keyboard.h (modified) (1 diff)
• libraries/network/WANDiscoverable.h (modified) (1 diff)
• modules/objects/eventsystem/EventFilter.cc (modified) (1 diff)
• modules/objects/eventsystem/EventListener.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)

code/branches/unity_build/src/libraries/core/Core.h

@@ -45 +45 @@
 
 #include <string>
-#include <loki/ScopeGuard.h>
-
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"

code/branches/unity_build/src/libraries/core/CoreIncludes.h

@@ -80 +80 @@
 #include "util/Debug.h"
 #include "Identifier.h"
-#include "SubclassIdentifier.h"
 #include "ClassFactory.h"
 #include "ObjectList.h"

code/branches/unity_build/src/libraries/core/EventIncludes.h

@@ -37 +37 @@
 
 #include "CorePrereqs.h"
+
+#include "Event.h"
 #include "XMLPort.h"
 #include "command/Executor.h"

code/branches/unity_build/src/libraries/core/LuaState.h

@@ -48 +48 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include <loki/ScopeGuard.h>
 
 #include "ToluaInterface.h"

code/branches/unity_build/src/libraries/core/ObjectListBase.h

@@ -41 +41 @@
 
 #include "CorePrereqs.h"
-
 #include <vector>
-#include "OrxonoxClass.h"
 
 namespace orxonox

code/branches/unity_build/src/libraries/core/OrxonoxClass.h

@@ -45 +45 @@
 
 #include "CorePrereqs.h"
-#include "Super.h"
 
 #include <set>
 #include <vector>
+#include "Super.h"
 
 /**

code/branches/unity_build/src/libraries/core/Super.h

@@ -73 +73 @@
 
 #include "CorePrereqs.h"
-
 #include "util/Debug.h"
-#include "Event.h"
 
 ///////////////////////

code/branches/unity_build/src/libraries/core/ToluaInterface.h

@@ -39 +39 @@
 #include "CorePrereqs.h"
 #include <boost/preprocessor/cat.hpp>
+#include <loki/ScopeGuard.h>
 
 // Macro for declaring a tolua interface of a library/module

code/branches/unity_build/src/libraries/core/ViewportEventListener.h

@@ -30 +30 @@
 #define _ViewportEventListener_H__
 
+#include "CorePrereqs.h"
+
 #include "util/OgreForwardRefs.h"
-
-#include "CorePrereqs.h"
 #include "OrxonoxClass.h"
 

code/branches/unity_build/src/libraries/core/command/Functor.h

@@ -114 +114 @@
 #define _Functor_H__
 
+#include "core/CorePrereqs.h"
+
 #include <typeinfo>
-
-#include "core/CorePrereqs.h"
 
 #include "util/Debug.h"

code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.h

@@ -39 +39 @@
 #include <sstream>
 #include <string>
-#include <vector>
 #include "util/Singleton.h"
 #include "Shell.h"

code/branches/unity_build/src/libraries/core/input/InputManager.h

@@ -33 +33 @@
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>

code/branches/unity_build/src/libraries/core/input/InputPrereqs.h

@@ -41 +41 @@
 #include <ois/OISKeyboard.h>
 #include <ois/OISMouse.h>
-#include <ois/OISJoyStick.h>
 #include "util/OrxEnum.h"
 

code/branches/unity_build/src/libraries/core/input/JoyStick.h

@@ -34 +34 @@
 #include <string>
 #include <vector>
+#include <ois/OISJoyStick.h>
 #include "InputDevice.h"
 

code/branches/unity_build/src/libraries/core/input/JoyStickQuantityListener.h

@@ -36 +36 @@
 
 #include "InputPrereqs.h"
+
+#include <vector>
 #include "core/OrxonoxClass.h"
 

code/branches/unity_build/src/libraries/core/input/KeyBinderManager.h

@@ -34 +34 @@
 #include <map>
 #include <string>
-#include <boost/shared_ptr.hpp>
 
 #include "util/Singleton.h"

code/branches/unity_build/src/libraries/core/input/KeyDetector.h

@@ -32 +32 @@
 #include "InputPrereqs.h"
 
-#include <boost/shared_ptr.hpp>
 #include "util/Singleton.h"
 #include "KeyBinder.h"

code/branches/unity_build/src/libraries/core/input/Keyboard.h

@@ -31 +31 @@
 
 #include "InputPrereqs.h"
-
-#include "InputHandler.h"
 #include "InputDevice.h"
 

code/branches/unity_build/src/libraries/network/WANDiscoverable.h

@@ -28 +28 @@
 
 #include "NetworkPrereqs.h"
-// #include "core/OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
 #include "core/CoreIncludes.h"
 #include "MasterServerComm.h"

code/branches/unity_build/src/modules/objects/eventsystem/EventFilter.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Event.h"
 #include "core/XMLPort.h"
 #include "EventName.h"

code/branches/unity_build/src/modules/objects/eventsystem/EventListener.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Event.h"
 #include "core/XMLPort.h"
 

code/branches/unity_build/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/SubclassIdentifier.h"
 #include "worldentities/pawns/Pawn.h"