QToolBar: fix coverity warnings

I also changed a bit the way the timer for the popup is working

3 files changed, 18 insertions, 27 deletions

diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp
index b635628..3414b4f 100644
--- a/src/gui/widgets/qtoolbar.cpp
+++ b/src/gui/widgets/qtoolbar.cpp
@@ -70,6 +70,8 @@
 
 #include  "qdebug.h"
 
+#define POPUP_TIMER_INTERVAL 500
+
 QT_BEGIN_NAMESPACE
 
 #ifdef Q_WS_MAC
@@ -87,14 +89,6 @@ static void qt_mac_updateToolBarButtonHint(QWidget *parentWidget)
 void QToolBarPrivate::init()
 {
     Q_Q(QToolBar);
-
-    waitForPopupTimer = new QTimer(q);
-    waitForPopupTimer->setSingleShot(false);
-    waitForPopupTimer->setInterval(500);
-    QObject::connect(waitForPopupTimer, SIGNAL(timeout()), q, SLOT(_q_waitForPopup()));
-
-    floatable = true;
-    movable = true;
     q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));
     q->setBackgroundRole(QPalette::Button);
     q->setAttribute(Qt::WA_Hover);
@@ -1086,6 +1080,16 @@ bool QToolBar::event(QEvent *event)
     Q_D(QToolBar);
 
     switch (event->type()) {
+    case QEvent::Timer:
+        if (d->waitForPopupTimer.timerId() == static_cast<QTimerEvent*>(event)->timerId()) {
+            QWidget *w = QApplication::activePopupWidget();
+            if (!waitForPopup(this, w)) {
+                d->waitForPopupTimer.stop();
+                if (!this->underMouse())
+                    d->layout->setExpanded(false);
+            }
+        }
+        break;
     case QEvent::Hide:
         if (!isHidden())
             break;
@@ -1183,11 +1187,11 @@ bool QToolBar::event(QEvent *event)
 
             QWidget *w = QApplication::activePopupWidget();
             if (waitForPopup(this, w)) {
-                d->waitForPopupTimer->start();
+                d->waitForPopupTimer.start(POPUP_TIMER_INTERVAL, this);
                 break;
             }
 
-            d->waitForPopupTimer->stop();
+            d->waitForPopupTimer.stop();
             d->layout->setExpanded(false);
             break;
         }
@@ -1197,18 +1201,6 @@ bool QToolBar::event(QEvent *event)
     return QWidget::event(event);
 }
 
-void QToolBarPrivate::_q_waitForPopup()
-{
-    Q_Q(QToolBar);
-
-    QWidget *w = QApplication::activePopupWidget();
-    if (!waitForPopup(q, w)) {
-        waitForPopupTimer->stop();
-        if (!q->underMouse())
-            layout->setExpanded(false);
-    }
-}
-
 /*!
     Returns a checkable action that can be used to show or hide this
     toolbar.
diff --git a/src/gui/widgets/qtoolbar.h b/src/gui/widgets/qtoolbar.h
index 2ab4ffd..07502b3 100644
--- a/src/gui/widgets/qtoolbar.h
+++ b/src/gui/widgets/qtoolbar.h
@@ -167,7 +167,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_toggleView(bool))
     Q_PRIVATE_SLOT(d_func(), void _q_updateIconSize(const QSize &))
     Q_PRIVATE_SLOT(d_func(), void _q_updateToolButtonStyle(Qt::ToolButtonStyle))
-    Q_PRIVATE_SLOT(d_func(), void _q_waitForPopup())
 
     friend class QMainWindow;
     friend class QMainWindowLayout;
diff --git a/src/gui/widgets/qtoolbar_p.h b/src/gui/widgets/qtoolbar_p.h
index b03c460..42ea97f 100644
--- a/src/gui/widgets/qtoolbar_p.h
+++ b/src/gui/widgets/qtoolbar_p.h
@@ -56,6 +56,7 @@
 #include "qtoolbar.h"
 #include "QtGui/qaction.h"
 #include "private/qwidget_p.h"
+#include <QtCore/qbasictimer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -70,7 +71,7 @@ class QToolBarPrivate : public QWidgetPrivate
 
 public:
     inline QToolBarPrivate()
-        : explicitIconSize(false), explicitToolButtonStyle(false), movable(false),
+        : explicitIconSize(false), explicitToolButtonStyle(false), movable(true), floatable(true),
           allowedAreas(Qt::AllToolBarAreas), orientation(Qt::Horizontal),
           toolButtonStyle(Qt::ToolButtonIconOnly),
           layout(0), state(0)
@@ -84,16 +85,15 @@ public:
     void _q_toggleView(bool b);
     void _q_updateIconSize(const QSize &sz);
     void _q_updateToolButtonStyle(Qt::ToolButtonStyle style);
-    void _q_waitForPopup();
 
     bool explicitIconSize;
     bool explicitToolButtonStyle;
     bool movable;
+    bool floatable;
     Qt::ToolBarAreas allowedAreas;
     Qt::Orientation orientation;
     Qt::ToolButtonStyle toolButtonStyle;
     QSize iconSize;
-    bool floatable;
 
     QAction *toggleViewAction;
 
@@ -125,7 +125,7 @@ public:
     void unplug(const QRect &r);
     void plug(const QRect &r);
 
-    QTimer *waitForPopupTimer;
+    QBasicTimer waitForPopupTimer;
 };
 
 #endif // QT_NO_TOOLBAR