mathed uglyfication

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

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index 4de81929c1c8ad77a469654b17683f4a356f99c1..2c19c15b747b39a2ff166902125f7c155704a51a 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -23,7 +23,7 @@ public:
        ///
        MathHullInset();
        ///
-       explicit MathHullInset(string const & type);
+       explicit MathHullInset(std::string const & type);
        ///
        virtual std::auto_ptr<InsetBase> clone() const;
        ///
@@ -37,9 +37,9 @@ public:
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///
-       string label(row_type row) const;
+       std::string label(row_type row) const;
        ///
-       void label(row_type row, string const & label);
+       void label(row_type row, std::string const & label);
        ///
        void numbered(row_type row, bool num);
        ///
@@ -50,11 +50,9 @@ public:
        bool display() const;
        ///
        bool ams() const;
-       /// local dispatcher
-       dispatch_result dispatch(FuncRequest const & cmd, idx_type & idx, pos_type & pos);
        /// Appends \c list with all labels found within this inset.
        void getLabelList(Buffer const &,
-                         std::vector<string> & list) const;
+                         std::vector<std::string> & list) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies MatrixInsets
@@ -66,27 +64,29 @@ public:
        void addRow(row_type row);
        /// delete a row
        void delRow(row_type row);
+       ///
+       void swapRow(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;
+       std::string const & getType() const;
        /// change type
-       void mutate(string const &);
+       void mutate(std::string const &);
 
        ///
        int defaultColSpace(col_type col);
        ///
        char defaultColAlign(col_type col);
        ///
-       bool idxFirst(idx_type &, pos_type &) const;
+       bool idxFirst(BufferView &) const;
        ///
-       bool idxLast(idx_type &, pos_type &) const;
+       bool idxLast(BufferView &) const;
 
        ///
-       string fileInsetLabel() const;
+       std::string fileInsetLabel() const;
        ///
        void write(WriteStream & os) const;
        ///
@@ -98,11 +98,15 @@ public:
 
 protected:
        ///
-       string eolString(row_type row, bool fragile) const;
+       virtual
+       DispatchResult
+       priv_dispatch(BufferView & bv, FuncRequest const & cmd);
+       ///
+       std::string eolString(row_type row, bool fragile) const;
 
 private:
        ///
-       void setType(string const & type);
+       void setType(std::string const & type);
        ///
        void validate1(LaTeXFeatures & features);
        ///
@@ -110,9 +114,9 @@ private:
        ///
        void footer_write(WriteStream &) const;
        ///
-       string nicelabel(row_type row) const;
+       std::string nicelabel(row_type row) const;
        ///
-       void doExtern(FuncRequest const & func, idx_type & idx, pos_type & pos);
+       void doExtern(FuncRequest const & func, BufferView &);
        ///
        void glueall();
        ///
@@ -123,11 +127,11 @@ private:
        bool colChangeOK() const;
 
        /// "none", "simple", "display", "eqnarray",...
-       string type_;
+       std::string type_;
        ///
        std::vector<int> nonum_;
        ///
-       std::vector<string> label_;
+       std::vector<std::string> label_;
 };
 
 #endif