Changeset 715 for code/branches/FICN/src/orxonox/hud

Timestamp:

Dec 28, 2007, 11:33:10 PM (17 years ago)

Author:

rgrieder

Message:

• the master has spoken…
• misc/String.h is not anymore..

Location:

code/branches/FICN/src/orxonox/hud

Files:

• HUD.cc (modified) (1 diff)
• HUD.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/hud/HUD.cc

@@ -80 +80 @@
   }
 
-  void HUD::setTargetWindowName(String i){
+  void HUD::setTargetWindowName(std::string i){
     targetWindowName_=i;
     targetWindowNameText_->setCaption( targetWindowName_ );
   }
 
-  void HUD::setTargetWindowStatus(String i){
+  void HUD::setTargetWindowStatus(std::string i){
     targetWindowStatus_=i;
     targetWindowStatusText_->setCaption( targetWindowStatus_ );

code/branches/FICN/src/orxonox/hud/HUD.h

@@ -29 +29 @@
 #define _HUD_H__
 
+#include <string>
+
 #include <OgrePrerequisites.h>
 
 #include "../OrxonoxPrereqs.h"
-
-#include "misc/String.h"
 
 
@@ -61 +61 @@
     int timeSec_;
 
-    String targetWindowName_;
-    String targetWindowStatus_;
+    std::string targetWindowName_;
+    std::string targetWindowStatus_;
     int targetWindowDistance_;
     int targetWindowHitRating_;
@@ -93 +93 @@
 
     void setTime(int i, int j);
-    void setTargetWindowName(String i);
-    void setTargetWindowStatus(String i);
+    void setTargetWindowName(std::string i);
+    void setTargetWindowStatus(std::string i);
     void setTargetWindowDistance(int i);
     void setTargetWindowHitRating(int i);