Replace LString.h with support/std_string.h,

[features.git] / src / frontends / qt2 / QMathMatrixDialog.C

diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C
index 8efea25891b57b945a87d5fc003b6f08cfb468d2..ba11f8baaca2e393d086b5ca8ced45b667d73bcc 100644 (file)
--- a/src/frontends/qt2/QMathMatrixDialog.C
+++ b/src/frontends/qt2/QMathMatrixDialog.C
@@ -5,24 +5,20 @@
  *
  * \author Juergen Spitzmueller
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include "qt_helpers.h"
 
-#include "gettext.h"
-
-#include "support/lstrings.h"
+#include "support/std_sstream.h"
+#include "ControlMath.h"
 
 #include "QMath.h"
 #include "QMathMatrixDialog.h"
 
 #include <qcombobox.h>
-#include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qspinbox.h>
@@ -33,13 +29,13 @@ static char h_align_str[80] = "c";
 static char v_align_c[] = "tcb";
 
 
-QMathMatrixDialog::QMathMatrixDialog(QMath * form)
+QMathMatrixDialog::QMathMatrixDialog(QMathMatrix * form)
        : QMathMatrixDialogBase(0, 0, false, 0),
        form_(form)
 {
-       setCaption(_("LyX: Insert matrix"));
+       setCaption(qt_("LyX: Insert Matrix"));
 
-       table->setMinimumSize(100,100);
+       table->setMinimumSize(100, 100);
        rowsSB->setValue(2);
        columnsSB->setValue(2);
        valignCO->setCurrentItem(1);
@@ -78,14 +74,14 @@ void QMathMatrixDialog::change_adaptor()
 void QMathMatrixDialog::slotOK()
 {
        char const c = v_align_c[valignCO->currentItem()];
-       char const * sh = halignED->text().latin1();
-       int const nx = int(rowsSB->value());
-       int const ny = int(columnsSB->value());
+       string const sh = fromqstr(halignED->text());
+       int const nx = int(columnsSB->value());
+       int const ny = int(rowsSB->value());
 
        ostringstream os;
        os << nx << ' ' << ny << ' ' << c << ' ' << sh;
-       form_->insertMatrix(os.str().c_str());
-       
+       form_->controller().dispatchMatrix(os.str().c_str());
+
        // close the dialog
        close();
 }