Revert 23154.

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index eb5cb066dca31bfdc868f2b2d12d0eadb1934b43..3aee984cf9671af5535fff37ae074afc6913d484 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -14,16 +14,17 @@
 
 #include "Language.h"
 
-#include "debug.h"
 #include "Encoding.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
 
-using std::endl;
-using std::string;
+#include <ostream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -37,7 +38,7 @@ Language latex_lang("latex", "", "Latex", false, "", 0, "latex", "");
 Language const * latex_language = &latex_lang;
 
 
-void Languages::read(support::FileName const & filename)
+void Languages::read(FileName const & filename)
 {
        // We need to set the encoding of latex_lang
        latex_lang = Language("latex", "", "Latex", false, "iso8859-1",
@@ -59,7 +60,7 @@ void Languages::read(support::FileName const & filename)
                        lang = lex.getString();
                else
                        break;
-               LYXERR(Debug::INFO) << "Reading language " << lang << endl;
+               LYXERR(Debug::INFO, "Reading language " << lang);
 
                if (lex.next())
                        babel = lex.getString();