anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@737 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-05-17 16:42:35 +00:00
parent fa6aa115e7
commit cdaf9a5ad5
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2000-05-17 Juergen Vigna <jug@sad.it>
* src/BufferView2.C (removeAutoInsets): fixed use of AutoDeleteInsets * src/BufferView2.C (removeAutoInsets): fixed use of AutoDeleteInsets

4
src/buffer.C
View File

@ -2272,7 +2272,9 @@ void Buffer::makeLinuxDocFile(string const & fname, int column)
LyXLayout const & style = LyXLayout const & style =
textclasslist.Style(users->buffer()->params.textclass, textclasslist.Style(users->buffer()->params.textclass,
par->layout); par->layout);
#ifdef WITH_WARNINGS
#warning please check if this call is really needed!!! #warning please check if this call is really needed!!!
#endif
// par->AutoDeleteInsets(); // par->AutoDeleteInsets();
// treat <toc> as a special case for compatibility with old code // 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 = LyXLayout const & style =
textclasslist.Style(users->buffer()->params.textclass, textclasslist.Style(users->buffer()->params.textclass,
par->layout); par->layout);
#ifdef WITH_WARNINGS
#warning please check if this call is really needed!!! #warning please check if this call is really needed!!!
#endif
// par->AutoDeleteInsets(); // par->AutoDeleteInsets();
// environment tag closing // environment tag closing

2
src/lyxvc.C
View File

@ -185,7 +185,7 @@ void LyXVC::undoLast()
void LyXVC::toggleReadOnly() void LyXVC::toggleReadOnly()
{ {
switch (vcs->stat()) { switch (vcs->status()) {
case VCS::UNLOCKED: case VCS::UNLOCKED:
lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl; lyxerr[Debug::LYXVC] << "LyXVC: toggle to locked" << endl;
checkOut(); checkOut();

8
src/vc-backend.C
View File

@ -106,7 +106,7 @@ void RCS::scanMaster()
// get locker here // get locker here
if (contains(token, ";")) { if (contains(token, ";")) {
locker_ = "Unlocked"; locker_ = "Unlocked";
vcstat = UNLOCKED; vcstatus = UNLOCKED;
continue; continue;
} }
string tmpt, s1, s2; string tmpt, s1, s2;
@ -118,7 +118,7 @@ void RCS::scanMaster()
// s2 is user, and s1 is version // s2 is user, and s1 is version
if (s1 == version_) { if (s1 == version_) {
locker_ = s2; locker_ = s2;
vcstat = LOCKED; vcstatus = LOCKED;
break; break;
} }
} while (!contains(tmpt, ";")); } while (!contains(tmpt, ";"));
@ -258,12 +258,12 @@ void CVS::scanMaster()
<< mod_date << "'" << endl; << mod_date << "'" << endl;
if (file_date == mod_date) { if (file_date == mod_date) {
locker_ = "Unlocked"; locker_ = "Unlocked";
vcstat = UNLOCKED; vcstatus = UNLOCKED;
} else { } else {
// Here we should also to some more checking // Here we should also to some more checking
// to see if there are conflicts or not. // to see if there are conflicts or not.
locker_ = "Locked"; locker_ = "Locked";
vcstat = LOCKED; vcstatus = LOCKED;
} }
break; break;
} }

4
src/vc-backend.h
View File

@ -47,7 +47,7 @@ public:
/// ///
Buffer * owner() const { return owner_; } Buffer * owner() const { return owner_; }
/// ///
VCStatus stat() const { return vcstat; } VCStatus status() const { return vcstatus; }
protected: protected:
/// ///
static int doVCCommand(string const &, string const &); static int doVCCommand(string const &, string const &);
@ -58,7 +58,7 @@ protected:
string master_; string master_;
/// The status of the VC controlled file. /// 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 /** The version of the VC file. I am not sure if this can be a
string of if it must be a string of if it must be a