X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferEncodings.cpp;h=fe7e90c230b6299ad36fcdd982ef22f2d1d5c5f4;hb=3bbce7f24afbb469fff5ad352778af73d57b44d8;hp=d4f08fca34dad10387d32a118aacf38502f5319f;hpb=a9e663546b61becd1b3ae7ae660d551069659965;p=features.git

diff --git a/src/BufferEncodings.cpp b/src/BufferEncodings.cpp
index d4f08fca34..fe7e90c230 100644
--- a/src/BufferEncodings.cpp
+++ b/src/BufferEncodings.cpp
@@ -35,11 +35,8 @@ void BufferEncodings::initUnicodeMath(Buffer const & buffer, bool for_master)
 	}
 
 	// Check this buffer
-	Inset & inset = buffer.inset();
-	InsetIterator it = inset_iterator_begin(inset);
-	InsetIterator const end = inset_iterator_end(inset);
-	for (; it != end; ++it)
-		it->initUnicodeMath();
+	for (Inset const & it : buffer.inset())
+		it.initUnicodeMath();
 
 	if (!for_master)
 		return;
@@ -55,7 +52,7 @@ void BufferEncodings::validate(char_type c, LaTeXFeatures & features, bool for_m
 	CharInfo const & ci = Encodings::unicodeCharInfo(c);
 	if (ci.isUnicodeSymbol()) {
 		// In mathed, c could be used both in textmode and mathmode
-		docstring const textcommand = ci.textcommand();
+		docstring const textcommand = ci.textCommand();
 		bool const math_mode = for_mathed && isMathCmd(c);
 		bool const use_math = math_mode ||
 		                      (!for_mathed && textcommand.empty());
@@ -68,9 +65,9 @@ void BufferEncodings::validate(char_type c, LaTeXFeatures & features, bool for_m
 		// and if we do not use unicode-math
 		if ((math_mode && !unicode_math)
 		     || (use_math && !plain_utf8)) {
-			string const mathpreamble = ci.mathpreamble();
+			string const mathpreamble = ci.mathPreamble();
 			if (!mathpreamble.empty()) {
-				if (ci.mathfeature()) {
+				if (ci.mathFeature()) {
 					string feats = mathpreamble;
 					while (!feats.empty()) {
 						string feat;
@@ -83,9 +80,9 @@ void BufferEncodings::validate(char_type c, LaTeXFeatures & features, bool for_m
 		}
 		// with utf8-plain, we do not load packages (see #7766)
 		if (use_text && !plain_utf8) {
-			string const textpreamble = ci.textpreamble();
+			string const textpreamble = ci.textPreamble();
 			if (!textpreamble.empty()) {
-				if (ci.textfeature()) {
+				if (ci.textFeature()) {
 					string feats = textpreamble;
 					while (!feats.empty()) {
 						string feat;