X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=884d1a039bb7078ba141013e693a6ba15b65843f;hb=1dc55bd88b9671ade0b3ad84fcbd992db1c66ca3;hp=4f625b55b9e18bb97e8b6d971669809a7dd388fb;hpb=715b8cda54a2aded29260b57ff201b16fd906f21;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 4f625b55b9..884d1a039b 100644
--- 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
@@ -55,22 +57,22 @@ bool Language::isBabelExclusive() const
 }
 
 
-docstring const Language::translateLayout(string const & m) const
+docstring const Language::translateLayout(string const & msg) const
 {
-	if (m.empty())
+	if (msg.empty())
 		return docstring();
 
-	if (!isAscii(m)) {
-		lyxerr << "Warning: not translating `" << m
+	if (!isAscii(msg)) {
+		lyxerr << "Warning: not translating `" << msg
 		       << "' because it is not pure ASCII.\n";
-		return from_utf8(m);
+		return from_utf8(msg);
 	}
 
-	TranslationMap::const_iterator it = layoutTranslations_.find(m);
+	TranslationMap::const_iterator it = layoutTranslations_.find(msg);
 	if (it != layoutTranslations_.end())
 		return it->second;
 
-	docstring t = from_ascii(m);
+	docstring t = from_ascii(msg);
 	cleanTranslation(t);
 	return t;
 }
@@ -87,7 +89,7 @@ string Language::fontenc(BufferParams const & params) const
 	// We check whether the used rm font supports an encoding our language supports
 	LaTeXFont const & lf =
 		theLaTeXFonts().getLaTeXFont(from_ascii(params.fontsRoman()));
-	vector<string> const lfe = lf.fontencs();
+	vector<string> const & lfe = lf.fontencs();
 	for (auto & fe : fontenc_) {
 		// ASCII means: support all T* encodings plus OT1
 		if (fe == "ASCII") {
@@ -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;
 }