Restore the version number position on the splash screen

[lyx.git] / src / vc-backend.C

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 5fb8f6bb921d24fbd3c93246978a327cd4e8af48..e7ac9d7826bade3181b4d911854806f86dde2ecf 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -56,9 +56,9 @@ using std::ifstream;
 namespace fs = boost::filesystem;
 
 
-int VCS::doVCCommand(string const & cmd, string const & path)
+int VCS::doVCCommand(string const & cmd, FileName const & path)
 {
-       lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
+       LYXERR(Debug::LYXVC) << "doVCCommand: " << cmd << endl;
        Systemcall one;
        support::Path p(path);
        int const ret = one.startscript(Systemcall::Wait, cmd);
@@ -77,19 +77,19 @@ FileName const RCS::find_file(FileName const & file)
 {
        // Check if *,v exists.
        FileName tmp(file.absFilename() + ",v");
-       lyxerr[Debug::LYXVC] << "Checking if file is under rcs: "
+       LYXERR(Debug::LYXVC) << "Checking if file is under rcs: "
                             << tmp << endl;
        if (fs::is_readable(tmp.toFilesystemEncoding())) {
-               lyxerr[Debug::LYXVC] << "Yes " << file
+               LYXERR(Debug::LYXVC) << "Yes " << file
                                     << " is under rcs." << endl;
                return tmp;
        } else {
                // Check if RCS/*,v exists.
                tmp = FileName(addName(addPath(onlyPath(file.absFilename()), "RCS"), file.absFilename()) + ",v");
-               lyxerr[Debug::LYXVC] << "Checking if file is under rcs: "
+               LYXERR(Debug::LYXVC) << "Checking if file is under rcs: "
                                     << tmp << endl;
                if (fs::is_readable(tmp.toFilesystemEncoding())) {
-                       lyxerr[Debug::LYXVC] << "Yes " << file
+                       LYXERR(Debug::LYXVC) << "Yes " << file
                                             << " it is under rcs."<< endl;
                        return tmp;
                }
@@ -100,15 +100,15 @@ FileName const RCS::find_file(FileName const & file)
 
 void RCS::retrieve(FileName const & file)
 {
-       lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC::RCS: retrieve.\n\t" << file << endl;
        VCS::doVCCommand("co -q -r " + quoteName(file.toFilesystemEncoding()),
-                        string());
+                        FileName());
 }
 
 
 void RCS::scanMaster()
 {
-       lyxerr[Debug::LYXVC] << "LyXVC::RCS: scanMaster." << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC::RCS: scanMaster." << endl;
 
        ifstream ifs(master_.toFilesystemEncoding().c_str());
 
@@ -116,7 +116,7 @@ void RCS::scanMaster()
        bool read_enough = false;
 
        while (!read_enough && ifs >> token) {
-               lyxerr[Debug::LYXVC]
+               LYXERR(Debug::LYXVC)
                        << "LyXVC::scanMaster: current lex text: `"
                        << token << '\'' << endl;
 
@@ -128,7 +128,7 @@ void RCS::scanMaster()
                        ifs >> tmv;
                        tmv = rtrim(tmv, ";");
                        version_ = tmv;
-                       lyxerr[Debug::LYXVC] << "LyXVC: version found to be "
+                       LYXERR(Debug::LYXVC) << "LyXVC: version found to be "
                                             << tmv << endl;
                } else if (contains(token, "access")
                           || contains(token, "symbols")
@@ -162,7 +162,7 @@ void RCS::scanMaster()
                        read_enough = true;
                } else {
                        // unexpected
-                       lyxerr[Debug::LYXVC]
+                       LYXERR(Debug::LYXVC)
                                << "LyXVC::scanMaster(): unexpected token"
                                << endl;
                }
@@ -176,7 +176,7 @@ void RCS::registrer(string const & msg)
        cmd += msg;
        cmd += "\" ";
        cmd += quoteName(onlyFilename(owner_->fileName()));
-       doVCCommand(cmd, owner_->filePath());
+       doVCCommand(cmd, FileName(owner_->filePath()));
 }
 
 
@@ -184,7 +184,7 @@ void RCS::checkIn(string const & msg)
 {
        doVCCommand("ci -q -u -m\"" + msg + "\" "
                    + quoteName(onlyFilename(owner_->fileName())),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
 }
 
 
@@ -192,7 +192,7 @@ void RCS::checkOut()
 {
        owner_->markClean();
        doVCCommand("co -q -l " + quoteName(onlyFilename(owner_->fileName())),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
 }
 
 
@@ -200,7 +200,7 @@ void RCS::revert()
 {
        doVCCommand("co -f -u" + version() + " "
                    + quoteName(onlyFilename(owner_->fileName())),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
        // We ignore changes and just reload!
        owner_->markClean();
 }
@@ -208,10 +208,10 @@ void RCS::revert()
 
 void RCS::undoLast()
 {
-       lyxerr[Debug::LYXVC] << "LyXVC: undoLast" << endl;
+       LYXERR(Debug::LYXVC) << "LyXVC: undoLast" << endl;
        doVCCommand("rcs -o" + version() + " "
                    + quoteName(onlyFilename(owner_->fileName())),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
 }
 
 
@@ -219,7 +219,7 @@ void RCS::getLog(FileName const & tmpf)
 {
        doVCCommand("rlog " + quoteName(onlyFilename(owner_->fileName()))
                    + " > " + tmpf.toFilesystemEncoding(),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
 }
 
 
@@ -237,7 +237,7 @@ FileName const CVS::find_file(FileName const & file)
        // where we have file.
        FileName const dir(onlyPath(file.absFilename()) + "/CVS/Entries");
        string const tmpf = '/' + onlyFilename(file.absFilename()) + '/';
-       lyxerr[Debug::LYXVC] << "LyXVC: checking in `" << dir
+       LYXERR(Debug::LYXVC) << "LyXVC: checking in `" << dir
                             << "' for `" << tmpf << '\'' << endl;
        if (fs::is_readable(dir.toFilesystemEncoding())) {
                // Ok we are at least in a CVS dir. Parse the CVS/Entries
@@ -246,7 +246,7 @@ FileName const CVS::find_file(FileName const & file)
                ifstream ifs(dir.toFilesystemEncoding().c_str());
                string line;
                while (getline(ifs, line)) {
-                       lyxerr[Debug::LYXVC] << "\tEntries: " << line << endl;
+                       LYXERR(Debug::LYXVC) << "\tEntries: " << line << endl;
                        if (contains(line, tmpf))
                                return dir;
                }
@@ -257,16 +257,16 @@ FileName const CVS::find_file(FileName const & file)
 
 void CVS::scanMaster()
 {
-       lyxerr[Debug::LYXVC] << "LyXVC::CVS: scanMaster. \n     Checking: "
+       LYXERR(Debug::LYXVC) << "LyXVC::CVS: scanMaster. \n     Checking: "
                             << master_ << endl;
        // Ok now we do the real scan...
        ifstream ifs(master_.toFilesystemEncoding().c_str());
        string tmpf = '/' + onlyFilename(file_.absFilename()) + '/';
-       lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << '\'' << endl;
+       LYXERR(Debug::LYXVC) << "\tlooking for `" << tmpf << '\'' << endl;
        string line;
        static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
        while (getline(ifs, line)) {
-               lyxerr[Debug::LYXVC] << "\t  line: " << line << endl;
+               LYXERR(Debug::LYXVC) << "\t  line: " << line << endl;
                if (contains(line, tmpf)) {
                        // Ok extract the fields.
                        smatch sm;
@@ -283,7 +283,7 @@ void CVS::scanMaster()
                        // FIXME: must double check file is stattable/existing
                        time_t mod = fs::last_write_time(file_.toFilesystemEncoding());
                        string mod_date = rtrim(asctime(gmtime(&mod)), "\n");
-                       lyxerr[Debug::LYXVC]
+                       LYXERR(Debug::LYXVC)
                                <<  "Date in Entries: `" << file_date
                                << "'\nModification date of file: `"
                                << mod_date << '\'' << endl;
@@ -306,7 +306,7 @@ void CVS::registrer(string const & msg)
 {
        doVCCommand("cvs -q add -m \"" + msg + "\" "
                    + quoteName(onlyFilename(owner_->fileName())),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
 }
 
 
@@ -314,7 +314,7 @@ void CVS::checkIn(string const & msg)
 {
        doVCCommand("cvs -q commit -m \"" + msg + "\" "
                    + quoteName(onlyFilename(owner_->fileName())),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
 }
 
 
@@ -332,7 +332,7 @@ void CVS::revert()
        string const fil = quoteName(onlyFilename(owner_->fileName()));
 
        doVCCommand("rm -f " + fil + "; cvs update " + fil,
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
        owner_->markClean();
 }
 
@@ -350,7 +350,7 @@ void CVS::getLog(FileName const & tmpf)
 {
        doVCCommand("cvs log " + quoteName(onlyFilename(owner_->fileName()))
                    + " > " + tmpf.toFilesystemEncoding(),
-                   owner_->filePath());
+                   FileName(owner_->filePath()));
 }