anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

s/updateLabels/updateBuffer/g, per a suggestion of Abdel's.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33613 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-03-03 22:13:45 +00:00
parent 36f5607ec8
commit d65020b293
51 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Buffer.cpp
View File

@ -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));

8
src/Buffer.h
View File

@ -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

4
src/BufferView.cpp
View File

@ -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;
}

4
src/Counters.h
View File

@ -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); }

2
src/Cursor.cpp
View File

@ -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());
}

10
src/CutAndPaste.cpp
View File

@ -258,7 +258,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
static_cast<InsetMathHull &>(*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 &>(buffer));
if (mi.asRefInset()->getTarget() == oldname)
mi.asRefInset()->changeTarget(newname);
@ -287,7 +287,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
static_cast<InsetMathHull &>(*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 &>(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);
}

14
src/Text.cpp
View File

@ -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());

4
src/Text2.cpp
View File

@ -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();
}

18
src/Text3.cpp
View File

@ -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;

4
src/TextMetrics.cpp
View File

@ -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;

2
src/Undo.cpp
View File

@ -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;
}

2
src/frontends/qt4/GuiApplication.cpp
View File

@ -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;

10
src/frontends/qt4/GuiView.cpp
View File

@ -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(

2
src/insets/Inset.cpp
View File

@ -229,7 +229,7 @@ bool Inset::forceLTR() const
void Inset::initView()
{
if (isLabeled())
buffer().updateLabels();
buffer().updateBuffer();
}

4
src/insets/Inset.h
View File

@ -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;

4
src/insets/InsetBibitem.cpp
View File

@ -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();

4
src/insets/InsetBibitem.h
View File

@ -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;

4
src/insets/InsetCaption.cpp
View File

@ -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();
}

2
src/insets/InsetCaption.h
View File

@ -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;
///

2
src/insets/InsetCitation.cpp
View File

@ -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)

2
src/insets/InsetCitation.h
View File

@ -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 &);

6
src/insets/InsetFloat.cpp
View File

@ -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);

2
src/insets/InsetFloat.h
View File

@ -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);
///

4
src/insets/InsetFoot.cpp
View File

@ -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();
}

2
src/insets/InsetFoot.h
View File

@ -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 &);
///

6
src/insets/InsetInclude.cpp
View File

@ -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()) {

2
src/insets/InsetInclude.h
View File

@ -94,7 +94,7 @@ public:
///
void updateCommand();
///
void updateLabels(ParIterator const &, UpdateType);
void updateBuffer(ParIterator const &, UpdateType);
///
static ParamInfo const & findInfo(std::string const &);
///

6
src/insets/InsetLabel.cpp
View File

@ -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)) {

2
src/insets/InsetLabel.h
View File

@ -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 &);
///

4
src/insets/InsetListings.cpp
View File

@ -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);

2
src/insets/InsetListings.h
View File

@ -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;
///

2
src/insets/InsetRef.cpp
View File

@ -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.

2
src/insets/InsetRef.h
View File

@ -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:

4
src/insets/InsetTabular.cpp
View File

@ -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)

2
src/insets/InsetTabular.h
View File

@ -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 &);

6
src/insets/InsetText.cpp
View File

@ -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;
}
}

2
src/insets/InsetText.h
View File

@ -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;
///

4
src/insets/InsetWrap.cpp
View File

@ -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);

2
src/insets/InsetWrap.h
View File

@ -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);
///

2
src/lyxfind.cpp
View File

@ -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();

10
src/mathed/InsetMathGrid.cpp
View File

@ -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;
}

2
src/mathed/InsetMathGrid.h
View File

@ -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,<,>

14
src/mathed/InsetMathHull.cpp
View File

@ -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();
}
}

2
src/mathed/InsetMathHull.h
View File

@ -38,7 +38,7 @@ public:
///
void setBuffer(Buffer &);
///
void updateLabels(ParIterator const &, UpdateType);
void updateBuffer(ParIterator const &, UpdateType);
///
void addToToc(DocIterator const &);
///

20
src/mathed/InsetMathNest.cpp
View File

@ -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;

2
src/mathed/InsetMathNest.h
View File

@ -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

6
src/mathed/InsetMathRef.cpp
View File

@ -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);
}
}

2
src/mathed/InsetMathRef.h
View File

@ -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;
///

4
src/mathed/MathData.cpp
View File

@ -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);
}
}

2
src/mathed/MathData.h
View File

@ -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

2
src/support/Messages.h
View File

@ -43,7 +43,7 @@ private:
///
typedef std::map<std::string, docstring> 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_;
};