Changeset 646 for branches/replacing_gnuplot/bin/Parameter.h

Timestamp:

Jun 4, 2008, 12:05:22 AM (13 years ago)

Author:

Jari Häkkinen

Message:

Merged trunk changes r608:645 to replacing_gnuplot branch.

File:

• branches/replacing_gnuplot/bin/Parameter.h (modified) (2 diffs)

branches/replacing_gnuplot/bin/Parameter.h

@@ -26 +26 @@
 */
 
+#include "Option.h"
+
 #include <map>
 #include <string>
@@ -37 +39 @@
     Parameter( int argc, char *argv[]);
     std::string config_file(void) const;
-    inline bool copyright(void) const { return copyright_; }
+    inline bool copyright(void) const { return copyright_.value(); }
     /// @todo
-    inline bool force(void) const { return force_; }
-    inline bool generate_config(void) const { return generate_config_; }
-    inline bool ignore_cache(void) const { return ignore_cache_; }
-    inline bool report(void) const { return report_; }
-    inline bool revisions(void) const { return revisions_; }
+    inline bool force(void) const { return force_.value(); }
+    inline bool generate_config(void) const { return generate_config_.value(); }
+    // Until we fix caching (#313) ignore caching
+    //inline bool ignore_cache(void) const { return ignore_cache_.value(); }
+    inline bool ignore_cache(void) const { return true; }
+    inline bool report(void) const { return report_.value(); }
+    inline bool revisions(void) const { return revisions_.value(); }
     /// @return absolute path to root directory
-    inline const std::string& root(void) const { return root_; }
+    inline const std::string& root(void) const { return root_.value(); }
+    /// @return absolute path to root node
+    inline const std::string& root_node(void) const {return root_node_.value();}
     /// @return absolute path to target directory
-    inline const std::string& targetdir(void) const { return targetdir_; }
-    inline bool verbose(void) const { return verbose_; }
+    inline const std::string& targetdir(void) const 
+    { return targetdir_.value(); }
+    inline bool verbose(void) const { return verbose_.value(); }
 
   private:
     void analyse(void);
-    void defaults(void);
-    void help(void);
+    void help(void) const;
+    void missing_argument(std::string opt) const;
     void version(bool=false) const;
 
-    std::string config_file_;
-    bool copyright_;
-    bool force_;
-    bool generate_config_;
-    bool ignore_cache_;
-    bool report_;
-    bool revisions_;
-    std::string root_;
-    std::string targetdir_;
-    bool verbose_;
-    bool version_;
+    Option<std::string> config_file_;
+    Option<bool> copyright_;
+    Option<bool> force_;
+    Option<bool> generate_config_;
+    Option<bool> ignore_cache_;
+    Option<bool> report_;
+    Option<bool> revisions_;
+    Option<std::string> root_;
+    Option<std::string> root_node_;
+    Option<std::string> targetdir_;
+    Option<bool> verbose_;
   };