QSqlQueryModelPrivate, QPushButtonPrivate and QMenuPrivate cleanup

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

src/gui/widgets/qmenu.cpp

@@ -333,7 +333,7 @@ void QMenuPrivate::updateActionRects(const QRect &screen) const
 
         y += rect.height();
     }
-    itemsDirty = 0;
+    itemsDirty = false;
 }
 
 QSize QMenuPrivate::adjustMenuSizeForScreen(const QRect &screen)
@@ -1699,7 +1699,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     Q_D(QMenu);
     if (d->scroll) { // reset scroll state from last popup
         if (d->scroll->scrollOffset)
-            d->itemsDirty = 1; // sizeHint will be incorrect if there is previous scroll
+            d->itemsDirty = true; // sizeHint will be incorrect if there is previous scroll
         d->scroll->scrollOffset = 0;
         d->scroll->scrollFlags = QMenuPrivate::QMenuScroller::ScrollNone;
     }
@@ -2227,7 +2227,7 @@ void QMenu::changeEvent(QEvent *e)
     Q_D(QMenu);
     if (e->type() == QEvent::StyleChange || e->type() == QEvent::FontChange ||
         e->type() == QEvent::LayoutDirectionChange) {
-        d->itemsDirty = 1;
+        d->itemsDirty = true;
         setMouseTracking(style()->styleHint(QStyle::SH_Menu_MouseTracking, 0, this));
         if (isVisible())
             resize(sizeHint());
@@ -2289,11 +2289,11 @@ QMenu::event(QEvent *e)
         if (style()->styleHint(QStyle::SH_Menu_Mask, &option, this, &menuMask)) {
             setMask(menuMask.region);
         }
-        d->itemsDirty = 1;
+        d->itemsDirty = true;
         d->updateActionRects();
         break; }
     case QEvent::Show:
-        d->mouseDown = 0;
+        d->mouseDown = Q_NULLPTR;
         d->updateActionRects();
         if (d->currentAction)
             d->popupAction(d->currentAction, 0, false);
@@ -2762,7 +2762,7 @@ QMenu::timerEvent(QTimerEvent *e)
 void QMenu::actionEvent(QActionEvent *e)
 {
     Q_D(QMenu);
-    d->itemsDirty = 1;
+    d->itemsDirty = true;
     setAttribute(Qt::WA_Resized, false);
     if (d->tornPopup)
         d->tornPopup->syncWithMenu(this, e);
@@ -2938,7 +2938,7 @@ void QMenu::setSeparatorsCollapsible(bool collapse)
         return;
 
     d->collapsibleSeparators = collapse;
-    d->itemsDirty = 1;
+    d->itemsDirty = true;
     if (isVisible()) {
         d->updateActionRects();
         update();

src/gui/widgets/qmenu_p.h

@@ -73,7 +73,8 @@ class QMenuPrivate : public QWidgetPrivate
     Q_DECLARE_PUBLIC(QMenu)
 public:
     QMenuPrivate() : itemsDirty(0), maxIconWidth(0), tabWidth(0), ncols(0),
-                      collapsibleSeparators(true), activationRecursionGuard(false), hasHadMouse(0), aboutToHide(0), motions(0),
+                      collapsibleSeparators(true), activationRecursionGuard(false),
+                      hasHadMouse(false), aboutToHide(false), motions(0),
                       currentAction(0),
 #ifdef QT_KEYPAD_NAVIGATION
                       selectAction(0),
@@ -93,18 +94,19 @@ public:
     int scrollerHeight() const;
 
     //item calculations
-    mutable uint itemsDirty : 1;
-    mutable uint maxIconWidth, tabWidth;
+    mutable bool itemsDirty;
+    mutable uint maxIconWidth;
+    mutable uint tabWidth;
     QRect actionRect(QAction *) const;
 
     mutable QVector<QRect> actionRects;
-    mutable QHash<QAction *, QWidget *> widgetItems;
+    QHash<QAction *, QWidget *> widgetItems;
     void updateActionRects() const;
     void updateActionRects(const QRect &screen) const;
     QRect popupGeometry(const QWidget *widget) const;
     QRect popupGeometry(int screen = -1) const;
-    mutable uint ncols : 4; //4 bits is probably plenty
-    uint collapsibleSeparators : 1;
+    mutable int ncols;
+    bool collapsibleSeparators;
     QSize adjustMenuSizeForScreen(const QRect & screen);
     int getLastVisibleAction() const;
 
@@ -113,8 +115,8 @@ public:
     //selection
     static QMenu *mouseDown;
     QPoint mousePopupPos;
-    uint hasHadMouse : 1;
-    uint aboutToHide : 1;
+    bool hasHadMouse;
+    bool aboutToHide;
     int motions;
     QAction *currentAction;
 #ifdef QT_KEYPAD_NAVIGATION

src/gui/widgets/qpushbutton.cpp

@@ -342,7 +342,7 @@ void QPushButton::initStyleOption(QStyleOptionButton *option) const
 void QPushButton::setAutoDefault(bool enable)
 {
     Q_D(QPushButton);
-    uint state = enable ? QPushButtonPrivate::On : QPushButtonPrivate::Off;
+    QPushButtonPrivate::AutoDefaultValue state = enable ? QPushButtonPrivate::On : QPushButtonPrivate::Off;
     if (d->autoDefault != QPushButtonPrivate::Auto && d->autoDefault == state)
         return;
     d->autoDefault = state;
@@ -356,7 +356,7 @@ bool QPushButton::autoDefault() const
     Q_D(const QPushButton);
     if(d->autoDefault == QPushButtonPrivate::Auto)
         return ( d->dialogParent() != 0 );
-    return d->autoDefault;
+    return bool(d->autoDefault);
 }
 
 void QPushButton::setDefault(bool enable)
@@ -399,7 +399,6 @@ QSize QPushButton::sizeHint() const
 
     // calculate contents size...
 #ifndef QT_NO_ICON
-
     bool showButtonBoxIcons = qobject_cast<QDialogButtonBox*>(parentWidget())
                           && style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons);
 
@@ -642,7 +641,7 @@ void QPushButton::setFlat(bool flat)
     if (d->flat == flat)
         return;
     d->flat = flat;
-	d->resetLayoutItemMargins();
+    d->resetLayoutItemMargins();
     d->sizeHint = QSize();
     update();
     updateGeometry();

src/gui/widgets/qpushbutton_p.h

@@ -80,11 +80,11 @@ public:
     QDialog *dialogParent() const;
 
     QPointer<QMenu> menu;
-    uint autoDefault : 2;
-    uint defaultButton : 1;
-    uint flat : 1;
-    uint menuOpen : 1;
-    mutable uint lastAutoDefault : 1;
+    AutoDefaultValue autoDefault;
+    bool defaultButton;
+    bool flat;
+    bool menuOpen;
+    mutable bool lastAutoDefault;
 };
 
 QT_END_NAMESPACE

src/sql/models/qsqlquerymodel_p.h

@@ -77,7 +77,7 @@ public:
     mutable QSqlError error;
     QModelIndex bottom;
     QSqlRecord rec;
-    uint atEnd : 1;
+    bool atEnd;
     QVector<QHash<int, QVariant> > headers;
     QVarLengthArray<int, 56> colOffsets; // used to calculate indexInQuery of columns
 };