commit 2e6c1e8d11228242339498ffc79d0b1a40169025
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Feb 20 15:53:44 2026 +0100
Rename shadowing MathData
---
src/mathed/InsetMathHull.cpp | 12 ++++++------
src/mathed/InsetMathMacro.cpp | 6 +++---
src/mathed/MathExtern.cpp | 12 ++++++------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 5d8e3b4abd..fc16936a76 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -823,7 +823,7 @@ void InsetMathHull::usedMacros(MathData const & md,
DocIterator const & pos,
continue;
macros.erase(name);
// Look for macros in the definition of this macro.
- MathData md(pos.buffer());
+ MathData mdd(pos.buffer());
MacroData const * data =
pos.buffer()->getMacro(name, pos, true);
if (data) {
@@ -839,13 +839,13 @@ void InsetMathHull::usedMacros(MathData const & md,
DocIterator const & pos,
from_ascii("\r\n"),
from_ascii("\n")),
"\n") + "\n");
- asMathData(data->definition(), md);
+ asMathData(data->definition(), mdd);
}
- usedMacros(md, pos, macros, defs);
+ usedMacros(mdd, pos, macros, defs);
} else if (mt) {
- MathData md(pos.buffer());
- asMathData(mt->definition(), md);
- usedMacros(md, pos, macros, defs);
+ MathData mdd(pos.buffer());
+ asMathData(mt->definition(), mdd);
+ usedMacros(mdd, pos, macros, defs);
} else if (si) {
if (!si->nuc().empty())
usedMacros(si->nuc(), pos, macros, defs);
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index ece9bfd39d..9354ef716e 100644
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -289,9 +289,9 @@ void
InsetMathMacro::Private::updateNestedChildren(InsetMathMacro * owner, Inset
InsetArgumentProxy * ap = dynamic_cast
<InsetArgumentProxy *>(md[j].nucleus());
if (ap) {
- InsetMathMacro::Private * md = ap->owner()->d;
- if (md->macro_)
- md->macro_ = &md->macroBackup_;
+ InsetMathMacro::Private * mdd = ap->owner()->d;
+ if (mdd->macro_)
+ mdd->macro_ = &mdd->macroBackup_;
ap->setOwner(owner);
}
InsetMathNest * imn = md[j].nucleus()->asNestInset();
diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index a896f77a00..531138b358 100644
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -814,17 +814,17 @@ void extractSums(MathData & md)
InsetMathScript const * sub = md[i]->asScriptInset();
if (sub && sub->hasDown()) {
// try to figure out the summation index from the
subscript
- MathData const & md = sub->down();
+ MathData const & mdd = sub->down();
MathData::const_iterator xt =
- find_if(md.begin(), md.end(), &testEqualSign);
- if (xt != md.end()) {
+ find_if(mdd.begin(), mdd.end(), &testEqualSign);
+ if (xt != mdd.end()) {
// we found a '=', use everything in front of
that as index,
// and everything behind as lower index
- p->cell(1) = MathData(buf, md.begin(), xt);
- p->cell(2) = MathData(buf, xt + 1, md.end());
+ p->cell(1) = MathData(buf, mdd.begin(), xt);
+ p->cell(2) = MathData(buf, xt + 1, mdd.end());
} else {
// use everything as summation index, don't use
scripts.
- p->cell(1) = md;
+ p->cell(1) = mdd;
}
}
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
