More consistent default handling for StringOption

[alexxy/gromacs.git] / src / gromacs / options / basicoptionstorage.h

diff --git a/src/gromacs/options/basicoptionstorage.h b/src/gromacs/options/basicoptionstorage.h
index 2d674335f3b7db9f792c87ba1327eb959e2a947c..823ec97beb3e4ddca7ab0a5301c82c80c01a7b20 100644 (file)
--- a/src/gromacs/options/basicoptionstorage.h
+++ b/src/gromacs/options/basicoptionstorage.h
@@ -75,6 +75,9 @@ class BooleanOptionStorage : public OptionStorageTemplate<bool>
         virtual std::string typeString() const { return "bool"; }
         virtual std::string formatSingleValue(const bool &value) const;
 
+        //! \copydoc BooleanOptionInfo::defaultValue()
+        bool defaultValue() const { return valueCount() > 0 && values()[0]; }
+
     private:
         virtual void convertValue(const std::string &value);
 
@@ -203,6 +206,8 @@ class StringOptionStorage : public OptionStorageTemplate<std::string>
         virtual void convertValue(const std::string &value);
         virtual void refreshValues();
 
+        void refreshEnumIndexStore();
+
         StringOptionInfo        info_;
         ValueList               allowed_;
         int                    *enumIndexStore_;