Revert 23154.

[lyx.git] / src / Trans.cpp

diff --git a/src/Trans.cpp b/src/Trans.cpp
index 173958a629011a6fdbaaadd99aebae87ab3b4ec6..266d86765b02fe185767a3a8854e885237fd001d 100644 (file)
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -17,27 +17,21 @@
 #include "BufferView.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "debug.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 #include "Text.h"
 
-#include "support/filetools.h"
-#include "support/lstrings.h"
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
 
-namespace lyx {
-
-using support::split;
-using support::contains;
-using support::libFileSearch;
-
-using std::endl;
-using std::string;
-using std::pair;
-using std::map;
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
 /////////////////////////////////////////////////////////////////////
 //
@@ -121,7 +115,7 @@ static docstring const doAccent(docstring const & s, tex_accent accent)
        if (s.length() > 1) {
                if (accent != TEX_TIE || s.length() > 2)
                        lyxerr << "Warning: Too many characters given for accent "
-                              << lyx_accent_table[accent].name << '.' << std::endl;
+                              << lyx_accent_table[accent].name << '.' << endl;
                os << s.substr(1);
        }
        return normalize_c(os.str());
@@ -393,7 +387,7 @@ docstring const Trans::process(char_type c, TransManager & k)
 
 int Trans::load(string const & language)
 {
-       support::FileName const filename = libFileSearch("kbd", language, "kmap");
+       FileName const filename = libFileSearch("kbd", language, "kmap");
        if (filename.empty())
                return -1;