From 3858c5692ea6318979db2373c982363a5363e827 Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Tue, 17 Nov 2020 01:21:57 -0500 Subject: [PATCH] Renaming --- src/Buffer.cpp | 2 +- src/mathed/InsetMathMacro.cpp | 2 +- src/mathed/MathData.cpp | 4 ++-- src/mathed/MathData.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 97b837fb23..b5d9e4fecc 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -3872,7 +3872,7 @@ void Buffer::updateMacroInstances(UpdateType utype) const MacroContext mc = MacroContext(this, it); for (DocIterator::idx_type i = 0; i < n; ++i) { MathData & data = minset->cell(i); - data.updateMacros(nullptr, mc, utype, 0); + data.updateMacroInstances(nullptr, mc, utype, 0); } } } diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp index c051c8ed0b..ab9af5f5e8 100644 --- a/src/mathed/InsetMathMacro.cpp +++ b/src/mathed/InsetMathMacro.cpp @@ -726,7 +726,7 @@ void InsetMathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc, d->expanded_.setBuffer(buffer()); if (ret && !support::contains(display, latexname)) { if (utype == OutputUpdate && !d->expanded_.empty()) - d->expanded_.updateMacros(cur, mc, utype, nesting); + d->expanded_.updateMacroInstances(cur, mc, utype, nesting); } // get definition for list edit mode asArray(display.empty() ? d->macro_->definition() : display, diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp index 2b74cac118..bccd28ade3 100644 --- a/src/mathed/MathData.cpp +++ b/src/mathed/MathData.cpp @@ -225,7 +225,7 @@ bool MathData::addToMathRow(MathRow & mrow, MetricsInfo & mi) const bool has_contents = false; BufferView * bv = mi.base.bv; MathData * ar = const_cast(this); - ar->updateMacros(&bv->cursor(), mi.macrocontext, + ar->updateMacroInstances(&bv->cursor(), mi.macrocontext, InternalUpdate, mi.base.macro_nesting); @@ -398,7 +398,7 @@ void MathData::updateBuffer(ParIterator const & it, UpdateType utype, bool const } -void MathData::updateMacros(Cursor * cur, MacroContext const & mc, +void MathData::updateMacroInstances(Cursor * cur, MacroContext const & mc, UpdateType utype, int nesting) { // If we are editing a macro, we cannot update it immediately, diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h index 34749802fe..199039d441 100644 --- a/src/mathed/MathData.h +++ b/src/mathed/MathData.h @@ -178,7 +178,7 @@ public: /// attach/detach arguments to macros, updating the cur to /// stay visually at the same position (cur==0 is allowed) - void updateMacros(Cursor * cur, MacroContext const & mc, UpdateType, int nesting); + void updateMacroInstances(Cursor * cur, MacroContext const & mc, UpdateType, int nesting); /// void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false); /// -- 2.39.5