diff options
| -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) |