clear()->erase() ; lots of using directives for cxx

[features.git] / src / support / filetools.C

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 996b064852b95eb8d0de3b4d18d7f95fa3c6c6ae..1b2af682fa582bdec9ee10ee3ef773334dff217e 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -19,8 +19,6 @@
 #include <cctype>
 
 #include <utility>
-using std::make_pair;
-using std::pair;
 
 #ifdef __GNUG__
 #pragma implementation "filetools.h"
@@ -52,6 +50,10 @@ using std::pair;
 # endif
 #endif
 
+using std::make_pair;
+using std::pair;
+using std::endl;
+
 extern string system_lyxdir;
 extern string build_lyxdir;
 extern string user_lyxdir;
@@ -89,9 +91,7 @@ string MakeLatexName(string const & file)
 // Substitutes spaces with underscores in filename (and path)
 string QuoteName(string const & name)
 {
-#ifdef WITH_WARNINGS
-#warning Add proper emx support here!
-#endif
+       // CHECK Add proper emx support here!
 #ifndef __EMX__
        return '\'' + name + '\'';
 #else
@@ -303,9 +303,7 @@ string GetEnvPath(string const & name)
 
 bool PutEnv(string const & envstr)
 {
-#ifdef WITH_WARNINGS
-#warning Look at and fix this.
-#endif
+       // CHECK Look at and fix this.
         // f.ex. what about error checking?
 #if HAVE_PUTENV
         // this leaks, but what can we do about it?
@@ -750,7 +748,7 @@ string ReplaceEnvironmentPath(string const & path)
                if (!regexMatch(copy1, RegExp)) {
                        // No EndChar inside. So we are finished
                        result1 += CompareString + result0;
-                       result0.clear();
+                       result0.erase();
                        continue;
                }