Wrap C++ API into namespace

This change wraps the entire C++ API into namespace.

In practice, all the C++ interfaces inside the qtvirtualkeyboard plugin
are private, except the QPlatformInputContext plugin API. Even the
AbstractInputMethod and AbstractInputPanel are not really a public in
the sense that they could be used outside the plugin. At least it does
not make sense, since there is no way to extend the virtual keyboard
functionality without recompiling the plugin.

Task-number: QTRD-3628
Change-Id: I1037ee247abca3219efeaa4e4150baaff7c3d668
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

68 files changed, 588 insertions, 104 deletions

diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp
index 4b891260..2d1cdf22 100644
--- a/src/virtualkeyboard/abstractinputmethod.cpp
+++ b/src/virtualkeyboard/abstractinputmethod.cpp
@@ -21,6 +21,13 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::AbstractInputMethodPrivate
+    \internal
+*/
+
 AbstractInputMethodPrivate::AbstractInputMethodPrivate() :
     QObjectPrivate(),
     inputEngine(0)
@@ -28,7 +35,7 @@ AbstractInputMethodPrivate::AbstractInputMethodPrivate() :
 }
 
 /*!
-    \class AbstractInputMethod
+    \class QtVirtualKeyboard::AbstractInputMethod
 
     \inmodule qtvirtualkeyboard
 
@@ -297,3 +304,5 @@ bool AbstractInputMethod::reselect(int cursorPosition, const DeclarativeInputEng
     The input method emits this signal when the current \a index has changed
     in the selection list identified by \a type.
 */
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/abstractinputmethod.h b/src/virtualkeyboard/abstractinputmethod.h
index c67474be..409d4cc4 100644
--- a/src/virtualkeyboard/abstractinputmethod.h
+++ b/src/virtualkeyboard/abstractinputmethod.h
@@ -26,6 +26,8 @@
 #include "declarativeselectionlistmodel.h"
 #include <QtCore/private/qobject_p.h>
 
+namespace QtVirtualKeyboard {
+
 class AbstractInputMethodPrivate : public QObjectPrivate
 {
 public:
@@ -80,4 +82,6 @@ private:
     friend class DeclarativeInputEngine;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/abstractinputpanel.cpp b/src/virtualkeyboard/abstractinputpanel.cpp
index 4c3a1ddb..f64552ed 100644
--- a/src/virtualkeyboard/abstractinputpanel.cpp
+++ b/src/virtualkeyboard/abstractinputpanel.cpp
@@ -22,8 +22,10 @@
 #include "abstractinputpanel.h"
 #include <QtCore/QRect>
 
+namespace QtVirtualKeyboard {
+
 /*!
-    \class AbstractInputPanel
+    \class QtVirtualKeyboard::AbstractInputPanel
 
     \inmodule qtvirtualkeyboard
 
@@ -109,3 +111,5 @@ void AbstractInputPanel::createView()
 void AbstractInputPanel::destroyView()
 {
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/abstractinputpanel.h b/src/virtualkeyboard/abstractinputpanel.h
index 058448b3..92408baa 100644
--- a/src/virtualkeyboard/abstractinputpanel.h
+++ b/src/virtualkeyboard/abstractinputpanel.h
@@ -24,6 +24,8 @@
 
 #include <QObject>
 
+namespace QtVirtualKeyboard {
+
 class AbstractInputPanel : public QObject
 {
     Q_OBJECT
@@ -44,4 +46,6 @@ public slots:
     virtual void destroyView();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // ABSTRACTINPUTPANEL_H
diff --git a/src/virtualkeyboard/appinputpanel.cpp b/src/virtualkeyboard/appinputpanel.cpp
index fda5d64f..0583888b 100644
--- a/src/virtualkeyboard/appinputpanel.cpp
+++ b/src/virtualkeyboard/appinputpanel.cpp
@@ -21,6 +21,8 @@
 
 #include "appinputpanel.h"
 
+namespace QtVirtualKeyboard {
+
 AppInputPanel::AppInputPanel(AppInputPanelPrivate &dd, QObject *parent) :
     AbstractInputPanel(dd, parent)
 {
@@ -56,3 +58,5 @@ bool AppInputPanel::isVisible() const
     Q_D(const AppInputPanel);
     return d->visible;
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/appinputpanel.h b/src/virtualkeyboard/appinputpanel.h
index 5f235069..0b84bbf7 100644
--- a/src/virtualkeyboard/appinputpanel.h
+++ b/src/virtualkeyboard/appinputpanel.h
@@ -25,6 +25,13 @@
 #include "abstractinputpanel.h"
 #include <QtCore/private/qobject_p.h>
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::AppInputPanelPrivate
+    \internal
+*/
+
 class AppInputPanelPrivate : public QObjectPrivate
 {
 public:
@@ -37,6 +44,11 @@ public:
     bool visible;
 };
 
+/*!
+    \class QtVirtualKeyboard::AppInputPanel
+    \internal
+*/
+
 class AppInputPanel : public AbstractInputPanel
 {
     Q_OBJECT
@@ -54,4 +66,6 @@ public:
     bool isVisible() const;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // APPINPUTPANEL_H
diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml
index dfbe479b..672008c8 100644
--- a/src/virtualkeyboard/content/components/TraceInputArea.qml
+++ b/src/virtualkeyboard/content/components/TraceInputArea.qml
@@ -43,7 +43,7 @@ MultiPointTouchArea {
 
     /*! Pattern recognition mode of this input area.
 
-        The default value is \l {DeclarativeInputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}.
+        The default value is \l {QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}.
     */
     property int patternRecognitionMode: InputEngine.PatternRecognitionDisabled
 
diff --git a/src/virtualkeyboard/content/components/TraceInputKey.qml b/src/virtualkeyboard/content/components/TraceInputKey.qml
index b75f974a..b6880d23 100644
--- a/src/virtualkeyboard/content/components/TraceInputKey.qml
+++ b/src/virtualkeyboard/content/components/TraceInputKey.qml
@@ -49,7 +49,7 @@ Item {
 
     /*! Pattern recognition mode of this input area.
 
-        The default value is \l {DeclarativeInputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}.
+        The default value is \l {QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}.
     */
     property alias patternRecognitionMode: traceInputArea.patternRecognitionMode
 
diff --git a/src/virtualkeyboard/declarativeinputcontext.cpp b/src/virtualkeyboard/declarativeinputcontext.cpp
index ce88509e..c03d6670 100644
--- a/src/virtualkeyboard/declarativeinputcontext.cpp
+++ b/src/virtualkeyboard/declarativeinputcontext.cpp
@@ -35,6 +35,14 @@
 #include <private/qqmlmetatype_p.h>
 #endif
 
+bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMethodEvent::Attribute &attribute2)
+{
+    return attribute1.start == attribute2.start &&
+           attribute1.length == attribute2.length &&
+           attribute1.type == attribute2.type &&
+           attribute1.value == attribute2.value;
+}
+
 /*!
     \qmlmodule QtQuick.Enterprise.VirtualKeyboard 2.0
 
@@ -49,6 +57,15 @@
     \brief Contains classes for integrating input methods.
 */
 
+/*!
+    \namespace QtVirtualKeyboard
+    \inmodule InputFramework
+
+    \brief Namespace for the Qt Virtual Keyboard C++ API.
+*/
+
+namespace QtVirtualKeyboard {
+
 class DeclarativeInputContextPrivate : public QObjectPrivate
 {
 public:
@@ -115,7 +132,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(DeclarativeInputContextPrivate::StateFlags)
 
 /*!
     \qmltype InputContext
-    \instantiates DeclarativeInputContext
+    \instantiates QtVirtualKeyboard::DeclarativeInputContext
     \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \brief Provides access to an input context.
@@ -124,11 +141,9 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(DeclarativeInputContextPrivate::StateFlags)
 */
 
 /*!
-    \class DeclarativeInputContext
+    \class QtVirtualKeyboard::DeclarativeInputContext
     \inmodule InputFramework
-    \ingroup qtvirtualkeyboard-qml
     \brief Provides access to an input context.
-    \internal
 */
 
 /*!
@@ -338,6 +353,9 @@ void DeclarativeInputContext::setLocale(const QString &locale)
     }
 }
 
+/*!
+    \internal
+*/
 void DeclarativeInputContext::updateAvailableLocales(const QStringList &availableLocales)
 {
     Settings *settings = Settings::instance();
@@ -494,6 +512,9 @@ void DeclarativeInputContext::clear()
         emit preeditTextChanged();
 }
 
+/*!
+    \internal
+*/
 bool DeclarativeInputContext::fileExists(const QUrl &fileUrl)
 {
 #ifdef COMPILING_QML
@@ -510,6 +531,9 @@ bool DeclarativeInputContext::fileExists(const QUrl &fileUrl)
 #endif
 }
 
+/*!
+    \internal
+*/
 bool DeclarativeInputContext::hasEnterKeyAction(QObject *item) const
 {
     return item != 0 && qmlAttachedPropertiesObject<EnterKeyAction>(item, false);
@@ -537,14 +561,6 @@ void DeclarativeInputContext::setFocus(bool enable)
     emit focusEditorChanged();
 }
 
-bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMethodEvent::Attribute &attribute2)
-{
-    return attribute1.start == attribute2.start &&
-           attribute1.length == attribute2.length &&
-           attribute1.type == attribute2.type &&
-           attribute1.value == attribute2.value;
-}
-
 void DeclarativeInputContext::sendPreedit(const QString &text, const QList<QInputMethodEvent::Attribute> &attributes, int replaceFrom, int replaceLength)
 {
     Q_D(DeclarativeInputContext);
@@ -720,7 +736,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::focus
+    \property QtVirtualKeyboard::DeclarativeInputContext::focus
     \brief the focus status.
 
     This property is changed when the input method receives or loses focus.
@@ -733,7 +749,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::shift
+    \property QtVirtualKeyboard::DeclarativeInputContext::shift
     \brief the shift status.
 
     This property is changed when the shift status changes.
@@ -746,7 +762,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::capsLock
+    \property QtVirtualKeyboard::DeclarativeInputContext::capsLock
     \brief the caps lock status.
 
     This property is changed when the caps lock status changes.
@@ -759,7 +775,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::cursorPosition
+    \property QtVirtualKeyboard::DeclarativeInputContext::cursorPosition
     \brief the cursor position.
 
     This property is changed when the cursor position changes.
@@ -772,7 +788,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::inputMethodHints
+    \property QtVirtualKeyboard::DeclarativeInputContext::inputMethodHints
     \brief the input method hints.
 
     This property is changed when the input method hints changes.
@@ -785,7 +801,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::preeditText
+    \property QtVirtualKeyboard::DeclarativeInputContext::preeditText
     \brief the pre-edit text.
 
     This property sets the pre-edit text.
@@ -798,7 +814,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::surroundingText
+    \property QtVirtualKeyboard::DeclarativeInputContext::surroundingText
     \brief the surrounding text around cursor.
 
     This property is changed when the surrounding text around the cursor changes.
@@ -811,7 +827,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::selectedText
+    \property QtVirtualKeyboard::DeclarativeInputContext::selectedText
     \brief the selected text.
 
     This property is changed when the selected text changes.
@@ -824,7 +840,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::cursorRectangle
+    \property QtVirtualKeyboard::DeclarativeInputContext::cursorRectangle
     \brief the cursor rectangle.
 
     This property is changed when the cursor rectangle changes.
@@ -837,7 +853,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::keyboardRectangle
+    \property QtVirtualKeyboard::DeclarativeInputContext::keyboardRectangle
     \brief the keyboard rectangle.
 
     Use this property to set the keyboard rectangle.
@@ -850,7 +866,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::previewRectangle
+    \property QtVirtualKeyboard::DeclarativeInputContext::previewRectangle
     \brief the preview rectangle.
 
     Use this property to set the preview rectangle.
@@ -863,7 +879,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::previewVisible
+    \property QtVirtualKeyboard::DeclarativeInputContext::previewVisible
     \brief the animating status.
 
     Use this property to set the visibility status of the preview.
@@ -877,7 +893,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::animating
+    \property QtVirtualKeyboard::DeclarativeInputContext::animating
     \brief the animating status.
 
     Use this property to set the animating status, for example
@@ -891,7 +907,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::locale
+    \property QtVirtualKeyboard::DeclarativeInputContext::locale
     \brief the locale.
 
     Sets the locale for this input context.
@@ -904,7 +920,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::inputItem
+    \property QtVirtualKeyboard::DeclarativeInputContext::inputItem
     \brief the focused input item.
 
     This property is changed when the focused input item changes.
@@ -917,7 +933,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::shiftHandler
+    \property QtVirtualKeyboard::DeclarativeInputContext::shiftHandler
     \brief the shift handler instance.
 
     This property stores the shift handler.
@@ -930,7 +946,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \property DeclarativeInputContext::inputEngine
+    \property QtVirtualKeyboard::DeclarativeInputContext::inputEngine
     \brief the input engine.
 
     This property stores the input engine.
@@ -943,7 +959,19 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event)
 */
 
 /*!
-    \fn void DeclarativeInputContext::focusEditorChanged()
+    \fn void QtVirtualKeyboard::DeclarativeInputContext::focusEditorChanged()
 
     This signal is emitted when the focus editor changes.
 */
+
+/*!
+    \fn void QtVirtualKeyboard::DeclarativeInputContext::navigationKeyPressed(int key, bool isAutoRepeat)
+    \internal
+*/
+
+/*!
+    \fn void QtVirtualKeyboard::DeclarativeInputContext::navigationKeyReleased(int key, bool isAutoRepeat)
+    \internal
+*/
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/declarativeinputcontext.h b/src/virtualkeyboard/declarativeinputcontext.h
index 56e559e8..c22d5ed6 100644
--- a/src/virtualkeyboard/declarativeinputcontext.h
+++ b/src/virtualkeyboard/declarativeinputcontext.h
@@ -28,6 +28,8 @@
 #include <QInputMethodEvent>
 #include <QInputMethod>
 
+namespace QtVirtualKeyboard {
+
 class PlatformInputContext;
 class DeclarativeInputEngine;
 class DeclarativeShiftHandler;
@@ -53,8 +55,8 @@ class DeclarativeInputContext : public QObject
     Q_PROPERTY(bool animating READ animating WRITE setAnimating NOTIFY animatingChanged)
     Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged)
     Q_PROPERTY(QObject *inputItem READ inputItem NOTIFY inputItemChanged)
-    Q_PROPERTY(DeclarativeShiftHandler *shiftHandler READ shiftHandler CONSTANT)
-    Q_PROPERTY(DeclarativeInputEngine *inputEngine READ inputEngine CONSTANT)
+    Q_PROPERTY(QtVirtualKeyboard::DeclarativeShiftHandler *shiftHandler READ shiftHandler CONSTANT)
+    Q_PROPERTY(QtVirtualKeyboard::DeclarativeInputEngine *inputEngine READ inputEngine CONSTANT)
 
 public:
     explicit DeclarativeInputContext(PlatformInputContext *parent = 0);
@@ -133,4 +135,6 @@ private:
     friend class PlatformInputContext;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/declarativeinputengine.cpp b/src/virtualkeyboard/declarativeinputengine.cpp
index aa153fb6..5d887646 100644
--- a/src/virtualkeyboard/declarativeinputengine.cpp
+++ b/src/virtualkeyboard/declarativeinputengine.cpp
@@ -28,6 +28,8 @@
 #include <QTimerEvent>
 #include <QtCore/private/qobject_p.h>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeInputEnginePrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(DeclarativeInputEngine)
@@ -108,7 +110,7 @@ private:
     \qmltype InputEngine
     \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
-    \instantiates DeclarativeInputEngine
+    \instantiates QtVirtualKeyboard::DeclarativeInputEngine
     \brief Maps the user input to the input methods.
 
     The input engine is responsible for routing input events to input
@@ -120,7 +122,7 @@ private:
 */
 
 /*!
-    \class DeclarativeInputEngine
+    \class QtVirtualKeyboard::DeclarativeInputEngine
     \inmodule InputFramework
     \brief The DeclarativeInputEngine class provides an input engine
     that supports C++ and QML integration.
@@ -509,8 +511,8 @@ QList<int> DeclarativeInputEngine::patternRecognitionModes() const
 
     The trace interaction is ended by calling the traceEnd() method.
 */
-DeclarativeTrace *DeclarativeInputEngine::traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode,
-                                                     const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo)
+QtVirtualKeyboard::DeclarativeTrace *DeclarativeInputEngine::traceBegin(int traceId, QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode,
+                                                                        const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo)
 {
     Q_D(DeclarativeInputEngine);
     VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::traceBegin():"
@@ -548,7 +550,7 @@ DeclarativeTrace *DeclarativeInputEngine::traceBegin(int traceId, DeclarativeInp
     The function returns true if the trace interaction was accepted (i.e. the touch
     events should not be used for anything else).
 */
-bool DeclarativeInputEngine::traceEnd(DeclarativeTrace *trace)
+bool DeclarativeInputEngine::traceEnd(QtVirtualKeyboard::DeclarativeTrace *trace)
 {
     Q_D(DeclarativeInputEngine);
     VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::traceEnd():" << trace;
@@ -644,7 +646,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \property DeclarativeInputEngine::activeKey
+    \property QtVirtualKeyboard::DeclarativeInputEngine::activeKey
     \brief the active key.
 
     Currently pressed key.
@@ -656,7 +658,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
     Previously pressed key.
 */
 /*!
-    \property DeclarativeInputEngine::previousKey
+    \property QtVirtualKeyboard::DeclarativeInputEngine::previousKey
     \brief the previous active key.
 
     Previously pressed key.
@@ -670,7 +672,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \property DeclarativeInputEngine::inputMethod
+    \property QtVirtualKeyboard::DeclarativeInputEngine::inputMethod
     \brief the active input method.
 
     Use this property to set active the input method, or to monitor when the
@@ -685,7 +687,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \property DeclarativeInputEngine::inputModes
+    \property QtVirtualKeyboard::DeclarativeInputEngine::inputModes
     \brief the available input modes for active input method.
 
     The list of available input modes is dependent on the input method and
@@ -715,7 +717,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \property DeclarativeInputEngine::inputMode
+    \property QtVirtualKeyboard::DeclarativeInputEngine::inputMode
     \brief the current input mode.
 
     Use this property to get or set the current input mode. The
@@ -731,7 +733,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \property DeclarativeInputEngine::wordCandidateListModel
+    \property QtVirtualKeyboard::DeclarativeInputEngine::wordCandidateListModel
     \brief list model for the word candidate list.
 
     Use this property to access the list model for the word candidate
@@ -746,7 +748,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \property DeclarativeInputEngine::wordCandidateListVisibleHint
+    \property QtVirtualKeyboard::DeclarativeInputEngine::wordCandidateListVisibleHint
     \brief visible hint for the word candidate list.
 
     Use this property to check if the word candidate list should be visible
@@ -754,7 +756,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \enum DeclarativeInputEngine::InputMode
+    \enum QtVirtualKeyboard::DeclarativeInputEngine::InputMode
 
     This enum specifies the input mode for the input method.
 
@@ -779,7 +781,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \enum DeclarativeInputEngine::TextCase
+    \enum QtVirtualKeyboard::DeclarativeInputEngine::TextCase
 
     This enum specifies the text case for the input method.
 
@@ -790,7 +792,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \enum DeclarativeInputEngine::PatternRecognitionMode
+    \enum QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionMode
 
     This enum specifies the input mode for the input method.
 
@@ -801,7 +803,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \enum DeclarativeInputEngine::ReselectFlag
+    \enum QtVirtualKeyboard::DeclarativeInputEngine::ReselectFlag
 
     This enum specifies the rules for word reselection.
 
@@ -822,7 +824,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::virtualKeyClicked(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool isAutoRepeat)
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::virtualKeyClicked(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool isAutoRepeat)
 
     Indicates that the virtual \a key was clicked with the given \a text and
     \a modifiers. The \a isAutoRepeat indicates if the event is automatically
@@ -838,7 +840,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \property DeclarativeInputEngine::patternRecognitionModes
+    \property QtVirtualKeyboard::DeclarativeInputEngine::patternRecognitionModes
     \since QtQuick.Enterprise.VirtualKeyboard 2.0
     \brief the list of available pattern recognition modes.
 
@@ -852,7 +854,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::activeKeyChanged(Qt::Key key)
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::activeKeyChanged(Qt::Key key)
 
     Indicates that the active \a key has changed.
 */
@@ -864,7 +866,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::previousKeyChanged(Qt::Key key)
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::previousKeyChanged(Qt::Key key)
 
     Indicates that the previous \a key has changed.
 */
@@ -876,7 +878,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::inputMethodChanged()
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputMethodChanged()
 
     Indicates that the input method has changed.
 */
@@ -891,7 +893,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::inputMethodReset()
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputMethodReset()
 
     Emitted when the input method needs to be reset.
 
@@ -907,7 +909,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::inputMethodUpdate()
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputMethodUpdate()
 
     \note This signal is automatically connected to AbstractInputMethod::update()
     and InputMethod::update() when the input method is activated.
@@ -920,7 +922,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::inputModesChanged()
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputModesChanged()
 
     Indicates that the available input modes have changed.
 */
@@ -932,7 +934,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::inputModeChanged()
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputModeChanged()
 
     Indicates that the input mode has changed.
 */
@@ -952,8 +954,10 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent)
 */
 
 /*!
-    \fn void DeclarativeInputEngine::patternRecognitionModesChanged()
+    \fn void QtVirtualKeyboard::DeclarativeInputEngine::patternRecognitionModesChanged()
     \since QtQuick.Enterprise.VirtualKeyboard 2.0
 
     Indicates that the available pattern recognition modes have changed.
 */
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/declarativeinputengine.h b/src/virtualkeyboard/declarativeinputengine.h
index fafc64f3..42167f9d 100644
--- a/src/virtualkeyboard/declarativeinputengine.h
+++ b/src/virtualkeyboard/declarativeinputengine.h
@@ -25,6 +25,8 @@
 #include <QObject>
 #include <QPointer>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeInputContext;
 class DeclarativeSelectionListModel;
 class AbstractInputMethod;
@@ -42,11 +44,11 @@ class DeclarativeInputEngine : public QObject
     Q_FLAGS(ReselectFlags)
     Q_PROPERTY(Qt::Key activeKey READ activeKey NOTIFY activeKeyChanged)
     Q_PROPERTY(Qt::Key previousKey READ previousKey NOTIFY previousKeyChanged)
-    Q_PROPERTY(AbstractInputMethod *inputMethod READ inputMethod WRITE setInputMethod NOTIFY inputMethodChanged)
+    Q_PROPERTY(QtVirtualKeyboard::AbstractInputMethod *inputMethod READ inputMethod WRITE setInputMethod NOTIFY inputMethodChanged)
     Q_PROPERTY(QList<int> inputModes READ inputModes NOTIFY inputModesChanged)
     Q_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode NOTIFY inputModeChanged)
     Q_PROPERTY(QList<int> patternRecognitionModes READ patternRecognitionModes NOTIFY patternRecognitionModesChanged)
-    Q_PROPERTY(DeclarativeSelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged)
+    Q_PROPERTY(QtVirtualKeyboard::DeclarativeSelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged)
     Q_PROPERTY(bool wordCandidateListVisibleHint READ wordCandidateListVisibleHint NOTIFY wordCandidateListVisibleHintChanged)
 
     explicit DeclarativeInputEngine(DeclarativeInputContext *parent = 0);
@@ -102,9 +104,9 @@ public:
     bool wordCandidateListVisibleHint() const;
 
     QList<int> patternRecognitionModes() const;
-    Q_INVOKABLE DeclarativeTrace *traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode,
-                                             const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo);
-    Q_INVOKABLE bool traceEnd(DeclarativeTrace *trace);
+    Q_INVOKABLE QtVirtualKeyboard::DeclarativeTrace *traceBegin(int traceId, QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode,
+                                                                const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo);
+    Q_INVOKABLE bool traceEnd(QtVirtualKeyboard::DeclarativeTrace *trace);
 
     Q_INVOKABLE bool reselect(int cursorPosition, const ReselectFlags &reselectFlags);
 
@@ -133,8 +135,10 @@ private:
     friend class DeclarativeInputContext;
 };
 
-Q_DECLARE_METATYPE(DeclarativeInputEngine::TextCase)
-Q_DECLARE_METATYPE(DeclarativeInputEngine::InputMode)
-Q_DECLARE_OPERATORS_FOR_FLAGS(DeclarativeInputEngine::ReselectFlags)
+} // namespace QtVirtualKeyboard
+
+Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeInputEngine::TextCase)
+Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeInputEngine::InputMode)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QtVirtualKeyboard::DeclarativeInputEngine::ReselectFlags)
 
 #endif
diff --git a/src/virtualkeyboard/declarativeinputmethod.cpp b/src/virtualkeyboard/declarativeinputmethod.cpp
index 3bb9525c..a89d5988 100644
--- a/src/virtualkeyboard/declarativeinputmethod.cpp
+++ b/src/virtualkeyboard/declarativeinputmethod.cpp
@@ -23,9 +23,11 @@
 #include "declarativetrace.h"
 #include <QVariant>
 
+namespace QtVirtualKeyboard {
+
 /*!
     \qmltype InputMethod
-    \instantiates DeclarativeInputMethod
+    \instantiates QtVirtualKeyboard::DeclarativeInputMethod
     \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \brief Base type for creating input method in QML.
@@ -203,6 +205,11 @@
     The method returns \c true if the word was successfully reselected.
 */
 
+/*!
+    \class QtVirtualKeyboard::DeclarativeInputMethod
+    \internal
+*/
+
 DeclarativeInputMethod::DeclarativeInputMethod(QObject *parent) :
     AbstractInputMethod(parent)
 {
@@ -350,3 +357,5 @@ void DeclarativeInputMethod::update()
 {
     QMetaObject::invokeMethod(this, "update");
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/declarativeinputmethod.h b/src/virtualkeyboard/declarativeinputmethod.h
index c52de37e..4fecf257 100644
--- a/src/virtualkeyboard/declarativeinputmethod.h
+++ b/src/virtualkeyboard/declarativeinputmethod.h
@@ -24,11 +24,13 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeInputMethod : public AbstractInputMethod
 {
     Q_OBJECT
-    Q_PROPERTY(DeclarativeInputContext *inputContext READ inputContext CONSTANT)
-    Q_PROPERTY(DeclarativeInputEngine *inputEngine READ inputEngine CONSTANT)
+    Q_PROPERTY(QtVirtualKeyboard::DeclarativeInputContext *inputContext READ inputContext CONSTANT)
+    Q_PROPERTY(QtVirtualKeyboard::DeclarativeInputEngine *inputEngine READ inputEngine CONSTANT)
 
 public:
     explicit DeclarativeInputMethod(QObject *parent = 0);
@@ -56,4 +58,6 @@ public:
     void update();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // DECLARATIVEINPUTMETHOD_H
diff --git a/src/virtualkeyboard/declarativeselectionlistmodel.cpp b/src/virtualkeyboard/declarativeselectionlistmodel.cpp
index f42766b3..6d8d6d6c 100644
--- a/src/virtualkeyboard/declarativeselectionlistmodel.cpp
+++ b/src/virtualkeyboard/declarativeselectionlistmodel.cpp
@@ -23,6 +23,8 @@
 #include "abstractinputmethod.h"
 #include <QtCore/private/qabstractitemmodel_p.h>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeSelectionListModelPrivate : public QAbstractItemModelPrivate
 {
 public:
@@ -42,7 +44,7 @@ public:
 
 /*!
     \qmltype SelectionListModel
-    \instantiates DeclarativeSelectionListModel
+    \instantiates QtVirtualKeyboard::DeclarativeSelectionListModel
     \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \brief Provides a data model for the selection lists.
@@ -71,7 +73,7 @@ public:
 */
 
 /*!
-    \class DeclarativeSelectionListModel
+    \class QtVirtualKeyboard::DeclarativeSelectionListModel
 
     \inmodule InputFramework
 
@@ -83,7 +85,7 @@ public:
 */
 
 /*!
-    \enum DeclarativeSelectionListModel::Type
+    \enum QtVirtualKeyboard::DeclarativeSelectionListModel::Type
 
     This enum specifies the type of selection list.
 
@@ -92,7 +94,7 @@ public:
 */
 
 /*!
-    \enum DeclarativeSelectionListModel::Role
+    \enum QtVirtualKeyboard::DeclarativeSelectionListModel::Role
 
     This enum specifies a role of the data requested.
 
@@ -257,7 +259,7 @@ void DeclarativeSelectionListModel::selectionListActiveItemChanged(int type, int
     the list.
 */
 /*!
-    \fn void DeclarativeSelectionListModel::activeItemChanged(int index)
+    \fn void QtVirtualKeyboard::DeclarativeSelectionListModel::activeItemChanged(int index)
 
     This signal is emitted when the active item in the list changes. The
     UI should react to this signal by highlighting the item at \a index in
@@ -270,7 +272,9 @@ void DeclarativeSelectionListModel::selectionListActiveItemChanged(int type, int
     This signal is emitted when an item at \a index is selected by the user.
 */
 /*!
-    \fn void DeclarativeSelectionListModel::itemSelected(int index)
+    \fn void QtVirtualKeyboard::DeclarativeSelectionListModel::itemSelected(int index)
 
     This signal is emitted when an item at \a index is selected by the user.
 */
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/declarativeselectionlistmodel.h b/src/virtualkeyboard/declarativeselectionlistmodel.h
index a0372227..9f2a76fa 100644
--- a/src/virtualkeyboard/declarativeselectionlistmodel.h
+++ b/src/virtualkeyboard/declarativeselectionlistmodel.h
@@ -24,6 +24,8 @@
 
 #include <QAbstractListModel>
 
+namespace QtVirtualKeyboard {
+
 class AbstractInputMethod;
 class DeclarativeInputEngine;
 class DeclarativeSelectionListModelPrivate;
@@ -70,7 +72,9 @@ private:
     friend class DeclarativeInputEngine;
 };
 
-Q_DECLARE_METATYPE(DeclarativeSelectionListModel::Type)
-Q_DECLARE_METATYPE(DeclarativeSelectionListModel::Role)
+} // namespace QtVirtualKeyboard
+
+Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeSelectionListModel::Type)
+Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeSelectionListModel::Role)
 
 #endif // DECLARATIVESELECTIONLISTMODEL_H
diff --git a/src/virtualkeyboard/declarativesettings.cpp b/src/virtualkeyboard/declarativesettings.cpp
index b9516d77..5f83351c 100644
--- a/src/virtualkeyboard/declarativesettings.cpp
+++ b/src/virtualkeyboard/declarativesettings.cpp
@@ -27,6 +27,8 @@
 #include <QDir>
 #include <QtCore/private/qobject_p.h>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeSettingsPrivate : public QObjectPrivate
 {
 public:
@@ -115,6 +117,11 @@ QObject *DeclarativeSettings::registerSettingsModule(QQmlEngine *engine, QJSEngi
 }
 
 /*!
+    \class QtVirtualKeyboard::DeclarativeSettings
+    \internal
+*/
+
+/*!
     \internal
 */
 DeclarativeSettings::DeclarativeSettings(QQmlEngine *engine) :
@@ -267,3 +274,5 @@ void DeclarativeSettings::resetStyle()
     The list of active languages is a subset of the available languages, and can be
     used to limit the list of available languages in the application lifetime.
 */
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/declarativesettings.h b/src/virtualkeyboard/declarativesettings.h
index 0561ac46..ef115f02 100644
--- a/src/virtualkeyboard/declarativesettings.h
+++ b/src/virtualkeyboard/declarativesettings.h
@@ -24,6 +24,8 @@
 
 #include "qqml.h"
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeSettingsPrivate;
 
 class DeclarativeSettings : public QObject
@@ -65,4 +67,6 @@ private:
     void resetStyle();
 };
 
+}
+
 #endif // DECLARATIVESETTINGS_H
diff --git a/src/virtualkeyboard/declarativeshifthandler.cpp b/src/virtualkeyboard/declarativeshifthandler.cpp
index 53c44d49..96a5cb31 100644
--- a/src/virtualkeyboard/declarativeshifthandler.cpp
+++ b/src/virtualkeyboard/declarativeshifthandler.cpp
@@ -25,6 +25,8 @@
 #include <QtCore/private/qobject_p.h>
 #include <QSet>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeShiftHandlerPrivate : public QObjectPrivate
 {
 public:
@@ -58,12 +60,12 @@ public:
     \qmltype ShiftHandler
     \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
-    \instantiates DeclarativeShiftHandler
+    \instantiates QtVirtualKeyboard::DeclarativeShiftHandler
     \brief Manages the shift state.
 */
 
 /*!
-    \class DeclarativeShiftHandler
+    \class QtVirtualKeyboard::DeclarativeShiftHandler
     \inmodule InputFramework
     \brief Manages the shift state.
 */
@@ -258,7 +260,7 @@ void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled)
 }
 
 /*!
-    \property DeclarativeShiftHandler::sentenceEndingCharacters
+    \property QtVirtualKeyboard::DeclarativeShiftHandler::sentenceEndingCharacters
 
     This property specifies the sentence ending characters which
     will cause shift state change.
@@ -280,7 +282,7 @@ void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled)
 /*!
     \since 1.2
 
-    \property DeclarativeShiftHandler::autoCapitalizationEnabled
+    \property QtVirtualKeyboard::DeclarativeShiftHandler::autoCapitalizationEnabled
 
     This property provides the current state of the automatic
     capitalization feature.
@@ -298,7 +300,7 @@ void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled)
 /*!
     \since 1.2
 
-    \property DeclarativeShiftHandler::toggleShiftEnabled
+    \property QtVirtualKeyboard::DeclarativeShiftHandler::toggleShiftEnabled
 
     This property provides the current state of the toggleShift()
     method. When true, the current shift state can be changed by
@@ -314,3 +316,5 @@ void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled)
     method. When true, the current shift state can be changed by
     calling the toggleShift() method.
 */
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/declarativeshifthandler.h b/src/virtualkeyboard/declarativeshifthandler.h
index 71f3f2df..d428012d 100644
--- a/src/virtualkeyboard/declarativeshifthandler.h
+++ b/src/virtualkeyboard/declarativeshifthandler.h
@@ -24,6 +24,8 @@
 
 #include <QObject>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeInputContext;
 class DeclarativeShiftHandlerPrivate;
 
@@ -68,4 +70,6 @@ private:
     friend class DeclarativeInputContext;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // DECLARATIVESHIFTHANDLER_H
diff --git a/src/virtualkeyboard/declarativetrace.cpp b/src/virtualkeyboard/declarativetrace.cpp
index 56307ef3..51847139 100644
--- a/src/virtualkeyboard/declarativetrace.cpp
+++ b/src/virtualkeyboard/declarativetrace.cpp
@@ -22,6 +22,8 @@
 #include "declarativetrace.h"
 #include <QtCore/private/qobject_p.h>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeTracePrivate : public QObjectPrivate
 {
 public:
@@ -40,7 +42,7 @@ public:
 };
 
 /*!
-    \class DeclarativeTrace
+    \class QtVirtualKeyboard::DeclarativeTrace
     \inmodule qtvirtualkeyboard
     \since QtQuick.Enterprise.VirtualKeyboard 2.0
     \brief Trace is a data model for touch input data.
@@ -103,7 +105,7 @@ public:
 
 /*!
     \qmltype Trace
-    \instantiates DeclarativeTrace
+    \instantiates QtVirtualKeyboard::DeclarativeTrace
     \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
     \ingroup qtvirtualkeyboard-qml
     \since QtQuick.Enterprise.VirtualKeyboard 2.0
@@ -157,11 +159,11 @@ public:
 
     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()}
+    \l {QtVirtualKeyboard::AbstractInputMethod::traceBegin()} (C++) or \l {InputMethod::traceBegin()}
     {InputMethod.traceBegin()} (QML) method.
 
     By definition, the trace object can be destroyed at earliest in the
-    \l {AbstractInputMethod::traceEnd()} (C++) or \l {InputMethod::traceEnd()}
+    \l {QtVirtualKeyboard::AbstractInputMethod::traceEnd()} (C++) or \l {InputMethod::traceEnd()}
     {InputMethod.traceEnd()} (QML) method.
 */
 
@@ -366,7 +368,7 @@ void DeclarativeTrace::setCanceled(bool canceled)
     Unique id of this Trace.
 */
 
-/*! \property DeclarativeTrace::traceId
+/*! \property QtVirtualKeyboard::DeclarativeTrace::traceId
     \brief unique id of this Trace.
 */
 
@@ -377,7 +379,7 @@ void DeclarativeTrace::setCanceled(bool canceled)
     is added.
 */
 
-/*! \property DeclarativeTrace::channels
+/*! \property QtVirtualKeyboard::DeclarativeTrace::channels
     \brief list of data channels in the Trace.
 
     This property must be initialized before the data
@@ -389,7 +391,7 @@ void DeclarativeTrace::setCanceled(bool canceled)
     The number of points in the Trace.
 */
 
-/*! \property DeclarativeTrace::length
+/*! \property QtVirtualKeyboard::DeclarativeTrace::length
     \brief the number of of points in the Trace.
 */
 
@@ -399,7 +401,7 @@ void DeclarativeTrace::setCanceled(bool canceled)
     If the value is true, no more data is accepted.
 */
 
-/*! \property DeclarativeTrace::isFinal
+/*! \property QtVirtualKeyboard::DeclarativeTrace::isFinal
     \brief defines whether the Trace can accept more data.
     If the value is true, no more data is accepted.
 */
@@ -411,9 +413,11 @@ void DeclarativeTrace::setCanceled(bool canceled)
     whose isCanceled property set to true.
 */
 
-/*! \property DeclarativeTrace::isCanceled
+/*! \property QtVirtualKeyboard::DeclarativeTrace::isCanceled
     \brief defines whether the Trace is canceled.
 
     The input data should not be processed from the Traces
     whose isCanceled property set to true.
 */
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/declarativetrace.h b/src/virtualkeyboard/declarativetrace.h
index 51f801f1..2cfb653c 100644
--- a/src/virtualkeyboard/declarativetrace.h
+++ b/src/virtualkeyboard/declarativetrace.h
@@ -26,6 +26,8 @@
 #include <QVariant>
 #include <QPointF>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeTracePrivate;
 
 class DeclarativeTrace : public QObject
@@ -69,4 +71,6 @@ signals:
     void canceledChanged(bool isCanceled);
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // DECLARATIVETRACE_H
diff --git a/src/virtualkeyboard/defaultinputmethod.cpp b/src/virtualkeyboard/defaultinputmethod.cpp
index f42b2113..c1841165 100644
--- a/src/virtualkeyboard/defaultinputmethod.cpp
+++ b/src/virtualkeyboard/defaultinputmethod.cpp
@@ -22,6 +22,13 @@
 #include "defaultinputmethod.h"
 #include "declarativeinputcontext.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::DefaultInputMethod
+    \internal
+*/
+
 DefaultInputMethod::DefaultInputMethod(QObject *parent) :
     AbstractInputMethod(parent)
 {
@@ -59,3 +66,5 @@ void DefaultInputMethod::reset()
 void DefaultInputMethod::update()
 {
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/defaultinputmethod.h b/src/virtualkeyboard/defaultinputmethod.h
index f89ed6d9..9aa18b7e 100644
--- a/src/virtualkeyboard/defaultinputmethod.h
+++ b/src/virtualkeyboard/defaultinputmethod.h
@@ -24,6 +24,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class DefaultInputMethod : public AbstractInputMethod
 {
     Q_OBJECT
@@ -41,4 +43,6 @@ public:
     void update();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // DEFAULTINPUTMETHOD_H
diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp
index 61e80e9a..eeb4b14a 100644
--- a/src/virtualkeyboard/desktopinputpanel.cpp
+++ b/src/virtualkeyboard/desktopinputpanel.cpp
@@ -35,6 +35,8 @@
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/QLibraryInfo>
 
+namespace QtVirtualKeyboard {
+
 class DesktopInputPanelPrivate : public AppInputPanelPrivate
 {
 public:
@@ -53,6 +55,11 @@ public:
     bool previewBindingActive;
 };
 
+/*!
+    \class QtVirtualKeyboard::DesktopInputPanel
+    \internal
+*/
+
 DesktopInputPanel::DesktopInputPanel(QObject *parent) :
     AppInputPanel(*new DesktopInputPanelPrivate(), parent)
 {
@@ -234,3 +241,5 @@ void DesktopInputPanel::updateInputRegion()
     d->view->setMask(inputRegion);
 #endif
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/desktopinputpanel.h b/src/virtualkeyboard/desktopinputpanel.h
index e74a6f4b..a8842517 100644
--- a/src/virtualkeyboard/desktopinputpanel.h
+++ b/src/virtualkeyboard/desktopinputpanel.h
@@ -28,6 +28,8 @@ QT_BEGIN_NAMESPACE
 class QWindow;
 QT_END_NAMESPACE
 
+namespace QtVirtualKeyboard {
+
 class DesktopInputPanelPrivate;
 
 class DesktopInputPanel : public AppInputPanel
@@ -59,4 +61,6 @@ protected:
     void updateInputRegion();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // DESKTOPINPUTPANEL_H
diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc
index 0b991153..3f18187c 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -286,9 +286,9 @@ The trace API consists of the following virtual methods, which the input method
 must implement in order to receive and process touch input data.
 
 \list
-    \li \l { AbstractInputMethod::patternRecognitionModes } { patternRecognitionModes }
-    \li \l { AbstractInputMethod::traceBegin } { traceBegin }
-    \li \l { AbstractInputMethod::traceEnd } { traceEnd }
+    \li \l { QtVirtualKeyboard::AbstractInputMethod::patternRecognitionModes } { patternRecognitionModes }
+    \li \l { QtVirtualKeyboard::AbstractInputMethod::traceBegin } { traceBegin }
+    \li \l { QtVirtualKeyboard::AbstractInputMethod::traceEnd } { traceEnd }
 \endlist
 
 By implementing these methods, the input method can receive and process data
@@ -296,7 +296,7 @@ from a variety of input sources.
 
 The patternRecognitionModes method returns a list of pattern recognition modes,
 which are supported by the input method. A pattern recognition mode, such as
-\l { DeclarativeInputEngine::HandwritingRecoginition } { HandwritingRecoginition },
+\l { QtVirtualKeyboard::DeclarativeInputEngine::HandwritingRecoginition } { HandwritingRecoginition },
 defines the method by which the input method processes the data.
 
 The trace interaction is started when an input source detects a new contact point, and
diff --git a/src/virtualkeyboard/enterkeyaction.cpp b/src/virtualkeyboard/enterkeyaction.cpp
index 25b18762..bfc0b5cb 100644
--- a/src/virtualkeyboard/enterkeyaction.cpp
+++ b/src/virtualkeyboard/enterkeyaction.cpp
@@ -22,6 +22,8 @@
 #include "enterkeyaction.h"
 #include "enterkeyactionattachedtype.h"
 
+namespace QtVirtualKeyboard {
+
 /*!
     \qmltype EnterKeyAction
     \inqmlmodule QtQuick.Enterprise.VirtualKeyboard
@@ -50,7 +52,7 @@
 */
 
 /*!
-    \class EnterKeyAction
+    \class QtVirtualKeyboard::EnterKeyAction
     \internal
 */
 
@@ -93,3 +95,5 @@ EnterKeyActionAttachedType *EnterKeyAction::qmlAttachedProperties(QObject *objec
 
     Enables or disables the enter key button in virtual keyboard.
 */
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/enterkeyaction.h b/src/virtualkeyboard/enterkeyaction.h
index cfcbfdc1..68f0ab6d 100644
--- a/src/virtualkeyboard/enterkeyaction.h
+++ b/src/virtualkeyboard/enterkeyaction.h
@@ -24,6 +24,8 @@
 
 #include <qqml.h>
 
+namespace QtVirtualKeyboard {
+
 class EnterKeyActionAttachedType;
 
 class EnterKeyAction : public QObject
@@ -45,7 +47,9 @@ public:
     static EnterKeyActionAttachedType *qmlAttachedProperties(QObject *object);
 };
 
-Q_DECLARE_METATYPE(EnterKeyAction::Id)
-QML_DECLARE_TYPEINFO(EnterKeyAction, QML_HAS_ATTACHED_PROPERTIES)
+} // namespace QtVirtualKeyboard
+
+Q_DECLARE_METATYPE(QtVirtualKeyboard::EnterKeyAction::Id)
+QML_DECLARE_TYPEINFO(QtVirtualKeyboard::EnterKeyAction, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif
diff --git a/src/virtualkeyboard/enterkeyactionattachedtype.cpp b/src/virtualkeyboard/enterkeyactionattachedtype.cpp
index cda28c82..2528f068 100644
--- a/src/virtualkeyboard/enterkeyactionattachedtype.cpp
+++ b/src/virtualkeyboard/enterkeyactionattachedtype.cpp
@@ -21,6 +21,13 @@
 
 #include "enterkeyactionattachedtype.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::EnterKeyActionAttachedType
+    \internal
+*/
+
 EnterKeyActionAttachedType::EnterKeyActionAttachedType(QObject *parent) :
     QObject(parent),
     m_actionId(EnterKeyAction::None),
@@ -67,3 +74,5 @@ void EnterKeyActionAttachedType::setEnabled(bool enabled)
         emit enabledChanged();
     }
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/enterkeyactionattachedtype.h b/src/virtualkeyboard/enterkeyactionattachedtype.h
index 78ad60e0..5c2f5629 100644
--- a/src/virtualkeyboard/enterkeyactionattachedtype.h
+++ b/src/virtualkeyboard/enterkeyactionattachedtype.h
@@ -25,6 +25,8 @@
 #include <QObject>
 #include "enterkeyaction.h"
 
+namespace QtVirtualKeyboard {
+
 class EnterKeyActionAttachedType : public QObject
 {
     Q_OBJECT
@@ -53,4 +55,6 @@ private:
     bool m_enabled;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/hangul.cpp b/src/virtualkeyboard/hangul.cpp
index b05a8873..9b738f50 100644
--- a/src/virtualkeyboard/hangul.cpp
+++ b/src/virtualkeyboard/hangul.cpp
@@ -21,6 +21,8 @@
 
 #include "hangul.h"
 
+namespace QtVirtualKeyboard {
+
 const QList<ushort> Hangul::initials = QList<ushort>()
     << 0x3131 << 0x3132 << 0x3134 << 0x3137 << 0x3138 << 0x3139 << 0x3141
     << 0x3142 << 0x3143 << 0x3145 << 0x3146 << 0x3147 << 0x3148 << 0x3149
@@ -44,6 +46,11 @@ const int Hangul::TCount = 28;
 const int Hangul::NCount = Hangul::VCount * Hangul::TCount; // 588
 const int Hangul::SCount = Hangul::LCount * Hangul::NCount; // 11172
 
+/*!
+    \class QtVirtualKeyboard::Hangul
+    \internal
+*/
+
 QString Hangul::decompose(const QString &source)
 {
     QString result;
@@ -352,3 +359,5 @@ QMap<ushort, Hangul::HangulFinalIndex> Hangul::initDoubleFinalMap()
     map.insert(packDoubleFinal(HANGUL_FINAL_SIOS, HANGUL_FINAL_SIOS), HANGUL_FINAL_SSANGSIOS);
     return map;
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/hangul.h b/src/virtualkeyboard/hangul.h
index 668d36d9..eae946bc 100644
--- a/src/virtualkeyboard/hangul.h
+++ b/src/virtualkeyboard/hangul.h
@@ -26,6 +26,8 @@
 #include <QList>
 #include <QMap>
 
+namespace QtVirtualKeyboard {
+
 class Hangul
 {
     Q_DISABLE_COPY(Hangul)
@@ -121,4 +123,6 @@ private:
     static const int SCount;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/hangulinputmethod.cpp b/src/virtualkeyboard/hangulinputmethod.cpp
index b747c354..7a49896c 100644
--- a/src/virtualkeyboard/hangulinputmethod.cpp
+++ b/src/virtualkeyboard/hangulinputmethod.cpp
@@ -23,6 +23,13 @@
 #include "declarativeinputcontext.h"
 #include "hangul.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::HangulInputMethod
+    \internal
+*/
+
 HangulInputMethod::HangulInputMethod(QObject *parent) :
     AbstractInputMethod(*new AbstractInputMethodPrivate(), parent)
 {
@@ -82,3 +89,5 @@ void HangulInputMethod::reset()
 void HangulInputMethod::update()
 {
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/hangulinputmethod.h b/src/virtualkeyboard/hangulinputmethod.h
index 18a5269e..68bedefd 100644
--- a/src/virtualkeyboard/hangulinputmethod.h
+++ b/src/virtualkeyboard/hangulinputmethod.h
@@ -24,6 +24,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class HangulInputMethodPrivate;
 
 class HangulInputMethod : public AbstractInputMethod
@@ -44,4 +46,6 @@ public:
     void update();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // HANGULINPUTMETHOD_H
diff --git a/src/virtualkeyboard/hunspellinputmethod.cpp b/src/virtualkeyboard/hunspellinputmethod.cpp
index 494e7157..3a2508e3 100644
--- a/src/virtualkeyboard/hunspellinputmethod.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod.cpp
@@ -22,6 +22,13 @@
 #include "hunspellinputmethod_p.h"
 #include "declarativeinputcontext.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::HunspellInputMethod
+    \internal
+*/
+
 HunspellInputMethod::HunspellInputMethod(HunspellInputMethodPrivate &dd, QObject *parent) :
     AbstractInputMethod(dd, parent)
 {
@@ -293,3 +300,5 @@ void HunspellInputMethod::updateSuggestions(const QStringList &wordList, int act
     emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList);
     emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex);
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/hunspellinputmethod.h b/src/virtualkeyboard/hunspellinputmethod.h
index 33e32cee..70b695f1 100644
--- a/src/virtualkeyboard/hunspellinputmethod.h
+++ b/src/virtualkeyboard/hunspellinputmethod.h
@@ -24,6 +24,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class HunspellInputMethodPrivate;
 
 class HunspellInputMethod : public AbstractInputMethod
@@ -56,4 +58,6 @@ protected slots:
     void updateSuggestions(const QStringList &wordList, int activeWordIndex);
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // HUNSPELLINPUTMETHOD_H
diff --git a/src/virtualkeyboard/hunspellinputmethod_p.cpp b/src/virtualkeyboard/hunspellinputmethod_p.cpp
index 9c799725..56ebea9d 100644
--- a/src/virtualkeyboard/hunspellinputmethod_p.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod_p.cpp
@@ -28,6 +28,13 @@
 #include <QTextCodec>
 #include <QtCore/QLibraryInfo>
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::HunspellInputMethodPrivate
+    \internal
+*/
+
 HunspellInputMethodPrivate::HunspellInputMethodPrivate(HunspellInputMethod *q_ptr) :
     AbstractInputMethodPrivate(),
     q_ptr(q_ptr),
@@ -189,3 +196,5 @@ bool HunspellInputMethodPrivate::isJoiner(const QChar &c) const
     }
     return false;
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/hunspellinputmethod_p.h b/src/virtualkeyboard/hunspellinputmethod_p.h
index e93fca51..0446c4b5 100644
--- a/src/virtualkeyboard/hunspellinputmethod_p.h
+++ b/src/virtualkeyboard/hunspellinputmethod_p.h
@@ -25,6 +25,8 @@
 #include "hunspellinputmethod.h"
 #include "hunspellworker.h"
 
+namespace QtVirtualKeyboard {
+
 class HunspellInputMethodPrivate : public AbstractInputMethodPrivate
 {
     Q_DECLARE_PUBLIC(HunspellInputMethod)
@@ -53,4 +55,6 @@ public:
     bool autoSpaceAllowed;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // HUNSPELLINPUTMETHOD_P_H
diff --git a/src/virtualkeyboard/hunspellworker.cpp b/src/virtualkeyboard/hunspellworker.cpp
index 5c749d44..c1426adf 100644
--- a/src/virtualkeyboard/hunspellworker.cpp
+++ b/src/virtualkeyboard/hunspellworker.cpp
@@ -26,6 +26,23 @@
 #include <QFileInfo>
 #include <QTime>
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::HunspellTask
+    \internal
+*/
+
+/*!
+    \class QtVirtualKeyboard::HunspellWordList
+    \internal
+*/
+
+/*!
+    \class QtVirtualKeyboard::HunspellLoadDictionaryTask
+    \internal
+*/
+
 HunspellLoadDictionaryTask::HunspellLoadDictionaryTask(const QString &locale, const QStringList &searchPaths) :
     HunspellTask(),
     hunspellPtr(0),
@@ -85,6 +102,11 @@ void HunspellLoadDictionaryTask::run()
 #endif
 }
 
+/*!
+    \class QtVirtualKeyboard::HunspellBuildSuggestionsTask
+    \internal
+*/
+
 void HunspellBuildSuggestionsTask::run()
 {
 #ifdef QT_VIRTUALKEYBOARD_DEBUG
@@ -209,11 +231,21 @@ QString HunspellBuildSuggestionsTask::removeAccentsAndDiacritics(const QString&
     return normalized;
 }
 
+/*!
+    \class QtVirtualKeyboard::HunspellUpdateSuggestionsTask
+    \internal
+*/
+
 void HunspellUpdateSuggestionsTask::run()
 {
     emit updateSuggestions(wordList->list, wordList->index);
 }
 
+/*!
+    \class QtVirtualKeyboard::HunspellWorker
+    \internal
+*/
+
 HunspellWorker::HunspellWorker(QObject *parent) :
     QThread(parent),
     taskSema(),
@@ -275,3 +307,5 @@ void HunspellWorker::run()
         hunspell = 0;
     }
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/hunspellworker.h b/src/virtualkeyboard/hunspellworker.h
index 832e5807..af415db3 100644
--- a/src/virtualkeyboard/hunspellworker.h
+++ b/src/virtualkeyboard/hunspellworker.h
@@ -29,6 +29,12 @@
 #include <QSharedPointer>
 #include <hunspell/hunspell.h>
 
+QT_BEGIN_NAMESPACE
+class QTextCodec;
+QT_END_NAMESPACE
+
+namespace QtVirtualKeyboard {
+
 class HunspellTask : public QObject
 {
     Q_OBJECT
@@ -68,8 +74,6 @@ public:
     int index;
 };
 
-class QTextCodec;
-
 class HunspellBuildSuggestionsTask : public HunspellTask
 {
     Q_OBJECT
@@ -134,4 +138,6 @@ private:
     bool abort;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // HUNSPELLWORKER_H
diff --git a/src/virtualkeyboard/inputview.cpp b/src/virtualkeyboard/inputview.cpp
index 4c4b7782..f180fec6 100644
--- a/src/virtualkeyboard/inputview.cpp
+++ b/src/virtualkeyboard/inputview.cpp
@@ -21,6 +21,13 @@
 
 #include "inputview.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::InputView
+    \internal
+*/
+
 InputView::InputView(QWindow *parent) :
     QQuickView(parent)
 {
@@ -31,3 +38,5 @@ void InputView::resizeEvent(QResizeEvent *event)
     QQuickWindow::resizeEvent(event);
     emit sizeChanged();
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/inputview.h b/src/virtualkeyboard/inputview.h
index d2720074..e3a29471 100644
--- a/src/virtualkeyboard/inputview.h
+++ b/src/virtualkeyboard/inputview.h
@@ -24,6 +24,8 @@
 
 #include <QQuickView>
 
+namespace QtVirtualKeyboard {
+
 class InputView : public QQuickView
 {
     Q_OBJECT
@@ -37,4 +39,6 @@ protected:
     void resizeEvent(QResizeEvent *event);
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // INPUTVIEW_H
diff --git a/src/virtualkeyboard/lipiinputmethod.cpp b/src/virtualkeyboard/lipiinputmethod.cpp
index 204409cf..a2f9ef11 100644
--- a/src/virtualkeyboard/lipiinputmethod.cpp
+++ b/src/virtualkeyboard/lipiinputmethod.cpp
@@ -55,6 +55,8 @@
 #define LipiInputMethodPrivateBase AbstractInputMethodPrivate
 #endif
 
+namespace QtVirtualKeyboard {
+
 class LipiInputMethodPrivate : public LipiInputMethodPrivateBase
 {
     Q_DECLARE_PUBLIC(LipiInputMethod)
@@ -639,6 +641,11 @@ public:
     QVariantMap delayedResult;
 };
 
+/*!
+    \class QtVirtualKeyboard::LipiInputMethod
+    \internal
+*/
+
 LipiInputMethod::LipiInputMethod(QObject *parent) :
     LipiInputMethodBase(*new LipiInputMethodPrivate(this), parent)
 {
@@ -778,3 +785,5 @@ void LipiInputMethod::resultsAvailable(const QVariantList &resultList)
     Q_D(LipiInputMethod);
     d->resultsAvailable(resultList);
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/lipiinputmethod.h b/src/virtualkeyboard/lipiinputmethod.h
index 4f551335..0d490905 100644
--- a/src/virtualkeyboard/lipiinputmethod.h
+++ b/src/virtualkeyboard/lipiinputmethod.h
@@ -30,6 +30,8 @@
 #define LipiInputMethodBase AbstractInputMethod
 #endif
 
+namespace QtVirtualKeyboard {
+
 class LipiInputMethodPrivate;
 
 class LipiInputMethod : public LipiInputMethodBase
@@ -63,4 +65,6 @@ protected slots:
     void resultsAvailable(const QVariantList &resultList);
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/lipisharedrecognizer.cpp b/src/virtualkeyboard/lipisharedrecognizer.cpp
index a24222eb..ab93a343 100644
--- a/src/virtualkeyboard/lipisharedrecognizer.cpp
+++ b/src/virtualkeyboard/lipisharedrecognizer.cpp
@@ -38,6 +38,8 @@
 #include <QDir>
 #include <QtCore/QLibraryInfo>
 
+namespace QtVirtualKeyboard {
+
 int LipiSharedRecognizer::s_lipiEngineRefCount = 0;
 QString LipiSharedRecognizer::s_lipiRoot;
 void *LipiSharedRecognizer::s_lipiEngineHandle = 0;
@@ -51,6 +53,11 @@ QString LipiSharedRecognizer::s_activeModel;
 stringStringMap LipiSharedRecognizer::s_lipiEngineConfigEntries;
 int LipiSharedRecognizer::s_recognitionCount = 0;
 
+/*!
+    \class QtVirtualKeyboard::LipiSharedRecognizer
+    \internal
+*/
+
 LipiSharedRecognizer::LipiSharedRecognizer()
 {
     loadLipiInterface();
@@ -384,3 +391,5 @@ int LipiSharedRecognizer::loadMapping(const QString &mapFile)
 
     return SUCCESS;
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/lipisharedrecognizer.h b/src/virtualkeyboard/lipisharedrecognizer.h
index 32397afa..e43c8163 100644
--- a/src/virtualkeyboard/lipisharedrecognizer.h
+++ b/src/virtualkeyboard/lipisharedrecognizer.h
@@ -29,6 +29,8 @@
 
 class LTKLipiEngineInterface;
 
+namespace QtVirtualKeyboard {
+
 class LipiSharedRecognizer
 {
     Q_DISABLE_COPY(LipiSharedRecognizer)
@@ -76,4 +78,6 @@ private:
     static int s_recognitionCount;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // LIPISHAREDRECOGNIZER_H
diff --git a/src/virtualkeyboard/lipiworker.cpp b/src/virtualkeyboard/lipiworker.cpp
index bbf991bd..07ae5dbb 100644
--- a/src/virtualkeyboard/lipiworker.cpp
+++ b/src/virtualkeyboard/lipiworker.cpp
@@ -27,6 +27,18 @@
 #include "LTKShapeRecognizer.h"
 #include "LTKErrors.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::LipiTask
+    \internal
+*/
+
+/*!
+    \class QtVirtualKeyboard::LipiLoadModelDataTask
+    \internal
+*/
+
 void LipiLoadModelDataTask::run()
 {
     VIRTUALKEYBOARD_DEBUG() << "LipiLoadModelDataTask::run()";
@@ -42,6 +54,11 @@ void LipiLoadModelDataTask::run()
         qWarning() << QString("Error %1: %2").arg(result).arg(getErrorMessage(result).c_str());
 }
 
+/*!
+    \class QtVirtualKeyboard::LipiRecognitionTask
+    \internal
+*/
+
 LipiRecognitionTask::LipiRecognitionTask(const LTKCaptureDevice& deviceInfo,
                                          const LTKScreenContext& screenContext,
                                          const vector<int>& inSubsetOfClasses,
@@ -116,6 +133,11 @@ int LipiRecognitionTask::resultId() const
     return _resultId;
 }
 
+/*!
+    \class QtVirtualKeyboard::LipiRecognitionResultsTask
+    \internal
+*/
+
 LipiRecognitionResultsTask::LipiRecognitionResultsTask(QSharedPointer<vector<LTKShapeRecoResult> > resultVector,
                                                        const QMap<int, QChar> &unicodeMap,
                                                        int resultId) :
@@ -149,6 +171,11 @@ void LipiRecognitionResultsTask::run()
     emit resultsAvailable(resultList);
 }
 
+/*!
+    \class QtVirtualKeyboard::LipiWorker
+    \internal
+*/
+
 LipiWorker::LipiWorker(LTKShapeRecognizer *shapeRecognizer, QObject *parent) :
     QThread(parent),
     taskSema(),
@@ -217,3 +244,5 @@ void LipiWorker::run()
         }
     }
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/lipiworker.h b/src/virtualkeyboard/lipiworker.h
index 665b7916..447c23de 100644
--- a/src/virtualkeyboard/lipiworker.h
+++ b/src/virtualkeyboard/lipiworker.h
@@ -39,6 +39,8 @@
 #include "LTKShapeRecognizer.h"
 #include "LTKShapeRecoResult.h"
 
+namespace QtVirtualKeyboard {
+
 class LipiTask : public QObject
 {
     Q_OBJECT
@@ -133,4 +135,6 @@ private:
     bool abort;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // LIPIWORKER_H
diff --git a/src/virtualkeyboard/openwnninputmethod.cpp b/src/virtualkeyboard/openwnninputmethod.cpp
index 221472f4..9ff3d200 100644
--- a/src/virtualkeyboard/openwnninputmethod.cpp
+++ b/src/virtualkeyboard/openwnninputmethod.cpp
@@ -29,6 +29,8 @@
 #include <romkanhalfkatakana.h>
 #include <QTextFormat>
 
+namespace QtVirtualKeyboard {
+
 class OpenWnnInputMethodPrivate : public AbstractInputMethodPrivate
 {
     Q_DECLARE_PUBLIC(OpenWnnInputMethod)
@@ -585,6 +587,11 @@ public:
     int activeWordIndex;
 };
 
+/*!
+    \class QtVirtualKeyboard::OpenWnnInputMethod
+    \internal
+*/
+
 OpenWnnInputMethod::OpenWnnInputMethod(QObject *parent) :
     AbstractInputMethod(*new OpenWnnInputMethodPrivate(this), parent)
 {
@@ -793,3 +800,5 @@ void OpenWnnInputMethod::update()
     if (!d->disableUpdate)
         reset();
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/openwnninputmethod.h b/src/virtualkeyboard/openwnninputmethod.h
index c9051810..c49f0072 100644
--- a/src/virtualkeyboard/openwnninputmethod.h
+++ b/src/virtualkeyboard/openwnninputmethod.h
@@ -24,6 +24,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class OpenWnnInputMethodPrivate;
 
 class OpenWnnInputMethod : public AbstractInputMethod
@@ -50,4 +52,6 @@ public:
     void update();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/pinyindecoderservice.cpp b/src/virtualkeyboard/pinyindecoderservice.cpp
index 6f2f5f53..fea5008e 100644
--- a/src/virtualkeyboard/pinyindecoderservice.cpp
+++ b/src/virtualkeyboard/pinyindecoderservice.cpp
@@ -28,10 +28,17 @@
 #include <QtCore/QLibraryInfo>
 #include "virtualkeyboarddebug.h"
 
+namespace QtVirtualKeyboard {
+
 using namespace ime_pinyin;
 
 QScopedPointer<PinyinDecoderService> PinyinDecoderService::_instance;
 
+/*!
+    \class QtVirtualKeyboard::PinyinDecoderService
+    \internal
+*/
+
 PinyinDecoderService::PinyinDecoderService(QObject *parent) :
     QObject(parent),
     initDone(false)
@@ -210,3 +217,5 @@ QList<QString> PinyinDecoderService::predictionList(const QString &history)
         predictList.append(QString((QChar *)predictItems[i]));
     return predictList;
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/pinyindecoderservice.h b/src/virtualkeyboard/pinyindecoderservice.h
index 881ee6f7..e7940736 100644
--- a/src/virtualkeyboard/pinyindecoderservice.h
+++ b/src/virtualkeyboard/pinyindecoderservice.h
@@ -24,6 +24,8 @@
 
 #include <QObject>
 
+namespace QtVirtualKeyboard {
+
 class PinyinDecoderService : public QObject
 {
     Q_OBJECT
@@ -58,4 +60,6 @@ private:
     bool initDone;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // PINYINDECODERSERVICE_H
diff --git a/src/virtualkeyboard/pinyininputmethod.cpp b/src/virtualkeyboard/pinyininputmethod.cpp
index 2be8e240..3f9a69c6 100644
--- a/src/virtualkeyboard/pinyininputmethod.cpp
+++ b/src/virtualkeyboard/pinyininputmethod.cpp
@@ -24,6 +24,8 @@
 #include "declarativeinputcontext.h"
 #include "virtualkeyboarddebug.h"
 
+namespace QtVirtualKeyboard {
+
 class PinyinInputMethodPrivate : public AbstractInputMethodPrivate
 {
     Q_DECLARE_PUBLIC(PinyinInputMethod)
@@ -346,6 +348,11 @@ private:
     PinyinInputMethodPrivate::State state;
 };
 
+/*!
+    \class QtVirtualKeyboard::PinyinInputMethod
+    \internal
+*/
+
 PinyinInputMethod::PinyinInputMethod(QObject *parent) :
     AbstractInputMethod(*new PinyinInputMethodPrivate(this), parent)
 {
@@ -477,3 +484,5 @@ void PinyinInputMethod::update()
     d->chooseAndFinish();
     d->tryPredict();
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/pinyininputmethod.h b/src/virtualkeyboard/pinyininputmethod.h
index 18f3a416..aa3f55c0 100644
--- a/src/virtualkeyboard/pinyininputmethod.h
+++ b/src/virtualkeyboard/pinyininputmethod.h
@@ -24,6 +24,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class PinyinInputMethodPrivate;
 
 class PinyinInputMethod : public AbstractInputMethod
@@ -50,4 +52,6 @@ public:
     void update();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // PINYININPUTMETHOD_H
diff --git a/src/virtualkeyboard/plaininputmethod.cpp b/src/virtualkeyboard/plaininputmethod.cpp
index 968bebe7..e28fffac 100644
--- a/src/virtualkeyboard/plaininputmethod.cpp
+++ b/src/virtualkeyboard/plaininputmethod.cpp
@@ -23,6 +23,13 @@
 #include "declarativeinputengine.h"
 #include "declarativeinputcontext.h"
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::PlainInputMethod
+    \internal
+*/
+
 PlainInputMethod::PlainInputMethod(QObject *parent) :
     AbstractInputMethod(parent)
 {
@@ -72,3 +79,5 @@ void PlainInputMethod::reset()
 void PlainInputMethod::update()
 {
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/plaininputmethod.h b/src/virtualkeyboard/plaininputmethod.h
index 089b981c..65eb81cb 100644
--- a/src/virtualkeyboard/plaininputmethod.h
+++ b/src/virtualkeyboard/plaininputmethod.h
@@ -24,6 +24,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class PlainInputMethod : public AbstractInputMethod
 {
     Q_OBJECT
@@ -42,4 +44,6 @@ public:
     void update();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp
index 520ae785..94328e5b 100644
--- a/src/virtualkeyboard/platforminputcontext.cpp
+++ b/src/virtualkeyboard/platforminputcontext.cpp
@@ -31,6 +31,13 @@
 #include <QWindow>
 #include <QGuiApplication>
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::PlatformInputContext
+    \internal
+*/
+
 PlatformInputContext::PlatformInputContext() :
     m_declarativeContext(0),
     m_inputPanel(0),
@@ -247,3 +254,5 @@ void PlatformInputContext::updateInputPanelVisible()
         emitInputPanelVisibleChanged();
     }
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/platforminputcontext.h b/src/virtualkeyboard/platforminputcontext.h
index 910010ea..ba56deca 100644
--- a/src/virtualkeyboard/platforminputcontext.h
+++ b/src/virtualkeyboard/platforminputcontext.h
@@ -27,6 +27,8 @@
 #include <QPointer>
 #include <QLocale>
 
+namespace QtVirtualKeyboard {
+
 class DeclarativeInputContext;
 class AbstractInputPanel;
 class PlatformInputContext : public QPlatformInputContext
@@ -86,4 +88,6 @@ private:
     bool m_visible;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif
diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp
index bbd83131..bc473f34 100644
--- a/src/virtualkeyboard/plugin.cpp
+++ b/src/virtualkeyboard/plugin.cpp
@@ -52,6 +52,8 @@
 #include "declarativesettings.h"
 #include "declarativetrace.h"
 
+using namespace QtVirtualKeyboard;
+
 static const char pluginName[] = "qtvirtualkeyboard";
 static const char inputMethodEnvVarName[] = "QT_IM_MODULE";
 static const char pluginUri[] = "QtQuick.Enterprise.VirtualKeyboard";
diff --git a/src/virtualkeyboard/settings.cpp b/src/virtualkeyboard/settings.cpp
index 97907f8e..14500ef2 100644
--- a/src/virtualkeyboard/settings.cpp
+++ b/src/virtualkeyboard/settings.cpp
@@ -22,6 +22,8 @@
 #include "settings.h"
 #include <QtCore/private/qobject_p.h>
 
+namespace QtVirtualKeyboard {
+
 class SettingsPrivate : public QObjectPrivate
 {
 public:
@@ -43,6 +45,11 @@ public:
 
 static QScopedPointer<Settings> s_settingsInstance;
 
+/*!
+    \class QtVirtualKeyboard::Settings
+    \internal
+*/
+
 Settings::Settings(QObject *parent) :
     QObject(*new SettingsPrivate(), parent)
 {
@@ -129,3 +136,5 @@ void Settings::setActiveLocales(const QStringList &activeLocales)
         emit activeLocalesChanged();
     }
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/settings.h b/src/virtualkeyboard/settings.h
index f805928c..96200f28 100644
--- a/src/virtualkeyboard/settings.h
+++ b/src/virtualkeyboard/settings.h
@@ -24,6 +24,8 @@
 
 #include <QObject>
 
+namespace QtVirtualKeyboard {
+
 class SettingsPrivate;
 
 class Settings : public QObject
@@ -60,4 +62,6 @@ signals:
     void activeLocalesChanged();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // SETTINGS_H
diff --git a/src/virtualkeyboard/t9writeinputmethod.cpp b/src/virtualkeyboard/t9writeinputmethod.cpp
index 4389d03e..019e3c7a 100644
--- a/src/virtualkeyboard/t9writeinputmethod.cpp
+++ b/src/virtualkeyboard/t9writeinputmethod.cpp
@@ -36,6 +36,8 @@
 #include "decumaLanguages.h"
 #include "xxt9wOem.h"
 
+namespace QtVirtualKeyboard {
+
 class T9WriteCaseFormatter
 {
 public:
@@ -966,6 +968,11 @@ const DECUMA_MEM_FUNCTIONS T9WriteInputMethodPrivate::memFuncs = {
     NULL
 };
 
+/*!
+    \class QtVirtualKeyboard::T9WriteInputMethod
+    \internal
+*/
+
 T9WriteInputMethod::T9WriteInputMethod(QObject *parent) :
     AbstractInputMethod(*new T9WriteInputMethodPrivate(this), parent)
 {
@@ -1292,3 +1299,5 @@ void T9WriteInputMethod::resultsAvailable(const QVariantList &resultList)
     Q_D(T9WriteInputMethod);
     d->resultsAvailable(resultList);
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/t9writeinputmethod.h b/src/virtualkeyboard/t9writeinputmethod.h
index 3b9b445b..87866d10 100644
--- a/src/virtualkeyboard/t9writeinputmethod.h
+++ b/src/virtualkeyboard/t9writeinputmethod.h
@@ -24,6 +24,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class T9WriteInputMethodPrivate;
 
 class T9WriteInputMethod : public AbstractInputMethod
@@ -64,4 +66,6 @@ protected slots:
     void resultsAvailable(const QVariantList &resultList);
 };
 
+}
+
 #endif
diff --git a/src/virtualkeyboard/t9writeworker.cpp b/src/virtualkeyboard/t9writeworker.cpp
index fe148ffc..53422a6c 100644
--- a/src/virtualkeyboard/t9writeworker.cpp
+++ b/src/virtualkeyboard/t9writeworker.cpp
@@ -25,6 +25,13 @@
 #include <QFile>
 #include <QTime>
 
+namespace QtVirtualKeyboard {
+
+/*!
+    \class QtVirtualKeyboard::T9WriteTask
+    \internal
+*/
+
 T9WriteTask::T9WriteTask(QObject *parent) :
     QObject(parent),
     decumaSession(0),
@@ -38,6 +45,11 @@ void T9WriteTask::wait()
     runSema.release();
 }
 
+/*!
+    \class QtVirtualKeyboard::T9WriteDictionaryTask
+    \internal
+*/
+
 T9WriteDictionaryTask::T9WriteDictionaryTask(const QString &fileUri,
                                              const DECUMA_MEM_FUNCTIONS &memFuncs) :
     fileUri(fileUri),
@@ -83,6 +95,11 @@ void T9WriteDictionaryTask::run()
     emit completed(fileUri, dictionary);
 }
 
+/*!
+    \class QtVirtualKeyboard::T9WriteRecognitionResult
+    \internal
+*/
+
 T9WriteRecognitionResult::T9WriteRecognitionResult(int id, int maxResults, int maxCharsPerWord) :
     numResults(0),
     instantGesture(0),
@@ -105,6 +122,11 @@ T9WriteRecognitionResult::T9WriteRecognitionResult(int id, int maxResults, int m
     }
 }
 
+/*!
+    \class QtVirtualKeyboard::T9WriteRecognitionTask
+    \internal
+*/
+
 T9WriteRecognitionTask::T9WriteRecognitionTask(QSharedPointer<T9WriteRecognitionResult> result,
                                                const DECUMA_INSTANT_GESTURE_SETTINGS &instantGestureSettings,
                                                BOOST_LEVEL boostLevel,
@@ -215,6 +237,11 @@ int T9WriteRecognitionTask::resultId() const
     return result != 0 ? result->id : -1;
 }
 
+/*!
+    \class QtVirtualKeyboard::T9WriteRecognitionResultsTask
+    \internal
+*/
+
 T9WriteRecognitionResultsTask::T9WriteRecognitionResultsTask(QSharedPointer<T9WriteRecognitionResult> result) :
     T9WriteTask(),
     result(result)
@@ -266,6 +293,11 @@ void T9WriteRecognitionResultsTask::run()
     emit resultsAvailable(resultList);
 }
 
+/*!
+    \class QtVirtualKeyboard::T9WriteWorker
+    \internal
+*/
+
 T9WriteWorker::T9WriteWorker(DECUMA_SESSION *decumaSession, QObject *parent) :
     QThread(parent),
     taskSema(),
@@ -334,3 +366,5 @@ void T9WriteWorker::run()
         }
     }
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/t9writeworker.h b/src/virtualkeyboard/t9writeworker.h
index 597f9099..bfb65a86 100644
--- a/src/virtualkeyboard/t9writeworker.h
+++ b/src/virtualkeyboard/t9writeworker.h
@@ -35,6 +35,8 @@
 
 #include "decuma_hwr.h"
 
+namespace QtVirtualKeyboard {
+
 class T9WriteTask : public QObject
 {
     Q_OBJECT
@@ -168,4 +170,6 @@ private:
     bool abort;
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif // T9WRITEWORKER_H
diff --git a/src/virtualkeyboard/tcinputmethod.cpp b/src/virtualkeyboard/tcinputmethod.cpp
index a37161b1..af74b50d 100644
--- a/src/virtualkeyboard/tcinputmethod.cpp
+++ b/src/virtualkeyboard/tcinputmethod.cpp
@@ -26,6 +26,8 @@
 
 #include <QLibraryInfo>
 
+namespace QtVirtualKeyboard {
+
 using namespace tcime;
 
 class TCInputMethodPrivate : public AbstractInputMethodPrivate
@@ -123,6 +125,11 @@ public:
     int highlightIndex;
 };
 
+/*!
+    \class QtVirtualKeyboard::TCInputMethod
+    \internal
+*/
+
 TCInputMethod::TCInputMethod(QObject *parent) :
     AbstractInputMethod(*new TCInputMethodPrivate(this), parent)
 {
@@ -328,3 +335,5 @@ void TCInputMethod::update()
         d->reset();
     }
 }
+
+} // namespace QtVirtualKeyboard
diff --git a/src/virtualkeyboard/tcinputmethod.h b/src/virtualkeyboard/tcinputmethod.h
index 480b535a..e059d430 100644
--- a/src/virtualkeyboard/tcinputmethod.h
+++ b/src/virtualkeyboard/tcinputmethod.h
@@ -21,6 +21,8 @@
 
 #include "abstractinputmethod.h"
 
+namespace QtVirtualKeyboard {
+
 class TCInputMethodPrivate;
 
 class TCInputMethod : public AbstractInputMethod
@@ -54,4 +56,6 @@ signals:
     void simplifiedChanged();
 };
 
+} // namespace QtVirtualKeyboard
+
 #endif