From cc2bd9708b4134dcc04d0d84685622b113c0056a Mon Sep 17 00:00:00 2001
From: Anton Kudryavtsev <a.kudryavtsev@netris.ru>
Date: Fri, 7 Oct 2016 14:48:46 +0300
Subject: Qml: add missing 'override'

... and drop redundant 'virtual'

Change-Id: Ib1f68c1ebd0468cb4a77eecc986bbf718f6bf789
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/qml/qml/ftw/qqmlthread.cpp |  6 +++---
 src/qml/qml/ftw/qqmlthread_p.h | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/qml/qml/ftw')

diff --git a/src/qml/qml/ftw/qqmlthread.cpp b/src/qml/qml/ftw/qqmlthread.cpp
index 1523817c9e..ffa6e29290 100644
--- a/src/qml/qml/ftw/qqmlthread.cpp
+++ b/src/qml/qml/ftw/qqmlthread.cpp
@@ -55,7 +55,7 @@ public:
     QQmlThreadPrivate(QQmlThread *);
     QQmlThread *q;
 
-    virtual void run();
+    void run() override;
 
     inline void lock() { _mutex.lock(); }
     inline void unlock() { _mutex.unlock(); }
@@ -81,12 +81,12 @@ public:
     void threadEvent();
 
 protected:
-    virtual bool event(QEvent *);
+    bool event(QEvent *) override;
 
 private:
     struct MainObject : public QObject {
         MainObject(QQmlThreadPrivate *p);
-        virtual bool event(QEvent *e);
+        bool event(QEvent *e) override;
         QQmlThreadPrivate *p;
     };
     MainObject m_mainObject;
diff --git a/src/qml/qml/ftw/qqmlthread_p.h b/src/qml/qml/ftw/qqmlthread_p.h
index 9f180b1f14..295235e255 100644
--- a/src/qml/qml/ftw/qqmlthread_p.h
+++ b/src/qml/qml/ftw/qqmlthread_p.h
@@ -142,7 +142,7 @@ void QQmlThread::callMethodInThread(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -157,7 +157,7 @@ void QQmlThread::callMethodInThread(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -173,7 +173,7 @@ void QQmlThread::callMethodInThread(void (O::*Member)(V, V2), const T &arg, cons
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
@@ -187,7 +187,7 @@ void QQmlThread::callMethodInMain(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -202,7 +202,7 @@ void QQmlThread::callMethodInMain(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -218,7 +218,7 @@ void QQmlThread::callMethodInMain(void (O::*Member)(V, V2), const T &arg, const
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
@@ -232,7 +232,7 @@ void QQmlThread::postMethodToThread(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -247,7 +247,7 @@ void QQmlThread::postMethodToThread(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -263,7 +263,7 @@ void QQmlThread::postMethodToThread(void (O::*Member)(V, V2), const T &arg, cons
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
@@ -277,7 +277,7 @@ void QQmlThread::postMethodToMain(void (O::*Member)())
     struct I : public Message {
         void (O::*Member)();
         I(void (O::*Member)()) : Member(Member) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)();
         }
@@ -292,7 +292,7 @@ void QQmlThread::postMethodToMain(void (O::*Member)(V), const T &arg)
         void (O::*Member)(V);
         T arg;
         I(void (O::*Member)(V), const T &arg) : Member(Member), arg(arg) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg);
         }
@@ -308,7 +308,7 @@ void QQmlThread::postMethodToMain(void (O::*Member)(V, V2), const T &arg, const
         T arg;
         T2 arg2;
         I(void (O::*Member)(V, V2), const T &arg, const T2 &arg2) : Member(Member), arg(arg), arg2(arg2) {}
-        virtual void call(QQmlThread *thread) {
+        void call(QQmlThread *thread) override {
             O *me = static_cast<O *>(thread);
             (me->*Member)(arg, arg2);
         }
-- 
cgit v1.2.3