Renaming

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index cf341d58dac4cf5934ec8d91753cd0fe758e6362..e6d1c9158c70cb1fc87624887b170f1dc469995f 100644 (file)
--- 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
@@ -3938,7 +3938,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 2dbc16ca4f150ffbd664f80d314bda3ce9fa85e9..c8946d625cdd5e2c98b8080415c4783c109d209a 100644 (file)
--- 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 0d5e4a241b1937025e520af6b960b860b6787e36..c0e3aa618b58ec9fb077ea0a5513f3fac3f1f29c 100644 (file)
--- 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.