some remnaming

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

diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp
index 71ecc009b4201d09bec881f5f06d61bf2a0a9a65..cca86d5a596b2c071b1d4e846cd74711c0910a15 100644 (file)
--- a/src/frontends/qt4/GuiTabular.cpp
+++ b/src/frontends/qt4/GuiTabular.cpp
@@ -20,8 +20,6 @@
 #include "Validator.h"
 #include "qt_helpers.h"
 
-#include "support/convert.h"
-
 #include <QCloseEvent>
 #include <QCheckBox>
 #include <QPushButton>
@@ -148,9 +146,9 @@ GuiTabularDialog::GuiTabularDialog(LyXView & lv)
 }
 
 
-ControlTabular & GuiTabularDialog::controller() const
+ControlTabular & GuiTabularDialog::controller()
 {
-       return static_cast<ControlTabular &>(Dialog::controller());
+       return static_cast<ControlTabular &>(GuiDialog::controller());
 }
 
 
@@ -162,7 +160,7 @@ void GuiTabularDialog::change_adaptor()
 
 void GuiTabularDialog::closeEvent(QCloseEvent * e)
 {
-       slotWMHide();
+       slotClose();
        e->accept();
 }
 
@@ -600,7 +598,7 @@ void GuiTabularDialog::update_borders()
 }
 
 
-void GuiTabularDialog::update_contents()
+void GuiTabularDialog::updateContents()
 {
        controller().initialiseParams(string());
 
@@ -610,8 +608,8 @@ void GuiTabularDialog::update_contents()
        Tabular::row_type const row = tabular.cellRow(cell);
        Tabular::col_type const col = tabular.cellColumn(cell);
 
-       tabularRowED->setText(toqstr(convert<string>(row + 1)));
-       tabularColumnED->setText(toqstr(convert<string>(col + 1)));
+       tabularRowED->setText(QString::number(row + 1));
+       tabularColumnED->setText(QString::number(col + 1));
 
        bool const multicol(tabular.isMultiColumn(cell));