[Orxonox-commit 3337] r8025 - in code/branches/usability/src: libraries/tools orxonox

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-05 23:31:20 +0100 (Sat, 05 Mar 2011)
New Revision: 8025

Modified:
   code/branches/usability/src/libraries/tools/Shader.h
   code/branches/usability/src/orxonox/ChatInputHandler.cc
   code/branches/usability/src/orxonox/ChatInputHandler.h
Log:
Fixed some includes.

Modified: code/branches/usability/src/libraries/tools/Shader.h
===================================================================
--- code/branches/usability/src/libraries/tools/Shader.h	2011-03-05 22:19:06 UTC (rev 8024)
+++ code/branches/usability/src/libraries/tools/Shader.h	2011-03-05 22:31:20 UTC (rev 8025)
@@ -37,6 +37,7 @@
 
 #include <OgreCompositorInstance.h>
 
+#include "util/MultiType.h"
 #include "util/OgreForwardRefs.h"
 #include "core/ViewportEventListener.h"
 

Modified: code/branches/usability/src/orxonox/ChatInputHandler.cc
===================================================================
--- code/branches/usability/src/orxonox/ChatInputHandler.cc	2011-03-05 22:19:06 UTC (rev 8024)
+++ code/branches/usability/src/orxonox/ChatInputHandler.cc	2011-03-05 22:31:20 UTC (rev 8025)
@@ -27,18 +27,27 @@
  */
 
 #include "ChatInputHandler.h"
-#include "util/ScopedSingletonManager.h"
-#include "core/CoreIncludes.h"
-#include "core/GUIManager.h"
-#include "core/CorePrereqs.h"
-#include "core/command/ConsoleCommand.h"
+
+#include <cassert>
+#include <string>
 #include <CEGUIWindow.h>
+#include <CEGUIWindowManager.h>
 #include <elements/CEGUIListbox.h>
 #include <elements/CEGUIListboxItem.h>
 #include <elements/CEGUIListboxTextItem.h>
-#include <CEGUIWindowManager.h>
-#include <string>
 
+#include "util/ScopedSingletonManager.h"
+#include "core/CoreIncludes.h"
+#include "core/GUIManager.h"
+#include "core/command/ConsoleCommand.h"
+#include "core/input/InputBuffer.h"
+#include "core/input/InputManager.h"
+#include "core/input/InputState.h"
+#include "network/Host.h"
+
+#include "PlayerManager.h"
+#include "infos/PlayerInfo.h"
+
 namespace orxonox
 {
   /* singleton */

Modified: code/branches/usability/src/orxonox/ChatInputHandler.h
===================================================================
--- code/branches/usability/src/orxonox/ChatInputHandler.h	2011-03-05 22:19:06 UTC (rev 8024)
+++ code/branches/usability/src/orxonox/ChatInputHandler.h	2011-03-05 22:31:20 UTC (rev 8025)
@@ -29,31 +29,15 @@
 #ifndef _ChatInputHandler_H__
 #define _ChatInputHandler_H__
 
-/* std includes */
-#include <deque>
+#include <OrxonoxPrereqs.h>
+
 #include <string>
-#include <fstream>
-#include <iostream>
-#include <cassert>
 #include <CEGUIForwardRefs.h>
 #include <CEGUIcolour.h>
 
-/* project includes */
-#include <OrxonoxPrereqs.h>
-#include <core/BaseObject.h>
-#include <core/PathConfig.h>
+#include "util/Singleton.h"
+#include "network/ChatListener.h"
 
-#include "core/input/InputBuffer.h"
-#include "core/input/InputManager.h"
-#include "core/input/InputState.h"
-
-#include <network/ChatListener.h>
-#include <PlayerManager.h>
-#include <infos/PlayerInfo.h>
-
-#include "../libraries/network/Host.h"
-#include <util/Singleton.h>
-
 namespace orxonox // tolua_export
 { // tolua_export
   /* class to handle chat using an InputBuffer */