diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-20 17:31:18 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-21 12:26:21 +0000 |
| commit | f4f5e857447d42738b1b60b5c4184f39df2f1593 (patch) | |
| tree | cae2e6a223cb48350b9634c0a04b39847ebc4299 /src/controls/qquickstyle.cpp | |
| parent | 7cad85c2f0930e4f8531a0508c28abdae0f3e0de (diff) | |
C++11 keywords
- Q_NULLPTR -> nullptr
- Q_DECL_OVERRIDE -> override
Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickstyle.cpp')
| -rw-r--r-- | src/controls/qquickstyle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/qquickstyle.cpp b/src/controls/qquickstyle.cpp index 7fd6a2f0..6728667e 100644 --- a/src/controls/qquickstyle.cpp +++ b/src/controls/qquickstyle.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool create = false) { if (!object) - return Q_NULLPTR; + return nullptr; int idx = -1; return qobject_cast<QQuickStyle *>(qmlAttachedPropertiesObject(&idx, object, type, create)); } @@ -55,7 +55,7 @@ static QQuickStyle *attachedStyle(const QMetaObject *type, QObject *object, bool static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *parent) { if (!parent) - return Q_NULLPTR; + return nullptr; QQuickStyle *style = attachedStyle(type, parent); if (style) @@ -97,7 +97,7 @@ static QQuickStyle *findParentStyle(const QMetaObject *type, QObject *parent) return style; } - return Q_NULLPTR; + return nullptr; } static QList<QQuickStyle *> findChildStyles(const QMetaObject *type, QObject *object) @@ -165,7 +165,7 @@ QQuickStyle::~QQuickStyle() if (item) QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Parent); - setParentStyle(Q_NULLPTR); + setParentStyle(nullptr); } QSharedPointer<QSettings> QQuickStyle::settings(const QString &group) |