remove most traces of boost::regex

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 4ade252e723e6a3fae9949c0ef6bd19458017065..aa6bd303041cf15c7674667c7d98196e1ad98e1d 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1560,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;
                        }
                }
        }
@@ -1685,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);
 }
 
 
@@ -3365,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();
 
@@ -4129,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);
 }