1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix remaining Q_DECL_OVERRIDE instances

Browse Source 
Change-Id: I512ea5a6c8cf2928b276af7f83f00a1df5879595
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Allan Sandfeld Jensen 2019-04-02 11:37:43 +02:00
parent 2f8dcdf93c
commit 0683bbc67c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
View File

@ -773,16 +773,16 @@ bool readConfiguration(const QFile &file)
//! [qdecloverride] //! [qdecloverride]
// generate error if this doesn't actually override anything: // generate error if this doesn't actually override anything:
virtual void MyWidget::paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; virtual void MyWidget::paintEvent(QPaintEvent*) override;
//! [qdecloverride] //! [qdecloverride]
//! [qdeclfinal-1] //! [qdeclfinal-1]
// more-derived classes no longer permitted to override this: // 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-1]
//! [qdeclfinal-2] //! [qdeclfinal-2]
class QRect Q_DECL_FINAL { // cannot be derived from class QRect final { // cannot be derived from
// ... // ...
}; };
//! [qdeclfinal-2] //! [qdeclfinal-2]

2
src/plugins/platforms/linuxfb/qlinuxfbintegration.h
View File

@ -72,7 +72,7 @@ public:
QList<QPlatformScreen *> screens() const; QList<QPlatformScreen *> screens() const;
QFunctionPointer platformFunction(const QByteArray &function) const Q_DECL_OVERRIDE; QFunctionPointer platformFunction(const QByteArray &function) const override;
private: private:
void createInputHandlers(); void createInputHandlers();

6
src/tools/uic/cpp/cppwriteincludes.h
View File

@ -58,9 +58,9 @@ struct WriteIncludes : public TreeWalker
// //
// actions // actions
// //
void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; void acceptActionGroup(DomActionGroup *node) override;
void acceptAction(DomAction *node) Q_DECL_OVERRIDE; void acceptAction(DomAction *node) override;
void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; void acceptActionRef(DomActionRef *node) override;
// //
// custom widgets // custom widgets