Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/replacing_gnuplot/bin/Parameter.h

    r540 r646  
    2626*/
    2727
     28#include "Option.h"
     29
    2830#include <map>
    2931#include <string>
     
    3739    Parameter( int argc, char *argv[]);
    3840    std::string config_file(void) const;
    39     inline bool copyright(void) const { return copyright_; }
     41    inline bool copyright(void) const { return copyright_.value(); }
    4042    /// @todo
    41     inline bool force(void) const { return force_; }
    42     inline bool generate_config(void) const { return generate_config_; }
    43     inline bool ignore_cache(void) const { return ignore_cache_; }
    44     inline bool report(void) const { return report_; }
    45     inline bool revisions(void) const { return revisions_; }
     43    inline bool force(void) const { return force_.value(); }
     44    inline bool generate_config(void) const { return generate_config_.value(); }
     45    // Until we fix caching (#313) ignore caching
     46    //inline bool ignore_cache(void) const { return ignore_cache_.value(); }
     47    inline bool ignore_cache(void) const { return true; }
     48    inline bool report(void) const { return report_.value(); }
     49    inline bool revisions(void) const { return revisions_.value(); }
    4650    /// @return absolute path to root directory
    47     inline const std::string& root(void) const { return root_; }
     51    inline const std::string& root(void) const { return root_.value(); }
     52    /// @return absolute path to root node
     53    inline const std::string& root_node(void) const {return root_node_.value();}
    4854    /// @return absolute path to target directory
    49     inline const std::string& targetdir(void) const { return targetdir_; }
    50     inline bool verbose(void) const { return verbose_; }
     55    inline const std::string& targetdir(void) const
     56    { return targetdir_.value(); }
     57    inline bool verbose(void) const { return verbose_.value(); }
    5158
    5259  private:
    5360    void analyse(void);
    54     void defaults(void);
    55     void help(void);
     61    void help(void) const;
     62    void missing_argument(std::string opt) const;
    5663    void version(bool=false) const;
    5764
    58     std::string config_file_;
    59     bool copyright_;
    60     bool force_;
    61     bool generate_config_;
    62     bool ignore_cache_;
    63     bool report_;
    64     bool revisions_;
    65     std::string root_;
    66     std::string targetdir_;
    67     bool verbose_;
    68     bool version_;
     65    Option<std::string> config_file_;
     66    Option<bool> copyright_;
     67    Option<bool> force_;
     68    Option<bool> generate_config_;
     69    Option<bool> ignore_cache_;
     70    Option<bool> report_;
     71    Option<bool> revisions_;
     72    Option<std::string> root_;
     73    Option<std::string> root_node_;
     74    Option<std::string> targetdir_;
     75    Option<bool> verbose_;
    6976  };
    7077
Note: See TracChangeset for help on using the changeset viewer.