Context Navigation

← Previous Change
Next Change →

core

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/libraries/core

Files:

: 2 added
: 29 edited
: 6 moved

BaseObject.h (modified) (1 diff)
CMakeLists.txt (modified) (3 diffs)
ClassTreeMask.cc (modified) (1 diff)
Core.cc (modified) (1 diff)
Core.h (modified) (1 diff)
CoreIncludes.h (modified) (1 diff)
Event.cc (modified) (1 diff)
GUIManager.h (modified) (1 diff)
Game.h (modified) (1 diff)
GraphicsManager.h (modified) (1 diff)
ViewportEventListener.h (modified) (1 diff)
WindowEventListener.h (modified) (1 diff)
XMLNameListener.h (modified) (1 diff)
XMLPort.h (modified) (1 diff)
class (added)
class/CMakeLists.txt (added)
class/Identifier.cc (moved) (moved from code/branches/core6/src/libraries/core/Identifier.cc) (1 diff)
class/Identifier.h (moved) (moved from code/branches/core6/src/libraries/core/Identifier.h) (2 diffs)
class/OrxonoxClass.cc (moved) (moved from code/branches/core6/src/libraries/core/OrxonoxClass.cc) (1 diff)
class/OrxonoxClass.h (moved) (moved from code/branches/core6/src/libraries/core/OrxonoxClass.h) (1 diff)
class/SubclassIdentifier.h (moved) (moved from code/branches/core6/src/libraries/core/SubclassIdentifier.h) (1 diff)
class/Super.h (moved) (moved from code/branches/core6/src/libraries/core/Super.h) (1 diff)
command/ArgumentCompletionFunctions.cc (modified) (1 diff)
command/Functor.h (modified) (1 diff)
command/Shell.h (modified) (1 diff)
config/ConfigValueContainer.h (modified) (1 diff)
config/ConfigValueIncludes.h (modified) (1 diff)
input/InputBuffer.h (modified) (1 diff)
input/JoyStickQuantityListener.h (modified) (1 diff)
input/KeyBinderManager.h (modified) (1 diff)
object/ClassFactory.h (modified) (1 diff)
object/ContextObject.h (modified) (1 diff)
object/Iterator.h (modified) (1 diff)
object/MetaObjectList.cc (modified) (1 diff)
object/ObjectListIterator.h (modified) (1 diff)
object/SmartPtr.h (modified) (1 diff)
object/WeakPtr.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

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

Context Navigation

Changeset 9563 for code/branches/core6/src/libraries/core

Legend:

Download in other formats: