aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk@kdab.com>2017-10-06 11:38:59 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-11-17 10:05:23 +0000
commit9880acb424fd814501ba5fc4ae1caa989e23fafa (patch)
tree54cc0c66c80b665fed73f215e24893926e2069da /src/imports
parentc44e56715a535ebd9d687b5cb9b7f914e8500af5 (diff)
Replace remaining Q_NULLPTR with nullptr
Change-Id: I28a32af7f1c306a3002d47025a842475f848c1a4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/sharedimage/qsharedimageloader_p.h4
-rw-r--r--src/imports/sharedimage/sharedimageprovider.cpp2
-rw-r--r--src/imports/statemachine/signaltransition.cpp2
-rw-r--r--src/imports/statemachine/signaltransition.h2
-rw-r--r--src/imports/statemachine/timeouttransition.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/sharedimage/qsharedimageloader_p.h b/src/imports/sharedimage/qsharedimageloader_p.h
index 38e2bd4d54..4b0e989c29 100644
--- a/src/imports/sharedimage/qsharedimageloader_p.h
+++ b/src/imports/sharedimage/qsharedimageloader_p.h
@@ -58,10 +58,10 @@ class QSharedImageLoader : public QObject
public:
typedef QVector<QVariant> ImageParameters;
- QSharedImageLoader(QObject *parent = Q_NULLPTR);
+ QSharedImageLoader(QObject *parent = nullptr);
~QSharedImageLoader();
- QImage load(const QString &path, ImageParameters *params = Q_NULLPTR);
+ QImage load(const QString &path, ImageParameters *params = nullptr);
protected:
virtual QImage loadFile(const QString &path, ImageParameters *params);
diff --git a/src/imports/sharedimage/sharedimageprovider.cpp b/src/imports/sharedimage/sharedimageprovider.cpp
index f33057936d..aad6ea3b78 100644
--- a/src/imports/sharedimage/sharedimageprovider.cpp
+++ b/src/imports/sharedimage/sharedimageprovider.cpp
@@ -60,7 +60,7 @@ public:
NumImageParameters
};
- QuickSharedImageLoader(QObject *parent = Q_NULLPTR)
+ QuickSharedImageLoader(QObject *parent = nullptr)
: QSharedImageLoader(parent)
{
}
diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 0f88ec641b..aaf32f6d19 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -54,7 +54,7 @@
#include <private/qqmlboundsignal_p.h>
SignalTransition::SignalTransition(QState *parent)
- : QSignalTransition(this, SIGNAL(invokeYourself()), parent), m_complete(false), m_signalExpression(Q_NULLPTR)
+ : QSignalTransition(this, SIGNAL(invokeYourself()), parent), m_complete(false), m_signalExpression(nullptr)
{
connect(this, SIGNAL(signalChanged()), SIGNAL(qmlSignalChanged()));
}
diff --git a/src/imports/statemachine/signaltransition.h b/src/imports/statemachine/signaltransition.h
index 3b3a7dae79..d7a3b7b618 100644
--- a/src/imports/statemachine/signaltransition.h
+++ b/src/imports/statemachine/signaltransition.h
@@ -59,7 +59,7 @@ class SignalTransition : public QSignalTransition, public QQmlParserStatus
Q_PROPERTY(QQmlScriptString guard READ guard WRITE setGuard NOTIFY guardChanged)
public:
- explicit SignalTransition(QState *parent = Q_NULLPTR);
+ explicit SignalTransition(QState *parent = nullptr);
QQmlScriptString guard() const;
void setGuard(const QQmlScriptString &guard);
diff --git a/src/imports/statemachine/timeouttransition.h b/src/imports/statemachine/timeouttransition.h
index 0e5f5377e3..2fc850fc70 100644
--- a/src/imports/statemachine/timeouttransition.h
+++ b/src/imports/statemachine/timeouttransition.h
@@ -53,7 +53,7 @@ class TimeoutTransition : public QSignalTransition, public QQmlParserStatus
Q_INTERFACES(QQmlParserStatus)
public:
- TimeoutTransition(QState *parent = Q_NULLPTR);
+ TimeoutTransition(QState *parent = nullptr);
~TimeoutTransition();
int timeout() const;