return from switch

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 080369f104e935535a2be7e6a548416584717b29..469b316ea4809abd3a48bcf510e00050eb2ecfe8 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -878,7 +878,7 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
                // because of branches, e.g., a branch that contains an entire new section.
                // We do not really want to wrap that whole thing in a <div>...</div>.
                bool special_case = false;
-               Inset const * specinset = par->size() == 1 ? par->getInset(0) : 0;
+               Inset const * specinset = par->size() == 1 ? par->getInset(0) : nullptr;
                if (specinset && !specinset->getLayout().htmlisblock()) {
                        Layout const & style = par->layout();
                        FontInfo const first_font = style.labeltype == LABEL_MANUAL ?
@@ -974,7 +974,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
        xs << html::CR();
 
        // we will on occasion need to remember a layout from before.
-       Layout const * lastlay = 0;
+       Layout const * lastlay = nullptr;
 
        while (par != pend) {
                Layout const & style = par->layout();
@@ -1002,9 +1002,9 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                        // started---which we will be if the depth is the same.
                        if (par->params().depth() == origdepth) {
                                LATTEST(bstyle == style);
-                               if (lastlay != 0) {
+                               if (lastlay != nullptr) {
                                        closeItemTag(xs, *lastlay);
-                                       lastlay = 0;
+                                       lastlay = nullptr;
                                }
 
                                // this will be positive, if we want to skip the
@@ -1093,7 +1093,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                }
        }
 
-       if (lastlay != 0)
+       if (lastlay != nullptr)
                closeItemTag(xs, *lastlay);
        closeTag(xs, bstyle);
        xs << html::CR();
@@ -1156,9 +1156,9 @@ void xhtmlParagraphs(Text const & text,
        OutputParams ourparams = runparams;
        ParagraphList::const_iterator const pend =
                (epit == (int) paragraphs.size()) ?
-                       paragraphs.end() : paragraphs.constIterator(epit);
+                       paragraphs.end() : paragraphs.iterator_at(epit);
        while (bpit < epit) {
-               ParagraphList::const_iterator par = paragraphs.constIterator(bpit);
+               ParagraphList::const_iterator par = paragraphs.iterator_at(bpit);
                if (par->params().startOfAppendix()) {
                        // We want to reset the counter corresponding to toplevel sectioning
                        Layout const & lay =