Another warning.

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index eba5c5199dfc4379f4a92972fd2add12b9947e6b..7f161f22357ca1365efbab44d09ac2fc5495ad7b 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,6 +14,7 @@
 
 #include "InsetMathGrid.h"
 
+#include "Color.h"
 #include "DocIterator.h"
 #include "OutputEnums.h"
 
@@ -166,7 +167,8 @@ protected:
        bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
        ///
-       docstring eolString(row_type row, bool fragile, bool last_eoln) const;
+       docstring eolString(row_type row, bool fragile, bool latex,
+                       bool last_eoln) const;
 
 private:
        virtual Inset * clone() const;
@@ -187,7 +189,7 @@ private:
        ///
        void doExtern(Cursor & cur, FuncRequest & func);
        ///
-       void glueall();
+       void glueall(HullType type);
        /*!
         * split every row at the first relation operator.
         * The number of columns must be 1. One column is added.
@@ -207,7 +209,7 @@ private:
        ///
        docstring standardFont() const;
        ///
-       docstring standardColor() const;
+       ColorCode standardColor() const;
        /// consistency check
        void check() const;
        /// can this change its number of rows?
@@ -218,7 +220,7 @@ private:
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
        ///
-       std::vector<bool> nonum_;
+       std::vector<bool> numbered_;
        ///
        std::vector<InsetLabel *> label_;
        ///