diff options
author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-11-15 15:09:55 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-21 22:45:36 +0100 |
commit | 7a0c0602685ddf0c5f15a8f3bd6ae8336cf9c858 (patch) | |
tree | 1d6a109c94d18f3d2e252cf67ea6d61230efd090 /src/gui/text/qlinecontrol_p.h | |
parent | 9eba201a48874c93f398c7c1c053b5ddbeda7712 (diff) |
Support input method tentative commit string in QLineControl
Implements similar behavior as 8bd40fef0733a4796a308b3bc137a05296e142c4
did for QLineEdit.
Change-Id: I55de1f9a6703aca629f2e84398e481636c96eeca
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/text/qlinecontrol_p.h')
-rw-r--r-- | src/gui/text/qlinecontrol_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/text/qlinecontrol_p.h b/src/gui/text/qlinecontrol_p.h index e5435c22f6..7f5244ee07 100644 --- a/src/gui/text/qlinecontrol_p.h +++ b/src/gui/text/qlinecontrol_p.h @@ -61,6 +61,7 @@ #include "QtGui/qvalidator.h" #include "QtGui/qpalette.h" #include "QtGui/qguiapplication.h" +#include "QtGui/qinputpanel.h" #include "QtCore/qpoint.h" QT_BEGIN_HEADER @@ -205,12 +206,10 @@ public: bool isReadOnly() const { return m_readOnly; } void setReadOnly(bool enable) { m_readOnly = enable; } - QString text() const - { - QString res = m_maskData ? stripString(m_text) : m_text; - return (res.isNull() ? QString::fromLatin1("") : res); - } - void setText(const QString &txt) { internalSetText(txt, -1, false); } + QString text() const; + QString realText() const; + void setText(const QString &txt); + QString displayText() const { return m_textLayout.text(); } void backspace(); @@ -347,6 +346,7 @@ private: int m_cursor; int m_preeditCursor; int m_cursorWidth; + QString m_tentativeCommit; Qt::LayoutDirection m_layoutDirection; uint m_hideCursor : 1; // used to hide the m_cursor inside preedit areas uint m_separator : 1; |