Revert "Fix a number of signedness warnings"

[lyx.git] / src / mathed / MacroTable.h

diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index 1c9decc3e7bef8adb43a91db5fafcbb4173acd84..b588ee2cf9cab540119335824879f93af9e5d2c3 100644 (file)
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -25,8 +25,7 @@ namespace lyx {
 
 class Buffer;
 class MathData;
-class MathMacroTemplate;
-class Paragraph;
+class InsetMathMacroTemplate;
 class latexkeys;
 
 enum MacroType {
@@ -39,11 +38,11 @@ enum MacroType {
 class MacroData {
 public:
        /// Constructor to make STL containers happy
-       MacroData(Buffer * buf = 0);
+       explicit MacroData(Buffer * buf = 0);
        /// Create lazy MacroData which only queries the macro template when needed
        MacroData(Buffer * buf, DocIterator const & pos);
        /// Create non-lazy MacroData which directly queries the macro template
-       MacroData(Buffer * buf, MathMacroTemplate const & macro);
+       MacroData(Buffer * buf, InsetMathMacroTemplate const & macro);
 
        ///
        docstring const & definition() const { updateData(); return definition_; }
@@ -60,9 +59,21 @@ public:
        ///
        std::vector<docstring> const & defaults() const;
        ///
-       std::string const requires() const;
+       std::string const required() const;
+       ///
+       bool hidden() const;
+       ///
+       docstring const htmlname() const;
+       ///
+       docstring const xmlname() const;
+       ///
+       char const * MathMLtype() const;
+       ///
+       latexkeys const * symbol() const { return sym_; }
        ///
        void setSymbol(latexkeys const * sym) { sym_ = sym; }
+       ///
+       DocIterator const & pos() const { return pos_; }
 
        /// lock while being drawn to avoid recursions
        int lock() const { return ++lockCount_; }
@@ -96,7 +107,7 @@ public:
 
 private:
        ///
-       void queryData(MathMacroTemplate const & macro) const;
+       void queryData(InsetMathMacroTemplate const & macro) const;
        ///
        void updateData() const;
        ///
@@ -158,7 +169,7 @@ public:
        ///
        void dump();
        ///
-       void getMacroNames(std::set<docstring> & names) const;
+       void getMacroNames(std::set<docstring> & names, bool gethidden) const;
 
        /// the global list
        static MacroTable & globalMacros();