QGraphicsProxyWidgetPrivate cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/graphicsview/qgraphicsproxywidget_p.h b/src/gui/graphicsview/qgraphicsproxywidget_p.h
index eb62f18..3850647 100644 (file)
--- a/src/gui/graphicsview/qgraphicsproxywidget_p.h
+++ b/src/gui/graphicsview/qgraphicsproxywidget_p.h
@@ -57,7 +57,7 @@ class QGraphicsProxyWidgetPrivate : public QGraphicsWidgetPrivate
     Q_DECLARE_PUBLIC(QGraphicsProxyWidget)
 public:
     QGraphicsProxyWidgetPrivate()
-        : dragDropWidget(0),
+        : dragDropWidget(Q_NULLPTR),
           posChangeMode(NoMode),
           sizeChangeMode(NoMode),
           visibleChangeMode(NoMode),
@@ -65,7 +65,8 @@ public:
           styleChangeMode(NoMode),
           paletteChangeMode(NoMode),
           tooltipChangeMode(NoMode),
-          focusFromWidgetToProxy(0)
+          focusFromWidgetToProxy(false),
+          proxyIsGivingFocus(false)
     { }
     void init();
     void sendWidgetMouseEvent(QGraphicsSceneMouseEvent *event);
@@ -99,15 +100,15 @@ public:
         ProxyToWidgetMode,
         WidgetToProxyMode
     };
-    quint32 posChangeMode : 2;
-    quint32 sizeChangeMode : 2;
-    quint32 visibleChangeMode : 2;
-    quint32 enabledChangeMode : 2;
-    quint32 styleChangeMode : 2;
-    quint32 paletteChangeMode : 2;
-    quint32 tooltipChangeMode : 2;
-    quint32 focusFromWidgetToProxy : 1;
-    quint32 proxyIsGivingFocus : 1;
+    ChangeMode posChangeMode;
+    ChangeMode sizeChangeMode;
+    ChangeMode visibleChangeMode;
+    ChangeMode enabledChangeMode;
+    ChangeMode styleChangeMode;
+    ChangeMode paletteChangeMode;
+    ChangeMode tooltipChangeMode;
+    bool focusFromWidgetToProxy;
+    bool proxyIsGivingFocus;
 };
 
 QT_END_NAMESPACE

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 24fb0a3..37ffbc0 100644 (file)
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -5652,9 +5652,9 @@ void QWidget::setFocus(Qt::FocusReason reason)
     // Update proxy state
     if (QWExtra *topData = window()->d_func()->extra) {
         if (topData->proxyWidget && !topData->proxyWidget->hasFocus()) {
-            topData->proxyWidget->d_func()->focusFromWidgetToProxy = 1;
+            topData->proxyWidget->d_func()->focusFromWidgetToProxy = true;
             topData->proxyWidget->setFocus(reason);
-            topData->proxyWidget->d_func()->focusFromWidgetToProxy = 0;
+            topData->proxyWidget->d_func()->focusFromWidgetToProxy = false;
         }
     }
 #endif