Changeset 6314 for code/branches

Timestamp:

Dec 10, 2009, 6:30:13 PM (15 years ago)

Author:

landauf

Message:

fixed some warnings

Location:

code/branches/presentation2/src/orxonox

Files:

• Radar.cc (modified) (1 diff)
• items/MultiStateEngine.cc (modified) (3 diffs)
• weaponsystem/WeaponMode.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/Radar.cc

@@ -47 +47 @@
 
     Radar::Radar()
-        : focus_(0)
-        , itFocus_(0)
+        : itFocus_(0)
+        , focus_(0)
         , objectTypeCounter_(0)
     {

code/branches/presentation2/src/orxonox/items/MultiStateEngine.cc

@@ -35 +35 @@
 
 #include "util/Convert.h"
+#include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
@@ -251 +252 @@
         else
             assert(0);
-        return std::string();
+        return BLANKSTRING;
     }
 
@@ -268 +269 @@
         else
             assert(0);
-        return std::string();
+        return BLANKSTRING;
     }
 }

code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc

@@ -30 +30 @@
 #include "WeaponMode.h"
 
+#include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -272 +273 @@
             return this->defSndWpnFire_->getSource();
         else
-            return std::string();
+            return BLANKSTRING;
     }
 }