Changeset 6394 for code/branches/presentation2/src/orxonox/infos

Timestamp:

Dec 22, 2009, 2:07:44 PM (15 years ago)

Author:

rgrieder

Message:

std::string tweaks:

• Declared BLANKSTRING in UtilPrereqs.h as well (removed obsolete StringUtils.h includes to avoid dependencies)
• Using BLANKSTRING if const std::string& return type is possible
• Replaced a few (const) std::string arguments with const std::string&
• if (str == "") —> if (str.empty())
• std::string msg = name + "adsf"; —> const std::string& msg = name + "asdf";
• std::string asdf = object→getFooBar(); —> const std::string& asdf = object→getFooBar();
• std::string asdf = "asdf"; —> std::string asdf("asdf");
• ostream << "."; and name + "." —> ostream << '.'; and name + '.'
• str = ""; —> str.clear()
• std::string asdf = ""; —> std::string asdf;
• asdf_ = ""; (in c'tor) —> delete line

File:

• code/branches/presentation2/src/orxonox/infos/HumanPlayer.cc (modified) (3 diffs)

code/branches/presentation2/src/orxonox/infos/HumanPlayer.cc

@@ -164 +164 @@
         if (this->isInitialized() && this->isLocalPlayer())
         {
-            if (this->getGametype() && this->getGametype()->getHUDTemplate() != "")
+            if (this->getGametype() && !this->getGametype()->getHUDTemplate().empty())
                 this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
             else
@@ -179 +179 @@
         }
 
-        if (this->isLocalPlayer() && this->humanHudTemplate_ != "" && GameMode::showsGraphics())
+        if (this->isLocalPlayer() && !this->humanHudTemplate_.empty() && GameMode::showsGraphics())
         {
             this->humanHud_ = new OverlayGroup(this);
@@ -195 +195 @@
         }
 
-        if (this->isLocalPlayer() && this->gametypeHudTemplate_ != "")
+        if (this->isLocalPlayer() && !this->gametypeHudTemplate_.empty())
         {
             this->gametypeHud_ = new OverlayGroup(this);