From 6251d4dafc86bcbec09d1962050af9924249d419 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Tue, 30 Jun 2015 22:11:15 +0200
Subject: QtCore: Use Q_NULLPTR instead of 0 in all public headers

This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.

Task-number: QTBUG-45291
Change-Id: I0cc388ef9faf45cbcf425ad0dc77db3060c104a8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/statemachine/qabstractstate.h      | 2 +-
 src/corelib/statemachine/qabstracttransition.h | 2 +-
 src/corelib/statemachine/qeventtransition.h    | 4 ++--
 src/corelib/statemachine/qfinalstate.h         | 2 +-
 src/corelib/statemachine/qhistorystate.h       | 4 ++--
 src/corelib/statemachine/qsignaltransition.h   | 4 ++--
 src/corelib/statemachine/qstate.h              | 4 ++--
 src/corelib/statemachine/qstatemachine.h       | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/corelib/statemachine')

diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h
index 592c841c18..3aa4b2fabb 100644
--- a/src/corelib/statemachine/qabstractstate.h
+++ b/src/corelib/statemachine/qabstractstate.h
@@ -63,7 +63,7 @@ Q_SIGNALS:
     void activeChanged(bool active);
 
 protected:
-    QAbstractState(QState *parent = 0);
+    QAbstractState(QState *parent = Q_NULLPTR);
 
     virtual void onEntry(QEvent *event) = 0;
     virtual void onExit(QEvent *event) = 0;
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index bf32b3e825..0d61ae3f5c 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -67,7 +67,7 @@ public:
     };
     Q_ENUM(TransitionType)
 
-    QAbstractTransition(QState *sourceState = 0);
+    QAbstractTransition(QState *sourceState = Q_NULLPTR);
     virtual ~QAbstractTransition();
 
     QState *sourceState() const;
diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h
index 6909e855b1..5ec3b7bb26 100644
--- a/src/corelib/statemachine/qeventtransition.h
+++ b/src/corelib/statemachine/qeventtransition.h
@@ -49,8 +49,8 @@ class Q_CORE_EXPORT QEventTransition : public QAbstractTransition
     Q_PROPERTY(QObject* eventSource READ eventSource WRITE setEventSource)
     Q_PROPERTY(QEvent::Type eventType READ eventType WRITE setEventType)
 public:
-    QEventTransition(QState *sourceState = 0);
-    QEventTransition(QObject *object, QEvent::Type type, QState *sourceState = 0);
+    QEventTransition(QState *sourceState = Q_NULLPTR);
+    QEventTransition(QObject *object, QEvent::Type type, QState *sourceState = Q_NULLPTR);
     ~QEventTransition();
 
     QObject *eventSource() const;
diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h
index 51c97b1545..2c76e7b6e6 100644
--- a/src/corelib/statemachine/qfinalstate.h
+++ b/src/corelib/statemachine/qfinalstate.h
@@ -46,7 +46,7 @@ class Q_CORE_EXPORT QFinalState : public QAbstractState
 {
     Q_OBJECT
 public:
-    QFinalState(QState *parent = 0);
+    QFinalState(QState *parent = Q_NULLPTR);
     ~QFinalState();
 
 protected:
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h
index 549be15ab0..97ac376688 100644
--- a/src/corelib/statemachine/qhistorystate.h
+++ b/src/corelib/statemachine/qhistorystate.h
@@ -54,8 +54,8 @@ public:
     };
     Q_ENUM(HistoryType)
 
-    QHistoryState(QState *parent = 0);
-    QHistoryState(HistoryType type, QState *parent = 0);
+    QHistoryState(QState *parent = Q_NULLPTR);
+    QHistoryState(HistoryType type, QState *parent = Q_NULLPTR);
     ~QHistoryState();
 
     QAbstractState *defaultState() const;
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h
index bc56f4e9b7..c388323ec4 100644
--- a/src/corelib/statemachine/qsignaltransition.h
+++ b/src/corelib/statemachine/qsignaltransition.h
@@ -49,9 +49,9 @@ class Q_CORE_EXPORT QSignalTransition : public QAbstractTransition
     Q_PROPERTY(QByteArray signal READ signal WRITE setSignal NOTIFY signalChanged)
 
 public:
-    QSignalTransition(QState *sourceState = 0);
+    QSignalTransition(QState *sourceState = Q_NULLPTR);
     QSignalTransition(const QObject *sender, const char *signal,
-                      QState *sourceState = 0);
+                      QState *sourceState = Q_NULLPTR);
     ~QSignalTransition();
 
     QObject *senderObject() const;
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index a74c782027..0300a9ef2d 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -66,8 +66,8 @@ public:
     };
     Q_ENUM(RestorePolicy)
 
-    QState(QState *parent = 0);
-    QState(ChildMode childMode, QState *parent = 0);
+    QState(QState *parent = Q_NULLPTR);
+    QState(ChildMode childMode, QState *parent = Q_NULLPTR);
     ~QState();
 
     QAbstractState *errorState() const;
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index d6c3b7bfa7..5fca034386 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -104,8 +104,8 @@ public:
         NoCommonAncestorForTransitionError
     };
 
-    explicit QStateMachine(QObject *parent = 0);
-    explicit QStateMachine(QState::ChildMode childMode, QObject *parent = 0);
+    explicit QStateMachine(QObject *parent = Q_NULLPTR);
+    explicit QStateMachine(QState::ChildMode childMode, QObject *parent = Q_NULLPTR);
     ~QStateMachine();
 
     void addState(QAbstractState *state);
-- 
cgit v1.2.3