diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-06-12 11:56:30 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-06-12 11:59:20 (GMT) |
| commit | f2b93868f48a3e2d6e462ca8a051ab47eefef49d (patch) | |
| tree | 4c8dfac6a9dfae0dd519880b656d0758394aed4c /src/gui/widgets/qtoolbutton.cpp | |
| parent | 8134541fc3229177ec7545fa0d3ea49eadc8f00c (diff) | |
| download | Qt-f2b93868f48a3e2d6e462ca8a051ab47eefef49d.zip Qt-f2b93868f48a3e2d6e462ca8a051ab47eefef49d.tar.gz Qt-f2b93868f48a3e2d6e462ca8a051ab47eefef49d.tar.bz2 | |
QMenu, QMenuBar: small cleanup
Removed calls to the widget getters because we have the members directly
in the private class.
Diffstat (limited to 'src/gui/widgets/qtoolbutton.cpp')
| -rw-r--r-- | src/gui/widgets/qtoolbutton.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp index 0eb6364..d26cf5b 100644 --- a/src/gui/widgets/qtoolbutton.cpp +++ b/src/gui/widgets/qtoolbutton.cpp @@ -104,10 +104,9 @@ public: #ifndef QT_NO_MENU bool QToolButtonPrivate::hasMenu() const { - Q_Q(const QToolButton); return ((defaultAction && defaultAction->menu()) || (menuAction && menuAction->menu()) - || q->actions().size() > (defaultAction ? 1 : 0)); + || actions.size() > (defaultAction ? 1 : 0)); } #endif @@ -882,7 +881,6 @@ void QToolButtonPrivate::popupTimerDone() } else { actualMenu = new QMenu(q); mustDeleteActualMenu = true; - QList<QAction*> actions = q->actions(); for(int i = 0; i < actions.size(); i++) actualMenu->addAction(actions.at(i)); } |