John's Layout Tabular UI improvements and Martins fixes to clearing the

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

diff --git a/src/vc-backend.C b/src/vc-backend.C
index b624f72fbdfc17930f010b861ef3feb07846c98e..a5fd7be2a5d532e9a14eb96f6614ae1f4a32a7bc 100644 (file)
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -4,19 +4,21 @@
 #pragma implementation
 #endif
 
-#include <fstream>
-
 #include "vc-backend.h"
 #include "debug.h"
+#include "buffer.h"
+#include "BufferView.h"
+#include "LyXView.h"
+#include "lyxfunc.h"
+
 #include "support/FileInfo.h"
 #include "support/LRegex.h"
 #include "support/LSubstring.h"
 #include "support/path.h"
 #include "support/filetools.h"
-#include "buffer.h"
-#include "BufferView.h"
-#include "LyXView.h"
-#include "lyxfunc.h"
+#include "support/lstrings.h"
+
+#include <fstream>
 
 using std::endl;
 using std::ifstream;
@@ -111,7 +113,9 @@ void RCS::scanMaster()
                                vcstatus = UNLOCKED;
                                continue;
                        }
-                       string tmpt, s1, s2;
+                       string tmpt;
+                       string s1;
+                       string s2;
                        do {
                                ifs >> tmpt;
                                s1 = strip(tmpt, ';');
@@ -135,7 +139,6 @@ void RCS::scanMaster()
                                << endl;
                }
        }
-       version_ = "RCS: " + version_;
 }
 
 
@@ -237,15 +240,14 @@ void CVS::scanMaster()
        lyxerr[Debug::LYXVC] << "\tlooking for `" << tmpf << "'" << endl;
        string line;
        LRegex reg("/(.*)/(.*)/(.*)/(.*)/(.*)");
-       while(getline(ifs, line)) {
+       while (getline(ifs, line)) {
                lyxerr[Debug::LYXVC] << "\t  line: " << line << endl;
                if (contains(line, tmpf)) {
                        // Ok extract the fields.
                        LRegex::SubMatches const & sm = reg.exec(line);
                        //sm[0]; // whole matched string
                        //sm[1]; // filename
-                       version_ = "CVS: ";
-                       version_ += LSubstring(line, sm[2].first,
+                       version_ = LSubstring(line, sm[2].first,
                                              sm[2].second);
                        string file_date = LSubstring(line, sm[3].first,
                                                      sm[3].second);