From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 17 May 2000 16:42:35 +0000 (+0000)
Subject: rename VCS::stat() to CVS::status()
X-Git-Tag: 1.6.10~22244
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cdaf9a5ad50bae9adebdf73b2273fce12ed9b2df;p=features.git

rename VCS::stat() to CVS::status()


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@737 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/ChangeLog b/ChangeLog
index 8439ee30c2..95558284ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/lyxvc.C (toggleReadOnly): use VCS::status() instead of stat()
+
+	* src/vc-backend.*: renamed stat() to status() and vcstat to
+	vcstatus. It happens that Tru64 Unix 5.0 has stat() as a macro and
+	compilation broke. The new name seems more relevant, anyway.
+
 2000-05-17  Juergen Vigna  <jug@sad.it>
 
 	* src/BufferView2.C (removeAutoInsets): fixed use of AutoDeleteInsets
diff --git a/src/buffer.C b/src/buffer.C
index c15f61665f..a252e64c19 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2272,7 +2272,9 @@ void Buffer::makeLinuxDocFile(string const & fname, int column)
 		LyXLayout const & style =
 			textclasslist.Style(users->buffer()->params.textclass,
 					    par->layout);
+#ifdef WITH_WARNINGS
 #warning please check if this call is really needed!!!
+#endif
 //		par->AutoDeleteInsets();
 
 		// treat <toc> as a special case for compatibility with old code
@@ -2873,7 +2875,9 @@ void Buffer::makeDocBookFile(string const & fname, int column)
 		LyXLayout const & style =
 			textclasslist.Style(users->buffer()->params.textclass,
 					    par->layout);
+#ifdef WITH_WARNINGS
 #warning please check if this call is really needed!!!
+#endif
 //		par->AutoDeleteInsets();
 
 		// environment tag closing
diff --git a/src/lyxvc.C b/src/lyxvc.C
index 4b7305055b..ba4529c6dd 100644
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -185,7 +185,7 @@ void LyXVC::undoLast()
 
 void LyXVC::toggleReadOnly()
 {
-	switch (vcs->stat()) {
+	switch (vcs->status()) {
 	case VCS::UNLOCKED:
 		lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
 		checkOut();
diff --git a/src/vc-backend.C b/src/vc-backend.C
index 6e8a8b751e..3b4ef26a23 100644
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -106,7 +106,7 @@ void RCS::scanMaster()
 			// get locker here
 			if (contains(token, ";")) {
 				locker_ = "Unlocked";
-				vcstat = UNLOCKED;
+				vcstatus = UNLOCKED;
 				continue;
 			}
 			string tmpt, s1, s2;
@@ -118,7 +118,7 @@ void RCS::scanMaster()
 				// s2 is user, and s1 is version
 				if (s1 == version_) {
 					locker_ = s2;
-					vcstat = LOCKED;
+					vcstatus = LOCKED;
 					break;
 				}
 			} while (!contains(tmpt, ";"));
@@ -258,12 +258,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;
 		}
diff --git a/src/vc-backend.h b/src/vc-backend.h
index 7cb0783b22..830b055ed9 100644
--- a/src/vc-backend.h
+++ b/src/vc-backend.h
@@ -47,7 +47,7 @@ public:
 	///
 	Buffer * owner() const { return owner_; }
 	///
-	VCStatus stat() const { return vcstat; }
+	VCStatus status() const { return vcstatus; }
 protected:
 	///
 	static int doVCCommand(string const &, string const &);
@@ -58,7 +58,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