[LyX features/cleanup/updateMacros3] Renaming

[Richard Kimberly Heck]

The branch, cleanup/updateMacros3, has been updated.

- Log -----------------------------------------------------------------

commit 7bd31f68133a6a22251ce9524ff345edefaf9081
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Wed Nov 11 11:57:05 2020 -0500

    Renaming

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 1bb8507..cc60114 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1971,7 +1971,7 @@ Buffer::ExportStatus Buffer::writeLaTeXSource(otexstream & os,
 
 		// get parent macros (if this buffer has a parent) which will be
 		// written at the document begin further down.
-		MacroSet parentMacros;
+		MacroDataSet parentMacros;
 		listParentMacros(parentMacros, features);
 
 		// Write the preamble
@@ -3937,7 +3937,7 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
 }
 
 
-void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
+void Buffer::listParentMacros(MacroDataSet & macros, LaTeXFeatures & features) const
 {
 	Buffer const * const pbuf = d->parent();
 	if (!pbuf)
diff --git a/src/Buffer.h b/src/Buffer.h
index 2dbc16c..c8946d6 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -45,7 +45,7 @@ class LaTeXFeatures;
 class Language;
 class MacroData;
 class MacroNameSet;
-class MacroSet;
+class MacroDataSet;
 class OutputParams;
 class otexstream;
 class ParagraphList;
@@ -605,7 +605,7 @@ public:
 	/// List macro names of this buffer, the parent and the children
 	void listMacroNames(MacroNameSet & macros) const;
 	/// Collect macros of the parent and its children in front of this buffer.
-	void listParentMacros(MacroSet & macros, LaTeXFeatures & features) const;
+	void listParentMacros(MacroDataSet & macros, LaTeXFeatures & features) const;
 
 	/// Return macro defined before pos (or in the master buffer)
 	MacroData const * getMacro(docstring const & name, DocIterator const & pos, bool global = true) const;
diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index 0d5e4a2..c0e3aa6 100644
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -158,7 +158,7 @@ private:
 ///
 class MacroNameSet : public std::set<docstring> {};
 ///
-class MacroSet : public std::set<MacroData const *> {};
+class MacroDataSet : public std::set<MacroData const *> {};
 
 
 /// A lookup table of macro definitions.

-----------------------------------------------------------------------

Summary of changes:
 src/Buffer.cpp          |    4 ++--
 src/Buffer.h            |    4 ++--
 src/mathed/MacroTable.h |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Repository for new features