diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-10 10:52:32 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-10 10:33:57 +0000 |
commit | 1389ef74c0927a4b293ec9bac9203052ad8077f5 (patch) | |
tree | 3af8ae05cf1632533954727b6e871bb26ab1adb9 /examples/designer/taskmenuextension | |
parent | 72d761ac303c97197de0ed965652859e35dc8e32 (diff) | |
download | qttools-1389ef74c0927a4b293ec9bac9203052ad8077f5.tar.gz |
Qt Designer Examples: Introduce Q_DECL_OVERRIDE.
Change-Id: I08b4227e4609caef74576ea4e05d33c7142f2665
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'examples/designer/taskmenuextension')
4 files changed, 19 insertions, 19 deletions
diff --git a/examples/designer/taskmenuextension/tictactoe.h b/examples/designer/taskmenuextension/tictactoe.h index 0482ca427..14a6b6a9d 100644 --- a/examples/designer/taskmenuextension/tictactoe.h +++ b/examples/designer/taskmenuextension/tictactoe.h @@ -57,15 +57,15 @@ class TicTacToe : public QWidget public: TicTacToe(QWidget *parent = 0); - QSize minimumSizeHint() const; - QSize sizeHint() const; + QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const Q_DECL_OVERRIDE; void setState(const QString &newState); QString state() const; void clearBoard(); protected: - void mousePressEvent(QMouseEvent *event); - void paintEvent(QPaintEvent *event); + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; private: enum { Empty = '-', Cross = 'X', Nought = 'O' }; diff --git a/examples/designer/taskmenuextension/tictactoedialog.h b/examples/designer/taskmenuextension/tictactoedialog.h index 83e171f42..34182364a 100644 --- a/examples/designer/taskmenuextension/tictactoedialog.h +++ b/examples/designer/taskmenuextension/tictactoedialog.h @@ -56,7 +56,7 @@ class TicTacToeDialog : public QDialog public: explicit TicTacToeDialog(TicTacToe *plugin = 0, QWidget *parent = 0); - QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; private slots: void resetState(); diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h index 9b71b5aca..6ed8b7659 100644 --- a/examples/designer/taskmenuextension/tictactoeplugin.h +++ b/examples/designer/taskmenuextension/tictactoeplugin.h @@ -60,17 +60,17 @@ class TicTacToePlugin : public QObject, public QDesignerCustomWidgetInterface public: TicTacToePlugin(QObject *parent = 0); - QString name() const; - QString group() const; - QString toolTip() const; - QString whatsThis() const; - QString includeFile() const; - QIcon icon() const; - bool isContainer() const; - QWidget *createWidget(QWidget *parent); - bool isInitialized() const; - void initialize(QDesignerFormEditorInterface *formEditor); - QString domXml() const; + 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; private: bool initialized; diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.h b/examples/designer/taskmenuextension/tictactoetaskmenu.h index 7ea657176..0f41cf8ba 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.h +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.h @@ -59,8 +59,8 @@ class TicTacToeTaskMenu : public QObject, public QDesignerTaskMenuExtension public: TicTacToeTaskMenu(TicTacToe *tic, QObject *parent); - QAction *preferredEditAction() const; - QList<QAction *> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction *> taskActions() const Q_DECL_OVERRIDE; private slots: void editState(); @@ -80,7 +80,7 @@ public: TicTacToeTaskMenuFactory(QExtensionManager *parent = 0); protected: - QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const; + QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE; }; //! [1] |