bug 183

[lyx.git] / src / vc-backend.h

diff --git a/src/vc-backend.h b/src/vc-backend.h
index 77e6c6cd1e68b56fd4444e9b0743d6dad6fdae74..0df186cde299e0123a284491e24831784fce3985 100644 (file)
--- a/src/vc-backend.h
+++ b/src/vc-backend.h
@@ -39,7 +39,11 @@ public:
        ///
        virtual void getLog(string const &) = 0;
        ///
-       string const & version() const { return version_; }
+       virtual string const versionString() const = 0;
+       ///
+       string const & version() const {
+               return version_; 
+       }
        ///
        string const & locker() const { return locker_; }
        ///
@@ -47,10 +51,10 @@ public:
        ///
        Buffer * owner() const { return owner_; }
        ///
-       VCStatus stat() const { return vcstat; }
+       VCStatus status() const { return vcstatus; }
 protected:
        ///
-       int doVCCommand(string const &);
+       static int doVCCommand(string const &, string const &);
 
        /** The master VC file. For RCS this is *,v or RCS/ *,v. master should
            have full path.
@@ -58,7 +62,7 @@ protected:
        string master_;
        
        /// The status of the VC controlled file.
-       VCStatus vcstat;
+       VCStatus vcstatus;
        
        /** The version of the VC file. I am not sure if this can be a
            string of if it must be a
@@ -76,9 +80,12 @@ protected:
 class RCS : public VCS {
 public:
        ///
+       explicit
        RCS(string const & m);
        ///
-       static string find_file(string const & file);
+       static string const find_file(string const & file);
+       ///
+       static void retrive(string const & file);
        ///
        virtual void scanMaster();
        ///
@@ -93,7 +100,10 @@ public:
        virtual void undoLast();
        ///
        virtual void getLog(string const &);
-private:
+       ///
+       virtual string const versionString() const {
+               return "RCS: " + version_;
+       }
 };
 
 
@@ -101,9 +111,10 @@ private:
 class CVS : public VCS {
 public:
        ///
+       explicit
        CVS(string const & m, string const & f);
        ///
-       static string find_file(string const & file);
+       static string const find_file(string const & file);
        ///
        virtual void scanMaster();
        ///
@@ -118,6 +129,10 @@ public:
        virtual void undoLast();
        ///
        virtual void getLog(string const &);
+       ///
+       virtual string const versionString() const {
+               return "CVS: " + version_;
+       }
 private:
        string file_;
 };