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 c9d90deb1cb6919d88ce39806a9fedcb372fa505..6c9237351a8faf37ed5d09b131482d4398791400 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -1,37 +1,39 @@
 // -*- 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:
        ///
        MathHullInset();
        ///
-       explicit MathHullInset(MathInsetTypes t);
+       explicit MathHullInset(string const & type);
        ///
-       MathHullInset(MathInsetTypes t, MathGridInset const & grid);
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       MathHullInset(MathInsetTypes t, col_type cols);
+       mode_type currentMode() const;
        ///
-       MathInset * clone() const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void metrics(MathMetricsInfo & st) const;
+       void draw(PainterInfo &, int x, int y) const;
        ///
-       void draw(MathPainterInfo &, int x, int y) const;
-       ///
-       void metricsT(TextMetricsInfo const & st) const;
+       void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///
@@ -48,8 +50,10 @@ public:
        bool display() const;
        ///
        bool ams() const;
+       /// local dispatcher
+       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
        ///
-       std::vector<string> const getLabelList() const;
+       void getLabelList(std::vector<string> &) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies MatrixInsets
@@ -57,19 +61,19 @@ public:
        /// identifies HullInset
        MathHullInset * asHullInset() { return this; }
 
-       ///
-       void addRow(row_type);
-       ///
-       void delRow(row_type);
-       ///
-       void addFancyCol(col_type);
-       ///
-       void delFancyCol(col_type);
+       /// add a row
+       void addRow(row_type row);
+       /// delete a row
+       void delRow(row_type row);
+       /// add a column
+       void addCol(col_type col);
+       /// delete a column
+       void delCol(col_type col);
 
+       /// get type
+       string const & getType() const;
        /// change type
        void mutate(string const &);
-       ///
-       void mutate(MathInsetTypes);
 
        ///
        int defaultColSpace(col_type col);
@@ -81,7 +85,7 @@ public:
        bool idxLast(idx_type &, pos_type &) const;
 
        ///
-       MathInsetTypes getType() const;
+       string fileInsetLabel() const;
        ///
        void write(WriteStream & os) const;
        ///
@@ -91,9 +95,13 @@ public:
        ///
        void infoize(std::ostream & os) const;
 
+protected:
+       ///
+       string eolString(row_type row, bool fragile) const;
+
 private:
        ///
-       void setType(MathInsetTypes t);
+       void setType(string const & type);
        ///
        void validate1(LaTeXFeatures & features);
        ///
@@ -101,14 +109,20 @@ private:
        ///
        void footer_write(WriteStream &) const;
        ///
+       string nicelabel(row_type row) const;
+       ///
+       void doExtern(FuncRequest const & func, idx_type & idx, pos_type & pos);
+       ///
        void glueall();
        ///
-       string nicelabel(row_type row) const;
+       char const * standardFont() const;
        /// consistency check
        void check() const;
+       /// can this change its number of cols?
+       bool colChangeOK() const;
 
-       ///
-       MathInsetTypes objtype_;
+       /// "none", "simple", "display", "eqnarray",...
+       string type_;
        ///
        std::vector<int> nonum_;
        ///