small cleanup: we don't need to store the funcrequest

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13980 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/InsertTableWidget.C b/src/frontends/qt4/InsertTableWidget.C
index 94c61aa2eb4230aeebb44bd95bf5ff49d7946705..270bf3820e833cc586d13d25f744376e51689124 100644 (file)
--- a/src/frontends/qt4/InsertTableWidget.C
+++ b/src/frontends/qt4/InsertTableWidget.C
@@ -31,8 +31,8 @@
 namespace lyx {\r
 namespace frontend {\r
 \r
-InsertTableWidget::InsertTableWidget(LyXView & lyxView, FuncRequest const & func, QWidget * parent)\r
-       : QWidget(parent, Qt::Popup), colwidth_(20), rowheight_(12), lyxView_(lyxView), func_(func)\r
+InsertTableWidget::InsertTableWidget(LyXView & lyxView, QWidget * parent)\r
+       : QWidget(parent, Qt::Popup), colwidth_(20), rowheight_(12), lyxView_(lyxView)\r
 {\r
        init();\r
        setMouseTracking(true);\r
@@ -93,11 +93,11 @@ void InsertTableWidget::mouseMoveEvent(QMouseEvent * event)
                resetGeometry();\r
        }\r
 \r
-       if (bottom_ != b0 || right_ != r0)\r
+       if (bottom_ != b0 || right_ != r0) {\r
                update();\r
-\r
-       QString status = QString("%1x%2").arg(bottom_).arg(right_);\r
-       QToolTip::showText(event->globalPos(), status , this); \r
+               QString status = QString("%1x%2").arg(bottom_).arg(right_);\r
+               QToolTip::showText(event->globalPos(), status , this);\r
+       }\r
 }\r
 \r
 \r
@@ -166,8 +166,8 @@ void InsertTableWidget::drawGrid(int const rows, int const cols, Qt::GlobalColor
 \r
 void InsertTableWidget::updateParent()\r
 {\r
-       FuncStatus const status = lyxView_.getLyXFunc().getStatus(func_);\r
-       parentWidget()->setEnabled(status.enabled());\r
+       bool status = lyxView_.getLyXFunc().getStatus(FuncRequest(LFUN_TABULAR_INSERT)).enabled();\r
+       parentWidget()->setEnabled(status);\r
 }\r
 \r
 \r

diff --git a/src/frontends/qt4/InsertTableWidget.h b/src/frontends/qt4/InsertTableWidget.h
index e3fc0f553d2e4e448e17f7c66af63e535a025ef8..c055048290aef0b6fc8963e2b26b0b81995aba67 100644 (file)
--- a/src/frontends/qt4/InsertTableWidget.h
+++ b/src/frontends/qt4/InsertTableWidget.h
@@ -26,7 +26,7 @@ class InsertTableWidget : public QWidget {
        Q_OBJECT\r
 public:\r
 \r
-       InsertTableWidget(LyXView &, FuncRequest const &, QWidget *);\r
+       InsertTableWidget(LyXView &, QWidget *);\r
 \r
 signals:\r
        //! widget is visible\r
@@ -64,8 +64,6 @@ private:
        int bottom_;\r
        //! column of pointer\r
        int right_;     \r
-       //! the tabular_insert funcrequest\r
-       FuncRequest const & func_ ;\r
        //! the lyxview we need to dispatch the funcrequest\r
        LyXView & lyxView_;\r
        //! widget under mouse\r

diff --git a/src/frontends/qt4/QLToolbar.C b/src/frontends/qt4/QLToolbar.C
index 945edbe796f2211de0fd4bfd7cd32f679718b446..f1d10affe324ca256333e549564baaf694cd4e90 100644 (file)
--- a/src/frontends/qt4/QLToolbar.C
+++ b/src/frontends/qt4/QLToolbar.C
@@ -241,7 +241,7 @@ void QLToolbar::add(FuncRequest const & func, string const & tooltip)
                tb->setIcon(QPixmap(toqstr(toolbarbackend.getIcon(func))));
                tb->setToolTip(toqstr(tooltip));
                tb->setFocusPolicy(Qt::NoFocus);
-               InsertTableWidget * iv = new InsertTableWidget(owner_, func, tb);
+               InsertTableWidget * iv = new InsertTableWidget(owner_, tb);
                connect(tb, SIGNAL(toggled(bool)), iv, SLOT(show(bool)));
                connect(iv, SIGNAL(visible(bool)), tb, SLOT(setChecked(bool)));
                connect(this, SIGNAL(updated()), iv, SLOT(updateParent()));