Improve (Selection|FileName)OptionManager handling

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

diff --git a/src/gromacs/options/filenameoption.h b/src/gromacs/options/filenameoption.h
index 45fd6fa1a9abab5fbf6b22d0686f11f41a16c0be..7b5abb146da9efdad654ca2e81dd5f3d2c505ab3 100644 (file)
--- a/src/gromacs/options/filenameoption.h
+++ b/src/gromacs/options/filenameoption.h
@@ -165,7 +165,8 @@ class FileNameOption : public OptionTemplate<std::string, FileNameOption>
         using MyBase::defaultValueIfSet;
 
         //! Creates a FileNameOptionStorage object.
-        virtual AbstractOptionStoragePointer createStorage() const;
+        virtual AbstractOptionStoragePointer createStorage(
+            const OptionManagerContainer &managers) const;
 
         OptionFileType          filetype_;
         int                     legacyType_;
@@ -197,21 +198,6 @@ class FileNameOptionInfo : public OptionInfo
         //! Creates an option info object for the given option.
         explicit FileNameOptionInfo(FileNameOptionStorage *option);
 
-        /*! \brief
-         * Set manager for handling interaction with other options.
-         *
-         * \param   manager  File name option manager to set.
-         *
-         * This must be called before the values are added.
-         *
-         * Typically it is called through setManagerForFileNameOptions(),
-         * which recursively sets the manager for all file name options in
-         * an Options object.
-         *
-         * Does not throw.
-         */
-        void setManager(FileNameOptionManager *manager);
-
         //! Whether the option specifies an input file.
         bool isInputFile() const;
         //! Whether the option specifies an output file.
@@ -231,7 +217,6 @@ class FileNameOptionInfo : public OptionInfo
         ExtensionList extensions() const;
 
     private:
-        FileNameOptionStorage &option();
         const FileNameOptionStorage &option() const;
 };