Sort all includes in src/gromacs

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

diff --git a/src/gromacs/options/abstractoptionstorage.h b/src/gromacs/options/abstractoptionstorage.h
index 791c4edea06f63f65049cf5dc3ae9385fca4b51f..9081d03898e1dbf8d7a11a88f278c45b30840e8f 100644 (file)
--- a/src/gromacs/options/abstractoptionstorage.h
+++ b/src/gromacs/options/abstractoptionstorage.h
@@ -45,9 +45,8 @@
 
 #include <string>
 
-#include "../utility/common.h"
-
-#include "optionflags.h"
+#include "gromacs/options/optionflags.h"
+#include "gromacs/utility/common.h"
 
 namespace gmx
 {
@@ -109,6 +108,14 @@ class AbstractOptionStorage
         //! Returns the description of the option set by the calling code.
         const std::string &description() const { return descr_; }
 
+        //! Returns true if defaultValueIfSet() value is specified.
+        bool defaultValueIfSetExists() const
+        { return hasFlag(efOption_DefaultValueIfSetExists); }
+        //! Returns the minimum number of values required in one set.
+        int minValueCount() const { return minValueCount_; }
+        //! Returns the maximum allowed number of values in one set (-1 = no limit).
+        int maxValueCount() const { return maxValueCount_; }
+
         /*! \brief
          * Returns an option info object corresponding to this option.
          */
@@ -221,10 +228,6 @@ class AbstractOptionStorage
         //! Clears the given flag.
         void clearFlag(OptionFlag flag) { return flags_.clear(flag); }
 
-        //! Returns the minimum number of values required in one set.
-        int minValueCount() const { return minValueCount_; }
-        //! Returns the maximum allowed number of values in one set (-1 = no limit).
-        int maxValueCount() const { return maxValueCount_; }
         /*! \brief
          * Sets a new minimum number of values required in one set.
          *