Amend 3093789e for cmake build

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index f3dc50feb60886a47bd6aa0b4ada4153ae8013fd..aa6bd303041cf15c7674667c7d98196e1ad98e1d 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -20,12 +20,11 @@
 
 #include "Paragraph.h"
 
-#include "LayoutFile.h"
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "BufferEncodings.h"
 #include "Changes.h"
 #include "Counters.h"
-#include "BufferEncodings.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -42,6 +41,7 @@
 #include "texstream.h"
 #include "TexRow.h"
 #include "Text.h"
+#include "TextClass.h"
 #include "WordLangTuple.h"
 #include "WordList.h"
 
@@ -61,7 +61,6 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <algorithm>
 #include <atomic>
 #include <sstream>
 #include <vector>
@@ -360,19 +359,19 @@ public:
                char_type const c,
                otexstream & os,
                pos_type i,
-               unsigned int & column);
+               unsigned int & column) const;
        ///
        bool latexSpecialTU(
                char_type const c,
                otexstream & os,
                pos_type i,
-               unsigned int & column);
+               unsigned int & column) const;
        ///
        bool latexSpecialT3(
                char_type const c,
                otexstream & os,
                pos_type i,
-               unsigned int & column);
+               unsigned int & column) const;
 
        ///
        void validate(LaTeXFeatures & features) const;
@@ -1317,7 +1316,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
 
 
 bool Paragraph::Private::latexSpecialT1(char_type const c, otexstream & os,
-       pos_type i, unsigned int & column)
+       pos_type i, unsigned int & column) const
 {
        switch (c) {
        case '>':
@@ -1345,7 +1344,7 @@ bool Paragraph::Private::latexSpecialT1(char_type const c, otexstream & os,
 
 
 bool Paragraph::Private::latexSpecialTU(char_type const c, otexstream & os,
-       pos_type i, unsigned int & column)
+       pos_type i, unsigned int & column) const
 {
        // TU encoding is currently on par with T1.
        return latexSpecialT1(c, os, i, column);
@@ -1353,7 +1352,7 @@ bool Paragraph::Private::latexSpecialTU(char_type const c, otexstream & os,
 
 
 bool Paragraph::Private::latexSpecialT3(char_type const c, otexstream & os,
-       pos_type /*i*/, unsigned int & column)
+       pos_type /*i*/, unsigned int & column) const
 {
        switch (c) {
        case '*':
@@ -1561,19 +1560,19 @@ void flushString(ostream & os, docstring & s)
 
 
 void Paragraph::write(ostream & os, BufferParams const & bparams,
-       depth_type & dth) const
+       depth_type & depth) const
 {
        // The beginning or end of a deeper (i.e. nested) area?
-       if (dth != d->params_.depth()) {
-               if (d->params_.depth() > dth) {
-                       while (d->params_.depth() > dth) {
+       if (depth != d->params_.depth()) {
+               if (d->params_.depth() > depth) {
+                       while (d->params_.depth() > depth) {
                                os << "\n\\begin_deeper";
-                               ++dth;
+                               ++depth;
                        }
                } else {
-                       while (d->params_.depth() < dth) {
+                       while (d->params_.depth() < depth) {
                                os << "\n\\end_deeper";
-                               --dth;
+                               --depth;
                        }
                }
        }
@@ -1686,11 +1685,11 @@ void Paragraph::validate(LaTeXFeatures & features) const
 }
 
 
-void Paragraph::insert(pos_type start, docstring const & str,
+void Paragraph::insert(pos_type pos, docstring const & str,
                       Font const & font, Change const & change)
 {
        for (size_t i = 0, n = str.size(); i != n ; ++i)
-               insertChar(start + i, str[i], font, change);
+               insertChar(pos + i, str[i], font, change);
 }
 
 
@@ -3366,7 +3365,7 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
 
                // If this is an InsetNewline, generate a new paragraph. Also reset the fonts, so that tags are closed in
                // this paragraph.
-               if (getInset(i) != nullptr && getInset(i)->lyxCode() == NEWLINE_CODE) {
+               if (getInset(i) && getInset(i)->lyxCode() == NEWLINE_CODE) {
                        if (!ignore_fonts)
                                xs->closeFontTags();
 
@@ -4130,12 +4129,12 @@ void Paragraph::setPlainLayout(DocumentClass const & tc)
 }
 
 
-void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
+void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tc)
 {
        if (usePlainLayout())
-               setPlainLayout(tclass);
+               setPlainLayout(tc);
        else
-               setDefaultLayout(tclass);
+               setDefaultLayout(tc);
 }