Changeset 9557

Timestamp:

Mar 23, 2013, 6:49:52 PM (11 years ago)

Author:

landauf

Message:

moved all files in core which are used for object management to a new subdirectory (core/object/)

Location:

code/branches/core6/src

Files:

• libraries/core/BaseObject.cc (modified) (2 diffs)
• libraries/core/BaseObject.h (modified) (1 diff)
• libraries/core/CMakeLists.txt (modified) (2 diffs)
• libraries/core/ClassTreeMask.h (modified) (1 diff)
• libraries/core/Core.cc (modified) (2 diffs)
• libraries/core/CoreIncludes.h (modified) (1 diff)
• libraries/core/Identifier.cc (modified) (1 diff)
• libraries/core/Identifier.h (modified) (1 diff)
• libraries/core/Loader.cc (modified) (1 diff)
• libraries/core/OrxonoxClass.cc (modified) (1 diff)
• libraries/core/input/JoyStickQuantityListener.cc (modified) (1 diff)
• libraries/core/object (added)
• libraries/core/object/CMakeLists.txt (added)
• libraries/core/object/ClassFactory.h (moved) (moved from code/branches/core6/src/libraries/core/ClassFactory.h) (1 diff)
• libraries/core/object/Iterator.h (moved) (moved from code/branches/core6/src/libraries/core/Iterator.h) (1 diff)
• libraries/core/object/MetaObjectList.cc (moved) (moved from code/branches/core6/src/libraries/core/MetaObjectList.cc) (1 diff)
• libraries/core/object/MetaObjectList.h (moved) (moved from code/branches/core6/src/libraries/core/MetaObjectList.h) (1 diff)
• libraries/core/object/ObjectList.h (moved) (moved from code/branches/core6/src/libraries/core/ObjectList.h) (1 diff)
• libraries/core/object/ObjectListBase.cc (moved) (moved from code/branches/core6/src/libraries/core/ObjectListBase.cc) (1 diff)
• libraries/core/object/ObjectListBase.h (moved) (moved from code/branches/core6/src/libraries/core/ObjectListBase.h) (1 diff)
• libraries/core/object/ObjectListIterator.h (moved) (moved from code/branches/core6/src/libraries/core/ObjectListIterator.h) (1 diff)
• libraries/core/object/SmartPtr.h (moved) (moved from code/branches/core6/src/libraries/core/SmartPtr.h) (1 diff)
• libraries/core/object/WeakPtr.h (moved) (moved from code/branches/core6/src/libraries/core/WeakPtr.h) (1 diff)
• libraries/network/Host.cc (modified) (1 diff)
• libraries/network/Server.cc (modified) (1 diff)
• libraries/network/packet/FunctionIDs.cc (modified) (1 diff)
• libraries/network/packet/Gamestate.cc (modified) (1 diff)
• modules/objects/SpaceBoundaries.cc (modified) (1 diff)
• modules/objects/SpaceBoundaries.h (modified) (1 diff)
• modules/objects/triggers/DistanceMultiTrigger.h (modified) (1 diff)
• modules/pickup/PickupManager.h (modified) (1 diff)
• orxonox/CameraManager.cc (modified) (1 diff)
• orxonox/Radar.cc (modified) (1 diff)
• orxonox/Radar.h (modified) (1 diff)
• orxonox/controllers/DroneController.h (modified) (1 diff)
• orxonox/interfaces/PlayerTrigger.h (modified) (1 diff)
• orxonox/interfaces/RadarViewable.h (modified) (1 diff)
• orxonox/sound/SoundManager.h (modified) (1 diff)

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

@@ -39 +39 @@
 #include "Event.h"
 #include "EventIncludes.h"
-#include "Iterator.h"
 #include "Template.h"
 #include "XMLFile.h"
@@ -45 +44 @@
 #include "XMLPort.h"
 #include "command/Functor.h"
+#include "object/Iterator.h"
 
 namespace orxonox

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

@@ -51 +51 @@
 #include "OrxonoxClass.h"
 #include "Super.h"
-#include "SmartPtr.h"
+#include "object/SmartPtr.h"
 
 namespace orxonox

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

@@ -34 +34 @@
   Loader.cc
   LuaState.cc
-  MetaObjectList.cc
   Namespace.cc
   NamespaceNode.cc
-  ObjectListBase.cc
   OrxonoxClass.cc
   Template.cc
@@ -70 +68 @@
 ADD_SUBDIRECTORY(command)
 ADD_SUBDIRECTORY(input)
+ADD_SUBDIRECTORY(object)
 
 ORXONOX_ADD_LIBRARY(core

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

@@ -73 +73 @@
 #include <stack>
 #include "BaseObject.h"
-#include "Iterator.h"
+#include "object/Iterator.h"
 
 namespace orxonox

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

@@ -71 +71 @@
 #include "Language.h"
 #include "LuaState.h"
-#include "ObjectList.h"
 #include "command/ConsoleCommand.h"
 #include "command/IOConsole.h"
@@ -77 +76 @@
 #include "command/TclThreadManager.h"
 #include "input/InputManager.h"
+#include "object/ObjectList.h"
 
 namespace orxonox

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

@@ -80 +80 @@
 #include "util/Output.h"
 #include "Identifier.h"
-#include "ClassFactory.h"
-#include "ObjectList.h"
+#include "object/ClassFactory.h"
+#include "object/ObjectList.h"
 
 

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

@@ -38 +38 @@
 #include "util/StringUtils.h"
 #include "ConfigValueContainer.h"
-#include "ClassFactory.h"
 #include "XMLPort.h"
+#include "object/ClassFactory.h"
 
 namespace orxonox

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

@@ -90 +90 @@
 
 #include "util/Output.h"
-#include "MetaObjectList.h"
-#include "ObjectList.h"
-#include "ObjectListBase.h"
+#include "object/MetaObjectList.h"
+#include "object/ObjectList.h"
+#include "object/ObjectListBase.h"
 #include "Super.h"
 

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

@@ -37 +37 @@
 #include "util/StringUtils.h"
 #include "BaseObject.h"
-#include "Iterator.h"
-#include "ObjectList.h"
 #include "LuaState.h"
 #include "Namespace.h"
 #include "Resource.h"
 #include "XMLFile.h"
+#include "object/Iterator.h"
+#include "object/ObjectList.h"
 
 namespace orxonox

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

@@ -35 +35 @@
 
 #include <cassert>
-#include "MetaObjectList.h"
+#include "object/MetaObjectList.h"
 #include "Identifier.h"
 

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

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 
 namespace orxonox

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

@@ -38 +38 @@
 #define _ClassFactory_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include <string>
 
 #include "util/Output.h"
-#include "Identifier.h"
+#include "core/Identifier.h"
 
 namespace orxonox

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

@@ -54 +54 @@
 #define _Iterator_H__
 
-#include "CorePrereqs.h"
-
-#include "Identifier.h"
+#include "core/CorePrereqs.h"
+
+#include "core/Identifier.h"
 #include "ObjectListBase.h"
 

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

@@ -35 +35 @@
 
 #include "util/Output.h"
-#include "Identifier.h"
+#include "core/Identifier.h"
 #include "ObjectListBase.h"
 

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

@@ -40 +40 @@
 #define _MetaObjectList_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 namespace orxonox

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

@@ -45 +45 @@
 #define _ObjectList_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
-#include "Identifier.h"
 #include "ObjectListBase.h"
 #include "ObjectListIterator.h"

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

@@ -35 +35 @@
 
 #include <set>
-#include "Identifier.h"
 #include "Iterator.h"
 #include "ObjectListIterator.h"

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

@@ -40 +40 @@
 #define _ObjectListBase_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 #include <vector>
 

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

@@ -55 +55 @@
 #define _ObjectListIterator_H__
 
-#include "CorePrereqs.h"
-#include "Identifier.h"
+#include "core/CorePrereqs.h"
+#include "core/Identifier.h"
 #include "ObjectList.h"
 

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

@@ -119 +119 @@
 #define _SmartPtr_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include <cassert>
 
-#include "Identifier.h"
-#include "OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
 #include "WeakPtr.h"
 

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

@@ -81 +81 @@
 #define _WeakPtr_H__
 
-#include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 
 #include <cassert>
-#include "Identifier.h"
-#include "OrxonoxClass.h"
-#include "command/Functor.h"
+
+#include "core/OrxonoxClass.h"
+#include "core/command/Functor.h"
 
 namespace orxonox

code/branches/core6/src/libraries/network/Host.cc

@@ -33 +33 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 #include "core/command/ConsoleCommand.h"
 #include "NetworkChatListener.h"

code/branches/core6/src/libraries/network/Server.cc

@@ -48 +48 @@
 #include "util/Clock.h"
 #include "util/Output.h"
-#include "core/ObjectList.h"
 #include "core/command/Executor.h"
 #include "packet/Chat.h"

code/branches/core6/src/libraries/network/packet/FunctionIDs.cc

@@ -35 +35 @@
 
 #include "util/Output.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 #include "network/NetworkFunction.h"
 

code/branches/core6/src/libraries/network/packet/Gamestate.cc

@@ -34 +34 @@
 #include "util/OrxAssert.h"
 #include "core/GameMode.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 #include "network/synchronisable/Synchronisable.h"
 #include "network/GamestateHandler.h"

code/branches/core6/src/modules/objects/SpaceBoundaries.cc

@@ -32 +32 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ObjectListIterator.h"
+#include "core/object/ObjectListIterator.h"
 #include "core/XMLPort.h"
 

code/branches/core6/src/modules/objects/SpaceBoundaries.h

@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
-#include "core/WeakPtr.h"
+#include "core/object/WeakPtr.h"
 
 #include "tools/interfaces/Tickable.h"

code/branches/core6/src/modules/objects/triggers/DistanceMultiTrigger.h

@@ -40 +40 @@
 #include <map>
 
-#include "core/WeakPtr.h"
+#include "core/object/WeakPtr.h"
 
 #include "worldentities/WorldEntity.h"

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

@@ -39 +39 @@
 
 #include <map>
-#include "core/WeakPtr.h"
+#include "core/object/WeakPtr.h"
 
 #include "PickupRepresentation.h"

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

@@ -38 +38 @@
 #include "core/GameMode.h"
 #include "core/GraphicsManager.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 #include "tools/Shader.h"
 #include "graphics/Camera.h"

code/branches/core6/src/orxonox/Radar.cc

@@ -37 +37 @@
 
 //#include "util/Math.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 #include "core/command/ConsoleCommand.h"
 #include "interfaces/RadarListener.h"

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

@@ -41 +41 @@
 #include <string>
 
-#include "core/ObjectListIterator.h"
+#include "core/object/ObjectListIterator.h"
 #include "interfaces/RadarViewable.h"
 #include "tools/interfaces/Tickable.h"

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

@@ -33 +33 @@
 
 #include "AIController.h"
-#include "core/WeakPtr.h"
+#include "core/object/WeakPtr.h"
 #include "tools/interfaces/Tickable.h"
 

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

@@ -39 +39 @@
 
 #include "core/OrxonoxClass.h"
-#include "core/WeakPtr.h"
+#include "core/object/WeakPtr.h"
 
 namespace orxonox

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

@@ -37 +37 @@
 #include "util/Math.h"
 #include "core/OrxonoxClass.h"
-#include "core/SmartPtr.h"
+#include "core/object/SmartPtr.h"
 
 namespace orxonox

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

@@ -40 +40 @@
 #include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
-#include "core/SmartPtr.h"
+#include "core/object/SmartPtr.h"
 
 // tolua_begin