X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvc-backend.C;h=81efc9f6ce2a6a7c6e0c085ec47c82d81f6a599e;hb=dacb5be6462e278d769686b7380984b584dd86ac;hp=46fc8b1e2a509b8490c7a33b46b8459d36305746;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 46fc8b1e2a..81efc9f6ce 100644
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -12,12 +12,14 @@
 #include "support/LRegex.h"
 #include "support/LSubstring.h"
 #include "support/path.h"
+#include "support/filetools.h"
 #include "buffer.h"
 #include "LyXView.h"
 #include "lyxfunc.h"
 
 using std::endl;
 using std::ifstream;
+using std::getline;
 
 int VCS::doVCCommand(string const & cmd, string const & path)
 {
@@ -36,7 +38,7 @@ RCS::RCS(string const & m)
 }
 
 
-string RCS::find_file(string const & file)
+string const RCS::find_file(string const & file)
 {
 	string tmp(file);
 	// Check if *,v exists.
@@ -105,7 +107,7 @@ void RCS::scanMaster()
 			// get locker here
 			if (contains(token, ";")) {
 				locker_ = "Unlocked";
-				vcstat = UNLOCKED;
+				vcstatus = UNLOCKED;
 				continue;
 			}
 			string tmpt, s1, s2;
@@ -117,7 +119,7 @@ void RCS::scanMaster()
 				// s2 is user, and s1 is version
 				if (s1 == version_) {
 					locker_ = s2;
-					vcstat = LOCKED;
+					vcstatus = LOCKED;
 					break;
 				}
 			} while (!contains(tmpt, ";"));
@@ -199,7 +201,7 @@ CVS::CVS(string const & m, string const & f)
 }
 
 
-string CVS::find_file(string const & file)
+string const CVS::find_file(string const & file)
 {
 	// First we look for the CVS/Entries in the same dir
 	// where we have file.
@@ -257,12 +259,12 @@ void CVS::scanMaster()
 				<< mod_date << "'" << endl;
 			if (file_date == mod_date) {
 				locker_ = "Unlocked";
-				vcstat = UNLOCKED;
+				vcstatus = UNLOCKED;
 			} else {
 				// Here we should also to some more checking
 				// to see if there are conflicts or not.
 				locker_ = "Locked";
-				vcstat = LOCKED;
+				vcstatus = LOCKED;
 			}
 			break;
 		}