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/imports/controls/universal/qquickuniversalprogressring_p.h | |
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/imports/controls/universal/qquickuniversalprogressring_p.h')
-rw-r--r-- | src/imports/controls/universal/qquickuniversalprogressring_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/controls/universal/qquickuniversalprogressring_p.h b/src/imports/controls/universal/qquickuniversalprogressring_p.h index 1d484e3a..f32beb54 100644 --- a/src/imports/controls/universal/qquickuniversalprogressring_p.h +++ b/src/imports/controls/universal/qquickuniversalprogressring_p.h @@ -60,7 +60,7 @@ class QQuickUniversalProgressRing : public QQuickItem Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL) public: - QQuickUniversalProgressRing(QQuickItem *parent = Q_NULLPTR); + QQuickUniversalProgressRing(QQuickItem *parent = nullptr); int count() const; void setCount(int count); @@ -73,7 +73,7 @@ Q_SIGNALS: void colorChanged(); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: int m_count; @@ -85,11 +85,11 @@ class QQuickUniversalProgressRingAnimator : public QQuickAnimator Q_OBJECT public: - QQuickUniversalProgressRingAnimator(QObject *parent = Q_NULLPTR); + QQuickUniversalProgressRingAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE |