Changeset 8788

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:

• 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)

code/branches/output/src/Orxonox.cc

@@ -43 +43 @@
 #endif
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "orxonox/Main.h"

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

@@ -42 +42 @@
 #include <string>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "Identifier.h"
 

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

@@ -33 +33 @@
 
 #include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/StringUtils.h"

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

@@ -52 +52 @@
 
 #include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/Scope.h"

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

@@ -78 +78 @@
 #include "CorePrereqs.h"
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "Identifier.h"
 #include "ClassFactory.h"

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

@@ -51 +51 @@
 #include <set>      // 50
 
-#include "util/Debug.h" // 48
+#include "util/Output.h" // 48
 
 #include <deque>    // 43

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

@@ -73 +73 @@
 #include "util/Clock.h"
 #include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/Math.h"

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

@@ -40 +40 @@
 
 #include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/Sleep.h"

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

@@ -47 +47 @@
 #include <boost/preprocessor/cat.hpp>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/DestructionHelper.h"
 #include "util/Singleton.h"

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

@@ -35 +35 @@
 #include "GameState.h"
 
-#include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/OrxAssert.h"

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

@@ -89 +89 @@
 #include <loki/TypeTraits.h>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "MetaObjectList.h"
 #include "ObjectList.h"

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

@@ -35 +35 @@
 
 #include <fstream>
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/StringUtils.h"
 #include "Core.h"

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

@@ -33 +33 @@
 #include <boost/scoped_ptr.hpp>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/StringUtils.h"

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

@@ -37 +37 @@
 #include <loki/ScopeGuard.h>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "Resource.h"

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

@@ -34 +34 @@
 #include "MetaObjectList.h"
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "Identifier.h"
 #include "ObjectListBase.h"

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

@@ -28 +28 @@
 
 #include "NamespaceNode.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 
 namespace orxonox

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

@@ -51 +51 @@
 
 #include "SpecialConfig.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "CommandLineParser.h"

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

@@ -69 +69 @@
 
 #include <cstdlib>
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "Identifier.h"
 

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

@@ -73 +73 @@
 
 #include "CorePrereqs.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 
 ///////////////////////

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

@@ -32 +32 @@
 #include <tinyxml/ticpp.h>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "CoreIncludes.h"
 #include "XMLPort.h"

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

@@ -53 +53 @@
 #include <tinyxml/ticpp.h>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/MultiType.h"

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

@@ -38 +38 @@
 #include <string>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/ExprParser.h"
 #include "util/StringUtils.h"

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

@@ -38 +38 @@
 
 #include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/StringUtils.h"
 #include "util/SubString.h"

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

@@ -118 +118 @@
 #include <typeinfo>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/MultiType.h"
 #include "core/OrxonoxClass.h"

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

@@ -34 +34 @@
 
 #include "SpecialConfig.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/StringUtils.h"

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

@@ -38 +38 @@
 #include "util/SubString.h"
 #include "util/StringUtils.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "core/command/ConsoleCommand.h"
 #include "core/command/CommandEvaluation.h"

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

@@ -43 +43 @@
 
 #include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "InputState.h"

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

@@ -32 +32 @@
 #include <sstream>
 #include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "core/ConfigValueIncludes.h"

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

@@ -29 +29 @@
 #include "KeyBinderManager.h"
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Exception.h"
 #include "util/ScopedSingletonManager.h"

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

@@ -44 +44 @@
 
 #include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/ScopedSingletonManager.h"
 #include "synchronisable/Synchronisable.h"

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

@@ -32 +32 @@
 #define WIN32_LEAN_AND_MEAN
 #include <enet/enet.h>
-#include "util/Debug.h"
+#include "util/Output.h"
 
 namespace orxonox

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

@@ -52 +52 @@
 #include "core/command/Executor.h"
 #include "core/GameMode.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/Clock.h"
 #include "util/OrxAssert.h"

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

@@ -33 +33 @@
 #include <cstring>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "packet/ServerInformation.h"
 

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

@@ -28 +28 @@
 
 #include "MasterServerComm.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 
 namespace orxonox

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

@@ -52 +52 @@
 #include <set>      // 20
 
-#include "util/Debug.h"      // 20
+#include "util/Output.h"      // 20
 #include <loki/TypeTraits.h> // 18
 

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

@@ -47 +47 @@
 
 #include "util/Clock.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "core/ObjectList.h"
 #include "core/command/Executor.h"

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

@@ -34 +34 @@
 #include <enet/enet.h>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include <util/Sleep.h>
 // #include "ClientInformation.h"

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

@@ -29 +29 @@
 #include "Acknowledgement.h"
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "network/GamestateHandler.h"
 #include "network/Host.h"

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

@@ -31 +31 @@
 
 #include <cassert>
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "network/synchronisable/Synchronisable.h"
 

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

@@ -34 +34 @@
 #include <string>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "core/ObjectList.h"
 #include "network/NetworkFunction.h"

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

@@ -31 +31 @@
 #include <zlib.h>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "util/OrxAssert.h"
 #include "core/GameMode.h"

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

@@ -37 +37 @@
 #include <boost/thread/mutex.hpp>
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "Acknowledgement.h"
 #include "Chat.h"

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

@@ -32 +32 @@
 
 #include <cassert>
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "network/Host.h"
 #include "network/synchronisable/Synchronisable.h"

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

@@ -48 +48 @@
 #undef min
 #undef max
-#include "Debug.h"
+#include "Output.h"
 
 namespace orxonox

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

@@ -130 +130 @@
 #include <loki/TypeManip.h>
 
-#include "Debug.h"
+#include "Output.h"
 #include "ImplicitConversion.h"
 

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

@@ -37 +37 @@
 #include <cstddef>
 #include <CEGUIExceptions.h>
-#include "Debug.h"
+#include "Output.h"
 
 namespace orxonox

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

@@ -63 +63 @@
 #include <sstream>
 #include <string>
-#include "Debug.h"
+#include "Output.h"
 
 namespace orxonox

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

@@ -40 +40 @@
 
 #include <cassert>
-#include "Debug.h"
+#include "Output.h"
 
 #ifndef NDEBUG

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

@@ -60 +60 @@
 #include <loki/ScopeGuard.h>
 
-#include "Debug.h"
+#include "Output.h"
 
 namespace orxonox

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

@@ -39 +39 @@
 #include <cstdio>
 
-#include "Debug.h"
+#include "Output.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 
 #include "Sleep.h"
-#include "Debug.h"
+#include "Output.h"
 
 #ifdef ORXONOX_PLATFORM_WINDOWS

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

@@ -45 +45 @@
 #include "SubString.h"
 #include <cstdio>
-#include "Debug.h"
+#include "Output.h"
 
 namespace orxonox

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

@@ -31 +31 @@
 #include "util/Math.h"
 #include "weapons/projectiles/SimpleRocket.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "weapons/weaponmodes/SimpleRocketFire.h"
 #include "worldentities/pawns/Pawn.h"

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

@@ -41 +41 @@
 #include "weapons/RocketController.h"
 #include "sound/WorldSound.h"
-#include "util/Debug.h"
+#include "util/Output.h"
 
 namespace orxonox

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

@@ -29 +29 @@
 #include "GSClient.h"
 
-#include "util/Debug.h"
 #include "util/Exception.h"
 #include "core/CommandLineParser.h"

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

@@ -30 +30 @@
 #include "GSMasterServer.h"
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "core/Game.h"
 #include "core/GameMode.h"

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

@@ -29 +29 @@
 #include "GSServer.h"
 
-#include "util/Debug.h"
+#include "util/Output.h"
 #include "core/CommandLineParser.h"
 #include "core/Game.h"