[Orxonox-commit 1724] r6442 - in code/branches/gamestate/src/libraries: core network util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-01-03 17:53:05 +0100 (Sun, 03 Jan 2010)
New Revision: 6442

Modified:
   code/branches/gamestate/src/libraries/core/Core.h
   code/branches/gamestate/src/libraries/core/Game.h
   code/branches/gamestate/src/libraries/core/IOConsole.cc
   code/branches/gamestate/src/libraries/core/IOConsole.h
   code/branches/gamestate/src/libraries/core/LuaState.h
   code/branches/gamestate/src/libraries/core/Template.cc
   code/branches/gamestate/src/libraries/network/TrafficControl.h
   code/branches/gamestate/src/libraries/util/Serialise.h
Log:
Removed unnecessary path qualifiers.

Modified: code/branches/gamestate/src/libraries/core/Core.h
===================================================================
--- code/branches/gamestate/src/libraries/core/Core.h	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/core/Core.h	2010-01-03 16:53:05 UTC (rev 6442)
@@ -37,7 +37,7 @@
 #include <boost/scoped_ptr.hpp>
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox
 {

Modified: code/branches/gamestate/src/libraries/core/Game.h
===================================================================
--- code/branches/gamestate/src/libraries/core/Game.h	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/core/Game.h	2010-01-03 16:53:05 UTC (rev 6442)
@@ -49,7 +49,7 @@
 #include "util/Debug.h"
 #include "util/ScopeGuard.h"
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "OrxonoxClass.h"
 
 /**
 @def

Modified: code/branches/gamestate/src/libraries/core/IOConsole.cc
===================================================================
--- code/branches/gamestate/src/libraries/core/IOConsole.cc	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/core/IOConsole.cc	2010-01-03 16:53:05 UTC (rev 6442)
@@ -34,8 +34,8 @@
 
 #include "util/Clock.h"
 #include "util/Math.h"
-#include "core/Game.h"
-#include "core/input/InputBuffer.h"
+#include "Game.h"
+#include "input/InputBuffer.h"
 
 // ##########################
 // ###   Mutual methods   ###

Modified: code/branches/gamestate/src/libraries/core/IOConsole.h
===================================================================
--- code/branches/gamestate/src/libraries/core/IOConsole.h	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/core/IOConsole.h	2010-01-03 16:53:05 UTC (rev 6442)
@@ -36,7 +36,7 @@
 #include <string>
 #include <vector>
 #include "util/Singleton.h"
-#include "core/Shell.h"
+#include "Shell.h"
 
 #ifdef ORXONOX_PLATFORM_UNIX
 struct termios;

Modified: code/branches/gamestate/src/libraries/core/LuaState.h
===================================================================
--- code/branches/gamestate/src/libraries/core/LuaState.h	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/core/LuaState.h	2010-01-03 16:53:05 UTC (rev 6442)
@@ -39,7 +39,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "util/ScopeGuard.h"
-#include "core/Functor.h"
+#include "Functor.h"
 #include "ToluaInterface.h"
 
 namespace orxonox // tolua_export

Modified: code/branches/gamestate/src/libraries/core/Template.cc
===================================================================
--- code/branches/gamestate/src/libraries/core/Template.cc	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/core/Template.cc	2010-01-03 16:53:05 UTC (rev 6442)
@@ -32,8 +32,8 @@
 #include <tinyxml/ticpp.h>
 
 #include "util/Debug.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
+#include "CoreIncludes.h"
+#include "XMLPort.h"
 
 namespace orxonox
 {

Modified: code/branches/gamestate/src/libraries/network/TrafficControl.h
===================================================================
--- code/branches/gamestate/src/libraries/network/TrafficControl.h	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/network/TrafficControl.h	2010-01-03 16:53:05 UTC (rev 6442)
@@ -33,7 +33,7 @@
 
 #include <list>
 #include <map>
-#include "network/ClientConnectionListener.h"
+#include "ClientConnectionListener.h"
 
 namespace orxonox {
 

Modified: code/branches/gamestate/src/libraries/util/Serialise.h
===================================================================
--- code/branches/gamestate/src/libraries/util/Serialise.h	2010-01-03 14:56:34 UTC (rev 6441)
+++ code/branches/gamestate/src/libraries/util/Serialise.h	2010-01-03 16:53:05 UTC (rev 6442)
@@ -34,9 +34,11 @@
 #ifndef _Serialise_H__
 #define _Serialise_H__
 
+#include "UtilPrereqs.h"
+
 #include <cstring>
-#include "util/Math.h"
-#include "util/mbool.h"
+#include "Math.h"
+#include "mbool.h"
 
 namespace orxonox{