diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-10 13:56:15 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-02-11 09:28:20 +0000 |
commit | 307cd0ed678b37395f02bfb11fd58f8d000da6af (patch) | |
tree | eb2fdf18b166baf5ea0a61ea0ce6315a430e209d | |
parent | 2d13c604e38ff145bd10aaca40bdea2e5e0b0522 (diff) |
Add more override.
Amending change b8b8c1d6e2dd087fb6bd7886b294c60a90b8560e.
Task-number: QTBUG-50804
Change-Id: I0a2efaa8d7c424169ae972a91800a00d34bcb1a2
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r-- | src/activeqt/container/qaxselect.cpp | 6 | ||||
-rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 26 | ||||
-rw-r--r-- | src/activeqt/control/qaxfactory.h | 12 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp index b091b1c..0b40e78 100644 --- a/src/activeqt/container/qaxselect.cpp +++ b/src/activeqt/container/qaxselect.cpp @@ -209,9 +209,9 @@ public: std::sort(m_controls.begin(), m_controls.end()); } - int rowCount(const QModelIndex & = QModelIndex()) const { return m_controls.count(); } - QVariant data(const QModelIndex &index, int role) const; - Qt::ItemFlags flags(const QModelIndex &index) const; + int rowCount(const QModelIndex & = QModelIndex()) const override { return m_controls.count(); } + QVariant data(const QModelIndex &index, int role) const override ; + Qt::ItemFlags flags(const QModelIndex &index) const override ; private: QList<Control> m_controls; diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index ae3e3e1..f85e2c9 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -111,11 +111,11 @@ public: QAxHostWidget(QWidget *parent, QAxClientSite *ax); ~QAxHostWidget(); - QSize sizeHint() const; - QSize minimumSizeHint() const; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; - int qt_metacall(QMetaObject::Call, int isignal, void **argv); - void* qt_metacast(const char *clname); + int qt_metacall(QMetaObject::Call, int isignal, void **argv) override; + void *qt_metacast(const char *clname) override; inline QAxClientSite *clientSite() const { @@ -125,15 +125,15 @@ public: QWindow *hostWindow() const; protected: - bool nativeEvent(const QByteArray &eventType, void *message, long *result); - bool event(QEvent *e); - bool eventFilter(QObject *o, QEvent *e); - void resizeEvent(QResizeEvent *e); - void focusInEvent(QFocusEvent *e); - void focusOutEvent(QFocusEvent *e); - void paintEvent(QPaintEvent *e); - void showEvent(QShowEvent *e); - QPaintEngine* paintEngine() const + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; + bool event(QEvent *e) override; + bool eventFilter(QObject *o, QEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void showEvent(QShowEvent *e) override; + QPaintEngine *paintEngine() const override { return 0; } diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h index e5745f8..9ee9a10 100644 --- a/src/activeqt/control/qaxfactory.h +++ b/src/activeqt/control/qaxfactory.h @@ -139,37 +139,37 @@ inline bool QAxFactory::stopServer() public: \ QAxDefaultFactory(const QUuid &app, const QUuid &lib) \ : QAxFactory(app, lib), className(QLatin1String(#Class)) {} \ - QStringList featureList() const \ + QStringList featureList() const override \ { \ QStringList list; \ list << className; \ return list; \ } \ - const QMetaObject *metaObject(const QString &key) const \ + const QMetaObject *metaObject(const QString &key) const override \ { \ if (key == className) \ return &Class::staticMetaObject; \ return 0; \ } \ - QObject *createObject(const QString &key) \ + QObject *createObject(const QString &key) override \ { \ if (key == className) \ return new Class(0); \ return 0; \ } \ - QUuid classID(const QString &key) const \ + QUuid classID(const QString &key) const override \ { \ if (key == className) \ return QUuid(IIDClass); \ return QUuid(); \ } \ - QUuid interfaceID(const QString &key) const \ + QUuid interfaceID(const QString &key) const override \ { \ if (key == className) \ return QUuid(IIDInterface); \ return QUuid(); \ } \ - QUuid eventsID(const QString &key) const \ + QUuid eventsID(const QString &key) const override \ { \ if (key == className) \ return QUuid(IIDEvents); \ |