Refactor class names

Since the virtual keyboard C++ interface is wrapped inside a
namespace, it is possible to get rid of "Declarative" name
in the class names, that would otherwise conflict with the
QML namespace in the documentation.

- Rename DeclarativeSettings to VirtualKeyboardSettings
- Remove "Declarative" from class names

The rationale for this change is that the name Declarative
refers to now obsolete QtQuick1 module. Also, the class names
are now the same in C++ and QML name spaces.

Change-Id: Ide050d47110443d894d95d35dddf0df5891587be
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/virtualkeyboard/hangulinputmethod.cpp b/src/virtualkeyboard/hangulinputmethod.cpp
index 7a49896c..823d8101 100644
--- a/src/virtualkeyboard/hangulinputmethod.cpp
+++ b/src/virtualkeyboard/hangulinputmethod.cpp
@@ -20,7 +20,7 @@
 ******************************************************************************/
 
 #include "hangulinputmethod.h"
-#include "declarativeinputcontext.h"
+#include "inputcontext.h"
 #include "hangul.h"
 
 namespace QtVirtualKeyboard {
@@ -39,20 +39,20 @@ HangulInputMethod::~HangulInputMethod()
 {
 }
 
-QList<DeclarativeInputEngine::InputMode> HangulInputMethod::inputModes(const QString &locale)
+QList<InputEngine::InputMode> HangulInputMethod::inputModes(const QString &locale)
 {
     Q_UNUSED(locale)
-    return QList<DeclarativeInputEngine::InputMode>() << DeclarativeInputEngine::Hangul;
+    return QList<InputEngine::InputMode>() << InputEngine::Hangul;
 }
 
-bool HangulInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode)
+bool HangulInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode)
 {
     Q_UNUSED(locale)
     Q_UNUSED(inputMode)
     return true;
 }
 
-bool HangulInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase)
+bool HangulInputMethod::setTextCase(InputEngine::TextCase textCase)
 {
     Q_UNUSED(textCase)
     return true;
@@ -61,7 +61,7 @@ bool HangulInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase)
 bool HangulInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers)
 {
     Q_UNUSED(modifiers)
-    DeclarativeInputContext *ic = inputContext();
+    InputContext *ic = inputContext();
     bool accept = false;
     int cursorPosition = ic->cursorPosition();
     if (ic->cursorPosition() > 0) {