Refactor InsetQuotes.h enums

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 4ade252e723e6a3fae9949c0ef6bd19458017065..7db4a3ecca047c050bcb8246067cfc238258082c 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -865,6 +865,7 @@ int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
        return end - i;
 }
 
+
 // Handle combining characters
 int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
                otexstream & os, char_type c, char_type next,
@@ -1235,7 +1236,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
                    && !runparams.inIPA
                        // TODO #10961: && not in inset Flex Code
                        // TODO #10961: && not in layout LyXCode
-                   && (!bparams.useNonTeXFonts || runparams.flavor != OutputParams::XETEX)) {
+                   && (!bparams.useNonTeXFonts || runparams.flavor != FLAVOR::XETEX)) {
                        if (c == 0x2013) {
                                // en-dash
                                os << "--";
@@ -1389,7 +1390,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
                        features.addPreambleSnippet(os.release(), true);
        }
 
-       if (features.runparams().flavor == OutputParams::HTML
+       if (features.runparams().flavor == FLAVOR::HTML
            && layout_->htmltitle()) {
                features.setHTMLTitle(owner_->asString(AS_STR_INSETS | AS_STR_SKIPDELETE));
        }
@@ -1484,7 +1485,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const
                } else if (!bp.use_dash_ligatures
                           && (c == 0x2013 || c == 0x2014)
                           && bp.useNonTeXFonts
-                          && features.runparams().flavor == OutputParams::XETEX)
+                          && features.runparams().flavor == FLAVOR::XETEX)
                        // XeTeX's dash behaviour is determined via a global setting
                        features.require("xetexdashbreakstate");
                BufferEncodings::validate(c, features);
@@ -1560,19 +1561,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 +1686,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);
 }
 
 
@@ -2509,7 +2510,7 @@ void Paragraph::latex(BufferParams const & bparams,
                if (c == META_INSET
                    && i >= start_pos && (end_pos == -1 || i < end_pos)) {
                        if (isDeleted(i))
-                               runparams.ctObject = getInset(i)->CtObject(runparams);
+                               runparams.ctObject = getInset(i)->getCtObject(runparams);
        
                        InsetMath const * im = getInset(i)->asInsetMath();
                        if (im && im->asHullInset()
@@ -2834,14 +2835,14 @@ void Paragraph::latex(BufferParams const & bparams,
                                if (incremented)
                                        --parInline;
 
-                               if (runparams.ctObject == OutputParams::CT_DISPLAYOBJECT
-                                   || runparams.ctObject == OutputParams::CT_UDISPLAYOBJECT) {
+                               if (runparams.ctObject == CtObject::DisplayObject
+                                   || runparams.ctObject == CtObject::UDisplayObject) {
                                        // Close \lyx*deleted and force its
                                        // reopening (if needed)
                                        os << '}';
                                        column++;
                                        runningChange = Change(Change::UNCHANGED);
-                                       runparams.ctObject = OutputParams::CT_NORMAL;
+                                       runparams.ctObject = CtObject::Normal;
                                }
                        }
                } else if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
@@ -3365,7 +3366,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 +4130,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);
 }