From 03bf9eb619872200aa977f0ab93add8e93a4c2d4 Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Mon, 9 Nov 2020 17:29:27 -0500 Subject: [PATCH] Renaming --- src/Buffer.cpp | 2 +- src/mathed/InsetMathMacro.cpp | 4 ++-- src/mathed/InsetMathNest.cpp | 2 +- src/mathed/MacroTable.cpp | 18 +++++++++--------- src/mathed/MacroTable.h | 10 +++++----- src/mathed/MathFactory.cpp | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 118384213c..cf341d58da 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -3690,7 +3690,7 @@ MacroData const * Buffer::getMacro(docstring const & name, } if (global) { - data = MacroTable::get().getMacro(name); + data = GlobalMacros::get().getMacro(name); if (data != nullptr) return data; } diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp index 600562f2fc..c051c8ed0b 100644 --- a/src/mathed/InsetMathMacro.cpp +++ b/src/mathed/InsetMathMacro.cpp @@ -938,7 +938,7 @@ MacroData const * InsetMathMacro::macroBackup() const { if (macro()) return &d->macroBackup_; - if (MacroData const * data = MacroTable::get().getMacro(name())) + if (MacroData const * data = GlobalMacros::get().getMacro(name())) return data; return nullptr; } @@ -957,7 +957,7 @@ void InsetMathMacro::validate(LaTeXFeatures & features) const features.require(d->required_); else if (!d->macro_) { // Update requires for known global macros. - MacroData const * data = MacroTable::get().getMacro(name()); + MacroData const * data = GlobalMacros::get().getMacro(name()); if (data && !data->required().empty()) features.require(data->required()); } diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index 19aa745d50..ee4cf77fe0 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -2106,7 +2106,7 @@ MathCompletionList::MathCompletionList(Cursor const & cur) // fill in global macros macros.clear(); - MacroTable::get().getMacroNames(macros, false); + GlobalMacros::get().getMacroNames(macros, false); //lyxerr << "Globals completion macros: "; for (it = macros.begin(); it != macros.end(); ++it) { //lyxerr << "\\" + *it << " "; diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp index 2bc427b221..e6daac67e0 100644 --- a/src/mathed/MacroTable.cpp +++ b/src/mathed/MacroTable.cpp @@ -215,22 +215,22 @@ int MacroData::write(odocstream & os, bool overwriteRedefinition) const // ///////////////////////////////////////////////////////////////////// -MacroTable & MacroTable::get() +GlobalMacros & GlobalMacros::get() { - static MacroTable theGlobalMacros; + static GlobalMacros theGlobalMacros; return theGlobalMacros; } -MacroData const * MacroTable::getMacro(docstring const & name) const +MacroData const * GlobalMacros::getMacro(docstring const & name) const { const_iterator it = find(name); return it == end() ? 0 : &it->second; } -MacroTable::iterator -MacroTable::insert(docstring const & name, MacroData const & data) +GlobalMacros::iterator +GlobalMacros::insert(docstring const & name, MacroData const & data) { //lyxerr << "MacroTable::insert: " << to_utf8(name) << endl; iterator it = find(name); @@ -243,8 +243,8 @@ MacroTable::insert(docstring const & name, MacroData const & data) } -MacroTable::iterator -MacroTable::insert(Buffer * buf, docstring const & definition) +GlobalMacros::iterator +GlobalMacros::insert(Buffer * buf, docstring const & definition) { //lyxerr << "MacroTable::insert, def: " << to_utf8(def) << endl; InsetMathMacroTemplate mac(buf); @@ -254,7 +254,7 @@ MacroTable::insert(Buffer * buf, docstring const & definition) } -void MacroTable::getMacroNames(std::set & names, bool gethidden) const +void GlobalMacros::getMacroNames(std::set & names, bool gethidden) const { for (const_iterator it = begin(); it != end(); ++it) if (gethidden || !it->second.hidden()) @@ -262,7 +262,7 @@ void MacroTable::getMacroNames(std::set & names, bool gethidden) cons } -void MacroTable::dump() +void GlobalMacros::dump() { lyxerr << "\n------------------------------------------" << endl; for (const_iterator it = begin(); it != end(); ++it) diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h index a6996da40e..0d5e4a241b 100644 --- a/src/mathed/MacroTable.h +++ b/src/mathed/MacroTable.h @@ -168,15 +168,15 @@ class MacroSet : public std::set {}; * hack to display certain contents nicely. * **/ -class MacroTable : public std::map +class GlobalMacros : public std::map { public: /// We are a singleton - MacroTable() = default; - MacroTable(MacroTable const &) = delete; - void operator=(MacroTable const &) = delete; + GlobalMacros() = default; + GlobalMacros(GlobalMacros const &) = delete; + void operator=(GlobalMacros const &) = delete; /// the global list: our unique instance - static MacroTable & get(); + static GlobalMacros & get(); /// Parse full "\\def..." or "\\newcommand..." or ... iterator insert(Buffer * buf, docstring const & definition); /// Insert pre-digested macro definition diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp index f9569737f6..49baa5dc19 100644 --- a/src/mathed/MathFactory.cpp +++ b/src/mathed/MathFactory.cpp @@ -202,7 +202,7 @@ void initSymbols() required = ""; } else htmlname = xmlname = ""; - MacroTable::iterator it = MacroTable::get().insert( + GlobalMacros::iterator it = GlobalMacros::get().insert( 0, from_utf8(macro)); if (!extra.empty() || !htmlname.empty() || !xmlname.empty() || !required.empty()) { MathWordList::iterator wit = theMathWordList.find(it->first); -- 2.39.5