summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-04-02 22:53:43 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-02 16:56:48 +0200
commit10b39adf34785239f6329d1054272a6b5a7390d3 (patch)
tree8bae65ff16fdf9a5bcf8cf6167618b46377d73f7 /src/widgets
parent7720edfadeb43e8dc5103c7250477dbe09fe26df (diff)
Remove redundant virtual method reimplementations from QToolBar.
Task-number: QTBUG-23524 Change-Id: Ib682d2e2c2ea1078524e2c90cdb10bfec113d259 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/widgets/qtoolbar.cpp16
-rw-r--r--src/widgets/widgets/qtoolbar.h2
2 files changed, 0 insertions, 18 deletions
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index 84cb5fd10c..6ba29c13b8 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -1279,22 +1279,6 @@ void QToolBar::initStyleOption(QStyleOptionToolBar *option) const
layout->getStyleOptionInfo(option, const_cast<QToolBar *>(this));
}
-/*!
- \reimp
-*/
-void QToolBar::childEvent(QChildEvent *event) // ### remove me in 5.0
-{
- QWidget::childEvent(event);
-}
-
-/*!
- \reimp
-*/
-void QToolBar::resizeEvent(QResizeEvent *event) // ### remove me in 5.0
-{
- QWidget::resizeEvent(event);
-}
-
QT_END_NAMESPACE
#include "moc_qtoolbar.cpp"
diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h
index ac59d9803a..1fd5da797b 100644
--- a/src/widgets/widgets/qtoolbar.h
+++ b/src/widgets/widgets/qtoolbar.h
@@ -147,9 +147,7 @@ Q_SIGNALS:
protected:
void actionEvent(QActionEvent *event);
void changeEvent(QEvent *event);
- void childEvent(QChildEvent *event);
void paintEvent(QPaintEvent *event);
- void resizeEvent(QResizeEvent *event);
bool event(QEvent *event);
void initStyleOption(QStyleOptionToolBar *option) const;