diff options
Diffstat (limited to 'examples/widgets/mainwindows')
7 files changed, 14 insertions, 14 deletions
diff --git a/examples/widgets/mainwindows/application/mainwindow.h b/examples/widgets/mainwindows/application/mainwindow.h index 9e3e1e907a..1300247ce7 100644 --- a/examples/widgets/mainwindows/application/mainwindow.h +++ b/examples/widgets/mainwindows/application/mainwindow.h @@ -71,7 +71,7 @@ public: void loadFile(const QString &fileName); protected: - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *event) override; private slots: void newFile(); diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp index 226f335c85..c472df966c 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp @@ -111,8 +111,8 @@ class ColorDock : public QFrame public: explicit ColorDock(const QString &c, QWidget *parent); - QSize sizeHint() const Q_DECL_OVERRIDE { return szHint; } - QSize minimumSizeHint() const Q_DECL_OVERRIDE { return minSzHint; } + QSize sizeHint() const override { return szHint; } + QSize minimumSizeHint() const override { return minSzHint; } void setCustomSizeHint(const QSize &size); @@ -120,7 +120,7 @@ public slots: void changeSizeHints(); protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; private: const QString color; diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.h b/examples/widgets/mainwindows/mainwindow/colorswatch.h index c2f6ef19b9..ec9d9e7372 100644 --- a/examples/widgets/mainwindows/mainwindow/colorswatch.h +++ b/examples/widgets/mainwindows/mainwindow/colorswatch.h @@ -69,9 +69,9 @@ public: protected: #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif // QT_NO_CONTEXTMENU - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) override; private slots: void changeClosable(bool on); @@ -130,12 +130,12 @@ class BlueTitleBar : public QWidget public: explicit BlueTitleBar(QWidget *parent = Q_NULLPTR); - QSize sizeHint() const Q_DECL_OVERRIDE { return minimumSizeHint(); } - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override { return minimumSizeHint(); } + QSize minimumSizeHint() const override; protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; public slots: void updateMask(); diff --git a/examples/widgets/mainwindows/mdi/mainwindow.h b/examples/widgets/mainwindows/mdi/mainwindow.h index 4525b52697..f163145c2c 100644 --- a/examples/widgets/mainwindows/mdi/mainwindow.h +++ b/examples/widgets/mainwindows/mdi/mainwindow.h @@ -71,7 +71,7 @@ public: bool openFile(const QString &fileName); protected: - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *event) override; private slots: void newFile(); diff --git a/examples/widgets/mainwindows/mdi/mdichild.h b/examples/widgets/mainwindows/mdi/mdichild.h index 22fbb28212..2ac8194f73 100644 --- a/examples/widgets/mainwindows/mdi/mdichild.h +++ b/examples/widgets/mainwindows/mdi/mdichild.h @@ -69,7 +69,7 @@ public: QString currentFile() { return curFile; } protected: - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *event) override; private slots: void documentWasModified(); diff --git a/examples/widgets/mainwindows/menus/mainwindow.h b/examples/widgets/mainwindows/menus/mainwindow.h index 590d7c7550..1f1a065aaf 100644 --- a/examples/widgets/mainwindows/menus/mainwindow.h +++ b/examples/widgets/mainwindows/menus/mainwindow.h @@ -70,7 +70,7 @@ public: protected: #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif // QT_NO_CONTEXTMENU //! [0] diff --git a/examples/widgets/mainwindows/sdi/mainwindow.h b/examples/widgets/mainwindows/sdi/mainwindow.h index 4b4beaeaae..059710eacb 100644 --- a/examples/widgets/mainwindows/sdi/mainwindow.h +++ b/examples/widgets/mainwindows/sdi/mainwindow.h @@ -73,7 +73,7 @@ public: void tile(const QMainWindow *previous); protected: - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *event) override; private slots: void newFile(); |