Amend 207eaeee9071cb

[lyx.git] / src / Language.h

diff --git a/src/Language.h b/src/Language.h
index 2e03644139c5bccff5b20e9c5977f04e443b09d9..d8ef03a125fa325fcb2737d22367ddf35276283f 100644 (file)
--- a/src/Language.h
+++ b/src/Language.h
@@ -15,8 +15,6 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#include "BufferParams.h"
-
 #include "support/docstring.h"
 #include "support/trivstring.h"
 
@@ -27,10 +25,13 @@
 
 namespace lyx {
 
-namespace support { class FileName; }
+namespace support {
+class FileName;
+class Lexer;
+}
 
+class BufferParams;
 class Encoding;
-class Lexer;
 
 ///
 class Language {
@@ -57,7 +58,7 @@ public:
        /// active characters
        std::string const activeChars() const { return active_chars_; }
        /// requirement (package, function)
-       std::string const required() const { return requires_; }
+       std::string const required() const { return required_; }
        /// provides feature
        std::string const provides() const { return provides_; }
        /// translatable GUI name
@@ -100,9 +101,9 @@ public:
        /// This language corresponds to a translation of the GUI
        bool hasGuiSupport() const { return has_gui_support_; }
        ///
-       bool read(Lexer & lex);
+       bool read(support::Lexer & lex);
        ///
-       bool readLanguage(Lexer & lex);
+       bool readLanguage(support::Lexer & lex);
        ///
        typedef std::map<trivstring, trivdocstring> TranslationMap;
        ///
@@ -125,7 +126,7 @@ private:
        ///
        trivstring active_chars_;
        ///
-       trivstring requires_;
+       trivstring required_;
        ///
        trivstring provides_;
        ///