use nullptr consistently (clang-tidy)

From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 11b7c04c52..22be6ba60c 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -323,7 +323,7 @@ public:
 
     inline void readProperty(QObject *target, void *property) const
     {
-        void *args[] = { property, 0 };
+        void *args[] = { property, nullptr };
         readPropertyWithArgs(target, args);
     }
 
@@ -340,7 +340,7 @@ public:
     bool writeProperty(QObject *target, void *value, WriteFlags flags) const
     {
         int status = -1;
-        void *argv[] = { value, 0, &status, &flags };
+        void *argv[] = { value, nullptr, &status, &flags };
         if (flags.testFlag(BypassInterceptor) && hasStaticMetaCallFunction())
             staticMetaCallFunction()(target, QMetaObject::WriteProperty, relativePropertyIndex(), argv);
         else if (flags.testFlag(BypassInterceptor) && isDirect())
@@ -417,7 +417,7 @@ public:
     void appendProperty(const QString &, QQmlPropertyRawData::Flags flags, int coreIndex,
                         int propType, int revision, int notifyIndex);
     void appendSignal(const QString &, QQmlPropertyRawData::Flags, int coreIndex,
-                      const int *types = 0, const QList<QByteArray> &names = QList<QByteArray>());
+                      const int *types = nullptr, const QList<QByteArray> &names = QList<QByteArray>());
     void appendMethod(const QString &, QQmlPropertyData::Flags flags, int coreIndex,
                       const QList<QByteArray> &names = QList<QByteArray>());
     void appendEnum(const QString &, const QVector<QQmlEnumValue> &);
@@ -465,7 +465,7 @@ public:
     static int originalClone(QObject *, int index);
 
     QList<QByteArray> signalParameterNames(int index) const;
-    static QString signalParameterStringForJS(QV4::ExecutionEngine *engine, const QList<QByteArray> &parameterNameList, QString *errorString = 0);
+    static QString signalParameterStringForJS(QV4::ExecutionEngine *engine, const QList<QByteArray> &parameterNameList, QString *errorString = nullptr);
 
     const char *className() const;
 
@@ -739,7 +739,7 @@ inline const QMetaObject *QQmlPropertyCache::metaObject() const
 // QML
 inline const QMetaObject *QQmlPropertyCache::firstCppMetaObject() const
 {
-    while (_parent && (_metaObject == 0 || _ownMetaObject))
+    while (_parent && (_metaObject == nullptr || _ownMetaObject))
         return _parent->firstCppMetaObject();
     return _metaObject;
 }
@@ -747,7 +747,7 @@ inline const QMetaObject *QQmlPropertyCache::firstCppMetaObject() const
 inline QQmlPropertyData *QQmlPropertyCache::property(int index) const
 {
     if (index < 0 || index >= (propertyIndexCacheStart + propertyIndexCache.count()))
-        return 0;
+        return nullptr;
 
     if (index < propertyIndexCacheStart)
         return _parent->property(index);
@@ -759,7 +759,7 @@ inline QQmlPropertyData *QQmlPropertyCache::property(int index) const
 inline QQmlPropertyData *QQmlPropertyCache::method(int index) const
 {
     if (index < 0 || index >= (methodIndexCacheStart + methodIndexCache.count()))
-        return 0;
+        return nullptr;
 
     if (index < methodIndexCacheStart)
         return _parent->method(index);
@@ -775,7 +775,7 @@ inline QQmlPropertyData *QQmlPropertyCache::method(int index) const
 inline QQmlPropertyData *QQmlPropertyCache::signal(int index) const
 {
     if (index < 0 || index >= (signalHandlerIndexCacheStart + signalHandlerIndexCache.count()))
-        return 0;
+        return nullptr;
 
     if (index < signalHandlerIndexCacheStart)
         return _parent->signal(index);
@@ -788,7 +788,7 @@ inline QQmlPropertyData *QQmlPropertyCache::signal(int index) const
 inline QQmlEnumData *QQmlPropertyCache::qmlEnum(int index) const
 {
     if (index < 0 || index >= enumCache.count())
-        return 0;
+        return nullptr;
 
     return const_cast<QQmlEnumData *>(&enumCache.at(index));
 }
@@ -819,7 +819,7 @@ QQmlPropertyData *
 QQmlPropertyCache::overrideData(QQmlPropertyData *data) const
 {
     if (!data->hasOverride())
-        return 0;
+        return nullptr;
 
     if (data->overrideIndexIsProperty())
         return property(data->overrideIndex());
@@ -921,7 +921,7 @@ bool QQmlMetaObject::isNull() const
 const char *QQmlMetaObject::className() const
 {
     if (_m.isNull()) {
-        return 0;
+        return nullptr;
     } else if (_m.isT1()) {
         return _m.asT1()->className();
     } else {
@@ -947,7 +947,7 @@ bool QQmlMetaObject::hasMetaObject() const
 
 const QMetaObject *QQmlMetaObject::metaObject() const
 {
-    if (_m.isNull()) return 0;
+    if (_m.isNull()) return nullptr;
     if (_m.isT1()) return _m.asT1()->createMetaObject();
     else return _m.asT2();
 }