diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-05 00:03:04 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-07 20:10:22 +0000 |
| commit | 3dd96630a2823ff9723a399c84303f565abce455 (patch) | |
| tree | a1282f7dd2f192387131dce1d9790bd0549b75b7 /src/qml/qml | |
| parent | 485e9fdf486446fb13012debe10137739b96d8ca (diff) | |
headers: Add missing override and remove redundant virtual
Change-Id: Ifa816ebcd79372afca42dbd0dc0ecde006bb688a
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlcontext_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlopenmetaobject_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject_p.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h index 162fbcc8f6..4d2bb72352 100644 --- a/src/qml/qml/qqmlcontext_p.h +++ b/src/qml/qml/qqmlcontext_p.h @@ -197,7 +197,7 @@ public: { inline ContextGuard(); inline ContextGuard &operator=(QObject *obj); - inline void objectDestroyed(QObject *); + inline void objectDestroyed(QObject *) override; inline bool wasSet() const; diff --git a/src/qml/qml/qqmlopenmetaobject_p.h b/src/qml/qml/qqmlopenmetaobject_p.h index 183baec941..4bb92489a5 100644 --- a/src/qml/qml/qqmlopenmetaobject_p.h +++ b/src/qml/qml/qqmlopenmetaobject_p.h @@ -83,7 +83,7 @@ public: protected: virtual void propertyCreated(int, QMetaPropertyBuilder &); - virtual void clear(); + void clear() override; private: QQmlOpenMetaObjectTypePrivate *d; diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index abbbf89ea2..b1d6451974 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -577,8 +577,8 @@ public: void setPriority(int); protected: - virtual void dataReceived(const Data &); - virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*); + void dataReceived(const Data &) override; + void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) override; private: QString m_content; diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h index 9a13e0047d..bb6fede7c8 100644 --- a/src/qml/qml/qqmlvmemetaobject_p.h +++ b/src/qml/qml/qqmlvmemetaobject_p.h @@ -83,7 +83,7 @@ public: inline QQmlVMEVariantQObjectPtr(); inline ~QQmlVMEVariantQObjectPtr(); - inline void objectDestroyed(QObject *); + inline void objectDestroyed(QObject *) override; inline void setGuardedValue(QObject *obj, QQmlVMEMetaObject *target, int index); QQmlVMEMetaObject *m_target; |