1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant virtual method reimplementations from QToolBar.

Browse Source 
Task-number: QTBUG-23524
Change-Id: Ib682d2e2c2ea1078524e2c90cdb10bfec113d259
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Jason McDonald 2012-04-02 22:53:43 +10:00 committed by Qt by Nokia
parent 7720edfade
commit 10b39adf34
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/widgets/qtoolbar.cpp
View File

@ -1279,22 +1279,6 @@ void QToolBar::initStyleOption(QStyleOptionToolBar *option) const
layout->getStyleOptionInfo(option, const_cast<QToolBar *>(this)); 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 QT_END_NAMESPACE
#include "moc_qtoolbar.cpp" #include "moc_qtoolbar.cpp"

2
src/widgets/widgets/qtoolbar.h
View File

@ -147,9 +147,7 @@ Q_SIGNALS:
protected: protected:
void actionEvent(QActionEvent *event); void actionEvent(QActionEvent *event);
void changeEvent(QEvent *event); void changeEvent(QEvent *event);
void childEvent(QChildEvent *event);
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event);
void resizeEvent(QResizeEvent *event);
bool event(QEvent *event); bool event(QEvent *event);
void initStyleOption(QStyleOptionToolBar *option) const; void initStyleOption(QStyleOptionToolBar *option) const;