Improve (Selection|FileName)OptionManager handling

[alexxy/gromacs.git] / src / gromacs / selection / selectionfileoptionstorage.h

diff --git a/src/gromacs/selection/selectionfileoptionstorage.h b/src/gromacs/selection/selectionfileoptionstorage.h
index a19321962fe2d2314b490cec50c456b721da8f16..ac628bf7ba26a7b47ab034a0614b2ed883d8dbb5 100644 (file)
--- a/src/gromacs/selection/selectionfileoptionstorage.h
+++ b/src/gromacs/selection/selectionfileoptionstorage.h
@@ -63,29 +63,25 @@ class SelectionFileOptionStorage : public AbstractOptionStorage
          * Initializes the storage from option settings.
          *
          * \param[in] settings   Storage settings.
+         * \param     manager    Manager for this object.
          */
-        SelectionFileOptionStorage(const SelectionFileOption &settings);
+        SelectionFileOptionStorage(const SelectionFileOption &settings,
+                                   SelectionOptionManager    *manager);
 
         virtual OptionInfo &optionInfo() { return info_; }
         virtual std::string typeString() const { return "file"; }
         virtual int valueCount() const { return 0; }
         virtual std::string formatValue(int /*i*/) const { return ""; }
 
-        //! \copydoc SelectionFileOptionInfo::setManager()
-        void setManager(SelectionOptionManager *manager)
-        {
-            manager_ = manager;
-        }
-
     private:
         virtual void clearSet();
         virtual void convertValue(const std::string &value);
         virtual void processSet();
         virtual void processAll() {}
 
-        SelectionFileOptionInfo info_;
-        SelectionOptionManager *manager_;
-        bool                    bValueParsed_;
+        SelectionFileOptionInfo  info_;
+        SelectionOptionManager  &manager_;
+        bool                     bValueParsed_;
 };
 
 } // namespace gmx