From 98b9480301b0338096ec8ec43d06bf4352a7ec00 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Wed, 14 Dec 2016 02:25:48 +0300 Subject: Examples: Replace Q_DECL_OVERRIDE by override Change-Id: I2bed9c0dc1d72005b40ae7a7b75fa22cc67f88c6 Reviewed-by: Friedemann Kleint --- .../designer/containerextension/multipagewidget.h | 2 +- .../multipagewidgetcontainerextension.h | 14 +++++++------- .../multipagewidgetextensionfactory.h | 2 +- .../containerextension/multipagewidgetplugin.h | 22 +++++++++++----------- examples/designer/customwidgetplugin/analogclock.h | 2 +- .../customwidgetplugin/customwidgetplugin.h | 22 +++++++++++----------- examples/designer/taskmenuextension/tictactoe.h | 8 ++++---- .../designer/taskmenuextension/tictactoedialog.h | 2 +- .../designer/taskmenuextension/tictactoeplugin.h | 22 +++++++++++----------- .../designer/taskmenuextension/tictactoetaskmenu.h | 6 +++--- .../designer/worldtimeclockplugin/worldtimeclock.h | 2 +- .../worldtimeclockplugin/worldtimeclockplugin.h | 22 +++++++++++----------- 12 files changed, 63 insertions(+), 63 deletions(-) diff --git a/examples/designer/containerextension/multipagewidget.h b/examples/designer/containerextension/multipagewidget.h index 424a7539e..cdb74d33b 100644 --- a/examples/designer/containerextension/multipagewidget.h +++ b/examples/designer/containerextension/multipagewidget.h @@ -68,7 +68,7 @@ class MultiPageWidget : public QWidget public: explicit MultiPageWidget(QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; int count() const; int currentIndex() const; diff --git a/examples/designer/containerextension/multipagewidgetcontainerextension.h b/examples/designer/containerextension/multipagewidgetcontainerextension.h index c0e70d5e3..7813aee9e 100644 --- a/examples/designer/containerextension/multipagewidgetcontainerextension.h +++ b/examples/designer/containerextension/multipagewidgetcontainerextension.h @@ -68,13 +68,13 @@ class MultiPageWidgetContainerExtension: public QObject, public: explicit MultiPageWidgetContainerExtension(MultiPageWidget *widget, QObject *parent); - void addWidget(QWidget *widget) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - int currentIndex() const Q_DECL_OVERRIDE; - void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; - void remove(int index) Q_DECL_OVERRIDE; - void setCurrentIndex(int index) Q_DECL_OVERRIDE; - QWidget *widget(int index) const Q_DECL_OVERRIDE; + void addWidget(QWidget *widget) override; + int count() const override; + int currentIndex() const override; + void insertWidget(int index, QWidget *widget) override; + void remove(int index) override; + void setCurrentIndex(int index) override; + QWidget *widget(int index) const override; private: MultiPageWidget *myWidget; diff --git a/examples/designer/containerextension/multipagewidgetextensionfactory.h b/examples/designer/containerextension/multipagewidgetextensionfactory.h index 1bfdecf80..56a02aebd 100644 --- a/examples/designer/containerextension/multipagewidgetextensionfactory.h +++ b/examples/designer/containerextension/multipagewidgetextensionfactory.h @@ -66,7 +66,7 @@ public: explicit MultiPageWidgetExtensionFactory(QExtensionManager *parent = 0); protected: - QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE; + QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const override; }; //! [0] diff --git a/examples/designer/containerextension/multipagewidgetplugin.h b/examples/designer/containerextension/multipagewidgetplugin.h index 382496cd0..a2f3cbc5f 100644 --- a/examples/designer/containerextension/multipagewidgetplugin.h +++ b/examples/designer/containerextension/multipagewidgetplugin.h @@ -69,17 +69,17 @@ class MultiPageWidgetPlugin: public QObject, public QDesignerCustomWidgetInterfa public: explicit MultiPageWidgetPlugin(QObject *parent = 0); - QString name() const Q_DECL_OVERRIDE; - QString group() const Q_DECL_OVERRIDE; - QString toolTip() const Q_DECL_OVERRIDE; - QString whatsThis() const Q_DECL_OVERRIDE; - QString includeFile() const Q_DECL_OVERRIDE; - QIcon icon() const Q_DECL_OVERRIDE; - bool isContainer() const Q_DECL_OVERRIDE; - QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE; - bool isInitialized() const Q_DECL_OVERRIDE; - void initialize(QDesignerFormEditorInterface *formEditor) Q_DECL_OVERRIDE; - QString domXml() const Q_DECL_OVERRIDE; + QString name() const override; + QString group() const override; + QString toolTip() const override; + QString whatsThis() const override; + QString includeFile() const override; + QIcon icon() const override; + bool isContainer() const override; + QWidget *createWidget(QWidget *parent) override; + bool isInitialized() const override; + void initialize(QDesignerFormEditorInterface *formEditor) override; + QString domXml() const override; private slots: void currentIndexChanged(int index); diff --git a/examples/designer/customwidgetplugin/analogclock.h b/examples/designer/customwidgetplugin/analogclock.h index 30c0c5238..cb758ce83 100644 --- a/examples/designer/customwidgetplugin/analogclock.h +++ b/examples/designer/customwidgetplugin/analogclock.h @@ -62,7 +62,7 @@ public: explicit AnalogClock(QWidget *parent = 0); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; }; #endif diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.h b/examples/designer/customwidgetplugin/customwidgetplugin.h index aa647c5c8..c10ab339c 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.h +++ b/examples/designer/customwidgetplugin/customwidgetplugin.h @@ -62,17 +62,17 @@ class AnalogClockPlugin : public QObject, public QDesignerCustomWidgetInterface public: explicit AnalogClockPlugin(QObject *parent = 0); - bool isContainer() const Q_DECL_OVERRIDE; - bool isInitialized() const Q_DECL_OVERRIDE; - QIcon icon() const Q_DECL_OVERRIDE; - QString domXml() const Q_DECL_OVERRIDE; - QString group() const Q_DECL_OVERRIDE; - QString includeFile() const Q_DECL_OVERRIDE; - QString name() const Q_DECL_OVERRIDE; - QString toolTip() const Q_DECL_OVERRIDE; - QString whatsThis() const Q_DECL_OVERRIDE; - QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; + bool isContainer() const override; + bool isInitialized() const override; + QIcon icon() const override; + QString domXml() const override; + QString group() const override; + QString includeFile() const override; + QString name() const override; + QString toolTip() const override; + QString whatsThis() const override; + QWidget *createWidget(QWidget *parent) override; + void initialize(QDesignerFormEditorInterface *core) override; private: bool initialized; diff --git a/examples/designer/taskmenuextension/tictactoe.h b/examples/designer/taskmenuextension/tictactoe.h index 70815fe90..6d922a9e9 100644 --- a/examples/designer/taskmenuextension/tictactoe.h +++ b/examples/designer/taskmenuextension/tictactoe.h @@ -67,15 +67,15 @@ class TicTacToe : public QWidget public: explicit TicTacToe(QWidget *parent = 0); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; void setState(const QString &newState); QString state() const; void clearBoard(); protected: - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void paintEvent(QPaintEvent *event) override; private: enum { Empty = '-', Cross = 'X', Nought = 'O' }; diff --git a/examples/designer/taskmenuextension/tictactoedialog.h b/examples/designer/taskmenuextension/tictactoedialog.h index f6c67a49a..6948a5d4e 100644 --- a/examples/designer/taskmenuextension/tictactoedialog.h +++ b/examples/designer/taskmenuextension/tictactoedialog.h @@ -66,7 +66,7 @@ class TicTacToeDialog : public QDialog public: explicit TicTacToeDialog(TicTacToe *plugin = 0, QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; private slots: void resetState(); diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h index 2a07062a4..1c1ce7a38 100644 --- a/examples/designer/taskmenuextension/tictactoeplugin.h +++ b/examples/designer/taskmenuextension/tictactoeplugin.h @@ -70,17 +70,17 @@ class TicTacToePlugin : public QObject, public QDesignerCustomWidgetInterface public: TicTacToePlugin(QObject *parent = 0); - QString name() const Q_DECL_OVERRIDE; - QString group() const Q_DECL_OVERRIDE; - QString toolTip() const Q_DECL_OVERRIDE; - QString whatsThis() const Q_DECL_OVERRIDE; - QString includeFile() const Q_DECL_OVERRIDE; - QIcon icon() const Q_DECL_OVERRIDE; - bool isContainer() const Q_DECL_OVERRIDE; - QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE; - bool isInitialized() const Q_DECL_OVERRIDE; - void initialize(QDesignerFormEditorInterface *formEditor) Q_DECL_OVERRIDE; - QString domXml() const Q_DECL_OVERRIDE; + QString name() const override; + QString group() const override; + QString toolTip() const override; + QString whatsThis() const override; + QString includeFile() const override; + QIcon icon() const override; + bool isContainer() const override; + QWidget *createWidget(QWidget *parent) override; + bool isInitialized() const override; + void initialize(QDesignerFormEditorInterface *formEditor) override; + QString domXml() const override; private: bool initialized; diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.h b/examples/designer/taskmenuextension/tictactoetaskmenu.h index b6da205f3..bcd5b63b3 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.h +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.h @@ -69,8 +69,8 @@ class TicTacToeTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit TicTacToeTaskMenu(TicTacToe *tic, QObject *parent); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList taskActions() const override; private slots: void editState(); @@ -90,7 +90,7 @@ public: explicit TicTacToeTaskMenuFactory(QExtensionManager *parent = 0); protected: - QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE; + QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const override; }; //! [1] diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.h b/examples/designer/worldtimeclockplugin/worldtimeclock.h index 718524f19..faf057b09 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclock.h +++ b/examples/designer/worldtimeclockplugin/worldtimeclock.h @@ -71,7 +71,7 @@ signals: void updated(QTime currentTime); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; private: int timeZoneOffset; diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h index 571b37e4e..d1487735b 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h @@ -66,17 +66,17 @@ class WorldTimeClockPlugin : public QObject, public: explicit WorldTimeClockPlugin(QObject *parent = 0); - bool isContainer() const Q_DECL_OVERRIDE; - bool isInitialized() const Q_DECL_OVERRIDE; - QIcon icon() const Q_DECL_OVERRIDE; - QString domXml() const Q_DECL_OVERRIDE; - QString group() const Q_DECL_OVERRIDE; - QString includeFile() const Q_DECL_OVERRIDE; - QString name() const Q_DECL_OVERRIDE; - QString toolTip() const Q_DECL_OVERRIDE; - QString whatsThis() const Q_DECL_OVERRIDE; - QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE; - void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; + bool isContainer() const override; + bool isInitialized() const override; + QIcon icon() const override; + QString domXml() const override; + QString group() const override; + QString includeFile() const override; + QString name() const override; + QString toolTip() const override; + QString whatsThis() const override; + QWidget *createWidget(QWidget *parent) override; + void initialize(QDesignerFormEditorInterface *core) override; private: bool initialized; -- cgit v1.2.3