cosmetics

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 7d0fe850d3895076a24816b689a880a3bdb52b7a..59694b9c508c678b51be40f548c0fdc74260c4b1 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -14,18 +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"
 
 #include <ostream>
 
-using std::endl;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -39,11 +38,11 @@ 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",
-                             encodings.getFromLyXName("iso8859-1"),
+                             encodings.fromLyXName("iso8859-1"),
                              "latex", "");
 
        Lexer lex(0, 0);
@@ -76,9 +75,9 @@ void Languages::read(support::FileName const & filename)
                if (lex.next())
                        latex_options = lex.getString();
 
-               Encoding const * encoding = encodings.getFromLyXName(encoding_str);
+               Encoding const * encoding = encodings.fromLyXName(encoding_str);
                if (!encoding) {
-                       encoding = encodings.getFromLyXName("iso8859-1");
+                       encoding = encodings.fromLyXName("iso8859-1");
                        lyxerr << "Unknown encoding " << encoding_str << endl;
                }