Replace Q_DECL_OVERRIDE with override

Change-Id: I176f91a8c51e81a2df3fe91733118261491223ee
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 15 insertions, 15 deletions

diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 14ead56740..5f8d2b94d3 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -398,7 +398,7 @@ public:
         return QMatrix4x4(matVals);
     }
 
-    const QMetaObject *getMetaObjectForMetaType(int type) Q_DECL_OVERRIDE
+    const QMetaObject *getMetaObjectForMetaType(int type) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -422,7 +422,7 @@ public:
         return 0;
     }
 
-    bool init(int type, QVariant& dst) Q_DECL_OVERRIDE
+    bool init(int type, QVariant& dst) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -452,7 +452,7 @@ public:
         return false;
     }
 
-    bool create(int type, int argc, const void *argv[], QVariant *v) Q_DECL_OVERRIDE
+    bool create(int type, int argc, const void *argv[], QVariant *v) override
     {
         switch (type) {
         case QMetaType::QFont: // must specify via js-object.
@@ -519,7 +519,7 @@ public:
         return true;
     }
 
-    bool createFromString(int type, const QString &s, void *data, size_t dataSize) Q_DECL_OVERRIDE
+    bool createFromString(int type, const QString &s, void *data, size_t dataSize) override
     {
         bool ok = false;
 
@@ -542,7 +542,7 @@ public:
         return false;
     }
 
-    bool createStringFrom(int type, const void *data, QString *s) Q_DECL_OVERRIDE
+    bool createStringFrom(int type, const void *data, QString *s) override
     {
         if (type == QMetaType::QColor) {
             const QColor *color = reinterpret_cast<const QColor *>(data);
@@ -553,7 +553,7 @@ public:
         return false;
     }
 
-    bool variantFromString(const QString &s, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromString(const QString &s, QVariant *v) override
     {
         QColor c(s);
         if (c.isValid()) {
@@ -596,7 +596,7 @@ public:
         return false;
     }
 
-    bool variantFromString(int type, const QString &s, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromString(int type, const QString &s, QVariant *v) override
     {
         bool ok = false;
 
@@ -639,7 +639,7 @@ public:
         return false;
     }
 
-    bool variantFromJsObject(int type, QQmlV4Handle object, QV4::ExecutionEngine *v4, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromJsObject(int type, QQmlV4Handle object, QV4::ExecutionEngine *v4, QVariant *v) override
     {
         QV4::Scope scope(v4);
 #ifndef QT_NO_DEBUG
@@ -665,7 +665,7 @@ public:
         return (*(reinterpret_cast<const T *>(lhs)) == rhs.value<T>());
     }
 
-    bool equal(int type, const void *lhs, const QVariant &rhs) Q_DECL_OVERRIDE
+    bool equal(int type, const void *lhs, const QVariant &rhs) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -698,7 +698,7 @@ public:
         return true;
     }
 
-    bool store(int type, const void *src, void *dst, size_t dstSize) Q_DECL_OVERRIDE
+    bool store(int type, const void *src, void *dst, size_t dstSize) override
     {
         Q_UNUSED(dstSize);
         switch (type) {
@@ -728,7 +728,7 @@ public:
         return true;
     }
 
-    bool read(const QVariant &src, void *dst, int dstType) Q_DECL_OVERRIDE
+    bool read(const QVariant &src, void *dst, int dstType) override
     {
         switch (dstType) {
         case QMetaType::QColor:
@@ -762,7 +762,7 @@ public:
         return false;
     }
 
-    bool write(int type, const void *src, QVariant& dst) Q_DECL_OVERRIDE
+    bool write(int type, const void *src, QVariant& dst) override
     {
         switch (type) {
         case QMetaType::QColor:
diff --git a/src/quick/util/qquickshortcut_p.h b/src/quick/util/qquickshortcut_p.h
index db918058b2..be76764e5f 100644
--- a/src/quick/util/qquickshortcut_p.h
+++ b/src/quick/util/qquickshortcut_p.h
@@ -106,9 +106,9 @@ Q_SIGNALS:
     void activatedAmbiguously();
 
 protected:
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
-    bool event(QEvent *event) Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
+    bool event(QEvent *event) override;
 
     struct Shortcut {
         Shortcut() : id(0) { }