[Orxonox-commit 3998] r8672 - in code/branches/unity_build/src: libraries/core libraries/core/command libraries/core/input libraries/network modules/objects/eventsystem orxonox/weaponsystem
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun May 29 23:02:17 CEST 2011
Author: rgrieder
Date: 2011-05-29 23:02:17 +0200 (Sun, 29 May 2011)
New Revision: 8672
Modified:
code/branches/unity_build/src/libraries/core/Core.h
code/branches/unity_build/src/libraries/core/CoreIncludes.h
code/branches/unity_build/src/libraries/core/EventIncludes.h
code/branches/unity_build/src/libraries/core/LuaState.h
code/branches/unity_build/src/libraries/core/ObjectListBase.h
code/branches/unity_build/src/libraries/core/OrxonoxClass.h
code/branches/unity_build/src/libraries/core/Super.h
code/branches/unity_build/src/libraries/core/ToluaInterface.h
code/branches/unity_build/src/libraries/core/ViewportEventListener.h
code/branches/unity_build/src/libraries/core/command/Functor.h
code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.h
code/branches/unity_build/src/libraries/core/input/InputManager.h
code/branches/unity_build/src/libraries/core/input/InputPrereqs.h
code/branches/unity_build/src/libraries/core/input/JoyStick.h
code/branches/unity_build/src/libraries/core/input/JoyStickQuantityListener.h
code/branches/unity_build/src/libraries/core/input/KeyBinderManager.h
code/branches/unity_build/src/libraries/core/input/KeyDetector.h
code/branches/unity_build/src/libraries/core/input/Keyboard.h
code/branches/unity_build/src/libraries/network/WANDiscoverable.h
code/branches/unity_build/src/modules/objects/eventsystem/EventFilter.cc
code/branches/unity_build/src/modules/objects/eventsystem/EventListener.cc
code/branches/unity_build/src/orxonox/weaponsystem/WeaponSystem.cc
Log:
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).
Modified: code/branches/unity_build/src/libraries/core/Core.h
===================================================================
--- code/branches/unity_build/src/libraries/core/Core.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/Core.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -44,8 +44,6 @@
#include "CorePrereqs.h"
#include <string>
-#include <loki/ScopeGuard.h>
-
#include "util/DestructionHelper.h"
#include "util/Singleton.h"
#include "OrxonoxClass.h"
Modified: code/branches/unity_build/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/unity_build/src/libraries/core/CoreIncludes.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/CoreIncludes.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -79,7 +79,6 @@
#include "util/Debug.h"
#include "Identifier.h"
-#include "SubclassIdentifier.h"
#include "ClassFactory.h"
#include "ObjectList.h"
Modified: code/branches/unity_build/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/unity_build/src/libraries/core/EventIncludes.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/EventIncludes.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -36,6 +36,8 @@
#define _EventIncludes_H__
#include "CorePrereqs.h"
+
+#include "Event.h"
#include "XMLPort.h"
#include "command/Executor.h"
Modified: code/branches/unity_build/src/libraries/core/LuaState.h
===================================================================
--- code/branches/unity_build/src/libraries/core/LuaState.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/LuaState.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -47,7 +47,6 @@
#include <string>
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <loki/ScopeGuard.h>
#include "ToluaInterface.h"
Modified: code/branches/unity_build/src/libraries/core/ObjectListBase.h
===================================================================
--- code/branches/unity_build/src/libraries/core/ObjectListBase.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/ObjectListBase.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -40,9 +40,7 @@
#define _ObjectListBase_H__
#include "CorePrereqs.h"
-
#include <vector>
-#include "OrxonoxClass.h"
namespace orxonox
{
Modified: code/branches/unity_build/src/libraries/core/OrxonoxClass.h
===================================================================
--- code/branches/unity_build/src/libraries/core/OrxonoxClass.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/OrxonoxClass.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -44,10 +44,10 @@
#define _OrxonoxClass_H__
#include "CorePrereqs.h"
-#include "Super.h"
#include <set>
#include <vector>
+#include "Super.h"
/**
@def CCOUT
Modified: code/branches/unity_build/src/libraries/core/Super.h
===================================================================
--- code/branches/unity_build/src/libraries/core/Super.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/Super.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -72,9 +72,7 @@
#define _Super_H__
#include "CorePrereqs.h"
-
#include "util/Debug.h"
-#include "Event.h"
///////////////////////
// Macro definitions //
Modified: code/branches/unity_build/src/libraries/core/ToluaInterface.h
===================================================================
--- code/branches/unity_build/src/libraries/core/ToluaInterface.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/ToluaInterface.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -38,6 +38,7 @@
#include "CorePrereqs.h"
#include <boost/preprocessor/cat.hpp>
+#include <loki/ScopeGuard.h>
// Macro for declaring a tolua interface of a library/module
#define DeclareToluaInterface(libraryName) \
Modified: code/branches/unity_build/src/libraries/core/ViewportEventListener.h
===================================================================
--- code/branches/unity_build/src/libraries/core/ViewportEventListener.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/ViewportEventListener.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -29,9 +29,9 @@
#ifndef _ViewportEventListener_H__
#define _ViewportEventListener_H__
+#include "CorePrereqs.h"
+
#include "util/OgreForwardRefs.h"
-
-#include "CorePrereqs.h"
#include "OrxonoxClass.h"
namespace orxonox
Modified: code/branches/unity_build/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/unity_build/src/libraries/core/command/Functor.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/command/Functor.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -113,10 +113,10 @@
#ifndef _Functor_H__
#define _Functor_H__
+#include "core/CorePrereqs.h"
+
#include <typeinfo>
-#include "core/CorePrereqs.h"
-
#include "util/Debug.h"
#include "util/MultiType.h"
#include "core/OrxonoxClass.h"
Modified: code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.h
===================================================================
--- code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/command/IOConsoleWindows.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -38,7 +38,6 @@
#include <sstream>
#include <string>
-#include <vector>
#include "util/Singleton.h"
#include "Shell.h"
Modified: code/branches/unity_build/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/InputManager.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/input/InputManager.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -32,7 +32,6 @@
#include "InputPrereqs.h"
#include <map>
-#include <set>
#include <string>
#include <vector>
#include <boost/function.hpp>
Modified: code/branches/unity_build/src/libraries/core/input/InputPrereqs.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/InputPrereqs.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/input/InputPrereqs.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -40,7 +40,6 @@
#include <ois/OISKeyboard.h>
#include <ois/OISMouse.h>
-#include <ois/OISJoyStick.h>
#include "util/OrxEnum.h"
namespace orxonox
Modified: code/branches/unity_build/src/libraries/core/input/JoyStick.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/JoyStick.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/input/JoyStick.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -33,6 +33,7 @@
#include <string>
#include <vector>
+#include <ois/OISJoyStick.h>
#include "InputDevice.h"
namespace orxonox
Modified: code/branches/unity_build/src/libraries/core/input/JoyStickQuantityListener.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/JoyStickQuantityListener.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/input/JoyStickQuantityListener.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -35,6 +35,8 @@
#define _JoyStickQuantityListener_H__
#include "InputPrereqs.h"
+
+#include <vector>
#include "core/OrxonoxClass.h"
namespace orxonox
Modified: code/branches/unity_build/src/libraries/core/input/KeyBinderManager.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/KeyBinderManager.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/input/KeyBinderManager.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -33,7 +33,6 @@
#include <map>
#include <string>
-#include <boost/shared_ptr.hpp>
#include "util/Singleton.h"
#include "core/OrxonoxClass.h"
Modified: code/branches/unity_build/src/libraries/core/input/KeyDetector.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/KeyDetector.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/input/KeyDetector.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -31,7 +31,6 @@
#include "InputPrereqs.h"
-#include <boost/shared_ptr.hpp>
#include "util/Singleton.h"
#include "KeyBinder.h"
Modified: code/branches/unity_build/src/libraries/core/input/Keyboard.h
===================================================================
--- code/branches/unity_build/src/libraries/core/input/Keyboard.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/core/input/Keyboard.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -30,8 +30,6 @@
#define _Core_Keyboard_H__
#include "InputPrereqs.h"
-
-#include "InputHandler.h"
#include "InputDevice.h"
namespace orxonox
Modified: code/branches/unity_build/src/libraries/network/WANDiscoverable.h
===================================================================
--- code/branches/unity_build/src/libraries/network/WANDiscoverable.h 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/libraries/network/WANDiscoverable.h 2011-05-29 21:02:17 UTC (rev 8672)
@@ -27,7 +27,7 @@
#define _WANDiscoverable_H__
#include "NetworkPrereqs.h"
-// #include "core/OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
#include "core/CoreIncludes.h"
#include "MasterServerComm.h"
Modified: code/branches/unity_build/src/modules/objects/eventsystem/EventFilter.cc
===================================================================
--- code/branches/unity_build/src/modules/objects/eventsystem/EventFilter.cc 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/modules/objects/eventsystem/EventFilter.cc 2011-05-29 21:02:17 UTC (rev 8672)
@@ -29,6 +29,7 @@
#include "EventFilter.h"
#include "core/CoreIncludes.h"
+#include "core/Event.h"
#include "core/XMLPort.h"
#include "EventName.h"
Modified: code/branches/unity_build/src/modules/objects/eventsystem/EventListener.cc
===================================================================
--- code/branches/unity_build/src/modules/objects/eventsystem/EventListener.cc 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/modules/objects/eventsystem/EventListener.cc 2011-05-29 21:02:17 UTC (rev 8672)
@@ -29,6 +29,7 @@
#include "EventListener.h"
#include "core/CoreIncludes.h"
+#include "core/Event.h"
#include "core/XMLPort.h"
namespace orxonox
Modified: code/branches/unity_build/src/orxonox/weaponsystem/WeaponSystem.cc
===================================================================
--- code/branches/unity_build/src/orxonox/weaponsystem/WeaponSystem.cc 2011-05-29 20:59:37 UTC (rev 8671)
+++ code/branches/unity_build/src/orxonox/weaponsystem/WeaponSystem.cc 2011-05-29 21:02:17 UTC (rev 8672)
@@ -29,6 +29,7 @@
#include "WeaponSystem.h"
#include "core/CoreIncludes.h"
+#include "core/SubclassIdentifier.h"
#include "worldentities/pawns/Pawn.h"
#include "WeaponSlot.h"
More information about the Orxonox-commit
mailing list