remove unused code

[lyx.git] / src / paragraph.C

diff --git a/src/paragraph.C b/src/paragraph.C
index 9bdfded1761bc100b101bfd533e92436c1b91093..8b4a2e1ed7318eb3d8f53cc12a48ad04344ee07f 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -76,8 +76,10 @@ extern BufferView * current_view;
 Paragraph::Paragraph()
        : pimpl_(new Paragraph::Pimpl(this))
 {
+#ifndef NO_NEXT
        next_ = 0;
        previous_ = 0;
+#endif
        enumdepth = 0;
        itemdepth = 0;
        bibkey = 0; // ale970302
@@ -85,6 +87,7 @@ Paragraph::Paragraph()
 }
 
 
+#ifndef NO_NEXT
 // This constructor inserts the new paragraph in a list.
 Paragraph::Paragraph(Paragraph * par)
        : pimpl_(new Paragraph::Pimpl(this))
@@ -103,6 +106,7 @@ Paragraph::Paragraph(Paragraph * par)
        bibkey = 0; // ale970302
        params().clear();
 }
+#endif
 
 
 Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
@@ -110,9 +114,10 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 {
        enumdepth = 0;
        itemdepth = 0;
+#ifndef NO_NEXT
        next_     = 0;
        previous_ = 0;
-
+#endif
        // this is because of the dummy layout of the paragraphs that
        // follow footnotes
        layout_ = lp.layout();
@@ -127,10 +132,11 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 
        // copy everything behind the break-position to the new paragraph
        insetlist = lp.insetlist;
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it)
-       {
-               it.setInset(it.getInset()->clone(*current_view->buffer(), same_ids));
+       InsetList::iterator it = insetlist.begin();
+       InsetList::iterator end = insetlist.end();
+       for (; it != end; ++it) {
+               it.setInset(it.getInset()->clone(*current_view->buffer(),
+                                                same_ids));
                // tell the new inset who is the boss now
                it.getInset()->parOwner(this);
        }
@@ -140,10 +146,12 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 // the destructor removes the new paragraph from the list
 Paragraph::~Paragraph()
 {
+#ifndef NO_NEXT
        if (previous_)
                previous_->next_ = next_;
        if (next_)
                next_->previous_ = previous_;
+#endif
 
        // ale970302
        delete bibkey;
@@ -349,21 +357,8 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
        minibuffer_inset = 0;
        if (minibuffer_char == Paragraph::META_INSET) {
                if (getInset(pos)) {
-                       minibuffer_inset = getInset(pos);
-                       // This is a little hack since I want exactly
-                       // the inset, not just a clone. Otherwise
-                       // the inset would be deleted when calling Erase(pos)
-                       // find the entry
-                       InsetList::iterator it = insetlist.begin();
-                       InsetList::iterator end = insetlist.end();
-                       for (; it != end; ++it) {
-                               if (it.getPos() == pos)
-                                       break;
-                       }
-
-                       if (it != end && it.getPos() == pos)
-                               it.setInset(0);
                        // the inset is not in a paragraph anymore
+                       minibuffer_inset = insetlist.release(pos);
                        minibuffer_inset->parOwner(0);
                } else {
                        minibuffer_inset = 0;
@@ -452,27 +447,7 @@ Inset * Paragraph::getInset(pos_type pos)
 {
        lyx::Assert(pos < size());
 
-       // Find the inset.
-       InsetList::iterator it = insetlist.begin();
-       InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it) {
-               if (it.getPos() == pos)
-                       break;
-       }
-
-       if (it != end && it.getPos() == pos)
-               return it.getInset();
-
-       lyxerr << "ERROR (Paragraph::getInset): "
-              << "Inset does not exist: " << pos << endl;
-       //::raise(SIGSTOP);
-
-       // text[pos] = ' '; // WHY!!! does this set the pos to ' '????
-       // Did this commenting out introduce a bug? So far I have not
-       // see any, please enlighten me. (Lgb)
-       // My guess is that since the inset does not exist, we might
-       // as well replace it with a space to prevent craches. (Asger)
-       return 0;
+       return insetlist.get(pos);
 }
 
 
@@ -720,7 +695,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
 }
 
 
-
+#ifndef NO_NEXT
 void Paragraph::next(Paragraph * p)
 {
        next_ = p;
@@ -758,6 +733,7 @@ Paragraph const * Paragraph::previous() const
 {
        return previous_;
 }
+#endif
 
 
 void Paragraph::breakParagraph(BufferParams const & bparams,
@@ -1082,6 +1058,7 @@ Paragraph const * Paragraph::depthHook(depth_type depth) const
        return newpar;
 }
 
+
 Paragraph * Paragraph::outerHook()
 {
        if (!getDepth())
@@ -1089,6 +1066,7 @@ Paragraph * Paragraph::outerHook()
        return depthHook(depth_type(getDepth() - 1));
 }
 
+
 Paragraph const * Paragraph::outerHook() const
 {
        if (!getDepth())
@@ -1335,6 +1313,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
        return next_;
 }
 
+
 // This could go to ParagraphParameters if we want to
 int Paragraph::startTeXParParams(BufferParams const & bparams,
                                 ostream & os, bool moving_arg) const
@@ -1395,6 +1374,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
        return column;
 }
 
+
 // This could go to ParagraphParameters if we want to
 int Paragraph::endTeXParParams(BufferParams const & bparams,
                               ostream & os, bool moving_arg) const
@@ -2055,5 +2035,3 @@ bool Paragraph::isFreeSpacing() const
                return (pimpl_->inset_owner->owner()->lyxCode() == Inset::ERT_CODE);
        return false;
 }
-
-