diff options
| author | axis <qt-info@nokia.com> | 2009-11-11 15:28:57 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-18 05:58:50 (GMT) |
| commit | d2f2598e888903830e86052819bdd183b6fda547 (patch) | |
| tree | ccb12b8891212605f733e9bfa4b809f92d931f9c | |
| parent | ed8c9ea36216ef57f21421cd444cf45e2865ded1 (diff) | |
| download | Qt-d2f2598e888903830e86052819bdd183b6fda547.zip Qt-d2f2598e888903830e86052819bdd183b6fda547.tar.gz Qt-d2f2598e888903830e86052819bdd183b6fda547.tar.bz2 | |
Fixed some initializers and saved some memory.
RevBy: Trust me
(cherry picked from commit 929dd1e7bc02c51e324425a79243f0ff08fb1508)
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index ec95d48..191d4a1 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -319,7 +319,11 @@ void QLongTapTimer::RunL() } QSymbianControl::QSymbianControl(QWidget *w) - : CCoeControl(), qwidget(w), m_ignoreFocusChanged(false) + : CCoeControl() + , qwidget(w) + , m_longTapDetector(0) + , m_ignoreFocusChanged(0) + , m_previousEventLongTap(0) { } diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index 333458b..3b5ce82 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -202,9 +202,9 @@ private: private: QWidget *qwidget; - bool m_ignoreFocusChanged; QLongTapTimer* m_longTapDetector; - bool m_previousEventLongTap; + bool m_ignoreFocusChanged : 1; + bool m_previousEventLongTap : 1; #ifdef Q_WS_S60 // Fader object used to fade everything except this menu and the CBA. |