more cursor dispatch

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

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 786826d22c1511b7c6898bedb06cfb1384879d1f..99bcd4fa4646d305ec61b6b17b9f88a2bb1b1421 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -35,6 +35,10 @@ using lyx::support::rtrim;
 using lyx::support::split;
 using lyx::support::Systemcall;
 
+using boost::regex;
+using boost::regex_match;
+using boost::smatch;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::asctime;
 using std::gmtime;
@@ -42,18 +46,9 @@ using std::gmtime;
 
 using std::endl;
 using std::getline;
-
+using std::string;
 using std::ifstream;
 
-using boost::regex;
-using boost::regex_match;
-
-#ifndef USE_INCLUDED_STRING
-using boost::smatch;
-#else
-using boost::cmatch;
-#endif
-
 
 int VCS::doVCCommand(string const & cmd, string const & path)
 {
@@ -139,7 +134,7 @@ void RCS::scanMaster()
                        // nothing
                } else if (contains(token, "locks")) {
                        // get locker here
-                       if (contains(token, ";")) {
+                       if (contains(token, ';')) {
                                locker_ = "Unlocked";
                                vcstatus = UNLOCKED;
                                continue;
@@ -158,7 +153,7 @@ void RCS::scanMaster()
                                        vcstatus = LOCKED;
                                        break;
                                }
-                       } while (!contains(tmpt, ";"));
+                       } while (!contains(tmpt, ';'));
 
                } else if (token == "comment") {
                        // we don't need to read any further than this.
@@ -269,22 +264,19 @@ void CVS::scanMaster()
        string tmpf = "/" + OnlyFilename(file_) + "/";
        lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << '\'' << endl;
        string line;
-       regex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
+       static regex const reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
        while (getline(ifs, line)) {
                lyxerr[Debug::LYXVC] << "\t  line: " << line << endl;
                if (contains(line, tmpf)) {
                        // Ok extract the fields.
-#ifndef USE_INCLUDED_STRING
                        smatch sm;
-#else
-                       cmatch sm;
-#endif
-                       regex_match(STRCONV(line), sm, reg);
+
+                       regex_match(line, sm, reg);
 
                        //sm[0]; // whole matched string
                        //sm[1]; // filename
-                       version_ = STRCONV(sm.str(2));
-                       string const file_date = STRCONV(sm.str(3));
+                       version_ = sm.str(2);
+                       string const file_date = sm.str(3);
 
                        //sm[4]; // options
                        //sm[5]; // tag or tagdate