diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 11:37:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 10:48:29 +0000 |
| commit | 0683bbc67ccd5ad5d3a4c8afc6ed968b473bd2d3 (patch) | |
| tree | 2c04bfcb4c4075ec7b54e5cf2fc812c2fe618ea6 /src | |
| parent | 2f8dcdf93cb2a6156d461679d8eecd9cc4a152f8 (diff) | |
Fix remaining Q_DECL_OVERRIDE instances
Change-Id: I512ea5a6c8cf2928b276af7f83f00a1df5879595
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.h | 2 | ||||
| -rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp index 03904659f5..eb75a29ca2 100644 --- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp @@ -773,16 +773,16 @@ bool readConfiguration(const QFile &file) //! [qdecloverride] // generate error if this doesn't actually override anything: - virtual void MyWidget::paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + virtual void MyWidget::paintEvent(QPaintEvent*) override; //! [qdecloverride] //! [qdeclfinal-1] // more-derived classes no longer permitted to override this: - virtual void MyWidget::paintEvent(QPaintEvent*) Q_DECL_FINAL; + virtual void MyWidget::paintEvent(QPaintEvent*) final; //! [qdeclfinal-1] //! [qdeclfinal-2] - class QRect Q_DECL_FINAL { // cannot be derived from + class QRect final { // cannot be derived from // ... }; //! [qdeclfinal-2] diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 7a871b3812..af6bd1d630 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -72,7 +72,7 @@ public: QList<QPlatformScreen *> screens() const; - QFunctionPointer platformFunction(const QByteArray &function) const Q_DECL_OVERRIDE; + QFunctionPointer platformFunction(const QByteArray &function) const override; private: void createInputHandlers(); diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 7f03849798..e9247f4cc4 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -58,9 +58,9 @@ struct WriteIncludes : public TreeWalker // // actions // - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptActionRef(DomActionRef *node) override; // // custom widgets |