From ece0c0a5e7e0b18beb58ccd868bde54c7be64f78 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Fri, 22 Nov 2019 14:46:58 +0100
Subject: Tidy nullptr usage

Move away from using 0 as pointer literal.

Done using clang-tidy. This is not complete as
run-clang-tidy can't handle all of qtbase in one go.

Change-Id: I1076a21f32aac0dab078af6f175f7508145eece0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/widgets/qtoolbutton.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/widgets/widgets/qtoolbutton.cpp')

diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index b00b219386..263fe5d8ce 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -202,7 +202,7 @@ QToolButton::QToolButton(QWidget * parent)
 void QToolButtonPrivate::init()
 {
     Q_Q(QToolButton);
-    defaultAction = 0;
+    defaultAction = nullptr;
 #if QT_CONFIG(toolbar)
     if (qobject_cast<QToolBar*>(parent))
         autoRaise = true;
@@ -227,7 +227,7 @@ void QToolButtonPrivate::init()
 #endif
 
     setLayoutItemMargins(QStyle::SE_ToolButtonLayoutItem);
-    delay = q->style()->styleHint(QStyle::SH_ToolButton_PopupDelay, 0, q);
+    delay = q->style()->styleHint(QStyle::SH_ToolButton_PopupDelay, nullptr, q);
 }
 
 /*!
@@ -477,10 +477,10 @@ void QToolButton::actionEvent(QActionEvent *event)
         break;
     case QEvent::ActionRemoved:
         if (d->defaultAction == action)
-            d->defaultAction = 0;
+            d->defaultAction = nullptr;
 #if QT_CONFIG(menu)
         if (action == d->menuAction)
-            d->menuAction = 0;
+            d->menuAction = nullptr;
 #endif
         action->disconnect(this);
         break;
@@ -583,7 +583,7 @@ void QToolButton::changeEvent(QEvent *e)
                || e->type() == QEvent::MacSizeChange
 #endif
                ) {
-        d->delay = style()->styleHint(QStyle::SH_ToolButton_PopupDelay, 0, this);
+        d->delay = style()->styleHint(QStyle::SH_ToolButton_PopupDelay, nullptr, this);
         d->setLayoutItemMargins(QStyle::SE_ToolButtonLayoutItem);
     }
 #endif
@@ -649,7 +649,7 @@ void QToolButton::setMenu(QMenu* menu)
 {
     Q_D(QToolButton);
 
-    if (d->menuAction == (menu ? menu->menuAction() : 0))
+    if (d->menuAction == (menu ? menu->menuAction() : nullptr))
         return;
 
     if (d->menuAction)
@@ -659,7 +659,7 @@ void QToolButton::setMenu(QMenu* menu)
         d->menuAction = menu->menuAction();
         addAction(d->menuAction);
     } else {
-        d->menuAction = 0;
+        d->menuAction = nullptr;
     }
 
     // changing the menu set may change the size hint, so reset it
-- 
cgit v1.2.3