diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-10 10:20:09 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-13 18:08:27 +0000 |
commit | 5dbd90b220c946f439a5806006a2665c2860bf31 (patch) | |
tree | e8a932f4cd25528bd55a1d4b7968c9e86bf3769b /src/designer/src/components/formeditor/default_container.h | |
parent | 121c7721972064105d8f1c1ac7ca001b6bff4491 (diff) | |
download | qttools-5dbd90b220c946f439a5806006a2665c2860bf31.tar.gz |
Qt Designer: Introduce Q_DECL_OVERRIDE.
Replacement done by a script and verified with clang 3.5 to not cause
new warnings.
Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src/designer/src/components/formeditor/default_container.h')
-rw-r--r-- | src/designer/src/components/formeditor/default_container.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/designer/src/components/formeditor/default_container.h b/src/designer/src/components/formeditor/default_container.h index a94e041ec..1a4a49c78 100644 --- a/src/designer/src/components/formeditor/default_container.h +++ b/src/designer/src/components/formeditor/default_container.h @@ -60,11 +60,11 @@ public: virtual QWidget *widget(int index) const { return m_widget->widget(index); } virtual int currentIndex() const { return m_widget->currentIndex(); } - virtual void setCurrentIndex(int index); + void setCurrentIndex(int index) Q_DECL_OVERRIDE; - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QStackedWidget *m_widget; @@ -82,11 +82,11 @@ public: virtual QWidget *widget(int index) const { return m_widget->widget(index); } virtual int currentIndex() const { return m_widget->currentIndex(); } - virtual void setCurrentIndex(int index); + void setCurrentIndex(int index) Q_DECL_OVERRIDE; - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QTabWidget *m_widget; @@ -104,11 +104,11 @@ public: virtual QWidget *widget(int index) const { return m_widget->widget(index); } virtual int currentIndex() const { return m_widget->currentIndex(); } - virtual void setCurrentIndex(int index); + void setCurrentIndex(int index) Q_DECL_OVERRIDE; - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QToolBox *m_widget; @@ -123,12 +123,12 @@ class SingleChildContainer: public QDesignerContainerExtension protected: explicit SingleChildContainer(Container *widget, bool active = true); public: - virtual int count() const; - virtual QWidget *widget(int index) const; - virtual int currentIndex() const; + int count() const Q_DECL_OVERRIDE; + QWidget *widget(int index) const Q_DECL_OVERRIDE; + int currentIndex() const Q_DECL_OVERRIDE; virtual void setCurrentIndex(int /*index*/) {} - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; virtual void remove(int /*index*/) {} virtual bool canAddWidget() const { return false; } |