macro rework

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

diff --git a/src/mathed/math_tabularinset.h b/src/mathed/math_tabularinset.h
index 35426e2dc7e467783305914c08a6357e94b1a4f2..88224601b2efb5a67e9513c8200e2f86deabe97b 100644 (file)
--- a/src/mathed/math_tabularinset.h
+++ b/src/mathed/math_tabularinset.h
@@ -1,31 +1,34 @@
 // -*- C++ -*-
-#ifndef MATH_TABULARINSET_H
-#define MATH_TABULARINSET_H
-
-#include "math_gridinset.h"
-
-
 /**
- * Inset for things like \begin{tabular}...\end{tabular}
+ * \file math_tabularinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author André Pönitz
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
+#ifndef MATH_TABULARINSET_H
+#define MATH_TABULARINSET_H
+
+#include "math_gridinset.h"
+
+
+/// Inset for things like \begin{tabular}...\end{tabular}
 class MathTabularInset : public MathGridInset {
 public:
        ///
-       MathTabularInset(string const &, int m, int n);
+       MathTabularInset(std::string const &, int m, int n);
        ///
-       MathTabularInset(string const &, int m, int n,
-               char valign, string const & halign);
+       MathTabularInset(std::string const &, int m, int n,
+               char valign, std::string const & halign);
        ///
-       MathTabularInset(string const &, char valign, string const & halign);
+       MathTabularInset(std::string const &, char valign, std::string const & halign);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       Dimension metrics(MetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -42,7 +45,7 @@ public:
 
 private:
        ///
-       string name_;
+       std::string name_;
 };
 
 #endif