From 644a082c7a33ab38ba2d15ab34f819673ce98c8d Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Fri, 7 Jun 2019 14:05:37 +0000
Subject: [PATCH] QToolButtonPrivate cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 src/gui/widgets/qtoolbutton.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp
index bcb39b55a..271050bd1 100644
--- a/src/gui/widgets/qtoolbutton.cpp
+++ b/src/gui/widgets/qtoolbutton.cpp
@@ -66,6 +66,12 @@ class QToolButtonPrivate : public QAbstractButtonPrivate
 {
     Q_DECLARE_PUBLIC(QToolButton)
 public:
+    enum ButtonPressed {
+        NoButtonPressed = 0,
+        MenuButtonPressed = 1,
+        ToolButtonPressed = 2
+    };
+
     void init();
 #ifndef QT_NO_MENU
     void _q_buttonPressed();
@@ -84,11 +90,10 @@ public:
     Qt::ArrowType arrowType;
     Qt::ToolButtonStyle toolButtonStyle;
     QToolButton::ToolButtonPopupMode popupMode;
-    enum { NoButtonPressed=0, MenuButtonPressed=1, ToolButtonPressed=2 };
-    uint buttonPressed : 2;
-    uint menuButtonDown          : 1;
-    uint autoRaise             : 1;
-    uint repeat                : 1;
+    ButtonPressed buttonPressed;
+    bool menuButtonDown;
+    bool autoRaise;
+    bool repeat;
     QAction *defaultAction;
 #ifndef QT_NO_MENU
     bool hasMenu() const;
-- 
2.11.0