Unify naming of menu items

[features.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 809e04bcfb8ebe1ec153f8141cfd11560d713da3..9ad7a9c217e7b7633899b9023945e9b125b64254 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -15,12 +15,14 @@
 
 #include "Language.h"
 
+#include "BufferParams.h"
 #include "Encoding.h"
 #include "LaTeXFonts.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lassert.h"
@@ -37,10 +39,10 @@ using namespace lyx::support;
 namespace lyx {
 
 Languages languages;
-Language const * ignore_language = 0;
-Language const * default_language = 0;
-Language const * latex_language = 0;
-Language const * reset_language = 0;
+Language const * ignore_language = nullptr;
+Language const * default_language = nullptr;
+Language const * latex_language = nullptr;
+Language const * reset_language = nullptr;
 
 
 bool Language::isPolyglossiaExclusive() const
@@ -258,7 +260,7 @@ bool Language::readLanguage(Lexer & lex)
                                lex.getLongString(from_ascii("EndPreBabelPreamble"));
                        break;
                case LA_REQUIRES:
-                       lex >> requires_;
+                       lex >> required_;
                        break;
                case LA_PROVIDES:
                        lex >> provides_;
@@ -278,9 +280,9 @@ bool Language::readLanguage(Lexer & lex)
 
 bool Language::read(Lexer & lex)
 {
-       encoding_ = 0;
-       internal_enc_ = 0;
-       rightToLeft_ = 0;
+       encoding_ = nullptr;
+       internal_enc_ = false;
+       rightToLeft_ = false;
 
        if (!lex.next()) {
                lex.printError("No name given for language: `$$Token'.");
@@ -344,12 +346,12 @@ void Languages::read(FileName const & filename)
                        break;
                if (l.lang() == "latex") {
                        // Check if latex language was not already defined.
-                       LASSERT(latex_language == 0, continue);
+                       LASSERT(latex_language == nullptr, continue);
                        static const Language latex_lang = l;
                        latex_language = &latex_lang;
                } else if (l.lang() == "ignore") {
                        // Check if ignore language was not already defined.
-                       LASSERT(ignore_language == 0, continue);
+                       LASSERT(ignore_language == nullptr, continue);
                        static const Language ignore_lang = l;
                        ignore_language = &ignore_lang;
                } else
@@ -436,7 +438,7 @@ Language const * Languages::getFromCode(string const & code) const
                if (match(code, l.second) == ApproximateMatch)
                        return &l.second;
        }
-       return 0;
+       return nullptr;
 }
 
 
@@ -460,7 +462,7 @@ Language const * Languages::getFromCode(string const & code,
        return getFromCode(code);
 
        LYXERR0("Unknown language `" << code << "'");
-       return 0;
+       return nullptr;
 }