diff options
Diffstat (limited to 'src/qml/qml/qqmlguard_p.h')
| -rw-r--r-- | src/qml/qml/qqmlguard_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlguard_p.h b/src/qml/qml/qqmlguard_p.h index 52526276be..87c3677d29 100644 --- a/src/qml/qml/qqmlguard_p.h +++ b/src/qml/qml/qqmlguard_p.h @@ -113,18 +113,18 @@ Q_DECLARE_METATYPE(QQmlGuard<QObject>) QT_BEGIN_NAMESPACE QQmlGuardImpl::QQmlGuardImpl() -: o(0), next(0), prev(0) +: o(nullptr), next(nullptr), prev(nullptr) { } QQmlGuardImpl::QQmlGuardImpl(QObject *g) -: o(g), next(0), prev(0) +: o(g), next(nullptr), prev(nullptr) { if (o) addGuard(); } QQmlGuardImpl::QQmlGuardImpl(const QQmlGuardImpl &g) -: o(g.o), next(0), prev(0) +: o(g.o), next(nullptr), prev(nullptr) { if (o) addGuard(); } @@ -132,7 +132,7 @@ QQmlGuardImpl::QQmlGuardImpl(const QQmlGuardImpl &g) QQmlGuardImpl::~QQmlGuardImpl() { if (prev) remGuard(); - o = 0; + o = nullptr; } void QQmlGuardImpl::addGuard() @@ -155,8 +155,8 @@ void QQmlGuardImpl::remGuard() if (next) next->prev = prev; *prev = next; - next = 0; - prev = 0; + next = nullptr; + prev = nullptr; } template<class T> |