ws changes only

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

diff --git a/src/vc-backend.C b/src/vc-backend.C
index 9e227b58cee86d13d2cf02b63de06b15b7960057..4d7222152662a3e8152a9c9fd3d9bca911421bed 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -24,7 +24,20 @@
 
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::AddName;
+using lyx::support::AddPath;
+using lyx::support::contains;
+using lyx::support::FileInfo;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+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;
@@ -32,16 +45,9 @@ using std::gmtime;
 #endif
 
 using std::endl;
-using std::ifstream;
 using std::getline;
-using boost::regex;
-using boost::regex_match;
-
-#ifndef USE_INCLUDED_STRING
-using boost::smatch;
-#else
-using boost::cmatch;
-#endif
+using std::string;
+using std::ifstream;
 
 
 int VCS::doVCCommand(string const & cmd, string const & path)
@@ -263,17 +269,14 @@ void CVS::scanMaster()
                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