more cleanup: some formatting and handle mouse events in their event handlers (and...

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

diff --git a/src/frontends/qt4/InsertTableWidget.C b/src/frontends/qt4/InsertTableWidget.C
index 270bf3820e833cc586d13d25f744376e51689124..319e6fd22722a1a2877493f855f868dc1101205f 100644 (file)
--- a/src/frontends/qt4/InsertTableWidget.C
+++ b/src/frontends/qt4/InsertTableWidget.C
@@ -16,7 +16,6 @@
 #include "FuncStatus.h"\r
 #include "funcrequest.h"\r
 #include "LyXView.h"\r
-#include "debug.h"\r
 \r
 #include "qt_helpers.h"\r
 \r
@@ -25,7 +24,6 @@
 #include <QString>\r
 #include <QToolTip>\r
 #include <QPainter>\r
-#include <QCoreApplication>\r
 \r
 \r
 namespace lyx {\r
@@ -75,13 +73,17 @@ void InsertTableWidget::mouseMoveEvent(QMouseEvent * event)
        // do this ourselves because when the mouse leaves the app\r
        // we get an enter event (ie underMouse() is true)!!\r
        underMouse_ = geometry().contains(event->globalPos());\r
-       if (!underMouse_)\r
+       if (!underMouse_) {\r
+               bottom_ = 0;\r
+               right_ = 0;\r
+               update();\r
                return;\r
+       }\r
 \r
        int const r0 = right_;\r
        int const b0 = bottom_;\r
-       right_ = event->x()/colwidth_ + 1;\r
-       bottom_ = event->y()/rowheight_ + 1;\r
+       right_ = event->x() / colwidth_ + 1;\r
+       bottom_ = event->y() / rowheight_ + 1;\r
 \r
        if (bottom_ == rows_) {\r
                ++rows_;\r
@@ -95,41 +97,12 @@ void InsertTableWidget::mouseMoveEvent(QMouseEvent * event)
 \r
        if (bottom_ != b0 || right_ != r0) {\r
                update();\r
-               QString status = QString("%1x%2").arg(bottom_).arg(right_);\r
+               QString const status = QString("%1x%2").arg(bottom_).arg(right_);\r
                QToolTip::showText(event->globalPos(), status , this);\r
        }\r
 }\r
 \r
 \r
-bool InsertTableWidget::event(QEvent * event)\r
-{\r
-       switch (event->type()) {\r
-       case QEvent::MouseMove: {\r
-               QMouseEvent * me = dynamic_cast<QMouseEvent *>(event);\r
-               mouseMoveEvent(me);\r
-               return true;\r
-               }\r
-       case QEvent::MouseButtonRelease: {\r
-               QMouseEvent * me = dynamic_cast<QMouseEvent *>(event);\r
-               mouseReleaseEvent(me);\r
-               return true;\r
-               }\r
-       case QEvent::MouseButtonPress: {\r
-               // swallow this one...\r
-               return true;\r
-               }\r
-       case QEvent::Leave: {\r
-               bottom_ = 0;\r
-               right_ = 0;\r
-               update();\r
-               return true;\r
-               }\r
-       default:\r
-               return QWidget::event(event);\r
-       }\r
-}\r
-\r
-\r
 void InsertTableWidget::mouseReleaseEvent(QMouseEvent * event)\r
 {\r
        if (underMouse_) {\r
@@ -141,6 +114,12 @@ void InsertTableWidget::mouseReleaseEvent(QMouseEvent * event)
 }\r
 \r
 \r
+void InsertTableWidget::mousePressEvent(QMouseEvent * event)\r
+{\r
+       // swallow this one\r
+}\r
+\r
+\r
 void InsertTableWidget::paintEvent(QPaintEvent * event)\r
 {\r
        drawGrid(rows_, cols_, Qt::white);\r

diff --git a/src/frontends/qt4/InsertTableWidget.h b/src/frontends/qt4/InsertTableWidget.h
index c055048290aef0b6fc8963e2b26b0b81995aba67..176ed9541727c788bf7709a1a5aaddb1b83c6d1f 100644 (file)
--- a/src/frontends/qt4/InsertTableWidget.h
+++ b/src/frontends/qt4/InsertTableWidget.h
@@ -16,8 +16,6 @@
 #include "frontends/LyXView.h"\r
 #include <QWidget>\r
 \r
-class QSize;\r
-\r
 namespace lyx {\r
 namespace frontend {\r
 \r
@@ -39,9 +37,9 @@ public slots:
        void updateParent();\r
 \r
 protected slots:\r
-       bool event(QEvent *);\r
        void mouseMoveEvent(QMouseEvent *);\r
        void mouseReleaseEvent(QMouseEvent *);\r
+       void mousePressEvent(QMouseEvent *);\r
        void paintEvent(QPaintEvent *);\r
        \r
 private:\r