diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-05 13:30:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-05 12:37:22 +0000 |
| commit | fbff938b52051aa9198b4234a0816dd91703a696 (patch) | |
| tree | 5e932e38306fef3b4646422f410ba20cdbcac187 | |
| parent | cb991e69c04726fb46ec8c03d966dcbf159e2fe0 (diff) | |
Add missing override declarations.
Task-number: QTBUG-50804
Change-Id: I4a926cc80341ecfb4919e72f9a5b9a0c15b0d9dd
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| -rw-r--r-- | src/activeqt/container/qaxobject.h | 4 | ||||
| -rw-r--r-- | src/activeqt/container/qaxwidget.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h index fd18c98..5c62303 100644 --- a/src/activeqt/container/qaxobject.h +++ b/src/activeqt/container/qaxobject.h @@ -50,8 +50,8 @@ class QAxObject : public QObject, public QAxBase friend class QAxEventSink; Q_OBJECT_FAKE public: - QObject* qObject() const { return (QObject*)this; } - const char *className() const; + QObject* qObject() const Q_DECL_OVERRIDE { return static_cast<QObject *>(const_cast<QAxObject *>(this)); } + const char *className() const Q_DECL_OVERRIDE; QAxObject(QObject *parent = 0); QAxObject(const QString &c, QObject *parent = 0); diff --git a/src/activeqt/container/qaxwidget.h b/src/activeqt/container/qaxwidget.h index 4792d0e..2cfa37f 100644 --- a/src/activeqt/container/qaxwidget.h +++ b/src/activeqt/container/qaxwidget.h @@ -73,7 +73,7 @@ public: virtual QAxAggregated *createAggregate(); protected: - bool initialize(IUnknown**); + bool initialize(IUnknown **) Q_DECL_OVERRIDE; virtual bool createHostWindow(bool); bool createHostWindow(bool, const QByteArray&); @@ -89,7 +89,7 @@ private: QAxClientSite *container; QAxWidgetPrivate *d; - const QMetaObject *parentMetaObject() const; + const QMetaObject *parentMetaObject() const Q_DECL_OVERRIDE; }; template <> inline QAxWidget *qobject_cast<QAxWidget*>(const QObject *o) |