add FileName::renameTo() method.

[lyx.git] / src / support / os_win32.cpp

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index cae4849801694ecb8948f26e9fae4c62b7ad136f..cddb497c5f529139166f1410dacfee5a1b3cd762 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -16,13 +16,12 @@
 
 #include "support/os.h"
 #include "support/os_win32.h"
-#include "support/lstrings.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "support/ExceptionMessage.h"
 
-#include "debug.h"
-#include "gettext.h"
-
 #include <boost/assert.hpp>
 
 #include <cstdlib>
@@ -63,9 +62,7 @@
 # endif
 #endif
 
-using std::endl;
-using std::string;
-
+using namespace std;
 
 namespace lyx {
 namespace support {
@@ -193,10 +190,8 @@ string external_path(string const & p)
 {
        string const dos_path = subst(p, "/", "\\");
 
-       LYXERR(Debug::LATEX)
-               << "<Win32 path correction> ["
-               << p << "]->>["
-               << dos_path << ']' << endl;
+       LYXERR(Debug::LATEX, "<Win32 path correction> ["
+               << p << "]->>[" << dos_path << ']');
        return dos_path;
 }
 
@@ -206,7 +201,7 @@ static string const get_long_path(string const & short_path)
        // GetLongPathName needs the path in file system encoding.
        // We can use to_local8bit, since file system encoding and the
        // local 8 bit encoding are identical on windows.
-       std::vector<char> long_path(MAX_PATH);
+       vector<char> long_path(MAX_PATH);
        DWORD result = GetLongPathName(to_local8bit(from_utf8(short_path)).c_str(),
                                       &long_path[0], long_path.size());
 
@@ -249,10 +244,8 @@ string latex_path(string const & p)
                string const drive = p.substr(0, 2);
                string const cygprefix = cygdrive + "/" + drive.substr(0, 1);
                string const cygpath = subst(subst(p, '\\', '/'), drive, cygprefix);
-               LYXERR(Debug::LATEX)
-                       << "<Path correction for LaTeX> ["
-                       << p << "]->>["
-                       << cygpath << ']' << endl;
+               LYXERR(Debug::LATEX, "<Path correction for LaTeX> ["
+                       << p << "]->>[" << cygpath << ']');
                return cygpath;
        }
        return subst(p, '\\', '/');