C++11 keywords

- Q_NULLPTR -> nullptr
- Q_DECL_OVERRIDE -> override

Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 48e7ca37..b9236216 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -143,7 +143,7 @@ public:
     Q_ENUM(Color)
     Q_ENUM(Shade)
 
-    explicit QQuickMaterialStyle(QObject *parent = Q_NULLPTR);
+    explicit QQuickMaterialStyle(QObject *parent = nullptr);
 
     static QQuickMaterialStyle *qmlAttachedProperties(QObject *object);
 
@@ -202,7 +202,7 @@ Q_SIGNALS:
     void paletteChanged();
 
 protected:
-    void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) Q_DECL_OVERRIDE;
+    void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) override;
 
 private:
     void init();