summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativelist.h
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:55:00 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-27 08:05:55 +0000
commit4f7b6037720b21b8150f8495b7318d139d447541 (patch)
treee5575c217489e7cd4c69da0269eac450b84e418d /src/declarative/qml/qdeclarativelist.h
parent3f8cddf6208eedab70ff481dbefd90b7c1553d39 (diff)
Replace Q_NULLPTR with nullptr
Change-Id: I1d645e10f702288ddd63f35df7c57d66533ffd6f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/declarative/qml/qdeclarativelist.h')
-rw-r--r--src/declarative/qml/qdeclarativelist.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index e5b8d249..71c6ddae 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -56,21 +56,21 @@ public:
typedef void (*ClearFunction)(QDeclarativeListProperty<T> *);
QDeclarativeListProperty()
- : object(Q_NULLPTR),
- data(Q_NULLPTR),
- append(Q_NULLPTR),
- count(Q_NULLPTR),
- at(Q_NULLPTR),
- clear(Q_NULLPTR),
- dummy1(Q_NULLPTR),
- dummy2(Q_NULLPTR)
+ : object(nullptr),
+ data(nullptr),
+ append(nullptr),
+ count(nullptr),
+ at(nullptr),
+ clear(nullptr),
+ dummy1(nullptr),
+ dummy2(nullptr)
{}
QDeclarativeListProperty(QObject *o, QList<T *> &list)
: object(o), data(&list), append(qlist_append), count(qlist_count), at(qlist_at),
- clear(qlist_clear), dummy1(Q_NULLPTR), dummy2(Q_NULLPTR) {}
- QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = Q_NULLPTR,
- AtFunction t = Q_NULLPTR, ClearFunction r = Q_NULLPTR)
- : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(Q_NULLPTR), dummy2(Q_NULLPTR) {}
+ clear(qlist_clear), dummy1(nullptr), dummy2(nullptr) {}
+ QDeclarativeListProperty(QObject *o, void *d, AppendFunction a, CountFunction c = nullptr,
+ AtFunction t = nullptr, ClearFunction r = nullptr)
+ : object(o), data(d), append(a), count(c), at(t), clear(r), dummy1(nullptr), dummy2(nullptr) {}
bool operator==(const QDeclarativeListProperty &o) const {
return object == o.object &&
@@ -116,7 +116,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeListReference
{
public:
QDeclarativeListReference();
- explicit QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = Q_NULLPTR);
+ explicit QDeclarativeListReference(QObject *, const char *property, QDeclarativeEngine * = nullptr);
QDeclarativeListReference(const QDeclarativeListReference &);
QDeclarativeListReference &operator=(const QDeclarativeListReference &);
~QDeclarativeListReference();