architectural changes to tex2lyx

[lyx.git] / src / mathed / math_gridinset.C

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index d42d4927aae713a82c5522e8a13bf6ee4df427c5..e80458db6b63be2892a60af79ce2479ea6fb9536 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1,3 +1,5 @@
+#include <config.h>
+
 #include "math_gridinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
@@ -15,6 +17,8 @@ using std::max;
 using std::min;
 using std::vector;
 using std::istream;
+using std::auto_ptr;
+using std::endl;
 
 
 class GridInsetMailer : public MailInset {
@@ -23,11 +27,11 @@ public:
        ///
        virtual string const & name() const
        {
-               static const string theName = "tabular";
+               static string const theName = "tabular";
                return theName;
        }
        ///
-       virtual string const inset2string() const
+       virtual string const inset2string(Buffer const &) const
        {
                ostringstream data;
                //data << name() << " active_cell " << inset.getActCell() << '\n';
@@ -39,7 +43,7 @@ public:
 
 protected:
        InsetBase & inset() const { return inset_; }
-       MathGridInset & inset_; 
+       MathGridInset & inset_;
 };
 
 
@@ -114,7 +118,7 @@ MathGridInset::MathGridInset(char v, string const & h)
        setDefaults();
        valign(v);
        halign(h);
-       //lyxerr << "created grid with " << ncols() << " columns\n";
+       //lyxerr << "created grid with " << ncols() << " columns" << endl;
 }
 
 
@@ -160,9 +164,9 @@ MathGridInset::~MathGridInset()
 }
 
 
-MathInset * MathGridInset::clone() const
+auto_ptr<InsetBase> MathGridInset::clone() const
 {
-       return new MathGridInset(*this);
+       return auto_ptr<InsetBase>(new MathGridInset(*this));
 }
 
 
@@ -175,9 +179,9 @@ MathInset::idx_type MathGridInset::index(row_type row, col_type col) const
 void MathGridInset::setDefaults()
 {
        if (ncols() <= 0)
-               lyxerr << "positive number of columns expected\n";
+               lyxerr << "positive number of columns expected" << endl;
        //if (nrows() <= 0)
-       //      lyxerr << "positive number of rows expected\n";
+       //      lyxerr << "positive number of rows expected" << endl;
        for (col_type col = 0; col < ncols(); ++col) {
                colinfo_[col].align_ = defaultColAlign(col);
                colinfo_[col].skip_  = defaultColSpace(col);
@@ -199,7 +203,7 @@ void MathGridInset::halign(string const & hh)
                        ++col;
                        colinfo_[col].lines_ = 0;
                } else {
-                       lyxerr << "unknown column separator: '" << c << "'\n";
+                       lyxerr << "unknown column separator: '" << c << "'" << endl;
                }
        }
 
@@ -298,7 +302,7 @@ LyXLength MathGridInset::vcrskip(row_type row) const
 }
 
 
-Dimension MathGridInset::metrics(MetricsInfo & mi) const
+void MathGridInset::metrics(MetricsInfo & mi) const
 {
        // let the cells adjust themselves
        MathNestInset::metrics(mi);
@@ -434,7 +438,13 @@ Dimension MathGridInset::metrics(MetricsInfo & mi) const
                cxrow->setBaseline(cxrow->getBaseline() - ascent);
        }
 */
-       return dim_;
+}
+
+
+void MathGridInset::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       metrics(mi);
+       dim = dim_;
 }
 
 
@@ -1020,17 +1030,14 @@ dispatch_result MathGridInset::dispatch
 
                case LFUN_MOUSE_RELEASE:
                        //if (cmd.button() == mouse_button::button3) {
-                       //      GridInsetMailer mailer(*this);
-                       //      mailer.showDialog();
+                       //      GridInsetMailer(*this).showDialog();
                        //      return DISPATCHED;
                        //}
-                       break;
+                       return UNDISPATCHED;
 
-               case LFUN_INSET_DIALOG_UPDATE: {
-                       GridInsetMailer mailer(*this);
-                       mailer.updateDialog(cmd.view());
-                       break;
-               }
+               case LFUN_INSET_DIALOG_UPDATE:
+                       GridInsetMailer(*this).updateDialog(cmd.view());
+                       return UNDISPATCHED;
 
                // insert file functions
                case LFUN_DELETE_LINE_FORWARD:
@@ -1049,12 +1056,12 @@ dispatch_result MathGridInset::dispatch
                        return DISPATCHED_POP;
 
                case LFUN_CELL_SPLIT:
-                       //bv->lockedInsetStoreUndo(Undo::EDIT);
+                       //recordUndo(bv, Undo::ATOMIC);
                        splitCell(idx, pos);
                        return DISPATCHED_POP;
 
                case LFUN_BREAKLINE: {
-                       //bv->lockedInsetStoreUndo(Undo::INSERT);
+                       //recordUndo(bv, Undo::INSERT);
                        row_type const r = row(idx);
                        addRow(r);
 
@@ -1074,7 +1081,7 @@ dispatch_result MathGridInset::dispatch
                }
 
                case LFUN_TABULAR_FEATURE: {
-                       //lyxerr << "handling tabular-feature " << cmd.argument << "\n";
+                       //lyxerr << "handling tabular-feature " << cmd.argument << endl;
                        istringstream is(STRCONV(cmd.argument));
                        string s;
                        is >> s;
@@ -1093,25 +1100,25 @@ dispatch_result MathGridInset::dispatch
                        else if (s == "append-row")
                                for (int i = 0, n = extractInt(is); i < n; ++i)
                                        addRow(row(idx));
-                       else if (s == "delete-row") 
+                       else if (s == "delete-row")
                                for (int i = 0, n = extractInt(is); i < n; ++i) {
                                        delRow(row(idx));
                                        if (idx > nargs())
                                                idx -= ncols();
                                }
-                       else if (s == "copy-row") 
+                       else if (s == "copy-row")
                                for (int i = 0, n = extractInt(is); i < n; ++i)
                                        copyRow(row(idx));
                        else if (s == "swap-row")
                                swapRow(row(idx));
-                       else if (s == "append-column") 
+                       else if (s == "append-column")
                                for (int i = 0, n = extractInt(is); i < n; ++i) {
                                        row_type r = row(idx);
                                        col_type c = col(idx);
                                        addCol(c);
                                        idx = index(r, c);
                                }
-                       else if (s == "delete-column") 
+                       else if (s == "delete-column")
                                for (int i = 0, n = extractInt(is); i < n; ++i) {
                                        row_type r = row(idx);
                                        col_type c = col(idx);
@@ -1126,12 +1133,12 @@ dispatch_result MathGridInset::dispatch
                                swapCol(col(idx));
                        else
                                return UNDISPATCHED;
-                       lyxerr << "returning DISPATCHED_POP\n";
+                       lyxerr << "returning DISPATCHED_POP" << endl;
                        return DISPATCHED_POP;
                }
 
                case LFUN_PASTE: {
-                       //lyxerr << "pasting '" << cmd.argument << "'\n";
+                       //lyxerr << "pasting '" << cmd.argument << "'" << endl;
                        MathGridInset grid(1, 1);
                        mathed_parse_normal(grid, cmd.argument);
                        if (grid.nargs() == 1) {
@@ -1164,5 +1171,4 @@ dispatch_result MathGridInset::dispatch
                default:
                        return MathNestInset::dispatch(cmd, idx, pos);
        }
-       return UNDISPATCHED;
 }