Context Navigation

← Previous Changeset
Next Changeset →

Changeset 9558

Timestamp:

Mar 23, 2013, 8:42:47 PM (12 years ago)

Author:

landauf

Message:

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

Location:

code/branches/core6/src

Files:

: 2 added
: 48 edited
: 5 moved

libraries/core/CMakeLists.txt (modified) (4 diffs)
libraries/core/Core.cc (modified) (1 diff)
libraries/core/GUIManager.cc (modified) (1 diff)
libraries/core/Game.cc (modified) (1 diff)
libraries/core/GraphicsManager.cc (modified) (1 diff)
libraries/core/Identifier.cc (modified) (1 diff)
libraries/core/command/ArgumentCompletionFunctions.cc (modified) (1 diff)
libraries/core/command/Shell.cc (modified) (1 diff)
libraries/core/config (added)
libraries/core/config/CMakeLists.txt (added)
libraries/core/config/ConfigFileManager.cc (moved) (moved from code/branches/core6/src/libraries/core/ConfigFileManager.cc) (1 diff)
libraries/core/config/ConfigFileManager.h (moved) (moved from code/branches/core6/src/libraries/core/ConfigFileManager.h) (1 diff)
libraries/core/config/ConfigValueContainer.cc (moved) (moved from code/branches/core6/src/libraries/core/ConfigValueContainer.cc) (1 diff)
libraries/core/config/ConfigValueContainer.h (moved) (moved from code/branches/core6/src/libraries/core/ConfigValueContainer.h) (2 diffs)
libraries/core/config/ConfigValueIncludes.h (moved) (moved from code/branches/core6/src/libraries/core/ConfigValueIncludes.h) (1 diff)
libraries/core/input/Button.cc (modified) (1 diff)
libraries/core/input/InputBuffer.cc (modified) (1 diff)
libraries/core/input/InputManager.cc (modified) (1 diff)
libraries/core/input/JoyStick.cc (modified) (1 diff)
libraries/core/input/KeyBinder.cc (modified) (1 diff)
libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
libraries/network/TrafficControl.cc (modified) (1 diff)
libraries/network/WANDiscoverable.cc (modified) (1 diff)
libraries/network/WANDiscovery.h (modified) (1 diff)
libraries/tools/ParticleInterface.cc (modified) (1 diff)
modules/designtools/ScreenshotManager.cc (modified) (1 diff)
modules/designtools/SkyboxGenerator.cc (modified) (1 diff)
modules/overlays/hud/ChatOverlay.cc (modified) (1 diff)
modules/overlays/hud/HUDEnemyHealthBar.cc (modified) (1 diff)
modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
modules/overlays/stats/Stats.cc (modified) (1 diff)
modules/pong/Pong.cc (modified) (1 diff)
modules/pong/PongAI.cc (modified) (1 diff)
modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
orxonox/LevelManager.cc (modified) (1 diff)
orxonox/MoodManager.cc (modified) (1 diff)
orxonox/Test.cc (modified) (1 diff)
orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
orxonox/gametypes/Dynamicmatch.cc (modified) (1 diff)
orxonox/gametypes/Gametype.cc (modified) (1 diff)
orxonox/gametypes/LastManStanding.cc (modified) (1 diff)
orxonox/gametypes/LastTeamStanding.cc (modified) (1 diff)
orxonox/gametypes/TeamGametype.cc (modified) (1 diff)
orxonox/gametypes/UnderAttack.cc (modified) (1 diff)
orxonox/graphics/Camera.cc (modified) (1 diff)
orxonox/graphics/Model.cc (modified) (1 diff)
orxonox/infos/Bot.cc (modified) (1 diff)
orxonox/infos/HumanPlayer.cc (modified) (1 diff)
orxonox/items/Engine.cc (modified) (1 diff)
orxonox/overlays/InGameConsole.cc (modified) (1 diff)
orxonox/sound/SoundManager.cc (modified) (1 diff)
orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)
orxonox/worldentities/pawns/FpsPlayer.cc (modified) (1 diff)
orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
orxonox/worldentities/pawns/Spectator.cc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

-                      r9557
+                      r9558
   ClassTreeMask.cc
   CommandLineParser.cc
-  ConfigValueContainer.cc
   DynLib.cc
   DynLibManager.cc
 …
 BUILD_UNIT FilesystemBuildUnit.cc
   command/ArgumentCompletionFunctions.cc
   ConfigFileManager.cc
+  config/ConfigFileManager.cc
   PathConfig.cc
 END_BUILD_UNIT
 …
 ADD_SUBDIRECTORY(command)
+ADD_SUBDIRECTORY(config)
 ADD_SUBDIRECTORY(input)
 ADD_SUBDIRECTORY(object)
 …
   TOLUA_FILES
     command/CommandExecutor.h
     ConfigFileManager.h
+    config/ConfigFileManager.h
     Game.h
     GameMode.h

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

-                      r9557
+                      r9558
 #include "PathConfig.h"
 #include "CommandLineParser.h"
 #include "ConfigFileManager.h"
 #include "ConfigValueIncludes.h"
+#include "config/ConfigFileManager.h"
+#include "config/ConfigValueIncludes.h"
 #include "CoreIncludes.h"
 #include "DynLibManager.h"

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

r9050	r9558
78	78	#include "util/OrxAssert.h"
79	79	#include "util/output/BaseWriter.h"
80		#include "ConfigValueIncludes.h"
	80	#include "config/ConfigValueIncludes.h"
81	81	#include "Core.h"
82	82	#include "CoreIncludes.h"

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

r8861	r9558
47	47	#include "Core.h"
48	48	#include "CoreIncludes.h"
49		#include "ConfigValueIncludes.h"
	49	#include "config/ConfigValueIncludes.h"
50	50	#include "GameMode.h"
51	51	#include "GameState.h"

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

r8861	r9558
52	52	#include "util/StringUtils.h"
53	53	#include "util/SubString.h"
54		#include "ConfigValueIncludes.h"
	54	#include "config/ConfigValueIncludes.h"
55	55	#include "CoreIncludes.h"
56	56	#include "Core.h"

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

r9557	r9558
37	37
38	38	#include "util/StringUtils.h"
39		#include "ConfigValueContainer.h"
	39	#include "config/ConfigValueContainer.h"
40	40	#include "XMLPort.h"
41	41	#include "object/ClassFactory.h"

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

-                      r8858
+                      r9558
 #include "util/StringUtils.h"
 #include "core/Identifier.h"
 #include "core/ConfigFileManager.h"
 #include "core/ConfigValueContainer.h"
+#include "core/config/ConfigFileManager.h"
+#include "core/config/ConfigValueContainer.h"
 #include "CommandExecutor.h"
 #include "ConsoleCommand.h"

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

-                      r9550
+                      r9558
 #include "util/output/MemoryWriter.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigFileManager.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigFileManager.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/PathConfig.h"
 #include "core/input/InputBuffer.h"

code/branches/core6/src/libraries/core/config/ConfigFileManager.cc

-                      r9552
+                      r9558
 #include "util/Math.h"
 #include "util/StringUtils.h"
+#include "core/PathConfig.h"
+#include "core/command/ConsoleCommand.h"
 #include "ConfigValueContainer.h"
-#include "PathConfig.h"
-#include "command/ConsoleCommand.h"
 namespace orxonox

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

r9552	r9558
36	36	#define _ConfigFileManager_H__
37	37
38		#include "CorePrereqs.h"
	38	#include "core/CorePrereqs.h"
39	39
40	40	#include <list>

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

-                      r9552
+                      r9558
 #include "util/Convert.h"
 #include "util/SubString.h"
+#include "core/Language.h"
 #include "ConfigFileManager.h"
-#include "Language.h"
 namespace orxonox

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

-                      r9552
+                      r9558
 #define _ConfigValueContainer_H__
 #include "CorePrereqs.h"
+#include "core/CorePrereqs.h"
 #include <string>
 …
 #include "util/MultiType.h"
 #include "Identifier.h"
+#include "core/Identifier.h"
 namespace orxonox

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

-                      r9552
+                      r9558
 #define _ConfigValueIncludes_H__
 #include "CorePrereqs.h"
 #include "Identifier.h"
+#include "core/CorePrereqs.h"
+#include "core/Identifier.h"
 #include "ConfigValueContainer.h"

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

r8858	r9558
42	42	#include "core/command/CommandEvaluation.h"
43	43	#include "core/command/CommandExecutor.h"
44		#include "core/ConfigFileManager.h"
	44	#include "core/config/ConfigFileManager.h"
45	45
46	46	namespace orxonox

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

r6417	r9558
31	31	#include "util/Clipboard.h"
32	32	#include "core/CoreIncludes.h"
33		#include "core/ConfigValueIncludes.h"
	33	#include "core/config/ConfigValueIncludes.h"
34	34
35	35	namespace orxonox

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

r9550	r9558
46	46	#include "util/Exception.h"
47	47	#include "core/CoreIncludes.h"
48		#include "core/ConfigValueIncludes.h"
	48	#include "core/config/ConfigValueIncludes.h"
49	49	#include "core/CommandLineParser.h"
50	50	#include "core/GraphicsManager.h"

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

-                      r8858
+                      r9558
 #include "util/StringUtils.h"
 #include "core/ConfigFileManager.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigFileManager.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"

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

-                      r8858
+                      r9558
 #include "util/Output.h"
 #include "util/Exception.h"
-#include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
+#include "core/ConfigFileManager.h"
+#include "core/config/ConfigValueIncludes.h"
+#include "core/config/ConfigFileManager.h"
 #include "core/PathConfig.h"
 #include "InputCommands.h"

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

r8858	r9558
32	32	#include "util/Exception.h"
33	33	#include "util/ScopedSingletonManager.h"
34		#include "core/ConfigValueIncludes.h"
	34	#include "core/config/ConfigValueIncludes.h"
35	35	#include "core/CoreIncludes.h"
36	36	#include "core/LuaState.h"

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

r8858	r9558
33	33
34	34	#include "core/CoreIncludes.h"
35		#include "core/ConfigValueIncludes.h"
	35	#include "core/config/ConfigValueIncludes.h"
36	36	#include "synchronisable/Synchronisable.h"
37	37

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

r8858	r9558
33	33
34	34	#include "MasterServerProtocol.h"
35		#include "core/ConfigValueIncludes.h"
	35	#include "core/config/ConfigValueIncludes.h"
36	36	#include "core/CoreIncludes.h"
37	37

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

-                      r8858
+                      r9558
 #include "NetworkPrereqs.h"
 #include "packet/ServerInformation.h"
 #include "core/ConfigFileManager.h"
+#include "core/CoreIncludes.h"
 #include "core/OrxonoxClass.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
+#include "core/config/ConfigFileManager.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "MasterServerComm.h"
 #include "MasterServerProtocol.h"

code/branches/core6/src/libraries/tools/ParticleInterface.cc

r8858	r9558
43	43	#include "util/Math.h"
44	44	#include "core/CoreIncludes.h"
45		#include "core/ConfigValueIncludes.h"
	45	#include "core/config/ConfigValueIncludes.h"
46	46	#include "core/GameMode.h"
47	47

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

r8858	r9558
42	42	#include <OgreViewport.h>
43	43
44		#include "core/ConfigValueIncludes.h"
	44	#include "core/config/ConfigValueIncludes.h"
45	45	#include "core/GraphicsManager.h"
46	46	#include "core/PathConfig.h"

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

r8858	r9558
40	40	#include "util/ScopedSingletonManager.h"
41	41	#include "core/CoreIncludes.h"
42		#include "core/ConfigValueIncludes.h"
	42	#include "core/config/ConfigValueIncludes.h"
43	43	#include "core/GraphicsManager.h"
44	44	#include "core/PathConfig.h"

code/branches/core6/src/modules/overlays/hud/ChatOverlay.cc

r8858	r9558
35	35	#include "util/DisplayStringConversions.h"
36	36	#include "core/CoreIncludes.h"
37		#include "core/ConfigValueIncludes.h"
	37	#include "core/config/ConfigValueIncludes.h"
38	38	#include "core/command/Executor.h"
39	39

code/branches/core6/src/modules/overlays/hud/HUDEnemyHealthBar.cc

r9348	r9558
29	29	#include "HUDEnemyHealthBar.h"
30	30
31		#include "core/ConfigValueIncludes.h"
	31	#include "core/config/ConfigValueIncludes.h"
32	32	#include "worldentities/pawns/Pawn.h"
33	33

code/branches/core6/src/modules/overlays/hud/HUDNavigation.cc

r9526	r9558
51	51	#include "worldentities/pawns/Pawn.h"
52	52	#include "worldentities/WorldEntity.h"
53		#include "core/ConfigValueIncludes.h"
	53	#include "core/config/ConfigValueIncludes.h"
54	54	#include "tools/TextureGenerator.h"
55	55	// #include <boost/bind/bind_template.hpp>

code/branches/core6/src/modules/overlays/stats/Stats.cc

r7401	r9558
35	35	#include "util/StringUtils.h"
36	36	#include "core/CoreIncludes.h"
37		#include "core/ConfigValueIncludes.h"
	37	#include "core/config/ConfigValueIncludes.h"
38	38
39	39	namespace orxonox

code/branches/core6/src/modules/pong/Pong.cc

r9348	r9558
37	37	#include "core/EventIncludes.h"
38	38	#include "core/command/Executor.h"
39		#include "core/ConfigValueIncludes.h"
	39	#include "core/config/ConfigValueIncludes.h"
40	40
41	41	#include "gamestates/GSLevel.h"

code/branches/core6/src/modules/pong/PongAI.cc

r8952	r9558
35	35
36	36	#include "core/CoreIncludes.h"
37		#include "core/ConfigValueIncludes.h"
	37	#include "core/config/ConfigValueIncludes.h"
38	38	#include "core/command/Executor.h"
39	39	#include "tools/Timer.h"

code/branches/core6/src/modules/weapons/projectiles/Projectile.cc

r8855	r9558
34	34	#include "Projectile.h"
35	35
36		#include "core/ConfigValueIncludes.h"
	36	#include "core/config/ConfigValueIncludes.h"
37	37	#include "core/CoreIncludes.h"
38	38	#include "core/GameMode.h"

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

r9550	r9558
39	39	#include "core/ClassTreeMask.h"
40	40	#include "core/CommandLineParser.h"
41		#include "core/ConfigValueIncludes.h"
	41	#include "core/config/ConfigValueIncludes.h"
42	42	#include "core/CoreIncludes.h"
43	43	#include "core/Loader.h"

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

r8858	r9558
30	30
31	31	#include "util/ScopedSingletonManager.h"
32		#include "core/ConfigValueIncludes.h"
	32	#include "core/config/ConfigValueIncludes.h"
33	33	#include "core/CoreIncludes.h"
34	34	#include "core/Resource.h"

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

r8858	r9558
28	28
29	29	#include "core/CoreIncludes.h"
30		#include "core/ConfigValueIncludes.h"
	30	#include "core/config/ConfigValueIncludes.h"
31	31	#include "core/command/ConsoleCommand.h"
32	32	#include "network/NetworkFunction.h"

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

r8858	r9558
31	31	#include <OgreSceneManager.h>
32	32
33		#include "core/ConfigValueIncludes.h"
	33	#include "core/config/ConfigValueIncludes.h"
34	34	#include "core/CoreIncludes.h"
35	35	#include "core/Game.h"

code/branches/core6/src/orxonox/gametypes/Dynamicmatch.cc

r9348	r9558
54	54	#include "worldentities/pawns/Pawn.h"
55	55	#include "worldentities/pawns/SpaceShip.h"
56		#include "core/ConfigValueIncludes.h"
	56	#include "core/config/ConfigValueIncludes.h"
57	57	#include "interfaces/TeamColourable.h"
58	58	#include "items/Engine.h"

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

r9348	r9558
32	32	#include "core/Core.h"
33	33	#include "core/CoreIncludes.h"
34		#include "core/ConfigValueIncludes.h"
	34	#include "core/config/ConfigValueIncludes.h"
35	35	#include "core/GameMode.h"
36	36	#include "core/command/ConsoleCommand.h"

code/branches/core6/src/orxonox/gametypes/LastManStanding.cc

r9348	r9558
33	33	#include "infos/PlayerInfo.h"
34	34	#include "worldentities/pawns/Pawn.h"
35		#include "core/ConfigValueIncludes.h"
	35	#include "core/config/ConfigValueIncludes.h"
36	36	#include "util/Convert.h"
37	37

code/branches/core6/src/orxonox/gametypes/LastTeamStanding.cc

r9348	r9558
33	33	#include "infos/PlayerInfo.h"
34	34	#include "worldentities/pawns/Pawn.h"
35		#include "core/ConfigValueIncludes.h"
	35	#include "core/config/ConfigValueIncludes.h"
36	36	#include "util/Convert.h"
37	37

code/branches/core6/src/orxonox/gametypes/TeamGametype.cc

r9348	r9558
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "core/ConfigValueIncludes.h"
	32	#include "core/config/ConfigValueIncludes.h"
33	33	#include "infos/PlayerInfo.h"
34	34	#include "interfaces/TeamColourable.h"

code/branches/core6/src/orxonox/gametypes/UnderAttack.cc

r9348	r9558
31	31	#include "util/Convert.h"
32	32	#include "core/CoreIncludes.h"
33		#include "core/ConfigValueIncludes.h"
	33	#include "core/config/ConfigValueIncludes.h"
34	34	#include "chat/ChatManager.h"
35	35	#include "worldentities/pawns/Destroyer.h"

code/branches/core6/src/orxonox/graphics/Camera.cc

r8706	r9558
37	37	#include "util/StringUtils.h"
38	38	#include "core/CoreIncludes.h"
39		#include "core/ConfigValueIncludes.h"
	39	#include "core/config/ConfigValueIncludes.h"
40	40	#include "core/GameMode.h"
41	41	#include "core/GUIManager.h"

code/branches/core6/src/orxonox/graphics/Model.cc

r8858	r9558
32	32
33	33	#include "core/CoreIncludes.h"
34		#include "core/ConfigValueIncludes.h"
	34	#include "core/config/ConfigValueIncludes.h"
35	35	#include "core/GameMode.h"
36	36	#include "core/XMLPort.h"

code/branches/core6/src/orxonox/infos/Bot.cc

r7801	r9558
32	32	#include "core/GameMode.h"
33	33	#include "core/CoreIncludes.h"
34		#include "core/ConfigValueIncludes.h"
	34	#include "core/config/ConfigValueIncludes.h"
35	35	#include "gametypes/Gametype.h"
36	36	#include "controllers/AIController.h"

code/branches/core6/src/orxonox/infos/HumanPlayer.cc

r8327	r9558
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "core/ConfigValueIncludes.h"
	32	#include "core/config/ConfigValueIncludes.h"
33	33	#include "core/GameMode.h"
34	34	// #include "network/ClientInformation.h"

code/branches/core6/src/orxonox/items/Engine.cc

r8858	r9558
30	30
31	31	#include "core/CoreIncludes.h"
32		#include "core/ConfigValueIncludes.h"
	32	#include "core/config/ConfigValueIncludes.h"
33	33	#include "core/Template.h"
34	34	#include "core/XMLPort.h"

code/branches/core6/src/orxonox/overlays/InGameConsole.cc

r9550	r9558
49	49	#include "util/output/OutputManager.h"
50	50	#include "core/CoreIncludes.h"
51		#include "core/ConfigValueIncludes.h"
	51	#include "core/config/ConfigValueIncludes.h"
52	52	#include "core/command/ConsoleCommand.h"
53	53	#include "core/GUIManager.h"

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

r8903	r9558
39	39	#include "util/Clock.h"
40	40	#include "util/ScopedSingletonManager.h"
41		#include "core/ConfigValueIncludes.h"
	41	#include "core/config/ConfigValueIncludes.h"
42	42	#include "core/CoreIncludes.h"
43	43	#include "core/GameMode.h"

code/branches/core6/src/orxonox/worldentities/ControllableEntity.cc

r9348	r9558
33	33
34	34	#include "core/CoreIncludes.h"
35		#include "core/ConfigValueIncludes.h"
	35	#include "core/config/ConfigValueIncludes.h"
36	36	#include "core/GameMode.h"
37	37	#include "core/XMLPort.h"

code/branches/core6/src/orxonox/worldentities/pawns/FpsPlayer.cc

r9016	r9558
38	38
39	39	#include "core/CoreIncludes.h"
40		#include "core/ConfigValueIncludes.h"
	40	#include "core/config/ConfigValueIncludes.h"
41	41	#include "core/Template.h"
42	42	#include "core/XMLPort.h"

code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc

r9348	r9558
32	32
33	33	#include "core/CoreIncludes.h"
34		#include "core/ConfigValueIncludes.h"
	34	#include "core/config/ConfigValueIncludes.h"
35	35	#include "core/Template.h"
36	36	#include "core/XMLPort.h"

code/branches/core6/src/orxonox/worldentities/pawns/Spectator.cc

r7863	r9558
31	31	#include "util/Convert.h"
32	32	#include "core/CoreIncludes.h"
33		#include "core/ConfigValueIncludes.h"
	33	#include "core/config/ConfigValueIncludes.h"
34	34	#include "core/GameMode.h"
35	35	#include "core/command/CommandExecutor.h"

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

Context Navigation

Changeset 9558

Legend:

Download in other formats: