aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@theqtcompany.com>2016-06-14 15:40:28 +0200
committerNico Vertriest <nico.vertriest@theqtcompany.com>2016-06-17 12:35:41 +0000
commitbc7d95510fd509535b2bfa3c715937b3c3d56507 (patch)
tree9645e13018221da47aef68b02f2d5e5cd941bfcb
parentc85f4be2c88318e110a4b1efd7dc9aaa34c7868e (diff)
Doc: corrected link issues to AbstractInputMethod
AbstractInputMethod marked internal, so no links possible Change-Id: Id41f013a0b8b46eb170b5aebf6e75c259809ff33 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--src/virtualkeyboard/doc/src/technical-guide.qdoc4
-rw-r--r--src/virtualkeyboard/trace.cpp16
2 files changed, 7 insertions, 13 deletions
diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc
index 4832bdc1..26e95227 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -56,7 +56,6 @@ The input framework provides the following main interfaces:
\li InputEngine: exposes an API to integrate user input events (key
presses, etc.) and acts as a host for input methods.
\li InputMethod: a base type for QML based input methods.
- \li \l {QtVirtualKeyboard::AbstractInputMethod} {AbstractInputMethod}: a base type for C++ based input methods.
\endlist
\section1 The Input Context
@@ -140,8 +139,7 @@ key can be interrupted by using the InputEngine::virtualKeyCancel method.
Activating an input method is straightforward. The required steps are:
\list
- \li Instantiate a concrete implementation of InputMethod or
- \l {QtVirtualKeyboard::AbstractInputMethod} {AbstractInputMethod}
+ \li Instantiate a concrete implementation of InputMethod
\li Assign the instance to InputEngine::inputMethod
\li Set the proper input mode with InputEngine::inputMode
\endlist
diff --git a/src/virtualkeyboard/trace.cpp b/src/virtualkeyboard/trace.cpp
index d87d0a5b..683858af 100644
--- a/src/virtualkeyboard/trace.cpp
+++ b/src/virtualkeyboard/trace.cpp
@@ -103,13 +103,11 @@ public:
\endcode
Trace objects are owned by their creator, which is the input method in
- normal case. This means the objects are constructed in
- \l {AbstractInputMethod::traceBegin()} (C++) or \l {InputMethod::traceBegin()}
- {InputMethod.traceBegin()} (QML) method.
+ normal case. This means the objects are constructed in the
+ \l {InputMethod.traceBegin()} (QML) method.
By definition, the trace object can be destroyed at earliest in the
- \l {AbstractInputMethod::traceEnd()} (C++) or \l {InputMethod::traceEnd()}
- {InputMethod.traceEnd()} (QML) method.
+ \l {InputMethod.traceEnd()} (QML) method.
*/
/*!
@@ -167,13 +165,11 @@ public:
\endcode
Trace objects are owned by their creator, which is the input method in
- normal case. This means the objects are constructed in
- \l {QtVirtualKeyboard::AbstractInputMethod::traceBegin()} (C++) or \l {InputMethod::traceBegin()}
- {InputMethod.traceBegin()} (QML) method.
+ normal case. This means the objects are constructed in the
+ \l {InputMethod.traceBegin()} (QML) method.
By definition, the trace object can be destroyed at earliest in the
- \l {QtVirtualKeyboard::AbstractInputMethod::traceEnd()} (C++) or \l {InputMethod::traceEnd()}
- {InputMethod.traceEnd()} (QML) method.
+ \l {InputMethod.traceEnd()} (QML) method.
*/
/*! \internal */