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, 4 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h
index 6298dd9c22..b70bb5253c 100644
--- a/src/qml/qml/qqmlimport_p.h
+++ b/src/qml/qml/qqmlimport_p.h
@@ -92,7 +92,7 @@ struct QQmlImportInstance
 
     bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef &type,
                      int *vmajor, int *vminor, QQmlType* type_return,
-                     QString *base = 0, bool *typeRecursionDetected = 0,
+                     QString *base = nullptr, bool *typeRecursionDetected = nullptr,
                      QQmlType::RegistrationType = QQmlType::AnyRegistrationType,
                      QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion) const;
 };
@@ -100,7 +100,7 @@ struct QQmlImportInstance
 class QQmlImportNamespace
 {
 public:
-    QQmlImportNamespace() : nextNamespace(0) {}
+    QQmlImportNamespace() : nextNamespace(nullptr) {}
     ~QQmlImportNamespace() { qDeleteAll(imports); }
 
     QList<QQmlImportInstance *> imports;
@@ -109,7 +109,7 @@ public:
 
     bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef& type,
                      int *vmajor, int *vminor, QQmlType* type_return,
-                     QString *base = 0, QList<QQmlError> *errors = 0,
+                     QString *base = nullptr, QList<QQmlError> *errors = nullptr,
                      QQmlType::RegistrationType registrationType = QQmlType::AnyRegistrationType,
                      QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion);
 
@@ -137,7 +137,7 @@ public:
                      QQmlType *type_return,
                      int *version_major, int *version_minor,
                      QQmlImportNamespace **ns_return,
-                     QList<QQmlError> *errors = 0,
+                     QList<QQmlError> *errors = nullptr,
                      QQmlType::RegistrationType registrationType = QQmlType::AnyRegistrationType,
                      QQmlImport::RecursionRestriction recursionRestriction
                      = QQmlImport::PreventRecursion) const;