Changeset 8670

Timestamp:

May 29, 2011, 10:58:28 PM (13 years ago)

Author:

rgrieder

Message:

• Shell shouldn't inherit OrxonoxClass twice if not necessary.
• Return const MultitType& if possible in CommandLineParser.

Location:

code/branches/unity_build/src/libraries/core

Files:

• CommandLineParser.h (modified) (2 diffs)
• command/Shell.h (modified) (1 diff)

code/branches/unity_build/src/libraries/core/CommandLineParser.h

@@ -99 +99 @@
 
         //! Returns the actual value of the argument. Can be equal to default value.
-        MultiType getValue() const { return value_; }
+        const MultiType& getValue() const { return value_; }
         //! Returns the given default value as type T.
-        MultiType getDefaultValue() const { return defaultValue_; }
+        const MultiType& getDefaultValue() const { return defaultValue_; }
 
     private:
@@ -156 +156 @@
         static void getValue(const std::string& name, T* value)
         { *value = (T)(getArgument(name)->getValue()); }
-        static MultiType getValue(const std::string& name)
+        static const MultiType& getValue(const std::string& name)
         { return getArgument(name)->getValue(); }
         template <class T>

code/branches/unity_build/src/libraries/core/command/Shell.h

@@ -85 +85 @@
         Different graphical consoles build upon a Shell, for example InGameConsole and IOConsole.
     */
-    class _CoreExport Shell : virtual public OrxonoxClass, public OutputListener, public DevModeListener
+    class _CoreExport Shell : public OutputListener, public DevModeListener
     {
         public: