summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod/qcoefepinputcontext_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-01-29 01:53:32 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-01-29 01:53:32 (GMT)
commit91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d (patch)
treeef09bd890041b3c44f7be3322321c96174e94054 /src/gui/inputmethod/qcoefepinputcontext_p.h
parent687d50f05a1a2d9355f0990e845967930c57b985 (diff)
parentfe129a59ab54e6c0194c546a02bc64e886c252d5 (diff)
downloadQt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.zip
Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.gz
Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/inputmethod/qcoefepinputcontext_p.h')
-rw-r--r--src/gui/inputmethod/qcoefepinputcontext_p.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index 0b84e2f..f5034fc 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -57,6 +57,7 @@
#include "qinputcontext.h"
#include <qhash.h>
+#include <qtimer.h>
#include <private/qcore_symbian_p.h>
#include <private/qt_s60_p.h>
@@ -91,6 +92,9 @@ public:
TCoeInputCapabilities inputCapabilities();
+protected:
+ void timerEvent(QTimerEvent *timerEvent);
+
private:
void commitCurrentString(bool triggeredBySymbian);
void updateHints(bool mustUpdateInputCapabilities);
@@ -98,6 +102,7 @@ private:
void applyFormat(QList<QInputMethodEvent::Attribute> *attributes);
void queueInputCapabilitiesChanged();
bool needsInputPanel();
+ void commitTemporaryPreeditString();
private Q_SLOTS:
void ensureInputCapabilitiesChanged();
@@ -148,6 +153,8 @@ private:
MFepPointerEventHandlerDuringInlineEdit *m_pointerHandler;
int m_longPress;
int m_cursorPos;
+ QBasicTimer m_tempPreeditStringTimeout;
+ bool m_hasTempPreeditString;
};
QT_END_NAMESPACE