Changeset 7424 for sandbox_qt/src/libraries/core/CommandLineParser.cc

Timestamp:

Sep 12, 2010, 2:48:11 PM (15 years ago)

Author:

rgrieder

Message:

Added CommandlineParser again and adjusted it to work with QVariant instead of MultiType.
Also removed obsolete Game class.

File:

• sandbox_qt/src/libraries/core/CommandLineParser.cc (copied) (copied from sandbox_qt/src/libraries/core/CommandLineParser.cc) (4 diffs)

sandbox_qt/src/libraries/core/CommandLineParser.cc

@@ -32 +32 @@
 #include <sstream>
 
-#include "util/Convert.h"
+//#include "util/Convert.h"
 #include "util/Debug.h"
 #include "util/Exception.h"
@@ -54 +54 @@
         if (bParsingFile && this->bCommandLineOnly_)
             ThrowException(Argument, "Command line argument '" + getName() + "' is not allowed in files.");
-        if (value_.getType() == MT_Type::Bool)
-        {
-            // simulate command line switch
-            bool temp;
-            if (convertValue(&temp, value))
+        if (value_.type() == QVariant::Bool)
+        {
+            // Command line switch activated
+            this->bHasDefaultValue_ = false;
+            this->value_ = true;
+        }
+        else
+        {
+            QVariant temp(QString::fromStdString(value));
+            if (!temp.convert(value_.type()))
+                ThrowException(Argument, "Could not read command line argument '" + getName() + "'.");
+            else
             {
                 this->bHasDefaultValue_ = false;
                 this->value_ = temp;
             }
-            else if (value.empty())
-            {
-                this->bHasDefaultValue_ = false;
-                this->value_ = true;
-            }
-            else
-                ThrowException(Argument, "Could not read command line argument '" + getName() + "'.");
-        }
-        else
-        {
-            if (!value_.setValue(value))
-            {
-                value_.setValue(defaultValue_);
-                ThrowException(Argument, "Could not read command line argument '" + getName() + "'.");
-            }
-            else
-                this->bHasDefaultValue_ = false;
         }
     }
@@ -302 +292 @@
                 infoStr << "      ";
             infoStr << "--" << it->second->getName() << ' ';
-            if (it->second->getValue().getType() != MT_Type::Bool)
+            if (it->second->getValue().type() != QVariant::Bool)
                 infoStr << "ARG ";
             else
@@ -362 +352 @@
     void CommandLineParser::_parseFile()
     {
-        const std::string& filename = CommandLineParser::getValue("optionsFile").getString();
+        const std::string& filename = CommandLineParser::getValue("optionsFile").toString().toStdString();
 
         // look for additional arguments in given file or start.ini as default