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

Timestamp:

Sep 12, 2010, 2:48:11 PM (14 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.h (copied) (copied from sandbox_qt/src/libraries/core/CommandLineParser.h) (7 diffs)

sandbox_qt/src/libraries/core/CommandLineParser.h

@@ -46 +46 @@
 #include <fstream>
 #include <map>
+#include <QVariant>
 #include "util/OrxAssert.h"
-#include "util/MultiType.h"
 
 #define SetCommandLineArgument(name, defaultValue) \
@@ -67 +67 @@
     /**
     @brief
-        Container class for a command line argument of any type supported by MultiType.
+        Container class for a command line argument of any type supported by QVariant.
 
         Whenever you want to have an option specified by a command line switch,
@@ -106 +106 @@
 
         //! Returns the actual value of the argument. Can be equal to default value.
-        MultiType getValue() const { return value_; }
+        QVariant getValue() const { return value_; }
         //! Returns the given default value as type T.
-        MultiType getDefaultValue() const { return defaultValue_; }
+        QVariant getDefaultValue() const { return defaultValue_; }
 
     private:
         //! Constructor initialises both value_ and defaultValue_ with defaultValue.
-        CommandLineArgument(const std::string& name, const MultiType& defaultValue, bool bCommandLineOnly)
+        CommandLineArgument(const std::string& name, const QVariant& defaultValue, bool bCommandLineOnly)
             : bHasDefaultValue_(true)
             , name_(name)
@@ -135 +135 @@
         std::string usageInformation_; //!< Tells about the usage of this parameter
 
-        MultiType   value_;            //!< The actual value
-        MultiType   defaultValue_;     //!< Default value. Should not be changed.
+        QVariant    value_;            //!< The actual value
+        QVariant    defaultValue_;     //!< Default value. Should not be changed.
         bool        bCommandLineOnly_; //!< Whether you cannot specify the value in a text file
     };
@@ -165 +165 @@
         static void getValue(const std::string& name, T* value)
         { *value = (T)(getArgument(name)->getValue()); }
-        static MultiType getValue(const std::string& name)
+        static QVariant getValue(const std::string& name)
         { return getArgument(name)->getValue(); }
         template <class T>
@@ -211 +211 @@
     inline void CommandLineParser::getValue<std::string>(const std::string& name, std::string* value)
     {
-        *value = getArgument(name)->getValue().getString();
+        *value = getArgument(name)->getValue().toString().toStdString();
     }
 
@@ -230 +230 @@
         OrxAssert(!_getInstance().existsArgument(name),
             "Cannot add a command line argument with name '" + name + "' twice.");
-        OrxAssert(MultiType(defaultValue).getType() != MT_Type::Bool || MultiType(defaultValue).getBool() != true,
+        OrxAssert(QVariant(defaultValue).type() != QVariant::Bool || QVariant(defaultValue).toBool() != true,
                "Boolean command line arguments with positive default values are not supported." << std::endl
             << "Please use SetCommandLineSwitch and adjust your argument: " << name);