typo

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

diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index d31d04b35bb58da48a25d07ee59c64c9046ff7d9..77b306fccdd8bc41f8d28e2c39140e4e8ef655e0 100644 (file)
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -26,7 +26,6 @@ namespace lyx {
 class Buffer;
 class MathData;
 class InsetMathMacroTemplate;
-class Paragraph;
 class latexkeys;
 
 enum MacroType {
@@ -39,11 +38,11 @@ enum MacroType {
 class MacroData {
 public:
        /// Constructor to make STL containers happy
-       explicit MacroData(Buffer * buf = 0);
+       explicit MacroData(Buffer const * buf = 0);
        /// Create lazy MacroData which only queries the macro template when needed
-       MacroData(Buffer * buf, DocIterator const & pos);
+       MacroData(Buffer const * buf, DocIterator const & pos);
        /// Create non-lazy MacroData which directly queries the macro template
-       MacroData(Buffer * buf, InsetMathMacroTemplate const & macro);
+       MacroData(Buffer const * buf, InsetMathMacroTemplate const & macro);
 
        ///
        docstring const & definition() const { updateData(); return definition_; }
@@ -60,10 +59,12 @@ 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;
@@ -72,7 +73,7 @@ public:
        ///
        void setSymbol(latexkeys const * sym) { sym_ = sym; }
        ///
-       DocIterator const & pos() { return pos_; }
+       DocIterator const & pos() const { return pos_; }
 
        /// lock while being drawn to avoid recursions
        int lock() const { return ++lockCount_; }
@@ -121,25 +122,25 @@ private:
        /// macros.
        mutable DocIterator pos_;
        ///
-       mutable bool queried_;
+       mutable bool queried_ = false;
        ///
        mutable docstring definition_;
        ///
-       mutable size_t numargs_;
+       mutable size_t numargs_ = 0;
        ///
        mutable docstring display_;
        ///
-       latexkeys const * sym_;
+       latexkeys const * sym_ = nullptr;
        ///
-       mutable size_t optionals_;
+       mutable size_t optionals_ = 0;
        ///
        mutable std::vector<docstring> defaults_;
        ///
-       mutable int lockCount_;
+       mutable int lockCount_ = 0;
        ///
-       mutable bool redefinition_;
+       mutable bool redefinition_ = false;
        ///
-       mutable MacroType type_;
+       mutable MacroType type_ = MacroTypeNewcommand;
 };