X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvc-backend.C;h=c4336d48e7fda94429b2f919bbf1a9fba06c9c3f;hb=98c966c64594611e469313314abd1e59524adb4a;hp=78405f16a83ce342ba7fd5d1bdf3dad700438f84;hpb=59e18b17aec378d71ca7d8ef3e566be40c35aaf1;p=lyx.git diff --git a/src/vc-backend.C b/src/vc-backend.C index 78405f16a8..c4336d48e7 100644 --- a/src/vc-backend.C +++ b/src/vc-backend.C @@ -17,7 +17,7 @@ #include "support/path.h" #include "support/filetools.h" #include "support/lstrings.h" -#include "support/syscall.h" +#include "support/systemcall.h" #include @@ -28,9 +28,9 @@ using std::getline; int VCS::doVCCommand(string const & cmd, string const & path) { lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl; - Systemcalls one; + Systemcall one; Path p(path); - int const ret = one.startscript(Systemcalls::Wait, cmd); + int const ret = one.startscript(Systemcall::Wait, cmd); return ret; } @@ -70,9 +70,9 @@ string const RCS::find_file(string const & file) } -void RCS::retrive(string const & file) +void RCS::retrieve(string const & file) { - lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrive.\n\t" << file << endl; + lyxerr[Debug::LYXVC] << "LyXVC::RCS: retrieve.\n\t" << file << endl; VCS::doVCCommand("co -q -r \"" + file + "\"", string()); @@ -129,7 +129,7 @@ void RCS::scanMaster() break; } } while (!contains(tmpt, ";")); - + } else if (token == "comment") { // we don't need to read any further than this. read_enough = true; @@ -306,7 +306,7 @@ void CVS::revert() // Reverts to the version in CVS repository and // gets the updated version from the repository. string const fil = OnlyFilename(owner_->fileName()); - + doVCCommand("rm -f \"" + fil + "\"; cvs update \"" + fil + "\"", owner_->filePath()); owner_->markLyxClean();