macro rework

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

diff --git a/src/mathed/math_biginset.h b/src/mathed/math_biginset.h
index cb35dc915504cfa5db16b6339c49b3c0d5c51d22..df6899e234ff7fb78bf20c30a96b88a6055a2ab3 100644 (file)
--- a/src/mathed/math_biginset.h
+++ b/src/mathed/math_biginset.h
@@ -1,39 +1,34 @@
 // -*- C++ -*-
-
-/** 
- *  \file math_biginset.h
- *
- *  This file is part of LyX, the document processor.
- *  Licence details can be found in the file COPYING.
+/**
+ * \file math_biginset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  \author André Pönitz
+ * \author André Pönitz
  *
- *  Full author contact details are available in file CREDITS.
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef MATH_BIGINSET_H
 #define MATH_BIGINSET_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "math_diminset.h"
-#include "LString.h"
+
+#include <string>
 
 /// Inset for \bigl & Co.
 class MathBigInset : public MathDimInset {
 public:
        ///
-       MathBigInset(string const & name, string const & delim);
+       MathBigInset(std::string const & name, std::string const & delim);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void write(WriteStream & os) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void metrics(MathMetricsInfo & st) const;
+       void write(WriteStream & os) const;
        ///
        void normalize(NormalStream & os) const;
 
@@ -44,9 +39,9 @@ private:
        double increase() const;
 
        /// \bigl or what?
-       string const name_;
+       std::string const name_;
        /// ( or [ or Vert...
-       string const delim_;
+       std::string const delim_;
 };
 
 #endif