gcc compile fix.

[lyx.git] / src / VCBackend.h

diff --git a/src/VCBackend.h b/src/VCBackend.h
index 54dbc1775d00548b761356b9e8a1fb07b317a721..78ccbd4725d5ebe9404271bfed549b627ca59791 100644 (file)
--- a/src/VCBackend.h
+++ b/src/VCBackend.h
@@ -57,7 +57,7 @@ public:
        // can be this operation processed in the current RCS?
        virtual bool lockingToggleEnabled() = 0;
        /// revert current edits
-       virtual void revert() = 0;
+       virtual bool revert() = 0;
        // should a confirmation before revert requested?
        virtual bool isRevertWithConfirmation() = 0;
        /// FIXME
@@ -91,6 +91,10 @@ protected:
        /// parse information from the version file
        virtual void scanMaster() = 0;
 
+       /// Prepare a version identifier suitable for RCS and CVS.
+       /// If needed converts last or relative number to the absolute revision.
+       bool makeRCSRevision(std::string const &version, std::string &revis) const;
+       
        // GUI container for doVCCommandCall
        int doVCCommand(std::string const & cmd, support::FileName const & path, bool reportError = true);
        /**
@@ -147,7 +151,7 @@ public:
 
        virtual bool lockingToggleEnabled();
 
-       virtual void revert();
+       virtual bool revert();
 
        virtual bool isRevertWithConfirmation();
 
@@ -172,6 +176,7 @@ public:
 protected:
        virtual void scanMaster();
 private:
+       bool getRevisionInfo();
        /**
         * The version of the VC file. I am not sure if this can be a
         * string or if it must be a float/int.
@@ -179,6 +184,12 @@ private:
        std::string version_;
        /// The user currently keeping the lock on the VC file (or "Unlocked").
        std::string locker_;
+       /// Cache for revision info.
+       std::string rev_date_cache_;
+       ///
+       std::string rev_time_cache_;
+       ///
+       std::string rev_author_cache_;
 };
 
 
@@ -214,7 +225,7 @@ public:
 
        virtual bool isRevertWithConfirmation();
 
-       virtual void revert();
+       virtual bool revert();
 
        virtual void undoLast();
 
@@ -340,7 +351,7 @@ public:
 
        virtual bool lockingToggleEnabled();
 
-       virtual void revert();
+       virtual bool revert();
 
        virtual bool isRevertWithConfirmation();