Get rid of lyxstring, remove usage of STRCONV.

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

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index 903f97ae5fd79cc5b912582fdfb11c10eb0ea208..6c9237351a8faf37ed5d09b131482d4398791400 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -1,19 +1,23 @@
 // -*- C++ -*-
+/**
+ * \file math_hullinset.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.
+ */
+
 #ifndef MATH_HULLINSET_H
 #define MATH_HULLINSET_H
 
 #include "math_gridinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-/** This provides an interface between "LyX insets" and "LyX math insets"
- *  \author André Pönitz
- */
 
 class LaTeXFeatures;
 
+/// This provides an interface between "LyX insets" and "LyX math insets"
 class MathHullInset : public MathGridInset {
 public:
        ///
@@ -21,15 +25,15 @@ public:
        ///
        explicit MathHullInset(string const & type);
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        mode_type currentMode() const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(MathPainterInfo &, int x, int y) const;
+       void draw(PainterInfo &, int x, int y) const;
        ///
-       void metricsT(TextMetricsInfo const & mi) const;
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///
@@ -47,8 +51,8 @@ public:
        ///
        bool ams() const;
        /// local dispatcher
-       result_type dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
-       /// 
+       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
+       ///
        void getLabelList(std::vector<string> &) const;
        ///
        void validate(LaTeXFeatures & features) const;
@@ -80,6 +84,8 @@ public:
        ///
        bool idxLast(idx_type &, pos_type &) const;
 
+       ///
+       string fileInsetLabel() const;
        ///
        void write(WriteStream & os) const;
        ///
@@ -90,7 +96,7 @@ public:
        void infoize(std::ostream & os) const;
 
 protected:
-       ///     
+       ///
        string eolString(row_type row, bool fragile) const;
 
 private: