parlist-23-a,diff

[features.git] / src / insets / insettext.C

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 57dc7ccbba2145c2de60fa861be876dbbbe9998d..0c50c6c0c1a17c667d1b1d3e1117bd52b02fbc0b 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -79,34 +79,34 @@ using lyx::textclass_type;
 void InsetText::saveLyXTextState(LyXText * t) const
 {
        // check if my paragraphs are still valid
-       ParagraphList::iterator it = paragraphs.begin();
-       ParagraphList::iterator end = paragraphs.end();
+       ParagraphList::iterator it = const_cast<ParagraphList&>(paragraphs).begin();
+       ParagraphList::iterator end = const_cast<ParagraphList&>(paragraphs).end();
        for (; it != end; ++it) {
-               if (&*it == t->cursor.par())
+               if (it == t->cursor.par())
                        break;
        }
 
        if (it != end && t->cursor.pos() <= it->size()) {
-               sstate.lpar = &*t->cursor.par();
+               sstate.lpar = t->cursor.par();
                sstate.pos = t->cursor.pos();
                sstate.boundary = t->cursor.boundary();
-               sstate.selstartpar = &*t->selection.start.par();
+               sstate.selstartpar = t->selection.start.par();
                sstate.selstartpos = t->selection.start.pos();
                sstate.selstartboundary = t->selection.start.boundary();
-               sstate.selendpar = &*t->selection.end.par();
+               sstate.selendpar = t->selection.end.par();
                sstate.selendpos = t->selection.end.pos();
                sstate.selendboundary = t->selection.end.boundary();
                sstate.selection = t->selection.set();
                sstate.mark_set = t->selection.mark();
        } else {
-               sstate.lpar = 0;
+               sstate.lpar = const_cast<ParagraphList&>(paragraphs).end();
        }
 }
 
 
 void InsetText::restoreLyXTextState(LyXText * t) const
 {
-       if (!sstate.lpar)
+       if (sstate.lpar == const_cast<ParagraphList&>(paragraphs).end())
                return;
 
        t->selection.set(true);
@@ -193,10 +193,10 @@ void InsetText::init(InsetText const * ins)
        drawTextXOffset = 0;
        drawTextYOffset = 0;
        locked = false;
-       old_par = 0;
+       old_par = paragraphs.end();
        last_drawn_width = -1;
        cached_bview = 0;
-       sstate.lpar = 0;
+       sstate.lpar = paragraphs.end();
        in_insetAllowed = false;
 }
 
@@ -286,8 +286,8 @@ void InsetText::write(Buffer const * buf, ostream & os) const
 
 void InsetText::writeParagraphData(Buffer const * buf, ostream & os) const
 {
-       ParagraphList::iterator it = paragraphs.begin();
-       ParagraphList::iterator end = paragraphs.end();
+       ParagraphList::const_iterator it = paragraphs.begin();
+       ParagraphList::const_iterator end = paragraphs.end();
        Paragraph::depth_type dth = 0;
        for (; it != end; ++it) {
                it->write(buf, os, buf->params, dth);
@@ -344,10 +344,10 @@ void InsetText::dimension(BufferView * bv, LyXFont const &,
        Dimension & dim) const
 {
        LyXText * text = getLyXText(bv);
-       dim.a = text->rows().begin()->ascent_of_text() + TEXT_TO_INSET_OFFSET;
-       dim.d = text->height - dim.a + TEXT_TO_INSET_OFFSET;
-       dim.w = max(textWidth(bv), int(text->width)) + 2 * TEXT_TO_INSET_OFFSET;
-       dim.w = max(dim.w, 10);
+       dim.asc = text->rows().begin()->ascent_of_text() + TEXT_TO_INSET_OFFSET;
+       dim.des = text->height - dim.asc + TEXT_TO_INSET_OFFSET;
+       dim.wid = max(textWidth(bv), int(text->width)) + 2 * TEXT_TO_INSET_OFFSET;
+       dim.wid = max(dim.wid, 10);
        // cache it
        dim_ = dim;
 }
@@ -402,11 +402,11 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
                x += static_cast<float>(scroll());
 
        top_baseline = baseline;
-       top_y = baseline - dim_.a;
+       top_y = baseline - dim_.asc;
 
-       if (last_drawn_width != dim_.w) {
+       if (last_drawn_width != dim_.wid) {
                need_update |= FULL;
-               last_drawn_width = dim_.w;
+               last_drawn_width = dim_.wid;
        }
 
        if (the_locking_inset && (cpar(bv) == inset_par)
@@ -462,7 +462,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
                drawFrame(pain, int(start_x));
        }
 
-       x += dim_.w - TEXT_TO_INSET_OFFSET;
+       x += dim_.wid - TEXT_TO_INSET_OFFSET;
 
        if (need_update != INIT) {
                need_update = NONE;
@@ -476,9 +476,9 @@ void InsetText::drawFrame(Painter & pain, int x) const
 {
        static int const ttoD2 = TEXT_TO_INSET_OFFSET / 2;
        frame_x = x + ttoD2;
-       frame_y = top_baseline - dim_.a + ttoD2;
-       frame_w = dim_.w - TEXT_TO_INSET_OFFSET;
-       frame_h = dim_.a + dim_.d - TEXT_TO_INSET_OFFSET;
+       frame_y = top_baseline - dim_.asc + ttoD2;
+       frame_w = dim_.wid - TEXT_TO_INSET_OFFSET;
+       frame_h = dim_.asc + dim_.des - TEXT_TO_INSET_OFFSET;
        pain.rectangle(frame_x, frame_y, frame_w, frame_h,
                       frame_color);
 }
@@ -671,8 +671,8 @@ void InsetText::lockInset(BufferView * bv)
        the_locking_inset = 0;
        inset_pos = inset_x = inset_y = 0;
        inset_boundary = false;
-       inset_par = 0;
-       old_par = 0;
+       inset_par = paragraphs.end();
+       old_par = paragraphs.end();
        bool clear = false;
        if (!lt) {
                lt = getLyXText(bv);
@@ -774,7 +774,7 @@ bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset,
                the_locking_inset = 0;
                if (lr)
                        moveRightIntern(bv, true, false);
-               old_par = 0; // force layout setting
+               old_par = paragraphs.end(); // force layout setting
                if (scroll())
                        scroll(bv, 0.0F);
                else
@@ -852,7 +852,7 @@ void InsetText::lfunMousePress(FuncRequest const & cmd)
                lockInset(bv);
 
        int tmp_x = cmd.x - drawTextXOffset;
-       int tmp_y = cmd.y + dim_.a - getLyXText(bv)->top_y();
+       int tmp_y = cmd.y + dim_.asc - getLyXText(bv)->top_y();
        Inset * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
 
        if (the_locking_inset) {
@@ -895,7 +895,7 @@ void InsetText::lfunMousePress(FuncRequest const & cmd)
                int old_top_y = lt->top_y();
 
                lt->setCursorFromCoordinates(cmd.x - drawTextXOffset,
-                                            cmd.y + dim_.a);
+                                            cmd.y + dim_.asc);
                // set the selection cursor!
                lt->selection.cursor = lt->cursor;
                lt->cursor.x_fix(lt->cursor.x());
@@ -944,7 +944,7 @@ bool InsetText::lfunMouseRelease(FuncRequest const & cmd)
                return the_locking_inset->localDispatch(cmd1);
 
        int tmp_x = cmd.x - drawTextXOffset;
-       int tmp_y = cmd.y + dim_.a - getLyXText(bv)->top_y();
+       int tmp_y = cmd.y + dim_.asc - getLyXText(bv)->top_y();
        Inset * inset = getLyXText(bv)->checkInsetHit(tmp_x, tmp_y);
        bool ret = false;
        if (inset) {
@@ -995,7 +995,7 @@ void InsetText::lfunMouseMotion(FuncRequest const & cmd)
        }
        LyXCursor cur = lt->cursor;
        lt->setCursorFromCoordinates
-               (cmd.x - drawTextXOffset, cmd.y + dim_.a);
+               (cmd.x - drawTextXOffset, cmd.y + dim_.asc);
        lt->cursor.x_fix(lt->cursor.x());
        if (cur == lt->cursor) {
                if (clear)
@@ -1029,8 +1029,8 @@ Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
                the_locking_inset = 0;
                inset_pos = inset_x = inset_y = 0;
                inset_boundary = false;
-               inset_par = 0;
-               old_par = 0;
+               inset_par = paragraphs.end();
+               old_par = paragraphs.end();
 
                bool clear = false;
                if (!lt) {
@@ -1057,7 +1057,7 @@ Inset::RESULT InsetText::localDispatch(FuncRequest const & cmd)
                        // FIXME: GUII I've changed this to none: probably WRONG
                        if (!checkAndActivateInset(bv, cmd.x, tmp_y, mouse_button::none)) {
                                lt->setCursorFromCoordinates(cmd.x - drawTextXOffset,
-                                                                       cmd.y + dim_.a);
+                                                                       cmd.y + dim_.asc);
                                lt->cursor.x_fix(lt->cursor.x());
                        }
                }
@@ -1504,9 +1504,9 @@ int InsetText::ascii(Buffer const * buf, ostream & os, int linelen) const
 {
        unsigned int lines = 0;
 
-       ParagraphList::iterator beg = paragraphs.begin();
-       ParagraphList::iterator end = paragraphs.end();
-       ParagraphList::iterator it = beg;
+       ParagraphList::const_iterator beg = paragraphs.begin();
+       ParagraphList::const_iterator end = paragraphs.end();
+       ParagraphList::const_iterator it = beg;
        for (; it != end; ++it) {
                string const tmp = buf->asciiParagraph(*it, linelen, it == beg);
                lines += lyx::count(tmp.begin(), tmp.end(), '\n');
@@ -1528,8 +1528,8 @@ int InsetText::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 
        Paragraph::depth_type depth = 0; // paragraph depth
 
-       ParagraphList::iterator pit = paragraphs.begin();
-       ParagraphList::iterator pend = paragraphs.end();
+       ParagraphList::iterator pit = const_cast<ParagraphList&>(paragraphs).begin();
+       ParagraphList::iterator pend = const_cast<ParagraphList&>(paragraphs).end();
 
        for (; pit != pend; ++pit) {
                string sgmlparam;
@@ -1865,8 +1865,8 @@ vector<string> const InsetText::getLabelList() const
 {
        vector<string> label_list;
 
-       ParagraphList::iterator pit = paragraphs.begin();
-       ParagraphList::iterator pend = paragraphs.end();
+       ParagraphList::const_iterator pit = paragraphs.begin();
+       ParagraphList::const_iterator pend = paragraphs.end();
        for (; pit != pend; ++pit) {
                InsetList::iterator beg = pit->insetlist.begin();
                InsetList::iterator end = pit->insetlist.end();
@@ -1938,7 +1938,7 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
 {
        x -= drawTextXOffset;
        int dummyx = x;
-       int dummyy = y + dim_.a;
+       int dummyy = y + dim_.asc;
        Inset * inset = getLyXText(bv)->checkInsetHit(dummyx, dummyy);
        // we only do the edit() call if the inset was hit by the mouse
        // or if it is a highly editable inset. So we should call this
@@ -1950,9 +1950,9 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
 
        if (inset) {
                if (x < 0)
-                       x = dim_.w;
+                       x = dim_.wid;
                if (y < 0)
-                       y = dim_.d;
+                       y = dim_.des;
                inset_x = cix(bv) - top_x + drawTextXOffset;
                inset_y = ciy(bv) + drawTextYOffset;
                FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
@@ -1995,8 +1995,8 @@ void InsetText::setParagraphData(ParagraphList const & plist)
        // See if this can be simplified when std::list is in effect.
        paragraphs.clear();
 
-       ParagraphList::iterator it = plist.begin();
-       ParagraphList::iterator end = plist.end();
+       ParagraphList::const_iterator it = plist.begin();
+       ParagraphList::const_iterator end = plist.end();
        for (; it != end; ++it) {
                paragraphs.push_back(*it);
                Paragraph & tmp = paragraphs.back();
@@ -2178,7 +2178,7 @@ LyXText * InsetText::getLyXText(BufferView const * lbv,
                if (recursive && the_locking_inset)
                        return the_locking_inset->getLyXText(lbv, true);
                LyXText * lt = cached_text.get();
-               lyx::Assert(lt && lt->rows().begin()->par() == paragraphs.begin());
+               lyx::Assert(lt && lt->rows().begin()->par() == const_cast<ParagraphList&>(paragraphs).begin());
                return lt;
        }
        // Super UGLY! (Lgb)
@@ -2204,7 +2204,7 @@ LyXText * InsetText::getLyXText(BufferView const * lbv,
                                if (locked) {
                                        saveLyXTextState(it->second.text.get());
                                } else {
-                                       sstate.lpar = 0;
+                                       sstate.lpar = const_cast<ParagraphList&>(paragraphs).end();
                                }
                        }
                        //
@@ -2251,7 +2251,8 @@ void InsetText::deleteLyXText(BufferView * bv, bool recursive) const
        it->second.remove = true;
        if (recursive) {
                /// then remove all LyXText in text-insets
-               for_each(paragraphs.begin(), paragraphs.end(),
+               for_each(const_cast<ParagraphList&>(paragraphs).begin(),
+                        const_cast<ParagraphList&>(paragraphs).end(),
                         boost::bind(&Paragraph::deleteInsetsLyXText, _1, bv));
        }
 }
@@ -2288,7 +2289,8 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const
        LyXText * t = it->second.text.get();
        saveLyXTextState(t);
 
-       for_each(paragraphs.begin(), paragraphs.end(),
+       for_each(const_cast<ParagraphList&>(paragraphs).begin(),
+                const_cast<ParagraphList&>(paragraphs).end(),
                 boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
 
        t->init(bv, true);
@@ -2327,7 +2329,8 @@ void InsetText::reinitLyXText() const
 
                saveLyXTextState(t);
 
-               for_each(paragraphs.begin(), paragraphs.end(),
+               for_each(const_cast<ParagraphList&>(paragraphs).begin(),
+                        const_cast<ParagraphList&>(paragraphs).end(),
                         boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv));
 
                t->init(bv, true);
@@ -2404,9 +2407,9 @@ void InsetText::clearSelection(BufferView * bv)
 void InsetText::clearInset(BufferView * bv, int start_x, int baseline) const
 {
        Painter & pain = bv->painter();
-       int w = dim_.w;
-       int h = dim_.a + dim_.d;
-       int ty = baseline - dim_.a;
+       int w = dim_.wid;
+       int h = dim_.asc + dim_.des;
+       int ty = baseline - dim_.asc;
 
        if (ty < 0) {
                h += ty;
@@ -2440,8 +2443,8 @@ Inset * InsetText::getInsetFromID(int id_arg) const
        if (id_arg == id())
                return const_cast<InsetText *>(this);
 
-       ParagraphList::iterator pit = paragraphs.begin();
-       ParagraphList::iterator pend = paragraphs.end();
+       ParagraphList::const_iterator pit = paragraphs.begin();
+       ParagraphList::const_iterator pend = paragraphs.end();
        for (; pit != pend; ++pit) {
                InsetList::iterator it = pit->insetlist.begin();
                InsetList::iterator end = pit->insetlist.end();
@@ -2734,8 +2737,8 @@ void InsetText::appendParagraphs(Buffer * buffer, ParagraphList & plist)
 
 void InsetText::addPreview(grfx::PreviewLoader & loader) const
 {
-       ParagraphList::iterator pit = paragraphs.begin();
-       ParagraphList::iterator pend = paragraphs.end();
+       ParagraphList::const_iterator pit = paragraphs.begin();
+       ParagraphList::const_iterator pend = paragraphs.end();
 
        for (; pit != pend; ++pit) {
                InsetList::iterator it  = pit->insetlist.begin();