* dimension.h: new operator!=() and operator=()

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

diff --git a/src/mathed/InsetMathArray.h b/src/mathed/InsetMathArray.h
index c104287e63d6cfb76abe44c382e63259b04ad8ed..0dd387dadace8759f0c0eb93e94dfe6d5f7726af 100644 (file)
--- a/src/mathed/InsetMathArray.h
+++ b/src/mathed/InsetMathArray.h
@@ -15,20 +15,23 @@
 #include "InsetMathGrid.h"
 
 
+namespace lyx {
+
+
 /// Inset for things like \begin{array}...\end{array}
 class InsetMathArray : public InsetMathGrid {
 public:
        ///
-       InsetMathArray(std::string const &, int m, int n);
+       InsetMathArray(docstring const &, int m, int n);
        ///
-       InsetMathArray(std::string const &, int m, int n,
-               char valign, std::string const & halign);
+       InsetMathArray(docstring const &, int m, int n,
+               char valign, docstring const & halign);
        ///
-       InsetMathArray(std::string const &, char valign, std::string const & halign);
+       InsetMathArray(docstring const &, char valign, docstring const & halign);
        /// convenience constructor from whitespace/newline separated data
-       InsetMathArray(std::string const &, std::string const & str);
+       InsetMathArray(docstring const &, docstring const & str);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -39,7 +42,7 @@ public:
        ///
        void write(WriteStream & os) const;
        ///
-       void infoize(std::ostream & os) const;
+       void infoize(odocstream & os) const;
        ///
        void normalize(NormalStream & os) const;
        ///
@@ -49,7 +52,10 @@ public:
 private:
        virtual std::auto_ptr<InsetBase> doClone() const;
        ///
-       std::string name_;
+       docstring name_;
 };
 
+
+} // namespace lyx
+
 #endif