From d65020b293ab208b1391f96a731e53e0c7274a02 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Wed, 3 Mar 2010 22:13:45 +0000 Subject: [PATCH] s/updateLabels/updateBuffer/g, per a suggestion of Abdel's. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33613 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Buffer.cpp | 14 +++++++------- src/Buffer.h | 8 ++++---- src/BufferView.cpp | 4 ++-- src/Counters.h | 4 ++-- src/Cursor.cpp | 2 +- src/CutAndPaste.cpp | 10 +++++----- src/Text.cpp | 14 +++++++------- src/Text2.cpp | 4 ++-- src/Text3.cpp | 18 +++++++++--------- src/TextMetrics.cpp | 4 ++-- src/Undo.cpp | 2 +- src/frontends/qt4/GuiApplication.cpp | 2 +- src/frontends/qt4/GuiView.cpp | 10 +++++----- src/insets/Inset.cpp | 2 +- src/insets/Inset.h | 4 ++-- src/insets/InsetBibitem.cpp | 4 ++-- src/insets/InsetBibitem.h | 4 ++-- src/insets/InsetCaption.cpp | 4 ++-- src/insets/InsetCaption.h | 2 +- src/insets/InsetCitation.cpp | 2 +- src/insets/InsetCitation.h | 2 +- src/insets/InsetFloat.cpp | 6 +++--- src/insets/InsetFloat.h | 2 +- src/insets/InsetFoot.cpp | 4 ++-- src/insets/InsetFoot.h | 2 +- src/insets/InsetInclude.cpp | 6 +++--- src/insets/InsetInclude.h | 2 +- src/insets/InsetLabel.cpp | 6 +++--- src/insets/InsetLabel.h | 2 +- src/insets/InsetListings.cpp | 4 ++-- src/insets/InsetListings.h | 2 +- src/insets/InsetRef.cpp | 2 +- src/insets/InsetRef.h | 2 +- src/insets/InsetTabular.cpp | 4 ++-- src/insets/InsetTabular.h | 2 +- src/insets/InsetText.cpp | 6 +++--- src/insets/InsetText.h | 2 +- src/insets/InsetWrap.cpp | 4 ++-- src/insets/InsetWrap.h | 2 +- src/lyxfind.cpp | 2 +- src/mathed/InsetMathGrid.cpp | 10 +++++----- src/mathed/InsetMathGrid.h | 2 +- src/mathed/InsetMathHull.cpp | 14 +++++++------- src/mathed/InsetMathHull.h | 2 +- src/mathed/InsetMathNest.cpp | 20 ++++++++++---------- src/mathed/InsetMathNest.h | 2 +- src/mathed/InsetMathRef.cpp | 6 +++--- src/mathed/InsetMathRef.h | 2 +- src/mathed/MathData.cpp | 4 ++-- src/mathed/MathData.h | 2 +- src/support/Messages.h | 2 +- 51 files changed, 124 insertions(+), 124 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 412db9bb5f..efae24f5ef 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1550,7 +1550,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os, { LaTeXFeatures features(*this, params(), runparams); validate(features); - updateLabels(UpdateMaster, OutputUpdate); + updateBuffer(UpdateMaster, OutputUpdate); checkBibInfoCache(); d->bibinfo_.makeCitationLabels(*this); updateMacros(); @@ -3564,7 +3564,7 @@ void Buffer::setBuffersForInsets() const } -void Buffer::updateLabels(UpdateScope scope, UpdateType utype) const +void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const { // Use the master text class also for child documents Buffer const * const master = masterBuffer(); @@ -3582,7 +3582,7 @@ void Buffer::updateLabels(UpdateScope scope, UpdateType utype) const // If this is a child document start with the master if (master != this) { bufToUpdate.insert(this); - master->updateLabels(UpdateMaster, utype); + master->updateBuffer(UpdateMaster, utype); // Do this here in case the master has no gui associated with it. Then, // the TocModel is not updated and TocModel::toc_ is invalid (bug 5699). if (!master->d->gui_) @@ -3610,7 +3610,7 @@ void Buffer::updateLabels(UpdateScope scope, UpdateType utype) const // do the real work ParIterator parit = cbuf.par_iterator_begin(); - updateLabels(parit, utype); + updateBuffer(parit, utype); if (master != this) // TocBackend update will be done later. @@ -3821,7 +3821,7 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const } -void Buffer::updateLabels(ParIterator & parit, UpdateType utype) const +void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const { LASSERT(parit.pit() == 0, /**/); @@ -3854,7 +3854,7 @@ void Buffer::updateLabels(ParIterator & parit, UpdateType utype) const InsetList::const_iterator end = parit->insetList().end(); for (; iit != end; ++iit) { parit.pos() = iit->pos; - iit->inset->updateLabels(parit, utype); + iit->inset->updateBuffer(parit, utype); } } } @@ -3905,7 +3905,7 @@ bool Buffer::reload() bool const success = loadLyXFile(d->filename); if (success) { - updateLabels(); + updateBuffer(); changed(true); markClean(); message(bformat(_("Document %1$s reloaded."), disp_fn)); diff --git a/src/Buffer.h b/src/Buffer.h index d50e67bdc7..4e372c296d 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -358,7 +358,7 @@ public: /// Updates the cached bibliography information. /// Note that you MUST call this method to update the cache. It will /// not happen otherwise. (Currently, it is called at the start of - /// updateLabels() and from GuiCitation.) + /// updateBuffer() and from GuiCitation.) void checkBibInfoCache() const; /// \return the bibliography information for this buffer's master, /// or just for it, if it isn't a child. @@ -545,13 +545,13 @@ public: /// Updates screen labels and some other information associated with /// insets and paragraphs. Actually, it's more like a general "recurse /// through the Buffer" routine, that visits all the insets and paragraphs. - void updateLabels() const { updateLabels(UpdateMaster, InternalUpdate); } + void updateBuffer() const { updateBuffer(UpdateMaster, InternalUpdate); } /// \param scope: whether to start with the master document or just /// do this one. /// \param output: whether we are preparing for output. - void updateLabels(UpdateScope scope, UpdateType utype) const; + void updateBuffer(UpdateScope scope, UpdateType utype) const; /// - void updateLabels(ParIterator & parit, UpdateType utype) const; + void updateBuffer(ParIterator & parit, UpdateType utype) const; /// Spellcheck starting from \p from. /// \p from initial position, will then points to the next misspelled diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 9bf731c529..1e0f4b249d 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -912,7 +912,7 @@ void BufferView::updateLayout(DocumentClass const * const oldlayout) setCursor(backcur.asDocIterator(&buffer_)); buffer_.errors("Class Switch"); - buffer_.updateLabels(); + buffer_.updateBuffer(); } /** Return the change status at cursor position, taking in account the @@ -2227,7 +2227,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old) d->cursor_ = cur; - buffer_.updateLabels(); + buffer_.updateBuffer(); buffer_.changed(true); return true; } diff --git a/src/Counters.h b/src/Counters.h index d992bbb3c6..509733f466 100644 --- a/src/Counters.h +++ b/src/Counters.h @@ -167,10 +167,10 @@ public: /// We're trying to track \refstepcounter in LaTeX, more or less. /// Note that this may be empty. docstring currentCounter() const; - /// Called during update labels as we go through various paragraphs, + /// Called during updateBuffer() as we go through various paragraphs, /// to track the layouts as we go through. void setActiveLayout(Layout const & lay); - /// Also for updateLabels(). + /// Also for updateBuffer(). /// Call this when entering things like footnotes, where there is now /// no "last layout" and we want to restore the "last layout" on exit. void clearLastLayout() { layout_stack_.push_back(0); } diff --git a/src/Cursor.cpp b/src/Cursor.cpp index 00963af21d..bcfbcf7e2e 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -1350,7 +1350,7 @@ void Cursor::insert(MathData const & ar) cap::eraseSelection(*this); cell().insert(pos(), ar); pos() += ar.size(); - // FIXME audit setBuffer/updateLabels calls + // FIXME audit setBuffer/updateBuffer calls inset().setBuffer(bv_->buffer()); } diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 3ea74e7da1..f70096b442 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -258,7 +258,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, static_cast(*itt); // this is necessary to prevent an uninitialized // buffer when the RefInset is in a MathBox. - // FIXME audit setBuffer/updateLabels calls + // FIXME audit setBuffer/updateBuffer calls mi.setBuffer(const_cast(buffer)); if (mi.asRefInset()->getTarget() == oldname) mi.asRefInset()->changeTarget(newname); @@ -287,7 +287,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, static_cast(*itt); // this is necessary to prevent an uninitialized // buffer when the RefInset is in a MathBox. - // FIXME audit setBuffer/updateLabels calls + // FIXME audit setBuffer/updateBuffer calls mi.setBuffer(const_cast(buffer)); if (mi.asRefInset()->getTarget() == oldname) mi.asRefInset()->changeTarget(newname); @@ -382,7 +382,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, pit = last_paste; pos = pars[last_paste].size(); - // FIXME Should we do it here, or should we let updateLabels() do it? + // FIXME Should we do it here, or should we let updateBuffer() do it? // Set paragraph buffers. It's important to do this right away // before something calls Inset::buffer() and causes a crash. for (pit_type p = startpit; p <= pit; ++p) @@ -775,7 +775,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) // need a valid cursor. (Lgb) cur.clearSelection(); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); // tell tabular that a recent copy happened dirtyTabularStack(false); @@ -953,7 +953,7 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, boost::tie(ppp, endpit) = pasteSelectionHelper(cur, parlist, docclass, errorList); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); cur.clearSelection(); text->setCursor(cur, ppp.first, ppp.second); } diff --git a/src/Text.cpp b/src/Text.cpp index 1b57b7bbde..20accf5562 100644 --- a/src/Text.cpp +++ b/src/Text.cpp @@ -717,7 +717,7 @@ void Text::breakParagraph(Cursor & cur, bool inverse_logic) break; // the character couldn't be deleted physically due to change tracking } - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); // A singlePar update is not enough in this case. cur.updateFlags(Update::Force); @@ -1294,7 +1294,7 @@ void Text::acceptOrRejectChanges(Cursor & cur, ChangeOp op) cur.clearSelection(); setCursorIntern(cur, begPit, begPos); cur.updateFlags(Update::Force); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); } @@ -1445,7 +1445,7 @@ bool Text::handleBibitems(Cursor & cur) cur.recordUndo(ATOMIC_UNDO, prevcur.pit()); mergeParagraph(bufparams, cur.text()->paragraphs(), prevcur.pit()); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); setCursorIntern(cur, prevcur.pit(), prevcur.pos()); cur.updateFlags(Update::Force); return true; @@ -1473,7 +1473,7 @@ bool Text::erase(Cursor & cur) cur.top().forwardPos(); if (was_inset) - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); else cur.checkBufferStructure(); needsUpdate = true; @@ -1549,7 +1549,7 @@ bool Text::backspacePos0(Cursor & cur) } if (needsUpdate) { - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); setCursorIntern(cur, prevcur.pit(), prevcur.pos()); } @@ -1589,7 +1589,7 @@ bool Text::backspace(Cursor & cur) bool const was_inset = cur.paragraph().isInset(cur.pos()); cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges); if (was_inset) - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); else cur.checkBufferStructure(); } @@ -1647,7 +1647,7 @@ bool Text::dissolveInset(Cursor & cur) } else // this is the least that needs to be done (bug 6003) // in the above case, pasteParagraphList handles this - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); // Ensure the current language is set correctly (bug 6292) cur.text()->setCursor(cur, cur.pit(), cur.pos()); diff --git a/src/Text2.cpp b/src/Text2.cpp index f2f89415c9..e290ee0266 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -231,7 +231,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout) pit_type undopit = undoSpan(end - 1); recUndo(cur, start, undopit - 1); setLayout(start, end, layout); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); } @@ -290,7 +290,7 @@ void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type) } // this handles the counter labels, and also fixes up // depth values for follow-on (child) paragraphs - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); } diff --git a/src/Text3.cpp b/src/Text3.cpp index 79dcff2279..f810eceac5 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -485,7 +485,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) recUndo(cur, pit, pit + 1); cur.finishUndo(); pars_.swap(pit, pit + 1); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); needsUpdate = true; ++cur.pit(); break; @@ -496,7 +496,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) recUndo(cur, pit - 1, pit); cur.finishUndo(); pars_.swap(pit, pit - 1); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); --cur.pit(); needsUpdate = true; break; @@ -522,7 +522,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) par.params().startOfAppendix(start); // we can set the refreshing parameters now - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); break; } @@ -1577,7 +1577,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.posForward(); // Some insets are numbered, others are shown in the outline pane so // let's update the labels and the toc backend. - bv->buffer().updateLabels(); + bv->buffer().updateBuffer(); break; case LFUN_TABULAR_INSERT: @@ -1631,7 +1631,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // date metrics. FuncRequest cmd_caption(LFUN_CAPTION_INSERT); doInsertInset(cur, cur.text(), cmd_caption, true, false); - bv->buffer().updateLabels(); + bv->buffer().updateBuffer(); cur.updateFlags(Update::Force); // FIXME: When leaving the Float (or Wrap) inset we should // delete any empty paragraph left above or below the @@ -2072,26 +2072,26 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_OUTLINE_UP: outline(OutlineUp, cur); setCursor(cur, cur.pit(), 0); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); needsUpdate = true; break; case LFUN_OUTLINE_DOWN: outline(OutlineDown, cur); setCursor(cur, cur.pit(), 0); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); needsUpdate = true; break; case LFUN_OUTLINE_IN: outline(OutlineIn, cur); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); needsUpdate = true; break; case LFUN_OUTLINE_OUT: outline(OutlineOut, cur); - cur.buffer()->updateLabels(); + cur.buffer()->updateBuffer(); needsUpdate = true; break; diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 37cf7a7991..b713cd5f7e 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -135,7 +135,7 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text) dim_.asc = 10; dim_.des = 10; - //text_->updateLabels(bv->buffer()); + //text_->updateBuffer(bv->buffer()); } @@ -414,7 +414,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) LYXERR(Debug::INFO, "MacroContext not initialised!" << " Going through the buffer again and hope" << " the context is better then."); - bv_->buffer().updateLabels(); + bv_->buffer().updateBuffer(); parPos = text_->macrocontextPosition(); LASSERT(!parPos.empty(), /**/); parPos.pit() = pit; diff --git a/src/Undo.cpp b/src/Undo.cpp index a24bdead03..fa07291ac6 100644 --- a/src/Undo.cpp +++ b/src/Undo.cpp @@ -428,7 +428,7 @@ bool Undo::Private::textUndoOrRedo(DocIterator & cur, bool isUndoOperation) // Adapt the new material to current buffer. buffer_.setBuffersForInsets(); // FIXME This shouldn't be here. - buffer_.updateLabels(); + buffer_.updateBuffer(); return true; } diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 7c90f449b6..5a21ee7f7f 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -1321,7 +1321,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) #ifndef DEVEL_VERSION buf->setReadonly(true); #endif - buf->updateLabels(); + buf->updateBuffer(); buf->errors("Parse"); } break; diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index e82130e49c..a59284d256 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1176,7 +1176,7 @@ void GuiView::setBuffer(Buffer * newBuffer) GuiWorkArea * wa = workArea(*newBuffer); if (wa == 0) { - newBuffer->masterBuffer()->updateLabels(); + newBuffer->masterBuffer()->updateBuffer(); wa = addWorkArea(*newBuffer); } else { //Disconnect the old buffer...there's no new one. @@ -1738,7 +1738,7 @@ void GuiView::openDocument(string const & fname) docstring str2; Buffer * buf = loadDocument(fullname); if (buf) { - buf->updateLabels(); + buf->updateBuffer(); setBuffer(buf); buf->errors("Parse"); str2 = bformat(_("Document %1$s opened."), disp_fn); @@ -1787,7 +1787,7 @@ static bool import(GuiView * lv, FileName const & filename, Buffer * buf = lv->loadDocument(lyxfile); if (!buf) return false; - buf->updateLabels(); + buf->updateBuffer(); lv->setBuffer(buf); buf->errors("Parse"); } else { @@ -2650,7 +2650,7 @@ void GuiView::openChildDocument(string const & fname) // This makes insertion of citations and references in the child work, // when the target is in the parent or another child document. child->setParent(&buffer); - child->masterBuffer()->updateLabels(); + child->masterBuffer()->updateBuffer(); setBuffer(child); if (parsed) child->errors("Parse"); @@ -2698,7 +2698,7 @@ bool GuiView::goToFileRow(string const & argument) buf = theBufferList().getBuffer(s); else if (s.exists()) { buf = loadDocument(s); - buf->updateLabels(); + buf->updateBuffer(); buf->errors("Parse"); } else { message(bformat( diff --git a/src/insets/Inset.cpp b/src/insets/Inset.cpp index c8c5d1d43b..a1ff2392da 100644 --- a/src/insets/Inset.cpp +++ b/src/insets/Inset.cpp @@ -229,7 +229,7 @@ bool Inset::forceLTR() const void Inset::initView() { if (isLabeled()) - buffer().updateLabels(); + buffer().updateBuffer(); } diff --git a/src/insets/Inset.h b/src/insets/Inset.h index 942faebcf1..01907cb330 100644 --- a/src/insets/Inset.h +++ b/src/insets/Inset.h @@ -115,7 +115,7 @@ public: /** * This is typically used after this inset is created interactively. * Intented purpose is to sanitize internal state with regard to current - * Buffer. The default implementation calls buffer().updateLabels() if + * Buffer. The default implementation calls buffer().updateBuffer() if * the inset is labeled. * * \sa isLabeled() @@ -478,7 +478,7 @@ public: /// Update the counters of this inset and of its contents. /// The boolean indicates whether we are preparing for output, e.g., /// of XHTML. - virtual void updateLabels(ParIterator const &, UpdateType) {} + virtual void updateBuffer(ParIterator const &, UpdateType) {} /// Updates the inset's dialog virtual Buffer const * updateFrontend() const; diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp index 67df65175a..3191bebd1c 100644 --- a/src/insets/InsetBibitem.cpp +++ b/src/insets/InsetBibitem.cpp @@ -95,7 +95,7 @@ void InsetBibitem::updateCommand(docstring const & new_key, bool) } setParam("key", key); - buffer().updateLabels(); + buffer().updateBuffer(); } @@ -273,7 +273,7 @@ void InsetBibitem::fillWithBibKeys(BiblioInfo & keys, InsetIterator const & it) // Update the counters of this inset and of its contents -void InsetBibitem::updateLabels(ParIterator const & it, UpdateType utype) +void InsetBibitem::updateBuffer(ParIterator const & it, UpdateType utype) { BufferParams const & bp = buffer().masterBuffer()->params(); Counters & counters = bp.documentClass().counters(); diff --git a/src/insets/InsetBibitem.h b/src/insets/InsetBibitem.h index 8891f8b795..4c298c32d9 100644 --- a/src/insets/InsetBibitem.h +++ b/src/insets/InsetBibitem.h @@ -65,7 +65,7 @@ private: /// virtual void fillWithBibKeys(BiblioInfo &, InsetIterator const &) const; /// Update the counter of this inset - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// void updateCommand(docstring const & new_key, bool dummy = false); /// @@ -74,7 +74,7 @@ private: Inset * clone() const { return new InsetBibitem(*this); } friend docstring bibitemWidest(Buffer const & buffer, OutputParams const &); - /// The label that is set by updateLabels + /// The label that is set by updateBuffer docstring autolabel_; /// static int key_counter; diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp index b9ed6029dd..9046d054e5 100644 --- a/src/insets/InsetCaption.cpp +++ b/src/insets/InsetCaption.cpp @@ -307,7 +307,7 @@ docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs, } -void InsetCaption::updateLabels(ParIterator const & it, UpdateType utype) +void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype) { Buffer const & master = *buffer().masterBuffer(); DocumentClass const & tclass = master.params().documentClass(); @@ -346,7 +346,7 @@ void InsetCaption::updateLabels(ParIterator const & it, UpdateType utype) } // Do the real work now. - InsetText::updateLabels(it, utype); + InsetText::updateBuffer(it, utype); if (utype == OutputUpdate) cnts.restoreLastCounter(); } diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h index e24808e853..be5a73aeba 100644 --- a/src/insets/InsetCaption.h +++ b/src/insets/InsetCaption.h @@ -64,7 +64,7 @@ private: /// bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const; // Update the counters of this inset and of its contents - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// int latex(odocstream & os, OutputParams const &) const; /// diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 5f6f9189e9..3a8ae931b8 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -456,7 +456,7 @@ docstring InsetCitation::screenLabel() const } -void InsetCitation::updateLabels(ParIterator const &, UpdateType) +void InsetCitation::updateBuffer(ParIterator const &, UpdateType) { CiteEngine const engine = buffer().params().citeEngine(); if (cache.params == params() && cache.engine == engine) diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h index 64996e7403..036d25fbbd 100644 --- a/src/insets/InsetCitation.h +++ b/src/insets/InsetCitation.h @@ -56,7 +56,7 @@ public: /// void validate(LaTeXFeatures &) const; /// - void updateLabels(ParIterator const & it, UpdateType); + void updateBuffer(ParIterator const & it, UpdateType); /// void addToToc(DocIterator const &); diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp index 41d0766eed..dfbd208c9f 100644 --- a/src/insets/InsetFloat.cpp +++ b/src/insets/InsetFloat.cpp @@ -152,7 +152,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd) setNewLabel(); if (params_.type != params.type) { params_.type = params.type; - buffer().updateLabels(); + buffer().updateBuffer(); } break; } @@ -192,7 +192,7 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd, } -void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype) +void InsetFloat::updateBuffer(ParIterator const & it, UpdateType utype) { Counters & cnts = buffer().masterBuffer()->params().documentClass().counters(); @@ -214,7 +214,7 @@ void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype) cnts.current_float(params().type); cnts.isSubfloat(subflt); - InsetCollapsable::updateLabels(it, utype); + InsetCollapsable::updateBuffer(it, utype); //reset afterwards cnts.current_float(saveflt); diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h index a0c55a072b..cc1e066588 100644 --- a/src/insets/InsetFloat.h +++ b/src/insets/InsetFloat.h @@ -97,7 +97,7 @@ private: /// bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const; // Update the counters of this inset and of its contents - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// void doDispatch(Cursor & cur, FuncRequest & cmd); /// diff --git a/src/insets/InsetFoot.cpp b/src/insets/InsetFoot.cpp index 48a70817cb..f311c1d61c 100644 --- a/src/insets/InsetFoot.cpp +++ b/src/insets/InsetFoot.cpp @@ -36,7 +36,7 @@ InsetFoot::InsetFoot(Buffer * buf) {} -void InsetFoot::updateLabels(ParIterator const & it, UpdateType utype) +void InsetFoot::updateBuffer(ParIterator const & it, UpdateType utype) { BufferParams const & bp = buffer().masterBuffer()->params(); Counters & cnts = bp.documentClass().counters(); @@ -53,7 +53,7 @@ void InsetFoot::updateLabels(ParIterator const & it, UpdateType utype) + ' ' + cnts.theCounter(count, outer.getParLanguage(bp)->code()); setLabel(custom_label_); } - InsetCollapsable::updateLabels(it, utype); + InsetCollapsable::updateBuffer(it, utype); if (utype == OutputUpdate) cnts.restoreLastCounter(); } diff --git a/src/insets/InsetFoot.h b/src/insets/InsetFoot.h index 28aee678b9..c6661e707f 100644 --- a/src/insets/InsetFoot.h +++ b/src/insets/InsetFoot.h @@ -38,7 +38,7 @@ private: /// int docbook(odocstream &, OutputParams const &) const; /// Update the counters of this inset and of its contents - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// void addToToc(DocIterator const &); /// diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 5f98c7f44a..ccd0dda6ac 100644 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -1047,18 +1047,18 @@ void InsetInclude::updateCommand() setParams(p); } -void InsetInclude::updateLabels(ParIterator const & it, UpdateType utype) +void InsetInclude::updateBuffer(ParIterator const & it, UpdateType utype) { Buffer const * const childbuffer = getChildBuffer(); if (childbuffer) { - childbuffer->updateLabels(Buffer::UpdateChildOnly, utype); + childbuffer->updateBuffer(Buffer::UpdateChildOnly, utype); return; } if (!isListings(params())) return; if (label_) - label_->updateLabels(it, utype); + label_->updateBuffer(it, utype); InsetListingsParams const par(to_utf8(params()["lstparams"])); if (par.getParamValue("caption").empty()) { diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h index 428a2dd7cc..f8c4065c97 100644 --- a/src/insets/InsetInclude.h +++ b/src/insets/InsetInclude.h @@ -94,7 +94,7 @@ public: /// void updateCommand(); /// - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// static ParamInfo const & findInfo(std::string const &); /// diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp index e35c3a76b0..7edd1aaca8 100644 --- a/src/insets/InsetLabel.cpp +++ b/src/insets/InsetLabel.cpp @@ -99,8 +99,8 @@ void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs) buffer().undo().endUndoGroup(); // We need an update of the Buffer reference cache. This is achieved by - // updateLabels(). - buffer().updateLabels(); + // updateBuffer(). + buffer().updateBuffer(); } @@ -120,7 +120,7 @@ docstring InsetLabel::screenLabel() const } -void InsetLabel::updateLabels(ParIterator const & par, UpdateType utype) +void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype) { docstring const & label = getParam("name"); if (buffer().insetLabel(label)) { diff --git a/src/insets/InsetLabel.h b/src/insets/InsetLabel.h index 3f083af55d..37b9cdb27c 100644 --- a/src/insets/InsetLabel.h +++ b/src/insets/InsetLabel.h @@ -53,7 +53,7 @@ public: static bool isCompatibleCommand(std::string const & s) { return s == "label"; } /// - void updateLabels(ParIterator const & it, UpdateType); + void updateBuffer(ParIterator const & it, UpdateType); /// void addToToc(DocIterator const &); /// diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp index 39919a25d9..859fe92e20 100644 --- a/src/insets/InsetListings.cpp +++ b/src/insets/InsetListings.cpp @@ -72,7 +72,7 @@ Inset::DisplayType InsetListings::display() const } -void InsetListings::updateLabels(ParIterator const & it, UpdateType utype) +void InsetListings::updateBuffer(ParIterator const & it, UpdateType utype) { Counters & cnts = buffer().masterBuffer()->params().documentClass().counters(); string const saveflt = cnts.current_float(); @@ -80,7 +80,7 @@ void InsetListings::updateLabels(ParIterator const & it, UpdateType utype) // Tell to captions what the current float is cnts.current_float("listing"); - InsetCollapsable::updateLabels(it, utype); + InsetCollapsable::updateBuffer(it, utype); //reset afterwards cnts.current_float(saveflt); diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h index d11612282d..8561de5cf7 100644 --- a/src/insets/InsetListings.h +++ b/src/insets/InsetListings.h @@ -48,7 +48,7 @@ private: /// docstring name() const { return from_ascii("Listings"); } // Update the counters of this inset and of its contents - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// void write(std::ostream & os) const; /// diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp index d6a594eec7..1c00f745f0 100644 --- a/src/insets/InsetRef.cpp +++ b/src/insets/InsetRef.cpp @@ -155,7 +155,7 @@ void InsetRef::tocString(odocstream & os) const } -void InsetRef::updateLabels(ParIterator const & it, UpdateType) +void InsetRef::updateBuffer(ParIterator const & it, UpdateType) { docstring const & ref = getParam("reference"); // register this inset into the buffer reference cache. diff --git a/src/insets/InsetRef.h b/src/insets/InsetRef.h index 908d1aa1e5..1b9e9f469c 100644 --- a/src/insets/InsetRef.h +++ b/src/insets/InsetRef.h @@ -70,7 +70,7 @@ public: /// static bool isCompatibleCommand(std::string const & s); /// - void updateLabels(ParIterator const & it, UpdateType); + void updateBuffer(ParIterator const & it, UpdateType); /// void addToToc(DocIterator const &); protected: diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 8a05f05709..2b6e6c51c1 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -3494,7 +3494,7 @@ void InsetTabular::edit(Cursor & cur, bool front, EntryDirection) } -void InsetTabular::updateLabels(ParIterator const & it, UpdateType utype) +void InsetTabular::updateBuffer(ParIterator const & it, UpdateType utype) { // In a longtable, tell captions what the current float is Counters & cnts = buffer().masterBuffer()->params().documentClass().counters(); @@ -3506,7 +3506,7 @@ void InsetTabular::updateLabels(ParIterator const & it, UpdateType utype) it2.forwardPos(); size_t const end = it2.nargs(); for ( ; it2.idx() < end; it2.top().forwardIdx()) - buffer().updateLabels(it2, utype); + buffer().updateBuffer(it2, utype); //reset afterwards if (tabular.is_long_tabular) diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index 545deb080f..7c525e569a 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -841,7 +841,7 @@ public: /// can we go further down on mouse click? bool descendable(BufferView const &) const { return true; } /// Update the counters of this inset and of its contents - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// void addToToc(DocIterator const &); diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index a74f4bc30a..e5b3e1308b 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -631,7 +631,7 @@ ParagraphList & InsetText::paragraphs() } -void InsetText::updateLabels(ParIterator const & it, UpdateType utype) +void InsetText::updateBuffer(ParIterator const & it, UpdateType utype) { ParIterator it2 = it; it2.forwardPos(); @@ -645,7 +645,7 @@ void InsetText::updateLabels(ParIterator const & it, UpdateType utype) cnt.clearLastLayout(); // FIXME cnt.saveLastCounter()? } - buffer().updateLabels(it2, utype); + buffer().updateBuffer(it2, utype); if (save_layouts) { // LYXERR0("Exiting " << name()); cnt.restoreLastLayout(); @@ -657,7 +657,7 @@ void InsetText::updateLabels(ParIterator const & it, UpdateType utype) // tclass.counters().clearLastLayout() // since we are saving and restoring the existing counters, etc. Counters const savecnt = tclass.counters(); - buffer().updateLabels(it2, utype); + buffer().updateBuffer(it2, utype); tclass.counters() = savecnt; } } diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h index d81d6ef142..a4c83f0b91 100644 --- a/src/insets/InsetText.h +++ b/src/insets/InsetText.h @@ -162,7 +162,7 @@ public: { return getLayout().allowParagraphCustomization(); } /// Update the counters of this inset and of its contents - virtual void updateLabels(ParIterator const &, UpdateType); + virtual void updateBuffer(ParIterator const &, UpdateType); /// the string that is passed to the TOC void tocString(odocstream &) const; /// diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp index 03d5ed528f..97fed142ec 100644 --- a/src/insets/InsetWrap.cpp +++ b/src/insets/InsetWrap.cpp @@ -114,7 +114,7 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd, } -void InsetWrap::updateLabels(ParIterator const & it, UpdateType utype) +void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype) { setLabel(_("wrap: ") + floatName(params_.type)); Counters & cnts = @@ -128,7 +128,7 @@ void InsetWrap::updateLabels(ParIterator const & it, UpdateType utype) // Tell to captions what the current float is cnts.current_float(params().type); - InsetCollapsable::updateLabels(it, utype); + InsetCollapsable::updateBuffer(it, utype); // reset afterwards cnts.current_float(saveflt); diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h index 5c601c894a..b1539fc971 100644 --- a/src/insets/InsetWrap.h +++ b/src/insets/InsetWrap.h @@ -79,7 +79,7 @@ private: /// bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const; /// Update the counters of this inset and of its contents - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// void doDispatch(Cursor & cur, FuncRequest & cmd); /// diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp index 8ec3f57cfa..4f3151dd2b 100644 --- a/src/lyxfind.cpp +++ b/src/lyxfind.cpp @@ -194,7 +194,7 @@ int replaceAll(BufferView * bv, ++num; } - buf.updateLabels(); + buf.updateBuffer(); bv->putSelectionAt(doc_iterator_begin(&buf), 0, false); if (num) buf.markDirty(); diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp index 2753dc8e40..a21c2f61e0 100644 --- a/src/mathed/InsetMathGrid.cpp +++ b/src/mathed/InsetMathGrid.cpp @@ -635,11 +635,11 @@ void InsetMathGrid::drawT(TextPainter & /*pain*/, int /*x*/, int /*y*/) const } -void InsetMathGrid::updateLabels(ParIterator const & it, UpdateType utype) +void InsetMathGrid::updateBuffer(ParIterator const & it, UpdateType utype) { // pass down for (idx_type idx = 0; idx < nargs(); ++idx) - cell(idx).updateLabels(it, utype); + cell(idx).updateBuffer(it, utype); } @@ -1336,10 +1336,10 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd) cell(i).append(grid.cell(grid.index(r, c))); } cur.clearSelection(); // bug 393 - // FIXME audit setBuffer/updateLabels calls + // FIXME audit setBuffer/updateBuffer calls cur.inset().setBuffer(*buffer_); - // FIXME audit setBuffer/updateLabels calls - cur.buffer()->updateLabels(); + // FIXME audit setBuffer/updateBuffer calls + cur.buffer()->updateBuffer(); cur.finishUndo(); break; } diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h index 40408bd879..17e9650124 100644 --- a/src/mathed/InsetMathGrid.h +++ b/src/mathed/InsetMathGrid.h @@ -113,7 +113,7 @@ public: /// void drawT(TextPainter & pi, int x, int y) const; /// - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// extract number of columns from alignment string static col_type guessColumns(docstring const & halign); /// accepts some LaTeX column codes: p,m,!,@,M,<,> diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index c9f16f407a..62a28ec4c9 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -214,7 +214,7 @@ void InsetMathHull::setBuffer(Buffer & buffer) } -void InsetMathHull::updateLabels(ParIterator const & it, UpdateType utype) +void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype) { if (!buffer_) { //FIXME: buffer_ should be set at creation for this inset! Problem is @@ -224,10 +224,10 @@ void InsetMathHull::updateLabels(ParIterator const & it, UpdateType utype) } for (size_t i = 0; i != label_.size(); ++i) { if (label_[i]) - label_[i]->updateLabels(it, utype); + label_[i]->updateBuffer(it, utype); } // pass down - InsetMathGrid::updateLabels(it, utype); + InsetMathGrid::updateBuffer(it, utype); } @@ -553,9 +553,9 @@ void InsetMathHull::label(row_type row, docstring const & label) delete label_[row]; label_[row] = dummy_pointer; // We need an update of the Buffer reference cache. - // This is achieved by updateLabels(). + // This is achieved by updateBuffer(). if (buffer_) - buffer().updateLabels(); + buffer().updateBuffer(); } else { if (buffer_) label_[row]->updateCommand(label); @@ -584,8 +584,8 @@ void InsetMathHull::numbered(row_type row, bool num) return; } // We need an update of the Buffer reference cache. - // This is achieved by updateLabels(). - buffer().updateLabels(); + // This is achieved by updateBuffer(). + buffer().updateBuffer(); } } diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h index 0a52e3a256..34b0fab04a 100644 --- a/src/mathed/InsetMathHull.h +++ b/src/mathed/InsetMathHull.h @@ -38,7 +38,7 @@ public: /// void setBuffer(Buffer &); /// - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// void addToToc(DocIterator const &); /// diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index d7ec9bd68c..ccfcd87088 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -173,10 +173,10 @@ void InsetMathNest::metrics(MetricsInfo const & mi) const } -void InsetMathNest::updateLabels(ParIterator const & it, UpdateType utype) +void InsetMathNest::updateBuffer(ParIterator const & it, UpdateType utype) { for (idx_type i = 0, n = nargs(); i != n; ++i) - cell(i).updateLabels(it, utype); + cell(i).updateBuffer(it, utype); } @@ -564,8 +564,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) } cur.niceInsert(topaste, parseflg, false); cur.clearSelection(); // bug 393 - // FIXME audit setBuffer/updateLabels calls - cur.buffer()->updateLabels(); + // FIXME audit setBuffer/updateBuffer calls + cur.buffer()->updateBuffer(); cur.finishUndo(); break; } @@ -577,8 +577,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) // Prevent stale position >= size crash // Probably not necessary anymore, see eraseSelection (gb 2005-10-09) cur.normalize(); - // FIXME audit setBuffer/updateLabels calls - cur.buffer()->updateLabels(); + // FIXME audit setBuffer/updateBuffer calls + cur.buffer()->updateBuffer(); break; case LFUN_COPY: @@ -988,8 +988,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) cur.posBackward(); cur.pushBackward(*cur.nextInset()); cur.niceInsert(save_selection); - // FIXME audit setBuffer/updateLabels calls - cur.buffer()->updateLabels(); + // FIXME audit setBuffer/updateBuffer calls + cur.buffer()->updateBuffer(); #else if (currentMode() == Inset::TEXT_MODE) { cur.recordUndoSelection(); @@ -1203,8 +1203,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) if (createInsetMath_fromDialogStr(cmd.argument(), ar)) { cur.recordUndoSelection(); cur.insert(ar); - // FIXME audit setBuffer/updateLabels calls - cur.buffer()->updateLabels(); + // FIXME audit setBuffer/updateBuffer calls + cur.buffer()->updateBuffer(); } else cur.undispatched(); break; diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h index ac95fbb353..49b90eb8b6 100644 --- a/src/mathed/InsetMathNest.h +++ b/src/mathed/InsetMathNest.h @@ -44,7 +44,7 @@ public: void drawDecoration(PainterInfo & pi, int x, int y) const { drawMarkers(pi, x, y); } /// - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// identifies NestInsets InsetMathNest * asNestInset() { return this; } /// identifies NestInsets diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp index 61d05b2eac..859845faaa 100644 --- a/src/mathed/InsetMathRef.cpp +++ b/src/mathed/InsetMathRef.cpp @@ -176,10 +176,10 @@ int InsetMathRef::docbook(odocstream & os, OutputParams const & runparams) const } -void InsetMathRef::updateLabels(ParIterator const & it, UpdateType /*utype*/) +void InsetMathRef::updateBuffer(ParIterator const & it, UpdateType /*utype*/) { if (!buffer_) { - LYXERR0("InsetMathRef::updateLabels: no buffer_!"); + LYXERR0("InsetMathRef::updateBuffer: no buffer_!"); return; } // register this inset into the buffer reference cache. @@ -214,7 +214,7 @@ void InsetMathRef::changeTarget(docstring const & target) if (createInsetMath_fromDialogStr( from_utf8(InsetCommand::params2string("ref", icp)), ar)) { *this = *ar[0].nucleus()->asRefInset(); - // FIXME audit setBuffer/updateLabels calls + // FIXME audit setBuffer/updateBuffer calls setBuffer(buf); } } diff --git a/src/mathed/InsetMathRef.h b/src/mathed/InsetMathRef.h index 8fa5a499a8..0ee76ac5b7 100644 --- a/src/mathed/InsetMathRef.h +++ b/src/mathed/InsetMathRef.h @@ -27,7 +27,7 @@ public: /// explicit InsetMathRef(Buffer * buf, docstring const & data); /// - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); /// //void write(WriteStream & os) const; /// diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp index d9eabcb310..fe80eeef5a 100644 --- a/src/mathed/MathData.cpp +++ b/src/mathed/MathData.cpp @@ -377,12 +377,12 @@ void MathData::drawT(TextPainter & pain, int x, int y) const } -void MathData::updateLabels(ParIterator const & it, UpdateType utype) +void MathData::updateBuffer(ParIterator const & it, UpdateType utype) { // pass down for (size_t i = 0, n = size(); i != n; ++i) { MathAtom & at = operator[](i); - at.nucleus()->updateLabels(it, utype); + at.nucleus()->updateBuffer(it, utype); } } diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h index 9fa63a86f3..72dca0d157 100644 --- a/src/mathed/MathData.h +++ b/src/mathed/MathData.h @@ -168,7 +168,7 @@ public: /// stay visually at the same position (cur==0 is allowed) void updateMacros(Cursor * cur, MacroContext const & mc); /// - void updateLabels(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType); protected: /// cached values for super/subscript placement diff --git a/src/support/Messages.h b/src/support/Messages.h index be94ec83c1..b7d8a52dc7 100644 --- a/src/support/Messages.h +++ b/src/support/Messages.h @@ -43,7 +43,7 @@ private: /// typedef std::map TranslationCache; /// Internal cache for gettext translated strings. - /// This is needed for performance reason within \c updateLabels() + /// This is needed for performance reason within \c updateBuffer() /// under Windows. mutable TranslationCache cache_; }; -- 2.39.2