X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=6e8e612f94480f6c191a88de63209102359fdab1;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=eb3eb52349d44c08e501b8823937805974723dcf;hpb=6751c8a72f3d895699f081e86b1e67810b471204;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index eb3eb52349..6e8e612f94 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -201,8 +201,7 @@ int countChars(DocIterator const & from, DocIterator const & to, bool with_blank
 		pos_type const pos = dit.pos();
 
 		if (pos != dit.lastpos() && !par.isDeleted(pos)) {
-			if (par.isInset(pos)) {
-				Inset const * ins = par.getInset(pos);
+			if (Inset const * ins = par.getInset(pos)) {
 				if (ins->isLetter())
 					++chars;
 				else if (with_blanks && ins->isSpace())
@@ -295,7 +294,7 @@ bool needEnumCounterReset(ParIterator const & it)
 // set the label of a paragraph. This includes the counters.
 void setLabel(Buffer const & buf, ParIterator & it)
 {
-	TextClass const & textclass = buf.params().getTextClass();
+	TextClass const & textclass = buf.params().textClass();
 	Paragraph & par = it.paragraph();
 	LayoutPtr const & layout = par.layout();
 	Counters & counters = textclass.counters();
@@ -483,7 +482,7 @@ void updateLabels(Buffer const & buf, bool childonly)
 {
 	Buffer const * const master = buf.masterBuffer();
 	// Use the master text class also for child documents
-	TextClass const & textclass = master->params().getTextClass();
+	TextClass const & textclass = master->params().textClass();
 
 	if (!childonly) {
 		// If this is a child document start with the master