do what the FIXME suggested

[lyx.git] / src / frontends / qt4 / GuiMathMatrix.cpp

diff --git a/src/frontends/qt4/GuiMathMatrix.cpp b/src/frontends/qt4/GuiMathMatrix.cpp
index 939acbbe19d5018df17997a1a683f0996233f05f..b7dae78b48be2c7ab5b9e00901509a5e52417548 100644 (file)
--- a/src/frontends/qt4/GuiMathMatrix.cpp
+++ b/src/frontends/qt4/GuiMathMatrix.cpp
@@ -12,10 +12,9 @@
 
 #include "GuiMathMatrix.h"
 
-#include "ControlMath.h"
 #include "EmptyTable.h"
 #include "qt_helpers.h"
-#include "gettext.h"
+#include "support/gettext.h"
 
 #include <sstream>
 
@@ -23,18 +22,15 @@
 #include <QPushButton>
 #include <QSpinBox>
 
-using std::ostringstream;
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-GuiMathMatrixDialog::GuiMathMatrixDialog(LyXView & lv)
-       : GuiDialog(lv, "mathmatrix")
+GuiMathMatrix::GuiMathMatrix(GuiView & lv)
+       : GuiMath(lv, "mathmatrix", qt_("Math Matrix"))
 {
        setupUi(this);
-       setViewTitle(_("Math Matrix"));
-       setController(new ControlMath(*this));
 
        table->setMinimumSize(100, 100);
        rowsSB->setValue(5);
@@ -65,13 +61,7 @@ GuiMathMatrixDialog::GuiMathMatrixDialog(LyXView & lv)
 }
 
 
-ControlMath & GuiMathMatrixDialog::controller() const
-{
-       return static_cast<ControlMath &>(GuiDialog::controller());
-}
-
-
-void GuiMathMatrixDialog::columnsChanged(int)
+void GuiMathMatrix::columnsChanged(int)
 {
        char h_align_str[80] = "c";
        int const nx = int(columnsSB->value());
@@ -83,18 +73,18 @@ void GuiMathMatrixDialog::columnsChanged(int)
 }
 
 
-void GuiMathMatrixDialog::rowsChanged(int)
+void GuiMathMatrix::rowsChanged(int)
 {
 }
 
 
-void GuiMathMatrixDialog::change_adaptor()
+void GuiMathMatrix::change_adaptor()
 {
        // FIXME: We need a filter for the halign input
 }
 
 
-void GuiMathMatrixDialog::slotOK()
+void GuiMathMatrix::slotOK()
 {
        char v_align_c[] = "tcb";
        char const c = v_align_c[valignCO->currentIndex()];
@@ -104,18 +94,22 @@ void GuiMathMatrixDialog::slotOK()
 
        ostringstream os;
        os << nx << ' ' << ny << ' ' << c << ' ' << sh;
-       controller().dispatchMatrix(os.str().c_str());
+       dispatchMatrix(os.str().c_str());
 
        // close the dialog
        close();
 }
 
 
-void GuiMathMatrixDialog::slotClose()
+void GuiMathMatrix::slotClose()
 {
        close();
 }
 
+
+Dialog * createGuiMathMatrix(GuiView & lv) { return new GuiMathMatrix(lv); }
+
+
 } // namespace frontend
 } // namespace lyx