Context Navigation

← Previous Change
Next Change →

Changeset 8788 for code/branches

Timestamp:

Jul 26, 2011, 12:05:23 AM (13 years ago)

Author:

landauf

Message:

changed includes from Debug.h to Output.h
doesn't compile.

Location:

code/branches/output/src

Files:

: 57 edited

Orxonox.cc (modified) (1 diff)
libraries/core/ClassFactory.h (modified) (1 diff)
libraries/core/CommandLineParser.cc (modified) (1 diff)
libraries/core/Core.cc (modified) (1 diff)
libraries/core/CoreIncludes.h (modified) (1 diff)
libraries/core/CorePrecompiledHeaders.h (modified) (1 diff)
libraries/core/GUIManager.cc (modified) (1 diff)
libraries/core/Game.cc (modified) (1 diff)
libraries/core/Game.h (modified) (1 diff)
libraries/core/GameState.cc (modified) (1 diff)
libraries/core/Identifier.h (modified) (1 diff)
libraries/core/Language.cc (modified) (1 diff)
libraries/core/Loader.cc (modified) (1 diff)
libraries/core/LuaState.cc (modified) (1 diff)
libraries/core/MetaObjectList.cc (modified) (1 diff)
libraries/core/NamespaceNode.cc (modified) (1 diff)
libraries/core/PathConfig.cc (modified) (1 diff)
libraries/core/SubclassIdentifier.h (modified) (1 diff)
libraries/core/Super.h (modified) (1 diff)
libraries/core/Template.cc (modified) (1 diff)
libraries/core/XMLPort.h (modified) (1 diff)
libraries/core/command/ConsoleCommandCompilation.cc (modified) (1 diff)
libraries/core/command/Executor.cc (modified) (1 diff)
libraries/core/command/Functor.h (modified) (1 diff)
libraries/core/command/TclBind.cc (modified) (1 diff)
libraries/core/input/Button.cc (modified) (1 diff)
libraries/core/input/InputDevice.h (modified) (1 diff)
libraries/core/input/KeyBinder.cc (modified) (1 diff)
libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
libraries/network/Client.cc (modified) (1 diff)
libraries/network/ClientConnection.cc (modified) (1 diff)
libraries/network/GamestateManager.cc (modified) (1 diff)
libraries/network/LANDiscoverable.cc (modified) (1 diff)
libraries/network/MasterServerComm.cc (modified) (1 diff)
libraries/network/NetworkPrecompiledHeaders.h (modified) (1 diff)
libraries/network/Server.cc (modified) (1 diff)
libraries/network/ServerConnection.cc (modified) (1 diff)
libraries/network/packet/Acknowledgement.cc (modified) (1 diff)
libraries/network/packet/DeleteObjects.cc (modified) (1 diff)
libraries/network/packet/FunctionIDs.cc (modified) (1 diff)
libraries/network/packet/Gamestate.cc (modified) (1 diff)
libraries/network/packet/Packet.cc (modified) (1 diff)
libraries/network/packet/Welcome.cc (modified) (1 diff)
libraries/util/Clipboard.cc (modified) (1 diff)
libraries/util/Convert.h (modified) (1 diff)
libraries/util/Exception.cc (modified) (1 diff)
libraries/util/Exception.h (modified) (1 diff)
libraries/util/OrxAssert.h (modified) (1 diff)
libraries/util/Scope.h (modified) (1 diff)
libraries/util/SignalHandler.cc (modified) (1 diff)
libraries/util/Sleep.cc (modified) (1 diff)
libraries/util/SubString.cc (modified) (1 diff)
modules/weapons/RocketController.cc (modified) (1 diff)
modules/weapons/projectiles/SimpleRocket.cc (modified) (1 diff)
orxonox/gamestates/GSClient.cc (modified) (1 diff)
orxonox/gamestates/GSMasterServer.cc (modified) (1 diff)
orxonox/gamestates/GSServer.cc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/branches/output/src/Orxonox.cc

r8351	r8788
43	43	#endif
44	44
45		#include "util/~~Debug~~.h"
	45	#include "util/Output.h"
46	46	#include "util/Exception.h"
47	47	#include "orxonox/Main.h"

code/branches/output/src/libraries/core/ClassFactory.h

r7401	r8788
42	42	#include <string>
43	43
44		#include "util/~~Debug~~.h"
	44	#include "util/Output.h"
45	45	#include "Identifier.h"
46	46

code/branches/output/src/libraries/core/CommandLineParser.cc

r8729	r8788
33	33
34	34	#include "util/Convert.h"
35		#include "util/~~Debug~~.h"
	35	#include "util/Output.h"
36	36	#include "util/Exception.h"
37	37	#include "util/StringUtils.h"

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

r8729	r8788
52	52
53	53	#include "util/Clock.h"
54		#include "util/~~Debug~~.h"
	54	#include "util/Output.h"
55	55	#include "util/Exception.h"
56	56	#include "util/Scope.h"

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

r8729	r8788
78	78	#include "CorePrereqs.h"
79	79
80		#include "util/~~Debug~~.h"
	80	#include "util/Output.h"
81	81	#include "Identifier.h"
82	82	#include "ClassFactory.h"

code/branches/output/src/libraries/core/CorePrecompiledHeaders.h

r7266	r8788
51	51	#include <set> // 50
52	52
53		#include "util/~~Debug~~.h" // 48
	53	#include "util/Output.h" // 48
54	54
55	55	#include <deque> // 43

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

r8729	r8788
73	73	#include "util/Clock.h"
74	74	#include "util/Convert.h"
75		#include "util/~~Debug~~.h"
	75	#include "util/Output.h"
76	76	#include "util/Exception.h"
77	77	#include "util/Math.h"

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

r8729	r8788
40	40
41	41	#include "util/Clock.h"
42		#include "util/~~Debug~~.h"
	42	#include "util/Output.h"
43	43	#include "util/Exception.h"
44	44	#include "util/Sleep.h"

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

r8423	r8788
47	47	#include <boost/preprocessor/cat.hpp>
48	48
49		#include "util/~~Debug~~.h"
	49	#include "util/Output.h"
50	50	#include "util/DestructionHelper.h"
51	51	#include "util/Singleton.h"

code/branches/output/src/libraries/core/GameState.cc

r6417	r8788
35	35	#include "GameState.h"
36	36
37		~~#include "util/Debug.h"~~
38	37	#include "util/Exception.h"
39	38	#include "util/OrxAssert.h"

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

r8706	r8788
89	89	#include <loki/TypeTraits.h>
90	90
91		#include "util/~~Debug~~.h"
	91	#include "util/Output.h"
92	92	#include "MetaObjectList.h"
93	93	#include "ObjectList.h"

code/branches/output/src/libraries/core/Language.cc

r7401	r8788
35	35
36	36	#include <fstream>
37		#include "util/~~Debug~~.h"
	37	#include "util/Output.h"
38	38	#include "util/StringUtils.h"
39	39	#include "Core.h"

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

r8108	r8788
33	33	#include <boost/scoped_ptr.hpp>
34	34
35		#include "util/~~Debug~~.h"
	35	#include "util/Output.h"
36	36	#include "util/Exception.h"
37	37	#include "util/StringUtils.h"

code/branches/output/src/libraries/core/LuaState.cc

r8729	r8788
37	37	#include <loki/ScopeGuard.h>
38	38
39		#include "util/~~Debug~~.h"
	39	#include "util/Output.h"
40	40	#include "util/Exception.h"
41	41	#include "Resource.h"

code/branches/output/src/libraries/core/MetaObjectList.cc

r5738	r8788
34	34	#include "MetaObjectList.h"
35	35
36		#include "util/~~Debug~~.h"
	36	#include "util/Output.h"
37	37	#include "Identifier.h"
38	38	#include "ObjectListBase.h"

code/branches/output/src/libraries/core/NamespaceNode.cc

r6417	r8788
28	28
29	29	#include "NamespaceNode.h"
30		#include "util/~~Debug~~.h"
	30	#include "util/Output.h"
31	31
32	32	namespace orxonox

code/branches/output/src/libraries/core/PathConfig.cc

r8729	r8788
51	51
52	52	#include "SpecialConfig.h"
53		#include "util/~~Debug~~.h"
	53	#include "util/Output.h"
54	54	#include "util/Exception.h"
55	55	#include "CommandLineParser.h"

code/branches/output/src/libraries/core/SubclassIdentifier.h

r7401	r8788
69	69
70	70	#include <cstdlib>
71		#include "util/~~Debug~~.h"
	71	#include "util/Output.h"
72	72	#include "Identifier.h"
73	73

code/branches/output/src/libraries/core/Super.h

r8729	r8788
73	73
74	74	#include "CorePrereqs.h"
75		#include "util/~~Debug~~.h"
	75	#include "util/Output.h"
76	76
77	77	///////////////////////

code/branches/output/src/libraries/core/Template.cc

r7163	r8788
32	32	#include <tinyxml/ticpp.h>
33	33
34		#include "util/~~Debug~~.h"
	34	#include "util/Output.h"
35	35	#include "CoreIncludes.h"
36	36	#include "XMLPort.h"

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

r7851	r8788
53	53	#include <tinyxml/ticpp.h>
54	54
55		#include "util/~~Debug~~.h"
	55	#include "util/Output.h"
56	56	#include "util/Exception.h"
57	57	#include "util/MultiType.h"

code/branches/output/src/libraries/core/command/ConsoleCommandCompilation.cc

r8079	r8788
38	38	#include <string>
39	39
40		#include "util/~~Debug~~.h"
	40	#include "util/Output.h"
41	41	#include "util/ExprParser.h"
42	42	#include "util/StringUtils.h"

code/branches/output/src/libraries/core/command/Executor.cc

r7401	r8788
38	38
39	39	#include "util/Convert.h"
40		#include "util/~~Debug~~.h"
	40	#include "util/Output.h"
41	41	#include "util/StringUtils.h"
42	42	#include "util/SubString.h"

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

r8729	r8788
118	118	#include <typeinfo>
119	119
120		#include "util/~~Debug~~.h"
	120	#include "util/Output.h"
121	121	#include "util/MultiType.h"
122	122	#include "core/OrxonoxClass.h"

code/branches/output/src/libraries/core/command/TclBind.cc

r8366	r8788
34	34
35	35	#include "SpecialConfig.h"
36		#include "util/~~Debug~~.h"
	36	#include "util/Output.h"
37	37	#include "util/Exception.h"
38	38	#include "util/StringUtils.h"

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

r7891	r8788
38	38	#include "util/SubString.h"
39	39	#include "util/StringUtils.h"
40		#include "util/~~Debug~~.h"
	40	#include "util/Output.h"
41	41	#include "core/command/ConsoleCommand.h"
42	42	#include "core/command/CommandEvaluation.h"

code/branches/output/src/libraries/core/input/InputDevice.h

r8351	r8788
43	43
44	44	#include "util/Clock.h"
45		#include "util/~~Debug~~.h"
	45	#include "util/Output.h"
46	46	#include "util/Exception.h"
47	47	#include "InputState.h"

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

r8366	r8788
32	32	#include <sstream>
33	33	#include "util/Convert.h"
34		#include "util/~~Debug~~.h"
	34	#include "util/Output.h"
35	35	#include "util/Exception.h"
36	36	#include "core/ConfigValueIncludes.h"

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

r7284	r8788
29	29	#include "KeyBinderManager.h"
30	30
31		#include "util/~~Debug~~.h"
	31	#include "util/Output.h"
32	32	#include "util/Exception.h"
33	33	#include "util/ScopedSingletonManager.h"

code/branches/output/src/libraries/network/Client.cc

r8327	r8788
44	44
45	45	#include "util/Clock.h"
46		#include "util/~~Debug~~.h"
	46	#include "util/Output.h"
47	47	#include "util/ScopedSingletonManager.h"
48	48	#include "synchronisable/Synchronisable.h"

code/branches/output/src/libraries/network/ClientConnection.cc

r8327	r8788
32	32	#define WIN32_LEAN_AND_MEAN
33	33	#include <enet/enet.h>
34		#include "util/~~Debug~~.h"
	34	#include "util/Output.h"
35	35
36	36	namespace orxonox

code/branches/output/src/libraries/network/GamestateManager.cc

r8407	r8788
52	52	#include "core/command/Executor.h"
53	53	#include "core/GameMode.h"
54		#include "util/~~Debug~~.h"
	54	#include "util/Output.h"
55	55	#include "util/Clock.h"
56	56	#include "util/OrxAssert.h"

code/branches/output/src/libraries/network/LANDiscoverable.cc

r8351	r8788
33	33	#include <cstring>
34	34
35		#include "util/~~Debug~~.h"
	35	#include "util/Output.h"
36	36	#include "packet/ServerInformation.h"
37	37

code/branches/output/src/libraries/network/MasterServerComm.cc

r8351	r8788
28	28
29	29	#include "MasterServerComm.h"
30		#include "util/~~Debug~~.h"
	30	#include "util/Output.h"
31	31
32	32	namespace orxonox

code/branches/output/src/libraries/network/NetworkPrecompiledHeaders.h

r8351	r8788
52	52	#include <set> // 20
53	53
54		#include "util/~~Debug~~.h" // 20
	54	#include "util/Output.h" // 20
55	55	#include <loki/TypeTraits.h> // 18
56	56

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

r8706	r8788
47	47
48	48	#include "util/Clock.h"
49		#include "util/~~Debug~~.h"
	49	#include "util/Output.h"
50	50	#include "core/ObjectList.h"
51	51	#include "core/command/Executor.h"

code/branches/output/src/libraries/network/ServerConnection.cc

r8358	r8788
34	34	#include <enet/enet.h>
35	35
36		#include "util/~~Debug~~.h"
	36	#include "util/Output.h"
37	37	#include <util/Sleep.h>
38	38	// #include "ClientInformation.h"

code/branches/output/src/libraries/network/packet/Acknowledgement.cc

r7801	r8788
29	29	#include "Acknowledgement.h"
30	30
31		#include "util/~~Debug~~.h"
	31	#include "util/Output.h"
32	32	#include "network/GamestateHandler.h"
33	33	#include "network/Host.h"

code/branches/output/src/libraries/network/packet/DeleteObjects.cc

r7801	r8788
31	31
32	32	#include <cassert>
33		#include "util/~~Debug~~.h"
	33	#include "util/Output.h"
34	34	#include "network/synchronisable/Synchronisable.h"
35	35

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

r7801	r8788
34	34	#include <string>
35	35
36		#include "util/~~Debug~~.h"
	36	#include "util/Output.h"
37	37	#include "core/ObjectList.h"
38	38	#include "network/NetworkFunction.h"

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

r8394	r8788
31	31	#include <zlib.h>
32	32
33		#include "util/~~Debug~~.h"
	33	#include "util/Output.h"
34	34	#include "util/OrxAssert.h"
35	35	#include "core/GameMode.h"

code/branches/output/src/libraries/network/packet/Packet.cc

r8327	r8788
37	37	#include <boost/thread/mutex.hpp>
38	38
39		#include "util/~~Debug~~.h"
	39	#include "util/Output.h"
40	40	#include "Acknowledgement.h"
41	41	#include "Chat.h"

code/branches/output/src/libraries/network/packet/Welcome.cc

r8706	r8788
32	32
33	33	#include <cassert>
34		#include "util/~~Debug~~.h"
	34	#include "util/Output.h"
35	35	#include "network/Host.h"
36	36	#include "network/synchronisable/Synchronisable.h"

code/branches/output/src/libraries/util/Clipboard.cc

r7401	r8788
48	48	#undef min
49	49	#undef max
50		#include "~~Debug~~.h"
	50	#include "Output.h"
51	51
52	52	namespace orxonox

code/branches/output/src/libraries/util/Convert.h

r8729	r8788
130	130	#include <loki/TypeManip.h>
131	131
132		#include "~~Debug~~.h"
	132	#include "Output.h"
133	133	#include "ImplicitConversion.h"
134	134

code/branches/output/src/libraries/util/Exception.cc

r8410	r8788
37	37	#include <cstddef>
38	38	#include <CEGUIExceptions.h>
39		#include "~~Debug~~.h"
	39	#include "Output.h"
40	40
41	41	namespace orxonox

code/branches/output/src/libraries/util/Exception.h

r8706	r8788
63	63	#include <sstream>
64	64	#include <string>
65		#include "~~Debug~~.h"
	65	#include "Output.h"
66	66
67	67	namespace orxonox

code/branches/output/src/libraries/util/OrxAssert.h

r8372	r8788
40	40
41	41	#include <cassert>
42		#include "~~Debug~~.h"
	42	#include "Output.h"
43	43
44	44	#ifndef NDEBUG

code/branches/output/src/libraries/util/Scope.h

r7401	r8788
60	60	#include <loki/ScopeGuard.h>
61	61
62		#include "~~Debug~~.h"
	62	#include "Output.h"
63	63
64	64	namespace orxonox

code/branches/output/src/libraries/util/SignalHandler.cc

r8351	r8788
39	39	#include <cstdio>
40	40
41		#include "~~Debug~~.h"
	41	#include "Output.h"
42	42
43	43	namespace orxonox

code/branches/output/src/libraries/util/Sleep.cc

r5738	r8788
34	34
35	35	#include "Sleep.h"
36		#include "~~Debug~~.h"
	36	#include "Output.h"
37	37
38	38	#ifdef ORXONOX_PLATFORM_WINDOWS

code/branches/output/src/libraries/util/SubString.cc

r7401	r8788
45	45	#include "SubString.h"
46	46	#include <cstdio>
47		#include "~~Debug~~.h"
	47	#include "Output.h"
48	48
49	49	namespace orxonox

code/branches/output/src/modules/weapons/RocketController.cc

r7163	r8788
31	31	#include "util/Math.h"
32	32	#include "weapons/projectiles/SimpleRocket.h"
33		#include "util/~~Debug~~.h"
	33	#include "util/Output.h"
34	34	#include "weapons/weaponmodes/SimpleRocketFire.h"
35	35	#include "worldentities/pawns/Pawn.h"

code/branches/output/src/modules/weapons/projectiles/SimpleRocket.cc

r8738	r8788
41	41	#include "weapons/RocketController.h"
42	42	#include "sound/WorldSound.h"
43		#include "util/~~Debug~~.h"
	43	#include "util/Output.h"
44	44
45	45	namespace orxonox

code/branches/output/src/orxonox/gamestates/GSClient.cc

r7163	r8788
29	29	#include "GSClient.h"
30	30
31		~~#include "util/Debug.h"~~
32	31	#include "util/Exception.h"
33	32	#include "core/CommandLineParser.h"

code/branches/output/src/orxonox/gamestates/GSMasterServer.cc

r7801	r8788
30	30	#include "GSMasterServer.h"
31	31
32		#include "util/~~Debug~~.h"
	32	#include "util/Output.h"
33	33	#include "core/Game.h"
34	34	#include "core/GameMode.h"

code/branches/output/src/orxonox/gamestates/GSServer.cc

r7801	r8788
29	29	#include "GSServer.h"
30	30
31		#include "util/~~Debug~~.h"
	31	#include "util/Output.h"
32	32	#include "core/CommandLineParser.h"
33	33	#include "core/Game.h"

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

Context Navigation

Changeset 8788 for code/branches

Legend:

Download in other formats: