diff options
| author | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-08 15:08:26 (GMT) |
|---|---|---|
| committer | Markku Luukkainen <markku.luukkainen@digia.com> | 2009-06-08 15:08:26 (GMT) |
| commit | 46cb3a09f4eedb2d4c612a6d73e9e0f14237350c (patch) | |
| tree | d318fadf80d53e6bdf5f9c546417122785d1c9a4 /src/gui/kernel/qwidget_s60.cpp | |
| parent | fb8dccabd68a854c50adfc3f1e77badc3ff50ec8 (diff) | |
| download | Qt-46cb3a09f4eedb2d4c612a6d73e9e0f14237350c.zip Qt-46cb3a09f4eedb2d4c612a6d73e9e0f14237350c.tar.gz Qt-46cb3a09f4eedb2d4c612a6d73e9e0f14237350c.tar.bz2 | |
Fixes from code review
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index 858320c..2a83fc7 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -86,9 +86,8 @@ static void mapSoftKeys(const QList <QAction*> &softkeys) */ } -static bool isSame(const QList<QAction*>& a, const QList<QAction*>& b) +static bool isEqual(const QList<QAction*>& a, const QList<QAction*>& b) { - bool isSame=true; if ( a.count() != b.count()) return false; int index=0; @@ -103,12 +102,12 @@ static bool isSame(const QList<QAction*>& a, const QList<QAction*>& b) } -void QWidgetPrivate::setNativeSoftKeys(const QList<QAction*> &softkeys) +void QWidgetPrivate::setSoftKeys_sys(const QList<QAction*> &softkeys) { Q_Q(QWidget); if (QApplication::focusWidget() && q!=QApplication::focusWidget()) { QList<QAction *> old = QApplication::focusWidget()->softKeys(); - if (isSame(old, softkeys )) + if (isEqual(old, softkeys )) return; } |