Context Navigation

← Previous Change
Next Change →

Changeset 9563 for code/branches

Timestamp:

Mar 24, 2013, 5:33:43 PM (12 years ago)

Author:

landauf

Message:

moved files used for class management to core/class/

Location:

code/branches/core6/src

Files:

: 2 added
: 72 edited
: 6 moved

libraries/core/BaseObject.h (modified) (1 diff)
libraries/core/CMakeLists.txt (modified) (3 diffs)
libraries/core/ClassTreeMask.cc (modified) (1 diff)
libraries/core/Core.cc (modified) (1 diff)
libraries/core/Core.h (modified) (1 diff)
libraries/core/CoreIncludes.h (modified) (1 diff)
libraries/core/Event.cc (modified) (1 diff)
libraries/core/GUIManager.h (modified) (1 diff)
libraries/core/Game.h (modified) (1 diff)
libraries/core/GraphicsManager.h (modified) (1 diff)
libraries/core/ViewportEventListener.h (modified) (1 diff)
libraries/core/WindowEventListener.h (modified) (1 diff)
libraries/core/XMLNameListener.h (modified) (1 diff)
libraries/core/XMLPort.h (modified) (1 diff)
libraries/core/class (added)
libraries/core/class/CMakeLists.txt (added)
libraries/core/class/Identifier.cc (moved) (moved from code/branches/core6/src/libraries/core/Identifier.cc) (1 diff)
libraries/core/class/Identifier.h (moved) (moved from code/branches/core6/src/libraries/core/Identifier.h) (2 diffs)
libraries/core/class/OrxonoxClass.cc (moved) (moved from code/branches/core6/src/libraries/core/OrxonoxClass.cc) (1 diff)
libraries/core/class/OrxonoxClass.h (moved) (moved from code/branches/core6/src/libraries/core/OrxonoxClass.h) (1 diff)
libraries/core/class/SubclassIdentifier.h (moved) (moved from code/branches/core6/src/libraries/core/SubclassIdentifier.h) (1 diff)
libraries/core/class/Super.h (moved) (moved from code/branches/core6/src/libraries/core/Super.h) (1 diff)
libraries/core/command/ArgumentCompletionFunctions.cc (modified) (1 diff)
libraries/core/command/Functor.h (modified) (1 diff)
libraries/core/command/Shell.h (modified) (1 diff)
libraries/core/config/ConfigValueContainer.h (modified) (1 diff)
libraries/core/config/ConfigValueIncludes.h (modified) (1 diff)
libraries/core/input/InputBuffer.h (modified) (1 diff)
libraries/core/input/JoyStickQuantityListener.h (modified) (1 diff)
libraries/core/input/KeyBinderManager.h (modified) (1 diff)
libraries/core/object/ClassFactory.h (modified) (1 diff)
libraries/core/object/ContextObject.h (modified) (1 diff)
libraries/core/object/Iterator.h (modified) (1 diff)
libraries/core/object/MetaObjectList.cc (modified) (1 diff)
libraries/core/object/ObjectListIterator.h (modified) (1 diff)
libraries/core/object/SmartPtr.h (modified) (1 diff)
libraries/core/object/WeakPtr.h (modified) (1 diff)
libraries/network/ClientConnectionListener.h (modified) (1 diff)
libraries/network/NetworkChatListener.h (modified) (1 diff)
libraries/network/NetworkFunction.h (modified) (1 diff)
libraries/network/WANDiscoverable.h (modified) (1 diff)
libraries/network/WANDiscovery.h (modified) (1 diff)
libraries/network/synchronisable/Synchronisable.h (modified) (1 diff)
libraries/tools/Timer.h (modified) (1 diff)
libraries/tools/interfaces/Tickable.h (modified) (1 diff)
libraries/tools/interfaces/TimeFactorListener.h (modified) (1 diff)
modules/designtools/ScreenshotManager.h (modified) (1 diff)
modules/designtools/SkyboxGenerator.h (modified) (1 diff)
modules/notifications/NotificationManager.h (modified) (1 diff)
modules/pickup/PickupManager.cc (modified) (1 diff)
modules/questsystem/QuestManager.h (modified) (1 diff)
modules/weapons/projectiles/BasicProjectile.h (modified) (1 diff)
orxonox/CameraManager.h (modified) (1 diff)
orxonox/LevelInfo.h (modified) (1 diff)
orxonox/LevelManager.h (modified) (1 diff)
orxonox/MoodManager.h (modified) (1 diff)
orxonox/chat/ChatListener.h (modified) (1 diff)
orxonox/controllers/FormationController.h (modified) (1 diff)
orxonox/gamestates/GSLevel.h (modified) (1 diff)
orxonox/gamestates/GSMainMenu.h (modified) (1 diff)
orxonox/gametypes/Gametype.h (modified) (1 diff)
orxonox/infos/PlayerInfo.h (modified) (1 diff)
orxonox/interfaces/GametypeMessageListener.h (modified) (1 diff)
orxonox/interfaces/NotificationListener.h (modified) (1 diff)
orxonox/interfaces/PickupCarrier.cc (modified) (1 diff)
orxonox/interfaces/PickupCarrier.h (modified) (1 diff)
orxonox/interfaces/PickupListener.h (modified) (1 diff)
orxonox/interfaces/Pickupable.cc (modified) (1 diff)
orxonox/interfaces/Pickupable.h (modified) (1 diff)
orxonox/interfaces/PlayerTrigger.h (modified) (1 diff)
orxonox/interfaces/RadarListener.h (modified) (1 diff)
orxonox/interfaces/RadarViewable.h (modified) (1 diff)
orxonox/interfaces/Rewardable.h (modified) (1 diff)
orxonox/interfaces/TeamColourable.h (modified) (1 diff)
orxonox/overlays/OrxonoxOverlay.h (modified) (1 diff)
orxonox/sound/BaseSound.h (modified) (1 diff)
orxonox/sound/SoundManager.h (modified) (1 diff)
orxonox/weaponsystem/WeaponMode.h (modified) (1 diff)
orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)
orxonox/worldentities/SpawnPoint.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/core6/src/libraries/core/BaseObject.h

-                      r9557
+                      r9563
 #include "util/mbool.h"
 #include "OrxonoxClass.h"
 #include "Super.h"
+#include "class/OrxonoxClass.h"
+#include "class/Super.h"
 #include "object/SmartPtr.h"

code/branches/core6/src/libraries/core/CMakeLists.txt

-                      r9560
+                      r9563
   GameMode.cc
   GameState.cc
-  Identifier.cc
   Language.cc
   Loader.cc
 …
   Namespace.cc
   NamespaceNode.cc
-  OrxonoxClass.cc
   Template.cc
   ViewportEventListener.cc
 …
+)
+ADD_SUBDIRECTORY(class)
 ADD_SUBDIRECTORY(command)
 ADD_SUBDIRECTORY(config)

code/branches/core6/src/libraries/core/ClassTreeMask.cc

r7401	r9563
33	33
34	34	#include "ClassTreeMask.h"
35		#include "Identifier.h"
	35	#include "class/Identifier.h"
36	36
37	37	namespace orxonox

code/branches/core6/src/libraries/core/Core.cc

r9560	r9563
68	68	#include "GraphicsManager.h"
69	69	#include "GUIManager.h"
70		#include "Identifier.h"
	70	#include "class/Identifier.h"
71	71	#include "Language.h"
72	72	#include "LuaState.h"

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

r8858	r9563
47	47	#include "util/DestructionHelper.h"
48	48	#include "util/Singleton.h"
49		#include "OrxonoxClass.h"
	49	#include "class/OrxonoxClass.h"
50	50
51	51	namespace orxonox

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

r9557	r9563
79	79
80	80	#include "util/Output.h"
81		#include "Identifier.h"
	81	#include "class/Identifier.h"
82	82	#include "object/ClassFactory.h"
83	83	#include "object/ObjectList.h"

code/branches/core6/src/libraries/core/Event.cc

r8858	r9563
35	35
36	36	#include "BaseObject.h"
37		#include "Identifier.h"
	37	#include "class/Identifier.h"
38	38
39	39	namespace orxonox

code/branches/core6/src/libraries/core/GUIManager.h

r8862	r9563
49	49	#include "util/Singleton.h"
50	50	#include "input/InputHandler.h"
51		#include "OrxonoxClass.h"
	51	#include "class/OrxonoxClass.h"
52	52	#include "WindowEventListener.h"
53	53

code/branches/core6/src/libraries/core/Game.h

r8858	r9563
50	50	#include "util/DestructionHelper.h"
51	51	#include "util/Singleton.h"
52		#include "OrxonoxClass.h"
	52	#include "class/OrxonoxClass.h"
53	53
54	54	/**

code/branches/core6/src/libraries/core/GraphicsManager.h

r8858	r9563
52	52	#include "util/DestructionHelper.h"
53	53	#include "util/Singleton.h"
54		#include "OrxonoxClass.h"
	54	#include "class/OrxonoxClass.h"
55	55
56	56	// tolua_begin

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

r8729	r9563
33	33
34	34	#include "util/OgreForwardRefs.h"
35		#include "OrxonoxClass.h"
	35	#include "class/OrxonoxClass.h"
36	36
37	37	namespace orxonox

code/branches/core6/src/libraries/core/WindowEventListener.h

r7874	r9563
36	36
37	37	#include "CorePrereqs.h"
38		#include "OrxonoxClass.h"
	38	#include "class/OrxonoxClass.h"
39	39
40	40	namespace orxonox

code/branches/core6/src/libraries/core/XMLNameListener.h

r7401	r9563
36	36
37	37	#include "CorePrereqs.h"
38		#include "OrxonoxClass.h"
	38	#include "class/OrxonoxClass.h"
39	39
40	40	namespace orxonox

code/branches/core6/src/libraries/core/XMLPort.h

r9348	r9563
58	58	#include "util/OrxAssert.h"
59	59	#include "util/StringUtils.h"
60		#include "Identifier.h"
	60	#include "class/Identifier.h"
61	61	#include "BaseObject.h"
62	62	#include "command/Executor.h"

code/branches/core6/src/libraries/core/class/Identifier.cc

-                      r9558
+                      r9563
 #include "util/StringUtils.h"
 #include "config/ConfigValueContainer.h"
 #include "XMLPort.h"
 #include "object/ClassFactory.h"
+#include "core/config/ConfigValueContainer.h"
+#include "core/XMLPort.h"
+#include "core/object/ClassFactory.h"
 namespace orxonox

code/branches/core6/src/libraries/core/class/Identifier.h

-                      r9557
+                      r9563
 #define _Identifier_H__
 #include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 #include <cassert>
 …
 #include "util/Output.h"
 #include "object/MetaObjectList.h"
 #include "object/ObjectList.h"
 #include "object/ObjectListBase.h"
+#include "core/object/MetaObjectList.h"
+#include "core/object/ObjectList.h"
+#include "core/object/ObjectListBase.h"
 #include "Super.h"

code/branches/core6/src/libraries/core/class/OrxonoxClass.cc

-                      r9562
+                      r9563
 #include <cassert>
 #include "object/MetaObjectList.h"
 #include "object/Context.h"
+#include "core/object/MetaObjectList.h"
+#include "core/object/Context.h"
 #include "Identifier.h"

code/branches/core6/src/libraries/core/class/OrxonoxClass.h

r9562	r9563
44	44	#define _OrxonoxClass_H__
45	45
46		#include "CorePrereqs.h"
	46	#include "core/CorePrereqs.h"
47	47
48	48	#include <set>

code/branches/core6/src/libraries/core/class/SubclassIdentifier.h

r9556	r9563
66	66	#define _SubclassIdentifier_H__
67	67
68		#include "CorePrereqs.h"
	68	#include "core/CorePrereqs.h"
69	69
70	70	#include <cstdlib>

code/branches/core6/src/libraries/core/class/Super.h

r9552	r9563
72	72	#define _Super_H__
73	73
74		#include "CorePrereqs.h"
	74	#include "core/CorePrereqs.h"
75	75	#include "util/Output.h"
76	76

code/branches/core6/src/libraries/core/command/ArgumentCompletionFunctions.cc

r9559	r9563
39	39	#include "util/Convert.h"
40	40	#include "util/StringUtils.h"
41		#include "core/Identifier.h"
	41	#include "core/class/Identifier.h"
42	42	#include "core/config/SettingsConfigFile.h"
43	43	#include "core/config/ConfigValueContainer.h"

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

r9550	r9563
120	120	#include "util/Output.h"
121	121	#include "util/MultiType.h"
122		#include "core/OrxonoxClass.h"
	122	#include "core/class/OrxonoxClass.h"
123	123	#include "FunctorPtr.h"
124	124

code/branches/core6/src/libraries/core/command/Shell.h

r8858	r9563
50	50	#include "util/output/BaseWriter.h"
51	51	#include "core/Core.h"
52		#include "core/OrxonoxClass.h"
	52	#include "core/class/OrxonoxClass.h"
53	53
54	54	namespace orxonox

code/branches/core6/src/libraries/core/config/ConfigValueContainer.h

r9558	r9563
51	51
52	52	#include "util/MultiType.h"
53		#include "core/Identifier.h"
	53	#include "core/class/Identifier.h"
54	54
55	55	namespace orxonox

code/branches/core6/src/libraries/core/config/ConfigValueIncludes.h

r9558	r9563
103	103	#include "core/CorePrereqs.h"
104	104
105		#include "core/Identifier.h"
	105	#include "core/class/Identifier.h"
106	106	#include "ConfigValueContainer.h"
107	107

code/branches/core6/src/libraries/core/input/InputBuffer.h

r6417	r9563
34	34	#include <list>
35	35	#include <string>
36		#include "core/OrxonoxClass.h"
	36	#include "core/class/OrxonoxClass.h"
37	37	#include "InputHandler.h"
38	38

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

r8729	r9563
38	38
39	39	#include <vector>
40		#include "core/OrxonoxClass.h"
	40	#include "core/class/OrxonoxClass.h"
41	41
42	42	namespace orxonox

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

r8729	r9563
36	36
37	37	#include "util/Singleton.h"
38		#include "core/OrxonoxClass.h"
	38	#include "core/class/OrxonoxClass.h"
39	39
40	40	namespace orxonox //tolua_export

code/branches/core6/src/libraries/core/object/ClassFactory.h

r9557	r9563
43	43
44	44	#include "util/Output.h"
45		#include "core/Identifier.h"
	45	#include "core/class/Identifier.h"
46	46
47	47	namespace orxonox

code/branches/core6/src/libraries/core/object/ContextObject.h

r9562	r9563
37	37	#include "core/CorePrereqs.h"
38	38
39		#include "core/OrxonoxClass.h"
	39	#include "core/class/OrxonoxClass.h"
40	40
41	41	namespace orxonox

code/branches/core6/src/libraries/core/object/Iterator.h

r9557	r9563
56	56	#include "core/CorePrereqs.h"
57	57
58		#include "core/Identifier.h"
	58	#include "core/class/Identifier.h"
59	59	#include "ObjectListBase.h"
60	60

code/branches/core6/src/libraries/core/object/MetaObjectList.cc

r9557	r9563
35	35
36	36	#include "util/Output.h"
37		#include "core/Identifier.h"
	37	#include "core/class/Identifier.h"
38	38	#include "ObjectListBase.h"
39	39

code/branches/core6/src/libraries/core/object/ObjectListIterator.h

r9557	r9563
56	56
57	57	#include "core/CorePrereqs.h"
58		#include "core/Identifier.h"
	58	#include "core/class/Identifier.h"
59	59	#include "ObjectList.h"
60	60

code/branches/core6/src/libraries/core/object/SmartPtr.h

r9557	r9563
123	123	#include <cassert>
124	124
125		#include "core/OrxonoxClass.h"
	125	#include "core/class/OrxonoxClass.h"
126	126	#include "WeakPtr.h"
127	127

code/branches/core6/src/libraries/core/object/WeakPtr.h

r9557	r9563
85	85	#include <cassert>
86	86
87		#include "core/OrxonoxClass.h"
	87	#include "core/class/OrxonoxClass.h"
88	88	#include "core/command/Functor.h"
89	89

code/branches/core6/src/libraries/network/ClientConnectionListener.h

r8327	r9563
31	31
32	32	#include "NetworkPrereqs.h"
33		#include "core/OrxonoxClass.h"
	33	#include "core/class/OrxonoxClass.h"
34	34
35	35	namespace orxonox

code/branches/core6/src/libraries/network/NetworkChatListener.h

r8858	r9563
32	32	#include "NetworkPrereqs.h"
33	33
34		#include "core/OrxonoxClass.h"
	34	#include "core/class/OrxonoxClass.h"
35	35
36	36	namespace orxonox

code/branches/core6/src/libraries/network/NetworkFunction.h

r8418	r9563
39	39	#include <boost/static_assert.hpp>
40	40
41		#include "core/Identifier.h"
	41	#include "core/class/Identifier.h"
42	42	#include "core/command/Functor.h"
43	43	#include "FunctionCallManager.h"

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

r8858	r9563
30	30
31	31	#include "NetworkPrereqs.h"
32		#include "core/OrxonoxClass.h"
	32	#include "core/class/OrxonoxClass.h"
33	33	#include "core/CoreIncludes.h"
34	34	#include "MasterServerComm.h"

code/branches/core6/src/libraries/network/WANDiscovery.h

r9559	r9563
32	32	#include "packet/ServerInformation.h"
33	33	#include "core/CoreIncludes.h"
34		#include "core/OrxonoxClass.h"
	34	#include "core/class/OrxonoxClass.h"
35	35	#include "core/config/ConfigValueIncludes.h"
36	36	#include "MasterServerComm.h"

code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h

r8858	r9563
40	40
41	41	#include "util/mbool.h"
42		#include "core/OrxonoxClass.h"
	42	#include "core/class/OrxonoxClass.h"
43	43	#include "SynchronisableVariable.h"
44	44	#include "NetworkCallback.h"

code/branches/core6/src/libraries/tools/Timer.h

r8858	r9563
79	79	#include "tools/ToolsPrereqs.h"
80	80
81		#include "core/OrxonoxClass.h"
	81	#include "core/class/OrxonoxClass.h"
82	82	#include "core/command/ExecutorPtr.h"
83	83

code/branches/core6/src/libraries/tools/interfaces/Tickable.h

-                      r5781
+                      r9563
 #include "tools/ToolsPrereqs.h"
 #include "core/OrxonoxClass.h"
 #include "core/Super.h"
+#include "core/class/OrxonoxClass.h"
+#include "core/class/Super.h"
 namespace orxonox

code/branches/core6/src/libraries/tools/interfaces/TimeFactorListener.h

r7172	r9563
31	31
32	32	#include "tools/ToolsPrereqs.h"
33		#include "core/OrxonoxClass.h"
	33	#include "core/class/OrxonoxClass.h"
34	34
35	35	namespace orxonox

code/branches/core6/src/modules/designtools/ScreenshotManager.h

r8413	r9563
44	44
45	45	#include "util/Singleton.h"
46		#include "core/OrxonoxClass.h"
	46	#include "core/class/OrxonoxClass.h"
47	47
48	48	namespace orxonox

code/branches/core6/src/modules/designtools/SkyboxGenerator.h

r8232	r9563
36	36	#define __SkyboxGenerator_h__
37	37
38		#include "core/OrxonoxClass.h"
	38	#include "core/class/OrxonoxClass.h"
39	39	#include "util/Singleton.h"
40	40	#include "tools/interfaces/Tickable.h"

code/branches/core6/src/modules/notifications/NotificationManager.h

r8706	r9563
42	42	#include <string>
43	43
44		#include "core/OrxonoxClass.h"
	44	#include "core/class/OrxonoxClass.h"
45	45	#include "util/Singleton.h"
46	46	#include "interfaces/NotificationListener.h"

code/branches/core6/src/modules/pickup/PickupManager.cc

r9348	r9563
37	37	#include "core/LuaState.h"
38	38	#include "core/GUIManager.h"
39		#include "core/Identifier.h"
	39	#include "core/class/Identifier.h"
40	40	#include "network/Host.h"
41	41	#include "network/NetworkFunction.h"

code/branches/core6/src/modules/questsystem/QuestManager.h

r8706	r9563
43	43
44	44	#include "util/Singleton.h"
45		#include "core/OrxonoxClass.h"
	45	#include "core/class/OrxonoxClass.h"
46	46
47	47	namespace orxonox // tolua_export

code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.h

r8858	r9563
39	39	#include "worldentities/pawns/Pawn.h"
40	40
41		#include "core/OrxonoxClass.h"
	41	#include "core/class/OrxonoxClass.h"
42	42
43	43	namespace orxonox

code/branches/core6/src/orxonox/CameraManager.h

r8079	r9563
41	41	#include "util/OgreForwardRefs.h"
42	42	#include "util/Singleton.h"
43		#include "core/OrxonoxClass.h"
	43	#include "core/class/OrxonoxClass.h"
44	44
45	45	namespace orxonox

code/branches/core6/src/orxonox/LevelInfo.h

r9348	r9563
45	45	#include <iostream>
46	46	#include <fstream>
47		#include "core/OrxonoxClass.h"
	47	#include "core/class/OrxonoxClass.h"
48	48
49	49	namespace orxonox // tolua_export

code/branches/core6/src/orxonox/LevelManager.h

r8079	r9563
46	46
47	47	#include "util/Singleton.h"
48		#include "core/OrxonoxClass.h"
	48	#include "core/class/OrxonoxClass.h"
49	49
50	50	// tolua_begin

code/branches/core6/src/orxonox/MoodManager.h

r8706	r9563
34	34	#include <string>
35	35	#include "util/Singleton.h"
36		#include "core/OrxonoxClass.h"
	36	#include "core/class/OrxonoxClass.h"
37	37
38	38	namespace orxonox

code/branches/core6/src/orxonox/chat/ChatListener.h

r8858	r9563
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include "core/OrxonoxClass.h"
	34	#include "core/class/OrxonoxClass.h"
35	35
36	36	namespace orxonox

code/branches/core6/src/orxonox/controllers/FormationController.h

-                      r9348
+                      r9563
 #include <vector>
 #include "core/Super.h"
+#include "core/class/Super.h"
 #include "util/Math.h"
 #include "core/OrxonoxClass.h"
+#include "core/class/OrxonoxClass.h"
 #include "controllers/Controller.h"
 #include "worldentities/ControllableEntity.h"

code/branches/core6/src/orxonox/gamestates/GSLevel.h

r7876	r9563
34	34	#include <string>
35	35	#include <set>
36		#include "core/OrxonoxClass.h"
	36	#include "core/class/OrxonoxClass.h"
37	37	#include "core/GameState.h"
38	38

code/branches/core6/src/orxonox/gamestates/GSMainMenu.h

r8079	r9563
34	34	#include "util/OgreForwardRefs.h"
35	35	#include "core/GameState.h"
36		#include "core/OrxonoxClass.h"
	36	#include "core/class/OrxonoxClass.h"
37	37
38	38	namespace orxonox

code/branches/core6/src/orxonox/gametypes/Gametype.h

r9348	r9563
37	37
38	38	#include "core/BaseObject.h"
39		#include "core/SubclassIdentifier.h"
	39	#include "core/class/SubclassIdentifier.h"
40	40	#include "tools/interfaces/Tickable.h"
41	41	#include "infos/GametypeInfo.h"

code/branches/core6/src/orxonox/infos/PlayerInfo.h

r8706	r9563
33	33
34	34	#include "Info.h"
35		#include "core/SubclassIdentifier.h"
	35	#include "core/class/SubclassIdentifier.h"
36	36
37	37	namespace orxonox // tolua_export

code/branches/core6/src/orxonox/interfaces/GametypeMessageListener.h

r7163	r9563
31	31
32	32	#include "OrxonoxPrereqs.h"
33		#include "core/OrxonoxClass.h"
	33	#include "core/class/OrxonoxClass.h"
34	34
35	35	namespace orxonox

code/branches/core6/src/orxonox/interfaces/NotificationListener.h

r8706	r9563
44	44	#include "util/StringUtils.h"
45	45
46		#include "core/OrxonoxClass.h"
	46	#include "core/class/OrxonoxClass.h"
47	47
48	48	namespace orxonox

code/branches/core6/src/orxonox/interfaces/PickupCarrier.cc

r8858	r9563
35	35
36	36	#include "core/CoreIncludes.h"
37		#include "core/Identifier.h"
	37	#include "core/class/Identifier.h"
38	38
39	39	#include "Pickupable.h"

code/branches/core6/src/orxonox/interfaces/PickupCarrier.h

r7552	r9563
41	41	#include <vector>
42	42
43		#include "core/OrxonoxClass.h"
	43	#include "core/class/OrxonoxClass.h"
44	44
45	45	namespace orxonox

code/branches/core6/src/orxonox/interfaces/PickupListener.h

r8351	r9563
39	39	#include "Pickupable.h"
40	40
41		#include "core/OrxonoxClass.h"
	41	#include "core/class/OrxonoxClass.h"
42	42
43	43	namespace orxonox

code/branches/core6/src/orxonox/interfaces/Pickupable.cc

r9348	r9563
34	34	#include "Pickupable.h"
35	35
36		#include "core/Identifier.h"
	36	#include "core/class/Identifier.h"
37	37	#include "core/CoreIncludes.h"
38	38	#include "util/Convert.h"

code/branches/core6/src/orxonox/interfaces/Pickupable.h

-                      r9348
+                      r9563
 #include <list>
 #include "core/Super.h"
+#include "core/class/Super.h"
 #include "core/OrxonoxClass.h"
+#include "core/class/OrxonoxClass.h"
 #include "Rewardable.h"

code/branches/core6/src/orxonox/interfaces/PlayerTrigger.h

r9557	r9563
38	38	#include "OrxonoxPrereqs.h"
39	39
40		#include "core/OrxonoxClass.h"
	40	#include "core/class/OrxonoxClass.h"
41	41	#include "core/object/WeakPtr.h"
42	42

code/branches/core6/src/orxonox/interfaces/RadarListener.h

r7163	r9563
31	31
32	32	#include "OrxonoxPrereqs.h"
33		#include "core/OrxonoxClass.h"
	33	#include "core/class/OrxonoxClass.h"
34	34
35	35	namespace orxonox

code/branches/core6/src/orxonox/interfaces/RadarViewable.h

r9557	r9563
36	36
37	37	#include "util/Math.h"
38		#include "core/OrxonoxClass.h"
	38	#include "core/class/OrxonoxClass.h"
39	39	#include "core/object/SmartPtr.h"
40	40

code/branches/core6/src/orxonox/interfaces/Rewardable.h

r7163	r9563
36	36
37	37	#include "OrxonoxPrereqs.h"
38		#include "core/OrxonoxClass.h"
	38	#include "core/class/OrxonoxClass.h"
39	39
40	40	namespace orxonox

code/branches/core6/src/orxonox/interfaces/TeamColourable.h

r5781	r9563
33	33
34	34	#include "util/UtilPrereqs.h"
35		#include "core/OrxonoxClass.h"
	35	#include "core/class/OrxonoxClass.h"
36	36
37	37	namespace orxonox

code/branches/core6/src/orxonox/overlays/OrxonoxOverlay.h

-                      r8706
+                      r9563
 #include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
-#include "core/Super.h"
 #include "core/WindowEventListener.h"
+#include "core/class/Super.h"
 namespace orxonox

code/branches/core6/src/orxonox/sound/BaseSound.h

r7856	r9563
35	35	#include <boost/shared_ptr.hpp>
36	36	#include <OgreDataStream.h>
37		#include "core/OrxonoxClass.h"
	37	#include "core/class/OrxonoxClass.h"
38	38
39	39	namespace orxonox

code/branches/core6/src/orxonox/sound/SoundManager.h

r9557	r9563
39	39
40	40	#include "util/Singleton.h"
41		#include "core/OrxonoxClass.h"
	41	#include "core/class/OrxonoxClass.h"
42	42	#include "core/object/SmartPtr.h"
43	43

code/branches/core6/src/orxonox/weaponsystem/WeaponMode.h

r8706	r9563
36	36	#include "util/Math.h"
37	37	#include "core/BaseObject.h"
38		#include "core/SubclassIdentifier.h"
	38	#include "core/class/SubclassIdentifier.h"
39	39	#include "tools/Timer.h"
40	40

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

r8729	r9563
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "core/SubclassIdentifier.h"
	32	#include "core/class/SubclassIdentifier.h"
33	33	#include "worldentities/pawns/Pawn.h"
34	34

code/branches/core6/src/orxonox/worldentities/SpawnPoint.h

r5929	r9563
33	33
34	34	#include <string>
35		#include "core/SubclassIdentifier.h"
	35	#include "core/class/SubclassIdentifier.h"
36	36	#include "worldentities/StaticEntity.h"
37	37

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 9563 for code/branches

Legend:

Download in other formats: