Changeset 1100 for branches/src-highlight/bin/Parameter.h

Timestamp:

Jun 13, 2010, 7:28:19 PM (12 years ago)

Author:

Peter Johansson

Message:

merge trunk to src-highlight

Location:

branches/src-highlight

Files:

• . (modified) (1 prop)
• bin/Parameter.h (modified) (3 diffs)

branches/src-highlight/bin/Parameter.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2006 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2007, 2008 Peter Johansson
+  Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -47 +47 @@
   class Parameter {
   public:
-    Parameter( int argc, char *argv[]);
+    Parameter(void);
     virtual ~Parameter(void);
+    void parse( int argc, char *argv[]);
+
     std::string config_file(void) const;
     
-    bool copyright(void) const;
-    bool force(void) const;
     bool generate_config(void) const ;
     bool ignore_cache(void) const;
-    bool report(void) const;
-    bool revisions(void) const;
     /// @return absolute path to root directory
     std::string root(void) const;
-    /// @return absolute path to target directory
-    std::string targetdir(void) const;
     bool verbose(void) const;
 
-  private:
-    void analyse(void);
+  protected:
+    yat::utility::CommandLine cmd_;
+    yat::utility::OptionHelp help_;
+
     // throw cmd_error if path doesn't exist
     void check_existence(std::string path) const;
@@ -72 +70 @@
     void check_readable(std::string path) const;
 
+  private:
+    void analyse(void);
+    virtual void analyse2(void)=0;
     void init(void);
+    // called at end of init(void)
+    virtual void init2(void) = 0;
+    void set_default(void);
+    virtual void set_default2(void)=0;
 
-    yat::utility::CommandLine cmd_;
     yat::utility::OptionArg<std::string> config_file_;
-    yat::utility::OptionSwitch copyright_;
-    yat::utility::OptionSwitch force_;
     yat::utility::OptionSwitch generate_config_;
-    yat::utility::OptionHelp help_;
     yat::utility::OptionSwitch ignore_cache_;
-    yat::utility::OptionSwitch report_;
-    yat::utility::OptionSwitch revisions_;
     yat::utility::OptionArg<std::string> root_;
-    yat::utility::OptionArg<std::string> target_;
     yat::utility::OptionSwitch verbose_;
+  protected:
     OptionVersion version_;