summaryrefslogtreecommitdiffstats
path: root/src/gui/inputmethod/qinputcontext.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-06-15 09:57:36 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-06-15 09:57:36 (GMT)
commit336dfcef05cb63df0a6d550b59a4badc7a0f01c1 (patch)
treea218ec97413e0c8ebc9600ac5db9b2adea485b32 /src/gui/inputmethod/qinputcontext.cpp
parente44d64510e019e5d3b379b704cfb824e0d7ccc9d (diff)
downloadQt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.zip
Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.tar.gz
Qt-336dfcef05cb63df0a6d550b59a4badc7a0f01c1.tar.bz2
Merge of master
Diffstat (limited to 'src/gui/inputmethod/qinputcontext.cpp')
-rw-r--r--src/gui/inputmethod/qinputcontext.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/inputmethod/qinputcontext.cpp b/src/gui/inputmethod/qinputcontext.cpp
index 8db326b..23e8e10 100644
--- a/src/gui/inputmethod/qinputcontext.cpp
+++ b/src/gui/inputmethod/qinputcontext.cpp
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
\ingroup i18n
- An input method is responsible to input complex text that cannot
+ An input method is responsible for inputting complex text that cannot
be inputted via simple keymap. It converts a sequence of input
events (typically key events) into a text string through the input
method specific converting process. The class of the processes are
@@ -89,11 +89,11 @@ QT_BEGIN_NAMESPACE
To abstract such different input method specific intermediate
information, Qt offers the QInputContext as base class. The
concept is well known as 'input context' in the input method
- domain. an input context is created for a text widget in response
+ domain. An input context is created for a text widget in response
to a demand. It is ensured that an input context is prepared for
an input method before input to a text widget.
- Multiple input contexts that is belonging to a single input method
+ Multiple input contexts that belong to a single input method
may concurrently coexist. Suppose multi-window text editor. Each
text widget of window A and B holds different QInputContext
instance which contains different state information such as