Changeset 6394 for code/branches/presentation2/src/libraries/core/NamespaceNode.cc

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/libraries/core/NamespaceNode.cc (modified) (3 diffs)

code/branches/presentation2/src/libraries/core/NamespaceNode.cc

@@ -50 +50 @@
         std::set<NamespaceNode*> nodes;
 
-        if ((name.size() == 0) || (name == ""))
+        if (name.empty())
         {
             nodes.insert(this);
@@ -154 +154 @@
                     output += ", ";
 
-                output += (*it).second->toString();
+                output += it->second->toString();
             }
 
-            output += ")";
+            output += ')';
         }
 
@@ -165 +165 @@
     std::string NamespaceNode::toString(const std::string& indentation) const
     {
-        std::string output = (indentation + this->name_ + "\n");
+        std::string output = (indentation + this->name_ + '\n');
 
         for (std::map<std::string, NamespaceNode*>::const_iterator it = this->subnodes_.begin(); it != this->subnodes_.end(); ++it)
-            output += (*it).second->toString(indentation + "  ");
+            output += it->second->toString(indentation + "  ");
 
         return output;