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 8439ee30c2f89f96eae3e136537a149355e838e3..95558284ab24fd86435aedbc7a8a5b2e399a20ab 100644 (file)
--- 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 c15f61665f02eb030da4e659a981fd103450f5fe..a252e64c190be9dcca9d54bd1a4b199fd833dde8 100644 (file)
--- 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 4b7305055b00ab4e6c10718607bb746b6e9e5c3f..ba4529c6dd61408ef76234b5b13095f89b962920 100644 (file)
--- 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 6e8a8b751e6026b3c16b3ff47a87459d0a29997b..3b4ef26a23132ff2248c66059c5156f3567e7f04 100644 (file)
--- 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 7cb0783b22cca4a9ccbbbf9510ff823a4bdd4464..830b055ed984744b51caf8042fb9627053d942ff 100644 (file)
--- 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