* src/frontends/controllers/Dialog.{cpp,h}:

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

diff --git a/src/mathed/InsetMathTabular.h b/src/mathed/InsetMathTabular.h
index da12246d6d82ab2ec4e3c3b22dac50f6295ab205..1d591924a53d23a32d7032a651ba060613580e3d 100644 (file)
--- a/src/mathed/InsetMathTabular.h
+++ b/src/mathed/InsetMathTabular.h
@@ -15,18 +15,21 @@
 #include "InsetMathGrid.h"
 
 
+namespace lyx {
+
+
 /// Inset for things like \begin{tabular}...\end{tabular}
 class InsetMathTabular : public InsetMathGrid {
 public:
        ///
-       InsetMathTabular(std::string const &, int m, int n);
+       InsetMathTabular(docstring const &, int m, int n);
        ///
-       InsetMathTabular(std::string const &, int m, int n,
-               char valign, std::string const & halign);
+       InsetMathTabular(docstring const &, int m, int n,
+               char valign, docstring const & halign);
        ///
-       InsetMathTabular(std::string const &, char valign, std::string const & halign);
+       InsetMathTabular(docstring const &, char valign, docstring const & halign);
        ///
-       void metrics(MetricsInfo & mi, Dimension & dim) const;
+       bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -37,16 +40,18 @@ public:
        ///
        void write(WriteStream & os) const;
        ///
-       void infoize(std::ostream & os) const;
+       void infoize(odocstream & os) const;
        ///
        void normalize(NormalStream &) const;
        ///
        void maple(MapleStream &) const;
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual std::auto_ptr<Inset> doClone() const;
        ///
-       std::string name_;
+       docstring name_;
 };
 
+} // namespace lyx
+
 #endif