[Orxonox-commit 626] r3158 - in branches/pch/src/orxonox: objects/quest overlays/hud overlays/notifications overlays/stats tools

rgrieder at orxonox.net rgrieder at orxonox.net
Sat Jun 13 17:05:39 CEST 2009 

Author: rgrieder
Date: 2009-06-13 17:05:38 +0200 (Sat, 13 Jun 2009)
New Revision: 3158

Modified:
   branches/pch/src/orxonox/objects/quest/AddQuest.cc
   branches/pch/src/orxonox/objects/quest/AddQuest.h
   branches/pch/src/orxonox/objects/quest/AddQuestHint.cc
   branches/pch/src/orxonox/objects/quest/AddQuestHint.h
   branches/pch/src/orxonox/objects/quest/AddReward.cc
   branches/pch/src/orxonox/objects/quest/AddReward.h
   branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc
   branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h
   branches/pch/src/orxonox/objects/quest/CompleteQuest.cc
   branches/pch/src/orxonox/objects/quest/CompleteQuest.h
   branches/pch/src/orxonox/objects/quest/FailQuest.cc
   branches/pch/src/orxonox/objects/quest/FailQuest.h
   branches/pch/src/orxonox/objects/quest/GlobalQuest.cc
   branches/pch/src/orxonox/objects/quest/GlobalQuest.h
   branches/pch/src/orxonox/objects/quest/LocalQuest.cc
   branches/pch/src/orxonox/objects/quest/LocalQuest.h
   branches/pch/src/orxonox/objects/quest/Quest.cc
   branches/pch/src/orxonox/objects/quest/Quest.h
   branches/pch/src/orxonox/objects/quest/QuestDescription.cc
   branches/pch/src/orxonox/objects/quest/QuestDescription.h
   branches/pch/src/orxonox/objects/quest/QuestEffect.cc
   branches/pch/src/orxonox/objects/quest/QuestEffect.h
   branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc
   branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h
   branches/pch/src/orxonox/objects/quest/QuestHint.cc
   branches/pch/src/orxonox/objects/quest/QuestHint.h
   branches/pch/src/orxonox/objects/quest/QuestItem.cc
   branches/pch/src/orxonox/objects/quest/QuestItem.h
   branches/pch/src/orxonox/objects/quest/QuestListener.cc
   branches/pch/src/orxonox/objects/quest/QuestListener.h
   branches/pch/src/orxonox/objects/quest/QuestManager.cc
   branches/pch/src/orxonox/objects/quest/QuestManager.h
   branches/pch/src/orxonox/objects/quest/Rewardable.cc
   branches/pch/src/orxonox/objects/quest/Rewardable.h
   branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h
   branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc
   branches/pch/src/orxonox/overlays/hud/ChatOverlay.h
   branches/pch/src/orxonox/overlays/hud/DeathMessage.h
   branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc
   branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
   branches/pch/src/orxonox/overlays/hud/KillMessage.h
   branches/pch/src/orxonox/overlays/notifications/Notification.cc
   branches/pch/src/orxonox/overlays/notifications/Notification.h
   branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc
   branches/pch/src/orxonox/overlays/notifications/NotificationManager.h
   branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc
   branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h
   branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc
   branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h
   branches/pch/src/orxonox/overlays/stats/CreateLines.h
   branches/pch/src/orxonox/tools/BillboardSet.cc
   branches/pch/src/orxonox/tools/BillboardSet.h
   branches/pch/src/orxonox/tools/Mesh.cc
   branches/pch/src/orxonox/tools/Mesh.h
   branches/pch/src/orxonox/tools/ParticleInterface.cc
   branches/pch/src/orxonox/tools/ParticleInterface.h
Log:
Removed the filename part of all @file foo.cc because Doxygen chooses the (always correct) filename automatically.
Also removed a few <string> includes that are not necessary.

Modified: branches/pch/src/orxonox/objects/quest/AddQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuest.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/AddQuest.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file AddQuest.cc
+    @file
     @brief Implementation of the AddQuest class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/AddQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuest.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/AddQuest.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file AddQuest.h
+    @file
     @brief Definition of the AddQuest class.
 */
 
@@ -36,8 +36,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
-
 #include "core/XMLPort.h"
 #include "ChangeQuestStatus.h"
 

Modified: branches/pch/src/orxonox/objects/quest/AddQuestHint.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuestHint.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/AddQuestHint.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file AddQuestHint.cc
+    @file
     @brief Implementation of the AddQuestHint class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/AddQuestHint.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuestHint.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/AddQuestHint.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file AddQuestHint.h
+    @file
     @brief Definition of the AddQuestHint class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/AddReward.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddReward.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/AddReward.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file AddReward.cc
+    @file
     @brief Implementation of the AddReward class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/AddReward.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddReward.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/AddReward.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file AddReward.h
+    @file
     @brief Definition of the AddReward class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file ChangeQuestStatus.cc
+    @file
     @brief Implementation of the ChangeQuestStatus class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/ChangeQuestStatus.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file ChangeQuestStatus.h
+    @file
     @brief Definition of the ChangeQuestStatus class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/CompleteQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/CompleteQuest.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/CompleteQuest.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file CompleteQuest.cc
+    @file
     @brief Implementation of the CompleteQuest class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/CompleteQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/CompleteQuest.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/CompleteQuest.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file CompleteQuest.h
+    @file
     @brief Definition of the CompleteQuest class.
 */
 
@@ -36,8 +36,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
-
 #include "core/XMLPort.h"
 #include "ChangeQuestStatus.h"
 

Modified: branches/pch/src/orxonox/objects/quest/FailQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/FailQuest.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/FailQuest.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file FailQuest.cc
+    @file
     @brief Implementation of the FailQuest class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/FailQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/FailQuest.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/FailQuest.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file FailQuest.h
+    @file
     @brief Definition of the FailQuest class.
 */
 
@@ -36,8 +36,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
-
 #include "core/XMLPort.h"
 #include "ChangeQuestStatus.h"
 

Modified: branches/pch/src/orxonox/objects/quest/GlobalQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/GlobalQuest.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/GlobalQuest.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file GlobalQuest.cc
+    @file
     @brief Implementation of the GlobalQuest class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/GlobalQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/GlobalQuest.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/GlobalQuest.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file GlobalQuest.h
+    @file
     @brief Definition of the GlobalQuest class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/LocalQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/LocalQuest.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/LocalQuest.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file LocalQuest.cc
+    @file
     @brief Implementation of the LocalQuest class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/LocalQuest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/LocalQuest.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/LocalQuest.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file LocalQuest.h
+    @file
     @brief Definition of the LocalQuest class.
 */
 
@@ -37,7 +37,6 @@
 #include "OrxonoxPrereqs.h"
 
 #include <map>
-#include <string>
 
 #include "core/XMLPort.h"
 #include "Quest.h"

Modified: branches/pch/src/orxonox/objects/quest/Quest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/Quest.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/Quest.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file Quest.cc
+    @file
     @brief Implementation of the Quest class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/Quest.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/Quest.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/Quest.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file Quest.h
+    @file
     @brief Definition of the Quest class.
         The Quest is the parent class of LocalQuest and GlobalQuest.
 */
@@ -38,7 +38,6 @@
 #include "OrxonoxPrereqs.h"
 
 #include <list>
-#include <string>
 
 #include "core/XMLPort.h"
 

Modified: branches/pch/src/orxonox/objects/quest/QuestDescription.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestDescription.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestDescription.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestDescription.cc
+    @file
     @brief Implementation of the QuestDescription class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestDescription.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestDescription.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestDescription.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestDescription.h
+    @file
     @brief Definition of the QuestDescription class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestEffect.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffect.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestEffect.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestEffect.cc
+    @file
     @brief Implementation of the QuestEffect class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestEffect.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffect.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestEffect.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file QuestEffect.h
+    @file
     @brief Definition of the QuestEffect class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestEffectBeacon.cc
+    @file
     @brief Implementation of the QuestEffectBeacon class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestEffectBeacon.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestEffectBeacon.h
+    @file
     @brief Definition of the QuestEffectBeacon class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestHint.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestHint.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestHint.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file QuestHint.cc
+    @file
     @brief Implementation of the QuestHint class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestHint.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestHint.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestHint.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file QuestHint.h
+    @file
     @brief Definition of the QuestHint class.
 */
 
@@ -37,7 +37,6 @@
 #include "OrxonoxPrereqs.h"
 
 #include <map>
-#include <string>
 
 #include "core/XMLPort.h"
 #include "QuestItem.h"

Modified: branches/pch/src/orxonox/objects/quest/QuestItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestItem.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestItem.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file QuestItem.cc
+    @file
     @brief Implementation of the QuestItem class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestItem.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestItem.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestItem.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
  
 /**
-    @file QuestItem.h
+    @file
     @brief Definition of the QuestItem class.
         The QuestItem is the parent class of Quest and QuestHint.
 */

Modified: branches/pch/src/orxonox/objects/quest/QuestListener.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestListener.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestListener.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestListener.cc
+    @file
     @brief Implementation of the QuestListener class.
 */
 
@@ -162,7 +162,7 @@
     @return
         Return the mode of the QuestListener. Can be eighter 'all', 'start', 'fail' or 'complete'.
     */
-    const std::string QuestListener::getMode(void)
+    std::string QuestListener::getMode(void)
     {
         if(this->mode_ == questListenerMode::all)
         {

Modified: branches/pch/src/orxonox/objects/quest/QuestListener.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestListener.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestListener.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestListener.h
+    @file
     @brief Definition of the QuestListener class.
 */
 
@@ -89,7 +89,7 @@
         bool setQuestId(const std::string & id); //!< Sets the questId of the Quest the QuestListener reacts to.
         bool setMode(const std::string & mode); //!< Sets the mode of the QuestListener.
         
-        const std::string getMode(void); //!< Get the mode of the QuestListener.
+        std::string getMode(void); //!< Get the mode of the QuestListener.
         
         /**
         @brief Get the questId of the Quest the QuestListener reacts to.

Modified: branches/pch/src/orxonox/objects/quest/QuestManager.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestManager.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestManager.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestManager.cc
+    @file
     @brief Implementation of the QuestManager class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/QuestManager.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/QuestManager.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/QuestManager.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file QuestManager.h
+    @file
     @brief Definition of the QuestManager class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/Rewardable.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/Rewardable.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/Rewardable.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file Rewardable.cc
+    @file
     @brief Implementation of the Rewardable class.
 */
 

Modified: branches/pch/src/orxonox/objects/quest/Rewardable.h
===================================================================
--- branches/pch/src/orxonox/objects/quest/Rewardable.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/objects/quest/Rewardable.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file Rewardable.h
+    @file
     @brief Definition of the Rewardable class.
 */
 

Modified: branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include "objects/GametypeMessageListener.h"
 #include "overlays/FadeoutText.h"
 

Modified: branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -28,6 +28,7 @@
 
 #include "ChatOverlay.h"
 
+#include <string>
 #include <OgreTextAreaOverlayElement.h>
 
 #include "util/Convert.h"

Modified: branches/pch/src/orxonox/overlays/hud/ChatOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/ChatOverlay.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/hud/ChatOverlay.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include <list>
 #include <OgreUTFString.h>
 

Modified: branches/pch/src/orxonox/overlays/hud/DeathMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/DeathMessage.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/hud/DeathMessage.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include "objects/GametypeMessageListener.h"
 #include "overlays/FadeoutText.h"
 

Modified: branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -28,6 +28,7 @@
 
 #include "HUDNavigation.h"
 
+#include <string>
 #include <OgreOverlayManager.h>
 #include <OgreTextAreaOverlayElement.h>
 #include <OgrePanelOverlayElement.h>

Modified: branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDNavigation.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/hud/HUDNavigation.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include <OgrePrerequisites.h>
 #include "objects/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"

Modified: branches/pch/src/orxonox/overlays/hud/KillMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/KillMessage.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/hud/KillMessage.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include "objects/GametypeMessageListener.h"
 #include "overlays/FadeoutText.h"
 

Modified: branches/pch/src/orxonox/overlays/notifications/Notification.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/Notification.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/Notification.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file Notification.cc
+    @file
     @brief Implementation of the Notification class.
 */
 

Modified: branches/pch/src/orxonox/overlays/notifications/Notification.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/Notification.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/Notification.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file Notification.h
+    @file
     @brief Definition of the Notification class.
 */
 

Modified: branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file NotificationManager.cc
+    @file
     @brief Implementation of the NotificationManager class.
 */
 

Modified: branches/pch/src/orxonox/overlays/notifications/NotificationManager.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationManager.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationManager.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file NotificationManager.h
+    @file
     @brief Definition of the NotificationManager class.
 */
 

Modified: branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file NotificationOverlay.cc
+    @file
     @brief Implementation of the NotificationOverlay class.
 */
 
@@ -126,7 +126,7 @@
     @brief
         Clips the input message so that it meets the requirements for the maximal length of Notifications given by the NotificationQueue.
     */
-    const std::string NotificationOverlay::clipMessage(const std::string & message)
+    std::string NotificationOverlay::clipMessage(const std::string & message)
     {
         if(message.length() <= (unsigned int)this->queue_->getNotificationLength()) //!< If the message is not too long.
             return message;

Modified: branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file NotificationOverlay.h
+    @file
     @brief Definition of the NotificationOverlay class.
 */
 
@@ -67,7 +67,7 @@
                 { this->setTextSize(size); }
         
         protected:
-            const std::string clipMessage(const std::string & message); //!< Clips the input message if too long.
+            std::string clipMessage(const std::string & message); //!< Clips the input message if too long.
 
         private:
             NotificationQueue* queue_; //!< The NotificationQeue this overlay belongs to.

Modified: branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file NotificationQueue.cc
+    @file
     @brief Implementation of the NotificationQueue class.
 */
 

Modified: branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -27,7 +27,7 @@
  */
 
 /**
-    @file NotificationQueue.h
+    @file
     @brief Definition of the NotificationQueue class.
 */
 

Modified: branches/pch/src/orxonox/overlays/stats/CreateLines.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/CreateLines.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/overlays/stats/CreateLines.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -28,7 +28,6 @@
 #define _CreateLines_H__
 
 #include "OrxonoxPrereqs.h"
-#include <string>
 
 namespace orxonox
 {

Modified: branches/pch/src/orxonox/tools/BillboardSet.cc
===================================================================
--- branches/pch/src/orxonox/tools/BillboardSet.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/tools/BillboardSet.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -28,8 +28,9 @@
 
 #include "BillboardSet.h"
 
+#include <cassert>
+#include <string>
 #include <sstream>
-#include <cassert>
 #include <OgreSceneManager.h>
 #include <OgreBillboardSet.h>
 #include <OgreBillboard.h>

Modified: branches/pch/src/orxonox/tools/BillboardSet.h
===================================================================
--- branches/pch/src/orxonox/tools/BillboardSet.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/tools/BillboardSet.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include <OgrePrerequisites.h>
 #include "util/UtilPrereqs.h"
 

Modified: branches/pch/src/orxonox/tools/Mesh.cc
===================================================================
--- branches/pch/src/orxonox/tools/Mesh.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/tools/Mesh.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -30,6 +30,7 @@
 
 #include <cassert>
 #include <sstream>
+#include <string>
 #include <OgreEntity.h>
 #include <OgreSceneManager.h>
 

Modified: branches/pch/src/orxonox/tools/Mesh.h
===================================================================
--- branches/pch/src/orxonox/tools/Mesh.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/tools/Mesh.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include <OgrePrerequisites.h>
 
 namespace orxonox

Modified: branches/pch/src/orxonox/tools/ParticleInterface.cc
===================================================================
--- branches/pch/src/orxonox/tools/ParticleInterface.cc	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/tools/ParticleInterface.cc	2009-06-13 15:05:38 UTC (rev 3158)
@@ -34,6 +34,7 @@
 #include "ParticleInterface.h"
 
 #include <cassert>
+#include <string>
 #include <OgreParticleSystem.h>
 #include <OgreParticleEmitter.h>
 #include <OgreSceneManager.h>

Modified: branches/pch/src/orxonox/tools/ParticleInterface.h
===================================================================
--- branches/pch/src/orxonox/tools/ParticleInterface.h	2009-06-13 15:03:51 UTC (rev 3157)
+++ branches/pch/src/orxonox/tools/ParticleInterface.h	2009-06-13 15:05:38 UTC (rev 3158)
@@ -31,7 +31,6 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include <string>
 #include <OgrePrerequisites.h>
 #include "tools/TimeFactorListener.h"

More information about the Orxonox-commit mailing list