explain why ownsClipbiard() does not work on Windows and OS X

[lyx.git] / src / language.C

diff --git a/src/language.C b/src/language.C
index 82217fedc5f781a6962e76921e95e6d97bcb25ca..754ebfd64da0904664a9eaf55b9a6cc787819177 100644 (file)
--- a/src/language.C
+++ b/src/language.C
@@ -19,6 +19,8 @@
 #include "lyxlex.h"
 #include "lyxrc.h"
 
+#include "support/filename.h"
+
 
 namespace lyx {
 
@@ -35,11 +37,11 @@ Language latex_lang("latex", "latex", "Latex", false, "", 0, "latex", "");
 Language const * latex_language = &latex_lang;
 
 
-void Languages::read(string const & filename)
+void Languages::read(support::FileName const & filename)
 {
        // We need to set the encoding of latex_lang
        latex_lang = Language("latex", "latex", "Latex", false, "iso8859-1",
-                             encodings.getEncoding("iso8859-1"),
+                             encodings.getFromLyXName("iso8859-1"),
                              "latex", "");
 
        LyXLex lex(0, 0);
@@ -57,7 +59,7 @@ void Languages::read(string const & filename)
                        lang = lex.getString();
                else
                        break;
-               lyxerr[Debug::INFO] << "Reading language " << lang << endl;
+               LYXERR(Debug::INFO) << "Reading language " << lang << endl;
 
                if (lex.next())
                        babel = lex.getString();
@@ -72,9 +74,9 @@ void Languages::read(string const & filename)
                if (lex.next())
                        latex_options = lex.getString();
 
-               Encoding const * encoding = encodings.getEncoding(encoding_str);
+               Encoding const * encoding = encodings.getFromLyXName(encoding_str);
                if (!encoding) {
-                       encoding = encodings.getEncoding("iso8859-1");
+                       encoding = encodings.getFromLyXName("iso8859-1");
                        lyxerr << "Unknown encoding " << encoding_str << endl;
                }