Changeset 6394 for code/branches/presentation2/src/libraries/core/CommandLineParser.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/CommandLineParser.cc (modified) (9 diffs)

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

@@ -63 +63 @@
                 this->value_ = temp;
             }
-            else if (value == "")
+            else if (value.empty())
             {
                 this->bHasDefaultValue_ = false;
@@ -140 +140 @@
                     OrxAssert(cmdLineArgsShortcut_.find(it->second->getShortcut()) == cmdLineArgsShortcut_.end(),
                         "Cannot have two command line shortcut with the same name.");
-                    if (it->second->getShortcut() != "")
+                    if (!it->second->getShortcut().empty())
                         cmdLineArgsShortcut_[it->second->getShortcut()] = it->second;
                 }
@@ -165 +165 @@
                         {
                             // negative number as a value
-                            value += arguments[i] + " ";
+                            value += arguments[i] + ' ';
                         }
                         else
@@ -173 +173 @@
                             // save old data first
                             value = removeTrailingWhitespaces(value);
-                            if (name != "")
+                            if (!name.empty())
                             {
                                 checkFullArgument(name, value, bParsingFile);
-                                name = "";
-                                assert(shortcut == "");
+                                name.clear();
+                                assert(shortcut.empty());
                             }
-                            else if (shortcut != "")
+                            else if (!shortcut.empty())
                             {
                                 checkShortcut(shortcut, value, bParsingFile);
-                                shortcut = "";
-                                assert(name == "");
+                                shortcut.clear();
+                                assert(name.empty());
                             }
 
@@ -198 +198 @@
 
                             // reset value string
-                            value = "";
+                            value.clear();
                         }
                     }
@@ -205 +205 @@
                         // value string
 
-                        if (name == "" && shortcut == "")
+                        if (name.empty() && shortcut.empty())
                         {
                             ThrowException(Argument, "Expected \"-\" or \"-\" in command line arguments.\n");
@@ -218 +218 @@
             // parse last argument
             value = removeTrailingWhitespaces(value);
-            if (name != "")
+            if (!name.empty())
             {
                 checkFullArgument(name, value, bParsingFile);
-                assert(shortcut == "");
-            }
-            else if (shortcut != "")
+                assert(shortcut.empty());
+            }
+            else if (!shortcut.empty())
             {
                 checkShortcut(shortcut, value, bParsingFile);
-                assert(name == "");
+                assert(name.empty());
             }
         }
@@ -291 +291 @@
             it != inst.cmdLineArgs_.end(); ++it)
         {
-            if (it->second->getShortcut() != "")
+            if (!it->second->getShortcut().empty())
                 infoStr << " [-" << it->second->getShortcut() << "] ";
             else
                 infoStr << "      ";
-            infoStr << "--" << it->second->getName() << " ";
+            infoStr << "--" << it->second->getName() << ' ';
             if (it->second->getValue().getType() != MT_Type::Bool)
                 infoStr << "ARG ";
@@ -347 +347 @@
     void CommandLineParser::_parseFile()
     {
-        std::string filename = CommandLineParser::getValue("optionsFile").getString();
+        const std::string& filename = CommandLineParser::getValue("optionsFile").getString();
 
         // look for additional arguments in given file or start.ini as default