diff options
45 files changed, 983 insertions, 974 deletions
diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp index 2d1cdf22..8485031b 100644 --- a/src/virtualkeyboard/abstractinputmethod.cpp +++ b/src/virtualkeyboard/abstractinputmethod.cpp @@ -73,7 +73,7 @@ AbstractInputMethod::~AbstractInputMethod() Returns the input context associated with the input method. This method returns \c NULL if the input method is not active. */ -DeclarativeInputContext *AbstractInputMethod::inputContext() const +InputContext *AbstractInputMethod::inputContext() const { Q_D(const AbstractInputMethod); return d->inputEngine ? d->inputEngine->inputContext() : 0; @@ -83,7 +83,7 @@ DeclarativeInputContext *AbstractInputMethod::inputContext() const Returns the input engine associated with the input method. This method returns \c NULL if the input method is not active. */ -DeclarativeInputEngine *AbstractInputMethod::inputEngine() const +InputEngine *AbstractInputMethod::inputEngine() const { Q_D(const AbstractInputMethod); return d->inputEngine; @@ -113,7 +113,7 @@ void AbstractInputMethod::update() Called by the input engine when the input method is activated and deactivated. */ -void AbstractInputMethod::setInputEngine(DeclarativeInputEngine *inputEngine) +void AbstractInputMethod::setInputEngine(InputEngine *inputEngine) { Q_D(AbstractInputMethod); if (d->inputEngine) { @@ -127,31 +127,31 @@ void AbstractInputMethod::setInputEngine(DeclarativeInputEngine *inputEngine) } } -QList<DeclarativeSelectionListModel::Type> AbstractInputMethod::selectionLists() +QList<SelectionListModel::Type> AbstractInputMethod::selectionLists() { - return QList<DeclarativeSelectionListModel::Type>(); + return QList<SelectionListModel::Type>(); } -int AbstractInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) +int AbstractInputMethod::selectionListItemCount(SelectionListModel::Type type) { Q_UNUSED(type) return 0; } -QVariant AbstractInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) +QVariant AbstractInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) { Q_UNUSED(type) Q_UNUSED(index) switch (role) { - case DeclarativeSelectionListModel::DisplayRole: + case SelectionListModel::DisplayRole: return QVariant(""); - case DeclarativeSelectionListModel::WordCompletionLengthRole: + case SelectionListModel::WordCompletionLengthRole: return QVariant(0); } return QVariant(); } -void AbstractInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void AbstractInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { Q_UNUSED(type) Q_UNUSED(index) @@ -165,9 +165,9 @@ void AbstractInputMethod::selectionListItemSelected(DeclarativeSelectionListMode This method is called by the input engine to query the list of supported pattern recognition modes. */ -QList<DeclarativeInputEngine::PatternRecognitionMode> AbstractInputMethod::patternRecognitionModes() const +QList<InputEngine::PatternRecognitionMode> AbstractInputMethod::patternRecognitionModes() const { - return QList<DeclarativeInputEngine::PatternRecognitionMode>(); + return QList<InputEngine::PatternRecognitionMode>(); } /*! @@ -182,8 +182,8 @@ QList<DeclarativeInputEngine::PatternRecognitionMode> AbstractInputMethod::patte a new Trace object. This object must remain valid until the traceEnd() method is called. If the Trace is rendered on screen, it remains there until the Trace object is destroyed. */ -DeclarativeTrace *AbstractInputMethod::traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +Trace *AbstractInputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_UNUSED(traceId) Q_UNUSED(patternRecognitionMode) @@ -201,7 +201,7 @@ DeclarativeTrace *AbstractInputMethod::traceBegin(int traceId, DeclarativeInputE The method returns \c true if the trace interaction is accepted. */ -bool AbstractInputMethod::traceEnd(DeclarativeTrace *trace) +bool AbstractInputMethod::traceEnd(Trace *trace) { Q_UNUSED(trace) return false; @@ -216,7 +216,7 @@ bool AbstractInputMethod::traceEnd(DeclarativeTrace *trace) The function returns \c true if the word was successfully reselected. */ -bool AbstractInputMethod::reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags) +bool AbstractInputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) { Q_UNUSED(cursorPosition) Q_UNUSED(reselectFlags) @@ -224,20 +224,20 @@ bool AbstractInputMethod::reselect(int cursorPosition, const DeclarativeInputEng } /*! - \fn QList<DeclarativeInputEngine::InputMode> AbstractInputMethod::inputModes(const QString& locale) + \fn QList<InputEngine::InputMode> AbstractInputMethod::inputModes(const QString& locale) Returns the list of input modes for \a locale. */ /*! - \fn bool AbstractInputMethod::setInputMode(const QString& locale, DeclarativeInputEngine::InputMode inputMode) + \fn bool AbstractInputMethod::setInputMode(const QString& locale, InputEngine::InputMode inputMode) Sets the \a inputMode and \a locale for this input method. Returns \c true if successful. */ /*! - \fn bool AbstractInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) + \fn bool AbstractInputMethod::setTextCase(InputEngine::TextCase textCase) Updates the \a textCase for this input method. The method returns \c true if successful. @@ -260,7 +260,7 @@ bool AbstractInputMethod::reselect(int cursorPosition, const DeclarativeInputEng */ /*! - \fn QList<DeclarativeSelectionListModel::Type> AbstractInputMethod::selectionLists() + \fn QList<SelectionListModel::Type> AbstractInputMethod::selectionLists() Returns the list of selection lists used by this input method. @@ -270,13 +270,13 @@ bool AbstractInputMethod::reselect(int cursorPosition, const DeclarativeInputEng */ /*! - \fn int AbstractInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) + \fn int AbstractInputMethod::selectionListItemCount(SelectionListModel::Type type) Returns the number of items in the selection list identified by \a type. */ /*! - \fn QVariant AbstractInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) + \fn QVariant AbstractInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) Returns item data for the selection list identified by \a type. The \a role parameter specifies which data is requested. The \a index parameter is a @@ -284,7 +284,7 @@ bool AbstractInputMethod::reselect(int cursorPosition, const DeclarativeInputEng */ /*! - \fn void AbstractInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) + \fn void AbstractInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) This method is called when an item at \a index has been selected by the user. The selection list is identified by the \a type parameter. diff --git a/src/virtualkeyboard/abstractinputmethod.h b/src/virtualkeyboard/abstractinputmethod.h index 409d4cc4..9a1cc6b3 100644 --- a/src/virtualkeyboard/abstractinputmethod.h +++ b/src/virtualkeyboard/abstractinputmethod.h @@ -22,8 +22,8 @@ #ifndef ABSTRACTINPUTMETHOD_H #define ABSTRACTINPUTMETHOD_H -#include "declarativeinputengine.h" -#include "declarativeselectionlistmodel.h" +#include "inputengine.h" +#include "selectionlistmodel.h" #include <QtCore/private/qobject_p.h> namespace QtVirtualKeyboard { @@ -33,7 +33,7 @@ class AbstractInputMethodPrivate : public QObjectPrivate public: AbstractInputMethodPrivate(); - DeclarativeInputEngine *inputEngine; + InputEngine *inputEngine; }; class AbstractInputMethod : public QObject @@ -47,26 +47,26 @@ public: explicit AbstractInputMethod(QObject *parent = 0); ~AbstractInputMethod(); - DeclarativeInputContext *inputContext() const; - DeclarativeInputEngine *inputEngine() const; + InputContext *inputContext() const; + InputEngine *inputEngine() const; - virtual QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale) = 0; - virtual bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) = 0; - virtual bool setTextCase(DeclarativeInputEngine::TextCase textCase) = 0; + virtual QList<InputEngine::InputMode> inputModes(const QString &locale) = 0; + virtual bool setInputMode(const QString &locale, InputEngine::InputMode inputMode) = 0; + virtual bool setTextCase(InputEngine::TextCase textCase) = 0; virtual bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) = 0; - virtual QList<DeclarativeSelectionListModel::Type> selectionLists(); - virtual int selectionListItemCount(DeclarativeSelectionListModel::Type type); - virtual QVariant selectionListData(DeclarativeSelectionListModel::Type type, int index, int role); - virtual void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); + virtual QList<SelectionListModel::Type> selectionLists(); + virtual int selectionListItemCount(SelectionListModel::Type type); + virtual QVariant selectionListData(SelectionListModel::Type type, int index, int role); + virtual void selectionListItemSelected(SelectionListModel::Type type, int index); - virtual QList<DeclarativeInputEngine::PatternRecognitionMode> patternRecognitionModes() const; - virtual DeclarativeTrace *traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); - virtual bool traceEnd(DeclarativeTrace *trace); + virtual QList<InputEngine::PatternRecognitionMode> patternRecognitionModes() const; + virtual Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + virtual bool traceEnd(Trace *trace); - virtual bool reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags); + virtual bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); signals: void selectionListChanged(int type); @@ -77,9 +77,9 @@ public slots: virtual void update(); private: - void setInputEngine(DeclarativeInputEngine *inputEngine); + void setInputEngine(InputEngine *inputEngine); - friend class DeclarativeInputEngine; + friend class InputEngine; }; } // namespace QtVirtualKeyboard diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml index 672008c8..bf969710 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 {QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. + The default value is \l {QtVirtualKeyboard::InputEngine::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 b6880d23..0bd781cd 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 {QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. + The default value is \l {QtVirtualKeyboard::InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. */ property alias patternRecognitionMode: traceInputArea.patternRecognitionMode diff --git a/src/virtualkeyboard/declarativeinputmethod.h b/src/virtualkeyboard/declarativeinputmethod.h deleted file mode 100644 index 4fecf257..00000000 --- a/src/virtualkeyboard/declarativeinputmethod.h +++ /dev/null @@ -1,63 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -#ifndef DECLARATIVEINPUTMETHOD_H -#define DECLARATIVEINPUTMETHOD_H - -#include "abstractinputmethod.h" - -namespace QtVirtualKeyboard { - -class DeclarativeInputMethod : public AbstractInputMethod -{ - Q_OBJECT - Q_PROPERTY(QtVirtualKeyboard::DeclarativeInputContext *inputContext READ inputContext CONSTANT) - Q_PROPERTY(QtVirtualKeyboard::DeclarativeInputEngine *inputEngine READ inputEngine CONSTANT) - -public: - explicit DeclarativeInputMethod(QObject *parent = 0); - ~DeclarativeInputMethod(); - - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); - - bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); - - QList<DeclarativeSelectionListModel::Type> selectionLists(); - int selectionListItemCount(DeclarativeSelectionListModel::Type type); - QVariant selectionListData(DeclarativeSelectionListModel::Type type, int index, int role); - void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); - - QList<DeclarativeInputEngine::PatternRecognitionMode> patternRecognitionModes() const; - DeclarativeTrace *traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); - bool traceEnd(DeclarativeTrace *trace); - - bool reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags); - - void reset(); - void update(); -}; - -} // namespace QtVirtualKeyboard - -#endif // DECLARATIVEINPUTMETHOD_H diff --git a/src/virtualkeyboard/defaultinputmethod.cpp b/src/virtualkeyboard/defaultinputmethod.cpp index c1841165..28af0463 100644 --- a/src/virtualkeyboard/defaultinputmethod.cpp +++ b/src/virtualkeyboard/defaultinputmethod.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "defaultinputmethod.h" -#include "declarativeinputcontext.h" +#include "inputcontext.h" namespace QtVirtualKeyboard { @@ -34,20 +34,20 @@ DefaultInputMethod::DefaultInputMethod(QObject *parent) : { } -QList<DeclarativeInputEngine::InputMode> DefaultInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> DefaultInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<DeclarativeInputEngine::InputMode>(); + return QList<InputEngine::InputMode>(); } -bool DefaultInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool DefaultInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_UNUSED(inputMode) return true; } -bool DefaultInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool DefaultInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; diff --git a/src/virtualkeyboard/defaultinputmethod.h b/src/virtualkeyboard/defaultinputmethod.h index 9aa18b7e..24926ac3 100644 --- a/src/virtualkeyboard/defaultinputmethod.h +++ b/src/virtualkeyboard/defaultinputmethod.h @@ -33,9 +33,9 @@ class DefaultInputMethod : public AbstractInputMethod public: explicit DefaultInputMethod(QObject *parent = 0); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp index eeb4b14a..85a61b0f 100644 --- a/src/virtualkeyboard/desktopinputpanel.cpp +++ b/src/virtualkeyboard/desktopinputpanel.cpp @@ -22,7 +22,7 @@ #include "desktopinputpanel.h" #include "inputview.h" #include "platforminputcontext.h" -#include "declarativeinputcontext.h" +#include "inputcontext.h" #include <QGuiApplication> #include <QQmlEngine> #include <QScreen> @@ -145,7 +145,7 @@ void DesktopInputPanel::repositionView(const QRect &rect) Q_D(DesktopInputPanel); VIRTUALKEYBOARD_DEBUG() << "DesktopInputPanel::repositionView():" << rect; if (d->view && d->view->geometry() != rect) { - DeclarativeInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->declarativeInputContext(); + InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); if (inputContext) { inputContext->setAnimating(true); if (!d->previewBindingActive) { @@ -173,7 +173,7 @@ void DesktopInputPanel::focusWindowChanged(QWindow *focusWindow) void DesktopInputPanel::focusWindowVisibleChanged(bool visible) { if (!visible) { - DeclarativeInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->declarativeInputContext(); + InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); if (inputContext) inputContext->hideInputPanel(); } @@ -182,7 +182,7 @@ void DesktopInputPanel::focusWindowVisibleChanged(bool visible) void DesktopInputPanel::previewRectangleChanged() { Q_D(DesktopInputPanel); - DeclarativeInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->declarativeInputContext(); + InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); d->previewRect = inputContext->previewRectangle(); if (d->previewVisible) updateInputRegion(); @@ -191,7 +191,7 @@ void DesktopInputPanel::previewRectangleChanged() void DesktopInputPanel::previewVisibleChanged() { Q_D(DesktopInputPanel); - DeclarativeInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->declarativeInputContext(); + InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); d->previewVisible = inputContext->previewVisible(); if (d->view->isVisible()) updateInputRegion(); diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc index 3f18187c..ddc6b1d3 100644 --- a/src/virtualkeyboard/doc/src/technical-guide.qdoc +++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc @@ -48,7 +48,7 @@ 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 AbstractInputMethod: a base type for C++ based input methods. + \li \l {QtVirtualKeyboard::AbstractInputMethod} {AbstractInputMethod}: a base type for C++ based input methods. \endlist \section1 The Input Context @@ -96,7 +96,7 @@ After the locale selection is done, the keyboard updates the input locale and input direction to match the current layout. The application can receive this information through the QInputMethod interface. -Internally, the current input locale is also updated to the DeclarativeInputEngine +Internally, the current input locale is also updated to the InputEngine and the current InputMethod instances. \section2 UI Animations @@ -133,7 +133,7 @@ Activating an input method is straightforward. The required steps are: \list \li Instantiate a concrete implementation of InputMethod or - AbstractInputMethod + \l {QtVirtualKeyboard::AbstractInputMethod} {AbstractInputMethod} \li Assign the instance to InputEngine::inputMethod \li Set the proper input mode with InputEngine::inputMode \endlist @@ -274,7 +274,7 @@ touch input data from touch screens or other input devices. \section2 Data Model for the Handwriting Input -The data collected from the input source is stored in an object named DeclarativeTrace (C++) or \l Trace (QML). +The data collected from the input source is stored in an object named QtVirtualKeyboard::Trace (C++) or \l Trace (QML). By definition, a trace is a set of points collected from a single point of contact. In addition to point data, the trace may also include data from other channels, @@ -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 { QtVirtualKeyboard::DeclarativeInputEngine::HandwritingRecoginition } { HandwritingRecoginition }, +\l { QtVirtualKeyboard::InputEngine::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/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) { diff --git a/src/virtualkeyboard/hangulinputmethod.h b/src/virtualkeyboard/hangulinputmethod.h index 68bedefd..5e0863df 100644 --- a/src/virtualkeyboard/hangulinputmethod.h +++ b/src/virtualkeyboard/hangulinputmethod.h @@ -36,9 +36,9 @@ public: explicit HangulInputMethod(QObject *parent = 0); ~HangulInputMethod(); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); diff --git a/src/virtualkeyboard/hunspellinputmethod.cpp b/src/virtualkeyboard/hunspellinputmethod.cpp index 3a2508e3..a911b487 100644 --- a/src/virtualkeyboard/hunspellinputmethod.cpp +++ b/src/virtualkeyboard/hunspellinputmethod.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "hunspellinputmethod_p.h" -#include "declarativeinputcontext.h" +#include "inputcontext.h" namespace QtVirtualKeyboard { @@ -43,20 +43,20 @@ HunspellInputMethod::~HunspellInputMethod() { } -QList<DeclarativeInputEngine::InputMode> HunspellInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> HunspellInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<DeclarativeInputEngine::InputMode>() << DeclarativeInputEngine::Latin << DeclarativeInputEngine::Numeric; + return QList<InputEngine::InputMode>() << InputEngine::Latin << InputEngine::Numeric; } -bool HunspellInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool HunspellInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_UNUSED(inputMode) Q_D(HunspellInputMethod); return d->createHunspell(locale); } -bool HunspellInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool HunspellInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -66,7 +66,7 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar { Q_UNUSED(modifiers) Q_D(HunspellInputMethod); - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); bool accept = false; switch (key) { @@ -81,8 +81,8 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar d->word.remove(d->word.length() - 1, 1); ic->setPreeditText(d->word); if (d->updateSuggestions()) { - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); } accept = true; } @@ -122,8 +122,8 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar ic->setPreeditText(d->word); d->ignoreUpdate = false; if (d->updateSuggestions()) { - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); } accept = true; } else if (text.length() > 1) { @@ -147,28 +147,28 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar return accept; } -QList<DeclarativeSelectionListModel::Type> HunspellInputMethod::selectionLists() +QList<SelectionListModel::Type> HunspellInputMethod::selectionLists() { - return QList<DeclarativeSelectionListModel::Type>() << DeclarativeSelectionListModel::WordCandidateList; + return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; } -int HunspellInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) +int HunspellInputMethod::selectionListItemCount(SelectionListModel::Type type) { Q_UNUSED(type) Q_D(HunspellInputMethod); return d->wordCandidates.count(); } -QVariant HunspellInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) +QVariant HunspellInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) { QVariant result; Q_UNUSED(type) Q_D(HunspellInputMethod); switch (role) { - case DeclarativeSelectionListModel::DisplayRole: + case SelectionListModel::DisplayRole: result = QVariant(d->wordCandidates.at(index)); break; - case DeclarativeSelectionListModel::WordCompletionLengthRole: + case SelectionListModel::WordCompletionLengthRole: { const QString wordCandidate(d->wordCandidates.at(index)); int wordCompletionLength = wordCandidate.length() - d->word.length(); @@ -182,7 +182,7 @@ QVariant HunspellInputMethod::selectionListData(DeclarativeSelectionListModel::T return result; } -void HunspellInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void HunspellInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(HunspellInputMethod); @@ -192,19 +192,19 @@ void HunspellInputMethod::selectionListItemSelected(DeclarativeSelectionListMode d->autoSpaceAllowed = true; } -bool HunspellInputMethod::reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags) +bool HunspellInputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) { Q_D(HunspellInputMethod); Q_ASSERT(d->word.isEmpty()); - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); if (!ic) return false; const QString surroundingText = ic->surroundingText(); int replaceFrom = 0; - if (reselectFlags.testFlag(DeclarativeInputEngine::WordBeforeCursor)) { + if (reselectFlags.testFlag(InputEngine::WordBeforeCursor)) { for (int i = cursorPosition - 1; i >= 0; --i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -219,12 +219,12 @@ bool HunspellInputMethod::reselect(int cursorPosition, const DeclarativeInputEng } } - if (reselectFlags.testFlag(DeclarativeInputEngine::WordAtCursor) && replaceFrom == 0) { + if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == 0) { d->word.clear(); return false; } - if (reselectFlags.testFlag(DeclarativeInputEngine::WordAfterCursor)) { + if (reselectFlags.testFlag(InputEngine::WordAfterCursor)) { for (int i = cursorPosition; i < surroundingText.length(); ++i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -243,7 +243,7 @@ bool HunspellInputMethod::reselect(int cursorPosition, const DeclarativeInputEng if (d->word.isEmpty()) return false; - if (reselectFlags.testFlag(DeclarativeInputEngine::WordAtCursor) && replaceFrom == -d->word.length()) { + if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == -d->word.length()) { d->word.clear(); return false; } @@ -262,8 +262,8 @@ bool HunspellInputMethod::reselect(int cursorPosition, const DeclarativeInputEng d->autoSpaceAllowed = false; if (d->updateSuggestions()) { - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); } return true; @@ -297,8 +297,8 @@ void HunspellInputMethod::updateSuggestions(const QStringList &wordList, int act if (!d->word.isEmpty() && !d->wordCandidates.isEmpty() && d->wordCandidates.at(0) != d->word) d->wordCandidates.replace(0, d->word); d->activeWordIndex = activeWordIndex; - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); } } // namespace QtVirtualKeyboard diff --git a/src/virtualkeyboard/hunspellinputmethod.h b/src/virtualkeyboard/hunspellinputmethod.h index 70b695f1..1dea56a0 100644 --- a/src/virtualkeyboard/hunspellinputmethod.h +++ b/src/virtualkeyboard/hunspellinputmethod.h @@ -38,18 +38,18 @@ public: explicit HunspellInputMethod(QObject *parent = 0); ~HunspellInputMethod(); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); - QList<DeclarativeSelectionListModel::Type> selectionLists(); - int selectionListItemCount(DeclarativeSelectionListModel::Type type); - QVariant selectionListData(DeclarativeSelectionListModel::Type type, int index, int role); - void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); + QList<SelectionListModel::Type> selectionLists(); + int selectionListItemCount(SelectionListModel::Type type); + QVariant selectionListData(SelectionListModel::Type type, int index, int role); + void selectionListItemSelected(SelectionListModel::Type type, int index); - bool reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags); + bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); void reset(); void update(); diff --git a/src/virtualkeyboard/hunspellinputmethod_p.cpp b/src/virtualkeyboard/hunspellinputmethod_p.cpp index 56ebea9d..a3f36df6 100644 --- a/src/virtualkeyboard/hunspellinputmethod_p.cpp +++ b/src/virtualkeyboard/hunspellinputmethod_p.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "hunspellinputmethod_p.h" -#include "declarativeinputcontext.h" +#include "inputcontext.h" #include <hunspell/hunspell.h> #include <QStringList> #include <QDir> @@ -92,8 +92,8 @@ void HunspellInputMethodPrivate::reset() { if (clearSuggestions()) { Q_Q(HunspellInputMethod); - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); } word.clear(); autoSpaceAllowed = false; @@ -161,9 +161,9 @@ bool HunspellInputMethodPrivate::isAutoSpaceAllowed() const Q_Q(const HunspellInputMethod); if (!autoSpaceAllowed) return false; - if (q->inputEngine()->inputMode() != DeclarativeInputEngine::Latin) + if (q->inputEngine()->inputMode() != InputEngine::Latin) return false; - DeclarativeInputContext *ic = q->inputContext(); + InputContext *ic = q->inputContext(); if (!ic) return false; Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); @@ -184,7 +184,7 @@ bool HunspellInputMethodPrivate::isJoiner(const QChar &c) const { if (c.isPunct() || c.isSymbol()) { Q_Q(const HunspellInputMethod); - DeclarativeInputContext *ic = q->inputContext(); + InputContext *ic = q->inputContext(); if (ic) { Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly) || inputMethodHints.testFlag(Qt::ImhEmailCharactersOnly)) diff --git a/src/virtualkeyboard/declarativeinputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp index a9d0b8be..afb6774e 100644 --- a/src/virtualkeyboard/declarativeinputcontext.cpp +++ b/src/virtualkeyboard/inputcontext.cpp @@ -19,9 +19,9 @@ ** ******************************************************************************/ -#include "declarativeinputcontext.h" -#include "declarativeinputengine.h" -#include "declarativeshifthandler.h" +#include "inputcontext.h" +#include "inputengine.h" +#include "shifthandler.h" #include "platforminputcontext.h" #include "virtualkeyboarddebug.h" #include "enterkeyaction.h" @@ -68,7 +68,7 @@ QT_END_NAMESPACE namespace QtVirtualKeyboard { -class DeclarativeInputContextPrivate : public QObjectPrivate +class InputContextPrivate : public QObjectPrivate { public: enum StateFlag { @@ -79,7 +79,7 @@ public: }; Q_DECLARE_FLAGS(StateFlags, StateFlag) - DeclarativeInputContextPrivate() : + InputContextPrivate() : QObjectPrivate(), inputContext(0), inputEngine(0), @@ -106,8 +106,8 @@ public: } PlatformInputContext *inputContext; - DeclarativeInputEngine *inputEngine; - DeclarativeShiftHandler *shiftHandler; + InputEngine *inputEngine; + ShiftHandler *shiftHandler; QRectF keyboardRect; QRectF previewRect; bool previewVisible; @@ -130,11 +130,11 @@ public: QSet<quint32> activeKeys; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(DeclarativeInputContextPrivate::StateFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(InputContextPrivate::StateFlags) /*! \qmltype InputContext - \instantiates QtVirtualKeyboard::DeclarativeInputContext + \instantiates QtVirtualKeyboard::InputContext \inqmlmodule QtQuick.Enterprise.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Provides access to an input context. @@ -143,93 +143,93 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(DeclarativeInputContextPrivate::StateFlags) */ /*! - \class QtVirtualKeyboard::DeclarativeInputContext + \class QtVirtualKeyboard::InputContext \inmodule InputFramework \brief Provides access to an input context. */ /*! \internal - Constructs a declarative input context with \a parent as the platform input + Constructs an input context with \a parent as the platform input context. */ -DeclarativeInputContext::DeclarativeInputContext(PlatformInputContext *parent) : - QObject(*new DeclarativeInputContextPrivate(), parent) +InputContext::InputContext(PlatformInputContext *parent) : + QObject(*new InputContextPrivate(), parent) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); d->inputContext = parent; if (d->inputContext) { - d->inputContext->setDeclarativeContext(this); + d->inputContext->setInputContext(this); connect(d->inputContext, SIGNAL(focusObjectChanged()), SLOT(onInputItemChanged())); connect(d->inputContext, SIGNAL(focusObjectChanged()), SIGNAL(inputItemChanged())); } - d->inputEngine = new DeclarativeInputEngine(this); - d->shiftHandler = new DeclarativeShiftHandler(this); + d->inputEngine = new InputEngine(this); + d->shiftHandler = new ShiftHandler(this); } /*! \internal Destroys the input context and frees all allocated resources. */ -DeclarativeInputContext::~DeclarativeInputContext() +InputContext::~InputContext() { } -bool DeclarativeInputContext::focus() const +bool InputContext::focus() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->focus; } -bool DeclarativeInputContext::shift() const +bool InputContext::shift() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->shift; } -void DeclarativeInputContext::setShift(bool enable) +void InputContext::setShift(bool enable) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->shift != enable) { d->shift = enable; emit shiftChanged(); } } -bool DeclarativeInputContext::capsLock() const +bool InputContext::capsLock() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->capsLock; } -void DeclarativeInputContext::setCapsLock(bool enable) +void InputContext::setCapsLock(bool enable) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->capsLock != enable) { d->capsLock = enable; emit capsLockChanged(); } } -int DeclarativeInputContext::cursorPosition() const +int InputContext::cursorPosition() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->cursorPosition; } -Qt::InputMethodHints DeclarativeInputContext::inputMethodHints() const +Qt::InputMethodHints InputContext::inputMethodHints() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->inputMethodHints; } -QString DeclarativeInputContext::preeditText() const +QString InputContext::preeditText() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->preeditText; } -void DeclarativeInputContext::setPreeditText(const QString &text, QList<QInputMethodEvent::Attribute> attributes, int replaceFrom, int replaceLength) +void InputContext::setPreeditText(const QString &text, QList<QInputMethodEvent::Attribute> attributes, int replaceFrom, int replaceLength) { // Add default attributes if (!text.isEmpty()) { @@ -247,7 +247,7 @@ void DeclarativeInputContext::setPreeditText(const QString &text, QList<QInputMe attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, text.length(), textFormat)); } } else { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->forceCursorPosition != -1) attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Selection, d->forceCursorPosition, 0, QVariant())); d->forceCursorPosition = -1; @@ -256,33 +256,33 @@ void DeclarativeInputContext::setPreeditText(const QString &text, QList<QInputMe sendPreedit(text, attributes, replaceFrom, replaceLength); } -QString DeclarativeInputContext::surroundingText() const +QString InputContext::surroundingText() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->surroundingText; } -QString DeclarativeInputContext::selectedText() const +QString InputContext::selectedText() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->selectedText; } -QRectF DeclarativeInputContext::cursorRectangle() const +QRectF InputContext::cursorRectangle() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->cursorRectangle; } -QRectF DeclarativeInputContext::keyboardRectangle() const +QRectF InputContext::keyboardRectangle() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->keyboardRect; } -void DeclarativeInputContext::setKeyboardRectangle(QRectF rectangle) +void InputContext::setKeyboardRectangle(QRectF rectangle) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->keyboardRect != rectangle) { d->keyboardRect = rectangle; emit keyboardRectangleChanged(); @@ -290,45 +290,45 @@ void DeclarativeInputContext::setKeyboardRectangle(QRectF rectangle) } } -QRectF DeclarativeInputContext::previewRectangle() const +QRectF InputContext::previewRectangle() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->previewRect; } -void DeclarativeInputContext::setPreviewRectangle(QRectF rectangle) +void InputContext::setPreviewRectangle(QRectF rectangle) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->previewRect != rectangle) { d->previewRect = rectangle; emit previewRectangleChanged(); } } -bool DeclarativeInputContext::previewVisible() const +bool InputContext::previewVisible() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->previewVisible; } -void DeclarativeInputContext::setPreviewVisible(bool visible) +void InputContext::setPreviewVisible(bool visible) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->previewVisible != visible) { d->previewVisible = visible; emit previewVisibleChanged(); } } -bool DeclarativeInputContext::animating() const +bool InputContext::animating() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->animating; } -void DeclarativeInputContext::setAnimating(bool animating) +void InputContext::setAnimating(bool animating) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->animating != animating) { d->animating = animating; emit animatingChanged(); @@ -337,16 +337,16 @@ void DeclarativeInputContext::setAnimating(bool animating) } -QString DeclarativeInputContext::locale() const +QString InputContext::locale() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->inputContext->locale().name(); } -void DeclarativeInputContext::setLocale(const QString &locale) +void InputContext::setLocale(const QString &locale) { - Q_D(DeclarativeInputContext); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputContext::setLocale():" << locale; + Q_D(InputContext); + VIRTUALKEYBOARD_DEBUG() << "InputContext::setLocale():" << locale; QLocale newLocale(locale); if (newLocale != d->inputContext->locale()) { d->inputContext->setLocale(newLocale); @@ -358,28 +358,28 @@ void DeclarativeInputContext::setLocale(const QString &locale) /*! \internal */ -void DeclarativeInputContext::updateAvailableLocales(const QStringList &availableLocales) +void InputContext::updateAvailableLocales(const QStringList &availableLocales) { Settings *settings = Settings::instance(); if (settings) settings->setAvailableLocales(availableLocales); } -QObject *DeclarativeInputContext::inputItem() const +QObject *InputContext::inputItem() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->inputContext ? d->inputContext->focusObject() : 0; } -DeclarativeShiftHandler *DeclarativeInputContext::shiftHandler() const +ShiftHandler *InputContext::shiftHandler() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->shiftHandler; } -DeclarativeInputEngine *DeclarativeInputContext::inputEngine() const +InputEngine *InputContext::inputEngine() const { - Q_D(const DeclarativeInputContext); + Q_D(const InputContext); return d->inputEngine; } @@ -391,13 +391,15 @@ DeclarativeInputEngine *DeclarativeInputContext::inputEngine() const on the keyboard. */ /*! + \fn void QtVirtualKeyboard::InputContext::hideInputPanel() + This method hides the input panel. This method should only be called when the user initiates the hide, e.g. by pressing a dedicated button on the keyboard. */ -void DeclarativeInputContext::hideInputPanel() +void InputContext::hideInputPanel() { - Q_D(DeclarativeInputContext); + Q_D(InputContext); d->inputContext->hideInputPanel(); } @@ -411,21 +413,21 @@ void DeclarativeInputContext::hideInputPanel() Sends a key click event with the given \a key, \a text and \a modifiers to the input item that currently has focus. */ -void DeclarativeInputContext::sendKeyClick(int key, const QString &text, int modifiers) +void InputContext::sendKeyClick(int key, const QString &text, int modifiers) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->focus && d->inputContext) { QKeyEvent pressEvent(QEvent::KeyPress, key, Qt::KeyboardModifiers(modifiers), text); QKeyEvent releaseEvent(QEvent::KeyRelease, key, Qt::KeyboardModifiers(modifiers), text); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputContext::::sendKeyClick():" << key; + VIRTUALKEYBOARD_DEBUG() << "InputContext::::sendKeyClick():" << key; - d->stateFlags |= DeclarativeInputContextPrivate::KeyEventState; + d->stateFlags |= InputContextPrivate::KeyEventState; d->inputContext->sendKeyEvent(&pressEvent); d->inputContext->sendKeyEvent(&releaseEvent); if (d->activeKeys.isEmpty()) - d->stateFlags &= ~DeclarativeInputContextPrivate::KeyEventState; + d->stateFlags &= ~InputContextPrivate::KeyEventState; } else { - qWarning() << "DeclarativeInputContext::::sendKeyClick():" << key << "no focus"; + qWarning() << "InputContext::::sendKeyClick():" << key << "no focus"; } } @@ -435,11 +437,13 @@ void DeclarativeInputContext::sendKeyClick(int key, const QString &text, int mod Commits the current pre-edit text. */ /*! + \fn void QtVirtualKeyboard::InputContext::commit() + Commits the current pre-edit text. */ -void DeclarativeInputContext::commit() +void InputContext::commit() { - Q_D(DeclarativeInputContext); + Q_D(InputContext); QString text = d->preeditText; commit(text); } @@ -460,10 +464,10 @@ void DeclarativeInputContext::commit() contents relative to \a replaceFrom with a length of \a replaceLength. */ -void DeclarativeInputContext::commit(const QString &text, int replaceFrom, int replaceLength) +void InputContext::commit(const QString &text, int replaceFrom, int replaceLength) { - Q_D(DeclarativeInputContext); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputContext::commit():" << text << replaceFrom << replaceLength; + Q_D(InputContext); + VIRTUALKEYBOARD_DEBUG() << "InputContext::commit():" << text << replaceFrom << replaceLength; bool preeditChanged = !d->preeditText.isEmpty(); d->preeditText.clear(); @@ -475,9 +479,9 @@ void DeclarativeInputContext::commit(const QString &text, int replaceFrom, int r } QInputMethodEvent inputEvent(QString(), attributes); inputEvent.setCommitString(text, replaceFrom, replaceLength); - d->stateFlags |= DeclarativeInputContextPrivate::InputMethodEventState; + d->stateFlags |= InputContextPrivate::InputMethodEventState; d->inputContext->sendEvent(&inputEvent); - d->stateFlags &= ~DeclarativeInputContextPrivate::InputMethodEventState; + d->stateFlags &= ~InputContextPrivate::InputMethodEventState; } if (preeditChanged) @@ -490,11 +494,13 @@ void DeclarativeInputContext::commit(const QString &text, int replaceFrom, int r Clears the pre-edit text. */ /*! + \fn void QtVirtualKeyboard::InputContext::clear() + Clears the pre-edit text. */ -void DeclarativeInputContext::clear() +void InputContext::clear() { - Q_D(DeclarativeInputContext); + Q_D(InputContext); bool preeditChanged = !d->preeditText.isEmpty(); d->preeditText.clear(); @@ -505,9 +511,9 @@ void DeclarativeInputContext::clear() d->forceCursorPosition = -1; } QInputMethodEvent event(QString(), attributes); - d->stateFlags |= DeclarativeInputContextPrivate::InputMethodEventState; + d->stateFlags |= InputContextPrivate::InputMethodEventState; d->inputContext->sendEvent(&event); - d->stateFlags &= ~DeclarativeInputContextPrivate::InputMethodEventState; + d->stateFlags &= ~InputContextPrivate::InputMethodEventState; } if (preeditChanged) @@ -517,7 +523,7 @@ void DeclarativeInputContext::clear() /*! \internal */ -bool DeclarativeInputContext::fileExists(const QUrl &fileUrl) +bool InputContext::fileExists(const QUrl &fileUrl) { #ifdef COMPILING_QML // workaround that qtquickcompiler removes *.qml file paths from qrc file (QTRD-3268) @@ -536,37 +542,37 @@ bool DeclarativeInputContext::fileExists(const QUrl &fileUrl) /*! \internal */ -bool DeclarativeInputContext::hasEnterKeyAction(QObject *item) const +bool InputContext::hasEnterKeyAction(QObject *item) const { return item != 0 && qmlAttachedPropertiesObject<EnterKeyAction>(item, false); } -void DeclarativeInputContext::onInputItemChanged() +void InputContext::onInputItemChanged() { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (!inputItem() && !d->activeKeys.isEmpty()) { // After losing keyboard focus it is impossible to track pressed keys d->activeKeys.clear(); - d->stateFlags &= ~DeclarativeInputContextPrivate::KeyEventState; + d->stateFlags &= ~InputContextPrivate::KeyEventState; } - d->stateFlags &= ~DeclarativeInputContextPrivate::InputMethodClickState; + d->stateFlags &= ~InputContextPrivate::InputMethodClickState; } -void DeclarativeInputContext::setFocus(bool enable) +void InputContext::setFocus(bool enable) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); if (d->focus != enable) { - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputContext::setFocus():" << enable; + VIRTUALKEYBOARD_DEBUG() << "InputContext::setFocus():" << enable; d->focus = enable; emit focusChanged(); } emit focusEditorChanged(); } -void DeclarativeInputContext::sendPreedit(const QString &text, const QList<QInputMethodEvent::Attribute> &attributes, int replaceFrom, int replaceLength) +void InputContext::sendPreedit(const QString &text, const QList<QInputMethodEvent::Attribute> &attributes, int replaceFrom, int replaceLength) { - Q_D(DeclarativeInputContext); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputContext::sendPreedit():" << text << replaceFrom << replaceLength; + Q_D(InputContext); + VIRTUALKEYBOARD_DEBUG() << "InputContext::sendPreedit():" << text << replaceFrom << replaceLength; bool textChanged = d->preeditText != text; bool attributesChanged = d->preeditTextAttributes != attributes; @@ -579,9 +585,9 @@ void DeclarativeInputContext::sendPreedit(const QString &text, const QList<QInpu QInputMethodEvent event(text, attributes); if (replaceFrom != 0 || replaceLength > 0) event.setCommitString(QString(), replaceFrom, replaceLength); - d->stateFlags |= DeclarativeInputContextPrivate::InputMethodEventState; + d->stateFlags |= InputContextPrivate::InputMethodEventState; d->inputContext->sendEvent(&event); - d->stateFlags &= ~DeclarativeInputContextPrivate::InputMethodEventState; + d->stateFlags &= ~InputContextPrivate::InputMethodEventState; } if (textChanged) @@ -589,21 +595,21 @@ void DeclarativeInputContext::sendPreedit(const QString &text, const QList<QInpu } } -void DeclarativeInputContext::reset() +void InputContext::reset() { - Q_D(DeclarativeInputContext); + Q_D(InputContext); d->inputEngine->reset(); } -void DeclarativeInputContext::externalCommit() +void InputContext::externalCommit() { - Q_D(DeclarativeInputContext); + Q_D(InputContext); d->inputEngine->update(); } -void DeclarativeInputContext::update(Qt::InputMethodQueries queries) +void InputContext::update(Qt::InputMethodQueries queries) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); Q_UNUSED(queries); // fetch @@ -629,7 +635,7 @@ void DeclarativeInputContext::update(Qt::InputMethodQueries queries) // update input engine if ((newSurroundingText || newCursorPosition) && - !d->stateFlags.testFlag(DeclarativeInputContextPrivate::InputMethodEventState)) { + !d->stateFlags.testFlag(InputContextPrivate::InputMethodEventState)) { d->inputEngine->update(); } if (newInputMethodHints) { @@ -655,35 +661,35 @@ void DeclarativeInputContext::update(Qt::InputMethodQueries queries) // word reselection if (newInputMethodHints || newSurroundingText || newSelectedText) - d->stateFlags &= ~DeclarativeInputContextPrivate::InputMethodClickState; + d->stateFlags &= ~InputContextPrivate::InputMethodClickState; if ((newSurroundingText || newCursorPosition) && !newSelectedText && (int)d->stateFlags == 0 && !d->inputMethodHints.testFlag(Qt::ImhNoPredictiveText) && d->cursorPosition > 0 && d->selectedText.isEmpty()) { - d->stateFlags |= DeclarativeInputContextPrivate::ReselectEventState; - if (d->inputEngine->reselect(d->cursorPosition, DeclarativeInputEngine::WordAtCursor)) - d->stateFlags |= DeclarativeInputContextPrivate::InputMethodClickState; - d->stateFlags &= ~DeclarativeInputContextPrivate::ReselectEventState; + d->stateFlags |= InputContextPrivate::ReselectEventState; + if (d->inputEngine->reselect(d->cursorPosition, InputEngine::WordAtCursor)) + d->stateFlags |= InputContextPrivate::InputMethodClickState; + d->stateFlags &= ~InputContextPrivate::ReselectEventState; } } -void DeclarativeInputContext::invokeAction(QInputMethod::Action action, int cursorPosition) +void InputContext::invokeAction(QInputMethod::Action action, int cursorPosition) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); switch (action) { case QInputMethod::Click: if ((int)d->stateFlags == 0) { bool reselect = !d->inputMethodHints.testFlag(Qt::ImhNoPredictiveText) && d->selectedText.isEmpty() && cursorPosition < d->preeditText.length(); if (reselect) { - d->stateFlags |= DeclarativeInputContextPrivate::ReselectEventState; + d->stateFlags |= InputContextPrivate::ReselectEventState; d->forceCursorPosition = d->cursorPosition + cursorPosition; d->inputEngine->update(); - d->inputEngine->reselect(d->cursorPosition, DeclarativeInputEngine::WordBeforeCursor); - d->stateFlags &= ~DeclarativeInputContextPrivate::ReselectEventState; + d->inputEngine->reselect(d->cursorPosition, InputEngine::WordBeforeCursor); + d->stateFlags &= ~InputContextPrivate::ReselectEventState; } else if (!d->preeditText.isEmpty() && cursorPosition == d->preeditText.length()) { d->inputEngine->update(); } } - d->stateFlags &= ~DeclarativeInputContextPrivate::InputMethodClickState; + d->stateFlags &= ~InputContextPrivate::InputMethodClickState; break; case QInputMethod::ContextMenu: @@ -691,11 +697,11 @@ void DeclarativeInputContext::invokeAction(QInputMethod::Action action, int curs } } -bool DeclarativeInputContext::filterEvent(const QEvent *event) +bool InputContext::filterEvent(const QEvent *event) { QEvent::Type type = event->type(); if (type == QEvent::KeyPress || type == QEvent::KeyRelease) { - Q_D(DeclarativeInputContext); + Q_D(InputContext); const QKeyEvent *keyEvent = static_cast<const QKeyEvent *>(event); // Keep track of pressed keys update key event state @@ -705,9 +711,9 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) d->activeKeys -= keyEvent->nativeScanCode(); if (d->activeKeys.isEmpty()) - d->stateFlags &= ~DeclarativeInputContextPrivate::KeyEventState; + d->stateFlags &= ~InputContextPrivate::KeyEventState; else - d->stateFlags |= DeclarativeInputContextPrivate::KeyEventState; + d->stateFlags |= InputContextPrivate::KeyEventState; #ifdef QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION int key = keyEvent->key(); @@ -738,7 +744,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::focus + \property QtVirtualKeyboard::InputContext::focus \brief the focus status. This property is changed when the input method receives or loses focus. @@ -751,7 +757,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::shift + \property QtVirtualKeyboard::InputContext::shift \brief the shift status. This property is changed when the shift status changes. @@ -764,7 +770,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::capsLock + \property QtVirtualKeyboard::InputContext::capsLock \brief the caps lock status. This property is changed when the caps lock status changes. @@ -777,7 +783,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::cursorPosition + \property QtVirtualKeyboard::InputContext::cursorPosition \brief the cursor position. This property is changed when the cursor position changes. @@ -790,7 +796,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::inputMethodHints + \property QtVirtualKeyboard::InputContext::inputMethodHints \brief the input method hints. This property is changed when the input method hints changes. @@ -803,7 +809,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::preeditText + \property QtVirtualKeyboard::InputContext::preeditText \brief the pre-edit text. This property sets the pre-edit text. @@ -816,7 +822,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::surroundingText + \property QtVirtualKeyboard::InputContext::surroundingText \brief the surrounding text around cursor. This property is changed when the surrounding text around the cursor changes. @@ -829,7 +835,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::selectedText + \property QtVirtualKeyboard::InputContext::selectedText \brief the selected text. This property is changed when the selected text changes. @@ -842,7 +848,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::cursorRectangle + \property QtVirtualKeyboard::InputContext::cursorRectangle \brief the cursor rectangle. This property is changed when the cursor rectangle changes. @@ -855,7 +861,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::keyboardRectangle + \property QtVirtualKeyboard::InputContext::keyboardRectangle \brief the keyboard rectangle. Use this property to set the keyboard rectangle. @@ -868,7 +874,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::previewRectangle + \property QtVirtualKeyboard::InputContext::previewRectangle \brief the preview rectangle. Use this property to set the preview rectangle. @@ -881,7 +887,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::previewVisible + \property QtVirtualKeyboard::InputContext::previewVisible \brief the animating status. Use this property to set the visibility status of the preview. @@ -895,7 +901,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::animating + \property QtVirtualKeyboard::InputContext::animating \brief the animating status. Use this property to set the animating status, for example @@ -909,7 +915,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::locale + \property QtVirtualKeyboard::InputContext::locale \brief the locale. Sets the locale for this input context. @@ -922,7 +928,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::inputItem + \property QtVirtualKeyboard::InputContext::inputItem \brief the focused input item. This property is changed when the focused input item changes. @@ -935,7 +941,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::shiftHandler + \property QtVirtualKeyboard::InputContext::shiftHandler \brief the shift handler instance. This property stores the shift handler. @@ -948,7 +954,7 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \property QtVirtualKeyboard::DeclarativeInputContext::inputEngine + \property QtVirtualKeyboard::InputContext::inputEngine \brief the input engine. This property stores the input engine. @@ -961,18 +967,18 @@ bool DeclarativeInputContext::filterEvent(const QEvent *event) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputContext::focusEditorChanged() + \fn void QtVirtualKeyboard::InputContext::focusEditorChanged() This signal is emitted when the focus editor changes. */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputContext::navigationKeyPressed(int key, bool isAutoRepeat) + \fn void QtVirtualKeyboard::InputContext::navigationKeyPressed(int key, bool isAutoRepeat) \internal */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputContext::navigationKeyReleased(int key, bool isAutoRepeat) + \fn void QtVirtualKeyboard::InputContext::navigationKeyReleased(int key, bool isAutoRepeat) \internal */ diff --git a/src/virtualkeyboard/declarativeinputcontext.h b/src/virtualkeyboard/inputcontext.h index c22d5ed6..b07b1cad 100644 --- a/src/virtualkeyboard/declarativeinputcontext.h +++ b/src/virtualkeyboard/inputcontext.h @@ -19,8 +19,8 @@ ** ******************************************************************************/ -#ifndef DECLARATIVEINPUTCONTEXT_H -#define DECLARATIVEINPUTCONTEXT_H +#ifndef INPUTCONTEXT_H +#define INPUTCONTEXT_H #include <QObject> #include <QRectF> @@ -31,15 +31,15 @@ namespace QtVirtualKeyboard { class PlatformInputContext; -class DeclarativeInputEngine; -class DeclarativeShiftHandler; -class DeclarativeInputContextPrivate; +class InputEngine; +class ShiftHandler; +class InputContextPrivate; -class DeclarativeInputContext : public QObject +class InputContext : public QObject { Q_OBJECT - Q_DISABLE_COPY(DeclarativeInputContext) - Q_DECLARE_PRIVATE(DeclarativeInputContext) + Q_DISABLE_COPY(InputContext) + Q_DECLARE_PRIVATE(InputContext) Q_PROPERTY(bool focus READ focus NOTIFY focusChanged) Q_PROPERTY(bool shift READ shift WRITE setShift NOTIFY shiftChanged) Q_PROPERTY(bool capsLock READ capsLock WRITE setCapsLock NOTIFY capsLockChanged) @@ -55,12 +55,12 @@ 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(QtVirtualKeyboard::DeclarativeShiftHandler *shiftHandler READ shiftHandler CONSTANT) - Q_PROPERTY(QtVirtualKeyboard::DeclarativeInputEngine *inputEngine READ inputEngine CONSTANT) + Q_PROPERTY(QtVirtualKeyboard::ShiftHandler *shiftHandler READ shiftHandler CONSTANT) + Q_PROPERTY(QtVirtualKeyboard::InputEngine *inputEngine READ inputEngine CONSTANT) public: - explicit DeclarativeInputContext(PlatformInputContext *parent = 0); - ~DeclarativeInputContext(); + explicit InputContext(PlatformInputContext *parent = 0); + ~InputContext(); bool focus() const; bool shift() const; @@ -86,8 +86,8 @@ public: void setLocale(const QString &locale); Q_INVOKABLE void updateAvailableLocales(const QStringList &availableLocales); QObject *inputItem() const; - DeclarativeShiftHandler *shiftHandler() const; - DeclarativeInputEngine *inputEngine() const; + ShiftHandler *shiftHandler() const; + InputEngine *inputEngine() const; Q_INVOKABLE void hideInputPanel(); Q_INVOKABLE void sendKeyClick(int key, const QString &text, int modifiers = 0); diff --git a/src/virtualkeyboard/declarativeinputengine.cpp b/src/virtualkeyboard/inputengine.cpp index 5d887646..999ee23c 100644 --- a/src/virtualkeyboard/declarativeinputengine.cpp +++ b/src/virtualkeyboard/inputengine.cpp @@ -19,10 +19,10 @@ ** ******************************************************************************/ -#include "declarativeinputengine.h" -#include "declarativeinputcontext.h" +#include "inputengine.h" +#include "inputcontext.h" #include "defaultinputmethod.h" -#include "declarativetrace.h" +#include "trace.h" #include "virtualkeyboarddebug.h" #include <QTimerEvent> @@ -30,18 +30,18 @@ namespace QtVirtualKeyboard { -class DeclarativeInputEnginePrivate : public QObjectPrivate +class InputEnginePrivate : public QObjectPrivate { - Q_DECLARE_PUBLIC(DeclarativeInputEngine) + Q_DECLARE_PUBLIC(InputEngine) public: - DeclarativeInputEnginePrivate(DeclarativeInputEngine *q_ptr) : + InputEnginePrivate(InputEngine *q_ptr) : QObjectPrivate(), q_ptr(q_ptr), inputContext(0), defaultInputMethod(0), - textCase(DeclarativeInputEngine::Lower), - inputMode(DeclarativeInputEngine::Latin), + textCase(InputEngine::Lower), + inputMode(InputEngine::Latin), activeKey(Qt::Key_unknown), activeKeyModifiers(Qt::NoModifier), previousKey(Qt::Key_unknown), @@ -51,13 +51,13 @@ public: { } - virtual ~DeclarativeInputEnginePrivate() + virtual ~InputEnginePrivate() { } bool virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool isAutoRepeat) { - Q_Q(DeclarativeInputEngine); + Q_Q(InputEngine); bool accept = false; if (inputMethod) { accept = inputMethod->keyEvent(key, text, modifiers); @@ -71,13 +71,13 @@ public: return accept; } - DeclarativeInputEngine* q_ptr; - DeclarativeInputContext *inputContext; + InputEngine* q_ptr; + InputContext *inputContext; QPointer<AbstractInputMethod> inputMethod; AbstractInputMethod *defaultInputMethod; - DeclarativeInputEngine::TextCase textCase; - DeclarativeInputEngine::InputMode inputMode; - QMap<DeclarativeSelectionListModel::Type, DeclarativeSelectionListModel *> selectionListModels; + InputEngine::TextCase textCase; + InputEngine::InputMode inputMode; + QMap<SelectionListModel::Type, SelectionListModel *> selectionListModels; Qt::Key activeKey; QString activeKeyText; Qt::KeyboardModifiers activeKeyModifiers; @@ -110,7 +110,7 @@ private: \qmltype InputEngine \inqmlmodule QtQuick.Enterprise.VirtualKeyboard \ingroup qtvirtualkeyboard-qml - \instantiates QtVirtualKeyboard::DeclarativeInputEngine + \instantiates QtVirtualKeyboard::InputEngine \brief Maps the user input to the input methods. The input engine is responsible for routing input events to input @@ -122,9 +122,9 @@ private: */ /*! - \class QtVirtualKeyboard::DeclarativeInputEngine + \class QtVirtualKeyboard::InputEngine \inmodule InputFramework - \brief The DeclarativeInputEngine class provides an input engine + \brief The InputEngine class provides an input engine that supports C++ and QML integration. The input engine is responsible for routing input events to input @@ -139,10 +139,10 @@ private: \internal Constructs an input engine with input context as \a parent. */ -DeclarativeInputEngine::DeclarativeInputEngine(DeclarativeInputContext *parent) : - QObject(*new DeclarativeInputEnginePrivate(this), parent) +InputEngine::InputEngine(InputContext *parent) : + QObject(*new InputEnginePrivate(this), parent) { - Q_D(DeclarativeInputEngine); + Q_D(InputEngine); d->inputContext = parent; if (d->inputContext) { connect(d->inputContext, SIGNAL(shiftChanged()), SLOT(shiftChanged())); @@ -151,14 +151,14 @@ DeclarativeInputEngine::DeclarativeInputEngine(DeclarativeInputContext *parent) d->defaultInputMethod = new DefaultInputMethod(this); if (d->defaultInputMethod) d->defaultInputMethod->setInputEngine(this); - d->selectionListModels[DeclarativeSelectionListModel::WordCandidateList] = new DeclarativeSelectionListModel(this); + d->selectionListModels[SelectionListModel::WordCandidateList] = new SelectionListModel(this); } /*! \internal Destroys the input engine and frees all allocated resources. */ -DeclarativeInputEngine::~DeclarativeInputEngine() +InputEngine::~InputEngine() { } @@ -192,10 +192,10 @@ DeclarativeInputEngine::~DeclarativeInputEngine() \sa virtualKeyCancel(), virtualKeyRelease() */ -bool DeclarativeInputEngine::virtualKeyPress(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool repeat) +bool InputEngine::virtualKeyPress(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool repeat) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::virtualKeyPress():" << key << text << modifiers << repeat; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyPress():" << key << text << modifiers << repeat; bool accept = false; if (d->activeKey == Qt::Key_unknown || d->activeKey == key) { d->activeKey = key; @@ -220,14 +220,16 @@ bool DeclarativeInputEngine::virtualKeyPress(Qt::Key key, const QString &text, Q the key state needs to be restored. */ /*! + \fn void QtVirtualKeyboard::InputEngine::virtualKeyCancel() + Reverts the active key state without emitting the key event. This method is useful when the user discards the current key and the key state needs to be restored. */ -void DeclarativeInputEngine::virtualKeyCancel() +void InputEngine::virtualKeyCancel() { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::virtualKeyCancel()"; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyCancel()"; if (d->activeKey != Qt::Key_unknown) { d->activeKey = Qt::Key_unknown; d->activeKeyText = QString(); @@ -257,10 +259,10 @@ void DeclarativeInputEngine::virtualKeyCancel() Returns \c true if the key was accepted by the input engine. */ -bool DeclarativeInputEngine::virtualKeyRelease(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) +bool InputEngine::virtualKeyRelease(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::virtualKeyRelease():" << key << text << modifiers; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyRelease():" << key << text << modifiers; bool accept = false; if (d->activeKey == key) { if (!d->repeatCount) { @@ -297,29 +299,29 @@ bool DeclarativeInputEngine::virtualKeyRelease(Qt::Key key, const QString &text, Emits a key click event for the given \a key, \a text and \a modifiers. Returns \c true if the key event was accepted by the input engine. */ -bool DeclarativeInputEngine::virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) +bool InputEngine::virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::virtualKeyClick():" << key << text << modifiers; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyClick():" << key << text << modifiers; return d->virtualKeyClick(key, text, modifiers, false); } /*! - Returns the \c DeclarativeInputContext instance associated with the input + Returns the \c InputContext instance associated with the input engine. */ -DeclarativeInputContext *DeclarativeInputEngine::inputContext() const +InputContext *InputEngine::inputContext() const { - Q_D(const DeclarativeInputEngine); + Q_D(const InputEngine); return d->inputContext; } /*! Returns the currently active key, or Qt::Key_unknown if no key is active. */ -Qt::Key DeclarativeInputEngine::activeKey() const +Qt::Key InputEngine::activeKey() const { - Q_D(const DeclarativeInputEngine); + Q_D(const InputEngine); return d->activeKey; } @@ -327,28 +329,28 @@ Qt::Key DeclarativeInputEngine::activeKey() const Returns the previously active key, or Qt::Key_unknown if no key has been active. */ -Qt::Key DeclarativeInputEngine::previousKey() const +Qt::Key InputEngine::previousKey() const { - Q_D(const DeclarativeInputEngine); + Q_D(const InputEngine); return d->previousKey; } /*! Returns the active input method. */ -AbstractInputMethod *DeclarativeInputEngine::inputMethod() const +AbstractInputMethod *InputEngine::inputMethod() const { - Q_D(const DeclarativeInputEngine); + Q_D(const InputEngine); return d->inputMethod; } /*! Sets \a inputMethod as the active input method. */ -void DeclarativeInputEngine::setInputMethod(AbstractInputMethod *inputMethod) +void InputEngine::setInputMethod(AbstractInputMethod *inputMethod) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::setInputMethod():" << inputMethod; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::setInputMethod():" << inputMethod; if (d->inputMethod != inputMethod) { update(); if (d->inputMethod) { @@ -362,27 +364,27 @@ void DeclarativeInputEngine::setInputMethod(AbstractInputMethod *inputMethod) d->inputMethod->setTextCase(d->textCase); // Allocate selection lists for the input method - QList<DeclarativeSelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists(); - QList<DeclarativeSelectionListModel::Type> inactiveSelectionLists = d->selectionListModels.keys(); - foreach (const DeclarativeSelectionListModel::Type &selectionListType, activeSelectionLists) { + QList<SelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists(); + QList<SelectionListModel::Type> inactiveSelectionLists = d->selectionListModels.keys(); + foreach (const SelectionListModel::Type &selectionListType, activeSelectionLists) { if (!d->selectionListModels.contains(selectionListType)) { - d->selectionListModels[selectionListType] = new DeclarativeSelectionListModel(this); - if (selectionListType == DeclarativeSelectionListModel::WordCandidateList) { + d->selectionListModels[selectionListType] = new SelectionListModel(this); + if (selectionListType == SelectionListModel::WordCandidateList) { emit wordCandidateListModelChanged(); } } d->selectionListModels[selectionListType]->setDataSource(inputMethod, selectionListType); - if (selectionListType == DeclarativeSelectionListModel::WordCandidateList) { + if (selectionListType == SelectionListModel::WordCandidateList) { emit wordCandidateListVisibleHintChanged(); } inactiveSelectionLists.removeAll(selectionListType); } // Deallocate inactive selection lists - foreach (const DeclarativeSelectionListModel::Type &selectionListType, inactiveSelectionLists) { + foreach (const SelectionListModel::Type &selectionListType, inactiveSelectionLists) { if (d->selectionListModels.contains(selectionListType)) { d->selectionListModels[selectionListType]->setDataSource(0, selectionListType); - if (selectionListType == DeclarativeSelectionListModel::WordCandidateList) { + if (selectionListType == SelectionListModel::WordCandidateList) { emit wordCandidateListVisibleHintChanged(); } } @@ -397,9 +399,9 @@ void DeclarativeInputEngine::setInputMethod(AbstractInputMethod *inputMethod) /*! Returns the list of available input modes. */ -QList<int> DeclarativeInputEngine::inputModes() const +QList<int> InputEngine::inputModes() const { - Q_D(const DeclarativeInputEngine); + Q_D(const InputEngine); QList<InputMode> inputModeList; if (d->inputMethod) { inputModeList = d->inputMethod->inputModes(d->inputContext->locale()); @@ -414,19 +416,19 @@ QList<int> DeclarativeInputEngine::inputModes() const return resultList; } -DeclarativeInputEngine::InputMode DeclarativeInputEngine::inputMode() const +InputEngine::InputMode InputEngine::inputMode() const { - Q_D(const DeclarativeInputEngine); + Q_D(const InputEngine); return d->inputMode; } -void DeclarativeInputEngine::setInputMode(DeclarativeInputEngine::InputMode inputMode) +void InputEngine::setInputMode(InputEngine::InputMode inputMode) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::setInputMode():" << inputMode; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::setInputMode():" << inputMode; if (d->inputMethod) { const QString locale(d->inputContext->locale()); - QList<DeclarativeInputEngine::InputMode> inputModeList(d->inputMethod->inputModes(locale)); + QList<InputEngine::InputMode> inputModeList(d->inputMethod->inputModes(locale)); if (inputModeList.contains(inputMode)) { d->inputMethod->setInputMode(locale, inputMode); if (d->inputMode != inputMode) { @@ -439,26 +441,26 @@ void DeclarativeInputEngine::setInputMode(DeclarativeInputEngine::InputMode inpu } } -DeclarativeSelectionListModel *DeclarativeInputEngine::wordCandidateListModel() const +SelectionListModel *InputEngine::wordCandidateListModel() const { - Q_D(const DeclarativeInputEngine); - return d->selectionListModels[DeclarativeSelectionListModel::WordCandidateList]; + Q_D(const InputEngine); + return d->selectionListModels[SelectionListModel::WordCandidateList]; } -bool DeclarativeInputEngine::wordCandidateListVisibleHint() const +bool InputEngine::wordCandidateListVisibleHint() const { - Q_D(const DeclarativeInputEngine); - if (!d->selectionListModels.contains(DeclarativeSelectionListModel::WordCandidateList)) + Q_D(const InputEngine); + if (!d->selectionListModels.contains(SelectionListModel::WordCandidateList)) return false; - return d->selectionListModels[DeclarativeSelectionListModel::WordCandidateList]->dataSource() != 0; + return d->selectionListModels[SelectionListModel::WordCandidateList]->dataSource() != 0; } /*! Returns list of supported pattern recognition modes. */ -QList<int> DeclarativeInputEngine::patternRecognitionModes() const +QList<int> InputEngine::patternRecognitionModes() const { - Q_D(const DeclarativeInputEngine); + Q_D(const InputEngine); QList<PatternRecognitionMode> patterRecognitionModeList; if (d->inputMethod) patterRecognitionModeList = d->inputMethod->patternRecognitionModes(); @@ -511,11 +513,11 @@ QList<int> DeclarativeInputEngine::patternRecognitionModes() const The trace interaction is ended by calling the traceEnd() method. */ -QtVirtualKeyboard::DeclarativeTrace *DeclarativeInputEngine::traceBegin(int traceId, QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +QtVirtualKeyboard::Trace *InputEngine::traceBegin(int traceId, QtVirtualKeyboard::InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::traceBegin():" + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::traceBegin():" << "traceId:" << traceId << "patternRecognitionMode:" << patternRecognitionMode << "traceCaptureDeviceInfo:" << traceCaptureDeviceInfo @@ -526,7 +528,7 @@ QtVirtualKeyboard::DeclarativeTrace *DeclarativeInputEngine::traceBegin(int trac return 0; if (!d->inputMethod->patternRecognitionModes().contains(patternRecognitionMode)) return 0; - DeclarativeTrace *trace = d->inputMethod->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); + Trace *trace = d->inputMethod->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); if (trace) trace->setTraceId(traceId); return trace; @@ -550,10 +552,10 @@ QtVirtualKeyboard::DeclarativeTrace *DeclarativeInputEngine::traceBegin(int trac 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(QtVirtualKeyboard::DeclarativeTrace *trace) +bool InputEngine::traceEnd(QtVirtualKeyboard::Trace *trace) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::traceEnd():" << trace; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::traceEnd():" << trace; Q_ASSERT(trace); if (!d->inputMethod) return false; @@ -569,10 +571,10 @@ bool DeclarativeInputEngine::traceEnd(QtVirtualKeyboard::DeclarativeTrace *trace The function returns \c true if the word was successfully reselected. */ -bool DeclarativeInputEngine::reselect(int cursorPosition, const ReselectFlags &reselectFlags) +bool InputEngine::reselect(int cursorPosition, const ReselectFlags &reselectFlags) { - Q_D(DeclarativeInputEngine); - VIRTUALKEYBOARD_DEBUG() << "DeclarativeInputEngine::reselect():" << cursorPosition << reselectFlags; + Q_D(InputEngine); + VIRTUALKEYBOARD_DEBUG() << "InputEngine::reselect():" << cursorPosition << reselectFlags; if (!d->inputMethod || !wordCandidateListVisibleHint()) return false; return d->inputMethod->reselect(cursorPosition, reselectFlags); @@ -582,9 +584,9 @@ bool DeclarativeInputEngine::reselect(int cursorPosition, const ReselectFlags &r \internal Resets the input method. */ -void DeclarativeInputEngine::reset() +void InputEngine::reset() { - Q_D(DeclarativeInputEngine); + Q_D(InputEngine); if (d->inputMethod) { RecursiveMethodGuard guard(d->recursiveMethodLock); if (!guard.locked()) { @@ -598,9 +600,9 @@ void DeclarativeInputEngine::reset() Updates the input method's state. This method is called whenever the input context is changed. */ -void DeclarativeInputEngine::update() +void InputEngine::update() { - Q_D(DeclarativeInputEngine); + Q_D(InputEngine); if (d->inputMethod) { RecursiveMethodGuard guard(d->recursiveMethodLock); if (!guard.locked()) { @@ -613,9 +615,9 @@ void DeclarativeInputEngine::update() \internal Updates the text case for the input method. */ -void DeclarativeInputEngine::shiftChanged() +void InputEngine::shiftChanged() { - Q_D(DeclarativeInputEngine); + Q_D(InputEngine); TextCase newCase = d->inputContext->shift() ? Upper : Lower; if (d->textCase != newCase) { d->textCase = newCase; @@ -628,9 +630,9 @@ void DeclarativeInputEngine::shiftChanged() /*! \internal */ -void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) +void InputEngine::timerEvent(QTimerEvent *timerEvent) { - Q_D(DeclarativeInputEngine); + Q_D(InputEngine); if (timerEvent->timerId() == d->repeatTimer) { d->repeatTimer = 0; d->virtualKeyClick(d->activeKey, d->activeKeyText, d->activeKeyModifiers, true); @@ -646,7 +648,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::activeKey + \property QtVirtualKeyboard::InputEngine::activeKey \brief the active key. Currently pressed key. @@ -658,7 +660,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) Previously pressed key. */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::previousKey + \property QtVirtualKeyboard::InputEngine::previousKey \brief the previous active key. Previously pressed key. @@ -672,7 +674,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::inputMethod + \property QtVirtualKeyboard::InputEngine::inputMethod \brief the active input method. Use this property to set active the input method, or to monitor when the @@ -687,7 +689,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::inputModes + \property QtVirtualKeyboard::InputEngine::inputModes \brief the available input modes for active input method. The list of available input modes is dependent on the input method and @@ -717,11 +719,11 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::inputMode + \property QtVirtualKeyboard::InputEngine::inputMode \brief the current input mode. Use this property to get or set the current input mode. The - DeclarativeInputEngine::inputModes provides list of valid input modes + InputEngine::inputModes provides list of valid input modes for current input method and locale. */ @@ -733,7 +735,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::wordCandidateListModel + \property QtVirtualKeyboard::InputEngine::wordCandidateListModel \brief list model for the word candidate list. Use this property to access the list model for the word candidate @@ -748,7 +750,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::wordCandidateListVisibleHint + \property QtVirtualKeyboard::InputEngine::wordCandidateListVisibleHint \brief visible hint for the word candidate list. Use this property to check if the word candidate list should be visible @@ -756,7 +758,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::DeclarativeInputEngine::InputMode + \enum QtVirtualKeyboard::InputEngine::InputMode This enum specifies the input mode for the input method. @@ -781,7 +783,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::DeclarativeInputEngine::TextCase + \enum QtVirtualKeyboard::InputEngine::TextCase This enum specifies the text case for the input method. @@ -792,7 +794,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::DeclarativeInputEngine::PatternRecognitionMode + \enum QtVirtualKeyboard::InputEngine::PatternRecognitionMode This enum specifies the input mode for the input method. @@ -803,7 +805,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::DeclarativeInputEngine::ReselectFlag + \enum QtVirtualKeyboard::InputEngine::ReselectFlag This enum specifies the rules for word reselection. @@ -824,7 +826,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::virtualKeyClicked(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool isAutoRepeat) + \fn void QtVirtualKeyboard::InputEngine::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 @@ -840,7 +842,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::DeclarativeInputEngine::patternRecognitionModes + \property QtVirtualKeyboard::InputEngine::patternRecognitionModes \since QtQuick.Enterprise.VirtualKeyboard 2.0 \brief the list of available pattern recognition modes. @@ -854,7 +856,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::activeKeyChanged(Qt::Key key) + \fn void QtVirtualKeyboard::InputEngine::activeKeyChanged(Qt::Key key) Indicates that the active \a key has changed. */ @@ -866,7 +868,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::previousKeyChanged(Qt::Key key) + \fn void QtVirtualKeyboard::InputEngine::previousKeyChanged(Qt::Key key) Indicates that the previous \a key has changed. */ @@ -878,7 +880,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputMethodChanged() + \fn void QtVirtualKeyboard::InputEngine::inputMethodChanged() Indicates that the input method has changed. */ @@ -893,7 +895,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputMethodReset() + \fn void QtVirtualKeyboard::InputEngine::inputMethodReset() Emitted when the input method needs to be reset. @@ -909,7 +911,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputMethodUpdate() + \fn void QtVirtualKeyboard::InputEngine::inputMethodUpdate() \note This signal is automatically connected to AbstractInputMethod::update() and InputMethod::update() when the input method is activated. @@ -922,7 +924,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputModesChanged() + \fn void QtVirtualKeyboard::InputEngine::inputModesChanged() Indicates that the available input modes have changed. */ @@ -934,7 +936,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::inputModeChanged() + \fn void QtVirtualKeyboard::InputEngine::inputModeChanged() Indicates that the input mode has changed. */ @@ -954,7 +956,7 @@ void DeclarativeInputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::DeclarativeInputEngine::patternRecognitionModesChanged() + \fn void QtVirtualKeyboard::InputEngine::patternRecognitionModesChanged() \since QtQuick.Enterprise.VirtualKeyboard 2.0 Indicates that the available pattern recognition modes have changed. diff --git a/src/virtualkeyboard/declarativeinputengine.h b/src/virtualkeyboard/inputengine.h index 42167f9d..a1f63e08 100644 --- a/src/virtualkeyboard/declarativeinputengine.h +++ b/src/virtualkeyboard/inputengine.h @@ -27,17 +27,17 @@ namespace QtVirtualKeyboard { -class DeclarativeInputContext; -class DeclarativeSelectionListModel; +class InputContext; +class SelectionListModel; class AbstractInputMethod; -class DeclarativeInputEnginePrivate; -class DeclarativeTrace; +class InputEnginePrivate; +class Trace; -class DeclarativeInputEngine : public QObject +class InputEngine : public QObject { Q_OBJECT - Q_DISABLE_COPY(DeclarativeInputEngine) - Q_DECLARE_PRIVATE(DeclarativeInputEngine) + Q_DISABLE_COPY(InputEngine) + Q_DECLARE_PRIVATE(InputEngine) Q_ENUMS(TextCase) Q_ENUMS(InputMode) Q_ENUMS(PatternRecognitionMode) @@ -48,10 +48,10 @@ class DeclarativeInputEngine : public QObject 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(QtVirtualKeyboard::DeclarativeSelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged) + Q_PROPERTY(QtVirtualKeyboard::SelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged) Q_PROPERTY(bool wordCandidateListVisibleHint READ wordCandidateListVisibleHint NOTIFY wordCandidateListVisibleHintChanged) - explicit DeclarativeInputEngine(DeclarativeInputContext *parent = 0); + explicit InputEngine(InputContext *parent = 0); public: enum TextCase { @@ -81,14 +81,14 @@ public: Q_DECLARE_FLAGS(ReselectFlags, ReselectFlag) public: - ~DeclarativeInputEngine(); + ~InputEngine(); Q_INVOKABLE bool virtualKeyPress(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool repeat); Q_INVOKABLE void virtualKeyCancel(); Q_INVOKABLE bool virtualKeyRelease(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); Q_INVOKABLE bool virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); - DeclarativeInputContext *inputContext() const; + InputContext *inputContext() const; Qt::Key activeKey() const; Qt::Key previousKey() const; @@ -100,13 +100,13 @@ public: InputMode inputMode() const; void setInputMode(InputMode inputMode); - DeclarativeSelectionListModel *wordCandidateListModel() const; + SelectionListModel *wordCandidateListModel() const; bool wordCandidateListVisibleHint() const; QList<int> patternRecognitionModes() const; - 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 QtVirtualKeyboard::Trace *traceBegin(int traceId, QtVirtualKeyboard::InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + Q_INVOKABLE bool traceEnd(QtVirtualKeyboard::Trace *trace); Q_INVOKABLE bool reselect(int cursorPosition, const ReselectFlags &reselectFlags); @@ -132,13 +132,13 @@ protected: void timerEvent(QTimerEvent *timerEvent); private: - friend class DeclarativeInputContext; + friend class InputContext; }; } // namespace QtVirtualKeyboard -Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeInputEngine::TextCase) -Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeInputEngine::InputMode) -Q_DECLARE_OPERATORS_FOR_FLAGS(QtVirtualKeyboard::DeclarativeInputEngine::ReselectFlags) +Q_DECLARE_METATYPE(QtVirtualKeyboard::InputEngine::TextCase) +Q_DECLARE_METATYPE(QtVirtualKeyboard::InputEngine::InputMode) +Q_DECLARE_OPERATORS_FOR_FLAGS(QtVirtualKeyboard::InputEngine::ReselectFlags) #endif diff --git a/src/virtualkeyboard/declarativeinputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp index a89d5988..a1a7398a 100644 --- a/src/virtualkeyboard/declarativeinputmethod.cpp +++ b/src/virtualkeyboard/inputmethod.cpp @@ -19,15 +19,15 @@ ** ******************************************************************************/ -#include "declarativeinputmethod.h" -#include "declarativetrace.h" +#include "inputmethod.h" +#include "trace.h" #include <QVariant> namespace QtVirtualKeyboard { /*! \qmltype InputMethod - \instantiates QtVirtualKeyboard::DeclarativeInputMethod + \instantiates QtVirtualKeyboard::InputMethod \inqmlmodule QtQuick.Enterprise.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Base type for creating input method in QML. @@ -206,33 +206,33 @@ namespace QtVirtualKeyboard { */ /*! - \class QtVirtualKeyboard::DeclarativeInputMethod + \class QtVirtualKeyboard::InputMethod \internal */ -DeclarativeInputMethod::DeclarativeInputMethod(QObject *parent) : +InputMethod::InputMethod(QObject *parent) : AbstractInputMethod(parent) { } -DeclarativeInputMethod::~DeclarativeInputMethod() +InputMethod::~InputMethod() { } -QList<DeclarativeInputEngine::InputMode> DeclarativeInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> InputMethod::inputModes(const QString &locale) { QVariant result; QMetaObject::invokeMethod(this, "inputModes", Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, locale)); - QList<DeclarativeInputEngine::InputMode> inputModeList; + QList<InputEngine::InputMode> inputModeList; foreach (const QVariant &inputMode, result.toList()) { - inputModeList.append(static_cast<DeclarativeInputEngine::InputMode>(inputMode.toInt())); + inputModeList.append(static_cast<InputEngine::InputMode>(inputMode.toInt())); } return inputModeList; } -bool DeclarativeInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool InputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { QVariant result; QMetaObject::invokeMethod(this, "setInputMode", @@ -242,7 +242,7 @@ bool DeclarativeInputMethod::setInputMode(const QString &locale, DeclarativeInpu return result.toBool(); } -bool DeclarativeInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool InputMethod::setTextCase(InputEngine::TextCase textCase) { QVariant result; QMetaObject::invokeMethod(this, "setTextCase", @@ -251,7 +251,7 @@ bool DeclarativeInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCa return result.toBool(); } -bool DeclarativeInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) +bool InputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) { QVariant result; QMetaObject::invokeMethod(this, "keyEvent", @@ -262,19 +262,19 @@ bool DeclarativeInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyb return result.toBool(); } -QList<DeclarativeSelectionListModel::Type> DeclarativeInputMethod::selectionLists() +QList<SelectionListModel::Type> InputMethod::selectionLists() { QVariant result; QMetaObject::invokeMethod(this, "selectionLists", Q_RETURN_ARG(QVariant, result)); - QList<DeclarativeSelectionListModel::Type> selectionListsList; + QList<SelectionListModel::Type> selectionListsList; foreach (const QVariant &selectionListType, result.toList()) { - selectionListsList.append(static_cast<DeclarativeSelectionListModel::Type>(selectionListType.toInt())); + selectionListsList.append(static_cast<SelectionListModel::Type>(selectionListType.toInt())); } return selectionListsList; } -int DeclarativeInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) +int InputMethod::selectionListItemCount(SelectionListModel::Type type) { QVariant result; QMetaObject::invokeMethod(this, "selectionListItemCount", @@ -283,7 +283,7 @@ int DeclarativeInputMethod::selectionListItemCount(DeclarativeSelectionListModel return result.toInt(); } -QVariant DeclarativeInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) +QVariant InputMethod::selectionListData(SelectionListModel::Type type, int index, int role) { QVariant result; QMetaObject::invokeMethod(this, "selectionListData", @@ -297,27 +297,27 @@ QVariant DeclarativeInputMethod::selectionListData(DeclarativeSelectionListModel return result; } -void DeclarativeInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void InputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { QMetaObject::invokeMethod(this, "selectionListItemSelected", Q_ARG(QVariant, static_cast<int>(type)), Q_ARG(QVariant, index)); } -QList<DeclarativeInputEngine::PatternRecognitionMode> DeclarativeInputMethod::patternRecognitionModes() const +QList<InputEngine::PatternRecognitionMode> InputMethod::patternRecognitionModes() const { QVariant result; - QMetaObject::invokeMethod(const_cast<DeclarativeInputMethod *>(this), "patternRecognitionModes", + QMetaObject::invokeMethod(const_cast<InputMethod *>(this), "patternRecognitionModes", Q_RETURN_ARG(QVariant, result)); - QList<DeclarativeInputEngine::PatternRecognitionMode> patterRecognitionModeList; + QList<InputEngine::PatternRecognitionMode> patterRecognitionModeList; foreach (const QVariant &patterRecognitionMode, result.toList()) { - patterRecognitionModeList.append(static_cast<DeclarativeInputEngine::PatternRecognitionMode>(patterRecognitionMode.toInt())); + patterRecognitionModeList.append(static_cast<InputEngine::PatternRecognitionMode>(patterRecognitionMode.toInt())); } return patterRecognitionModeList; } -DeclarativeTrace *DeclarativeInputMethod::traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +Trace *InputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { QVariant result; QMetaObject::invokeMethod(this, "traceBegin", @@ -326,10 +326,10 @@ DeclarativeTrace *DeclarativeInputMethod::traceBegin(int traceId, DeclarativeInp Q_ARG(int, (int)patternRecognitionMode), Q_ARG(QVariant, traceCaptureDeviceInfo), Q_ARG(QVariant, traceScreenInfo)); - return result.value<DeclarativeTrace *>(); + return result.value<Trace *>(); } -bool DeclarativeInputMethod::traceEnd(DeclarativeTrace *trace) +bool InputMethod::traceEnd(Trace *trace) { QVariant result; QMetaObject::invokeMethod(this, "traceEnd", @@ -338,7 +338,7 @@ bool DeclarativeInputMethod::traceEnd(DeclarativeTrace *trace) return result.toBool(); } -bool DeclarativeInputMethod::reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags) +bool InputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) { QVariant result; QMetaObject::invokeMethod(this, "reselect", @@ -348,12 +348,12 @@ bool DeclarativeInputMethod::reselect(int cursorPosition, const DeclarativeInput return result.toBool(); } -void DeclarativeInputMethod::reset() +void InputMethod::reset() { QMetaObject::invokeMethod(this, "reset"); } -void DeclarativeInputMethod::update() +void InputMethod::update() { QMetaObject::invokeMethod(this, "update"); } diff --git a/src/virtualkeyboard/inputmethod.h b/src/virtualkeyboard/inputmethod.h new file mode 100644 index 00000000..f7e0d3dd --- /dev/null +++ b/src/virtualkeyboard/inputmethod.h @@ -0,0 +1,60 @@ +/****************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd +** All rights reserved. +** For any questions to The Qt Company, please use contact form at http://qt.io +** +** This file is part of the Qt Virtual Keyboard module. +** +** Licensees holding valid commercial license for Qt may use this file in +** accordance with the Qt License Agreement provided with the Software +** or, alternatively, in accordance with the terms contained in a written +** agreement between you and The Qt Company. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.io +** +******************************************************************************/ + +#ifndef INPUTMETHOD_H +#define INPUTMETHOD_H + +#include "abstractinputmethod.h" + +namespace QtVirtualKeyboard { + +class InputMethod : public AbstractInputMethod +{ + Q_OBJECT + Q_PROPERTY(QtVirtualKeyboard::InputContext *inputContext READ inputContext CONSTANT) + Q_PROPERTY(QtVirtualKeyboard::InputEngine *inputEngine READ inputEngine CONSTANT) + +public: + explicit InputMethod(QObject *parent = 0); + ~InputMethod(); + + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); + + bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); + + QList<SelectionListModel::Type> selectionLists(); + int selectionListItemCount(SelectionListModel::Type type); + QVariant selectionListData(SelectionListModel::Type type, int index, int role); + void selectionListItemSelected(SelectionListModel::Type type, int index); + + QList<InputEngine::PatternRecognitionMode> patternRecognitionModes() const; + Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + bool traceEnd(Trace *trace); + + bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); + + void reset(); + void update(); +}; + +} // namespace QtVirtualKeyboard + +#endif // INPUTMETHOD_H diff --git a/src/virtualkeyboard/lipiinputmethod.cpp b/src/virtualkeyboard/lipiinputmethod.cpp index a2f9ef11..4f832573 100644 --- a/src/virtualkeyboard/lipiinputmethod.cpp +++ b/src/virtualkeyboard/lipiinputmethod.cpp @@ -21,11 +21,11 @@ #include "lipiinputmethod.h" #include "lipisharedrecognizer.h" -#include "declarativeinputengine.h" -#include "declarativeinputcontext.h" -#include "declarativeshifthandler.h" +#include "inputengine.h" +#include "inputcontext.h" +#include "shifthandler.h" #include "virtualkeyboarddebug.h" -#include "declarativetrace.h" +#include "trace.h" #ifdef HAVE_HUNSPELL #include "hunspellinputmethod_p.h" @@ -69,7 +69,7 @@ public: #endif q_ptr(q_ptr), recognizeTimer(0), - textCase(DeclarativeInputEngine::Lower) + textCase(InputEngine::Lower) { } @@ -78,7 +78,7 @@ public: cancelRecognition(); } - QByteArray getContext(DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, + QByteArray getContext(InputEngine::PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) const { @@ -95,7 +95,7 @@ public: return hash.result(); } - void setContext(DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, + void setContext(InputEngine::PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { @@ -142,8 +142,8 @@ public: currentContext = context; } - DeclarativeTrace *traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) + Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_UNUSED(traceId) @@ -157,14 +157,14 @@ public: delayedResult.clear(); } - DeclarativeTrace *trace = new DeclarativeTrace(); + Trace *trace = new Trace(); trace->setChannels(QStringList("t")); traceList.append(trace); return trace; } - void traceEnd(DeclarativeTrace *trace) + void traceEnd(Trace *trace) { if (trace->isCanceled()) { VIRTUALKEYBOARD_DEBUG() << "LipiInputMethodPrivate::traceEnd(): discarded" << trace; @@ -181,7 +181,7 @@ public: int countActiveTraces() const { int count = 0; - foreach (DeclarativeTrace *trace, traceList) { + foreach (Trace *trace, traceList) { if (!trace->isFinal()) count++; } @@ -208,7 +208,7 @@ public: if (swipeLength >= SWIPE_MIN_LENGTH) { Q_Q(LipiInputMethod); - DeclarativeInputContext *ic = q->inputContext(); + InputContext *ic = q->inputContext(); if (!ic) return; @@ -253,7 +253,7 @@ public: cancelRecognition(); #ifdef HAVE_HUNSPELL if (activeWordIndex != -1) { - q->selectionListItemSelected(DeclarativeSelectionListModel::WordCandidateList, activeWordIndex); + q->selectionListItemSelected(SelectionListModel::WordCandidateList, activeWordIndex); return; } #endif @@ -272,9 +272,9 @@ public: #endif cancelRecognition(); if (!(ic->inputMethodHints() & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly))) { - DeclarativeInputEngine::InputMode inputMode = ic->inputEngine()->inputMode(); - inputMode = inputMode == DeclarativeInputEngine::Latin ? - DeclarativeInputEngine::Numeric : DeclarativeInputEngine::Latin; + InputEngine::InputMode inputMode = ic->inputEngine()->inputMode(); + inputMode = inputMode == InputEngine::Latin ? + InputEngine::Numeric : InputEngine::Latin; ic->inputEngine()->setInputMode(inputMode); } } else if (swipeTouchCount == 2) { @@ -325,7 +325,7 @@ public: const int traceCount = traceList.size(); for (traceIndex = 0; traceIndex < traceCount; ++traceIndex) { - const DeclarativeTrace *trace = traceList.at(traceIndex); + const Trace *trace = traceList.at(traceIndex); const QVariantList &points = trace->points(); QVector2D swipeVector; const int pointCount = points.count(); @@ -446,7 +446,7 @@ public: traceGroup.emptyAllTraces(); } - void addPointsToTraceGroup(DeclarativeTrace *trace) + void addPointsToTraceGroup(Trace *trace) { vector<LTKChannel> channels; channels.push_back(LTKChannel("X", DT_INT, true)); @@ -547,13 +547,13 @@ public: const QChar chUpper = ch.toUpper(); #ifdef QT_VIRTUALKEYBOARD_LIPI_RECORD_TRACE_INPUT // In recording mode, the text case must match with the current text case - if (ch.isLetter() && (ch.isUpper() != (textCase == DeclarativeInputEngine::Upper))) + if (ch.isLetter() && (ch.isUpper() != (textCase == InputEngine::Upper))) return; saveTraces(ch.unicode(), qRound(result["confidence"].toDouble() * 100)); #endif Q_Q(LipiInputMethod); q->inputContext()->inputEngine()->virtualKeyClick((Qt::Key)chUpper.unicode(), - textCase == DeclarativeInputEngine::Lower ? QString(ch.toLower()) : QString(chUpper), + textCase == InputEngine::Lower ? QString(ch.toLower()) : QString(chUpper), Qt::NoModifier); } @@ -574,7 +574,7 @@ public: recordedData.append(QStringLiteral(".POINTS_PER_SECOND %1").arg(deviceInfo->getSamplingRate())); qlonglong t0 = 0; - foreach (const DeclarativeTrace *trace, traceList) { + foreach (const Trace *trace, traceList) { const QVariantList &points = trace->points(); const bool hasTime = trace->channels().contains("t"); const QVariantList timeData = hasTime ? trace->channelData("t") : QVariantList(); @@ -634,9 +634,9 @@ public: QScopedPointer<LTKScreenContext> screenContext; QSharedPointer<LipiRecognitionTask> recognitionTask; LTKTraceGroup traceGroup; - QList<DeclarativeTrace *> traceList; + QList<Trace *> traceList; int recognizeTimer; - DeclarativeInputEngine::TextCase textCase; + InputEngine::TextCase textCase; vector<int> subsetOfClasses; QVariantMap delayedResult; }; @@ -655,16 +655,16 @@ LipiInputMethod::~LipiInputMethod() { } -QList<DeclarativeInputEngine::InputMode> LipiInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> LipiInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<DeclarativeInputEngine::InputMode>() - << DeclarativeInputEngine::Latin - << DeclarativeInputEngine::Numeric - << DeclarativeInputEngine::Dialable; + return QList<InputEngine::InputMode>() + << InputEngine::Latin + << InputEngine::Numeric + << InputEngine::Dialable; } -bool LipiInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool LipiInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_D(LipiInputMethod); @@ -676,11 +676,11 @@ bool LipiInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine return false; d->subsetOfClasses.clear(); switch (inputMode) { - case DeclarativeInputEngine::Latin: + case InputEngine::Latin: d->recognizer.subsetOfClasses(QStringLiteral("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz?,.@"), d->subsetOfClasses); break; - case DeclarativeInputEngine::Numeric: - case DeclarativeInputEngine::Dialable: + case InputEngine::Numeric: + case InputEngine::Dialable: d->recognizer.subsetOfClasses(QStringLiteral("1234567890,.+"), d->subsetOfClasses); break; default: @@ -689,7 +689,7 @@ bool LipiInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine return true; } -bool LipiInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool LipiInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_D(LipiInputMethod); d->textCase = textCase; @@ -736,27 +736,27 @@ void LipiInputMethod::update() LipiInputMethodBase::update(); } -void LipiInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void LipiInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { LipiInputMethodBase::selectionListItemSelected(type, index); Q_D(LipiInputMethod); d->cancelRecognition(); } -QList<DeclarativeInputEngine::PatternRecognitionMode> LipiInputMethod::patternRecognitionModes() const +QList<InputEngine::PatternRecognitionMode> LipiInputMethod::patternRecognitionModes() const { - return QList<DeclarativeInputEngine::PatternRecognitionMode>() - << DeclarativeInputEngine::HandwritingRecoginition; + return QList<InputEngine::PatternRecognitionMode>() + << InputEngine::HandwritingRecoginition; } -DeclarativeTrace *LipiInputMethod::traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +Trace *LipiInputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_D(LipiInputMethod); return d->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); } -bool LipiInputMethod::traceEnd(DeclarativeTrace *trace) +bool LipiInputMethod::traceEnd(Trace *trace) { Q_D(LipiInputMethod); d->traceEnd(trace); diff --git a/src/virtualkeyboard/lipiinputmethod.h b/src/virtualkeyboard/lipiinputmethod.h index 0d490905..8826f731 100644 --- a/src/virtualkeyboard/lipiinputmethod.h +++ b/src/virtualkeyboard/lipiinputmethod.h @@ -42,21 +42,21 @@ public: explicit LipiInputMethod(QObject *parent = 0); ~LipiInputMethod(); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); void reset(); void update(); - void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); + void selectionListItemSelected(SelectionListModel::Type type, int index); - QList<DeclarativeInputEngine::PatternRecognitionMode> patternRecognitionModes() const; - DeclarativeTrace *traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); - bool traceEnd(DeclarativeTrace *trace); + QList<InputEngine::PatternRecognitionMode> patternRecognitionModes() const; + Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + bool traceEnd(Trace *trace); protected: void timerEvent(QTimerEvent *timerEvent); diff --git a/src/virtualkeyboard/openwnninputmethod.cpp b/src/virtualkeyboard/openwnninputmethod.cpp index 9ff3d200..0a3c7bde 100644 --- a/src/virtualkeyboard/openwnninputmethod.cpp +++ b/src/virtualkeyboard/openwnninputmethod.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "openwnninputmethod.h" -#include "declarativeinputcontext.h" +#include "inputcontext.h" #include "virtualkeyboarddebug.h" #include <openwnnenginejajp.h> #include <composingtext.h> @@ -55,7 +55,7 @@ public: OpenWnnInputMethodPrivate(OpenWnnInputMethod *q_ptr) : AbstractInputMethodPrivate(), q_ptr(q_ptr), - inputMode(DeclarativeInputEngine::Latin), + inputMode(InputEngine::Latin), exactMatchMode(false), converter(0), converterJAJP(), @@ -307,9 +307,9 @@ public: Q_Q(OpenWnnInputMethod); if (!candidateList.isEmpty() || !wasEmpty) - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); if (previousActiveWordIndex != activeWordIndex) - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); } void clearCandidates(bool deferUpdate = false) @@ -318,7 +318,7 @@ public: candidateList.clear(); if (!deferUpdate) { Q_Q(OpenWnnInputMethod); - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); } clearFocusCandidate(deferUpdate); } @@ -332,7 +332,7 @@ public: activeWordIndex++; if (activeWordIndex >= candidateList.size()) activeWordIndex = 0; - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); return candidateList.at(activeWordIndex); } @@ -342,7 +342,7 @@ public: if (activeWordIndex != -1) { activeWordIndex = -1; if (!deferUpdate) - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); } } @@ -569,7 +569,7 @@ public: } OpenWnnInputMethod *q_ptr; - DeclarativeInputEngine::InputMode inputMode; + InputEngine::InputMode inputMode; bool exactMatchMode; QString displayText; OpenWnnEngineJAJP *converter; @@ -601,17 +601,17 @@ OpenWnnInputMethod::~OpenWnnInputMethod() { } -QList<DeclarativeInputEngine::InputMode> OpenWnnInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> OpenWnnInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<DeclarativeInputEngine::InputMode>() - << DeclarativeInputEngine::Hiragana - << DeclarativeInputEngine::Katakana - << DeclarativeInputEngine::FullwidthLatin - << DeclarativeInputEngine::Latin; + return QList<InputEngine::InputMode>() + << InputEngine::Hiragana + << InputEngine::Katakana + << InputEngine::FullwidthLatin + << InputEngine::Latin; } -bool OpenWnnInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool OpenWnnInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_D(OpenWnnInputMethod); @@ -619,11 +619,11 @@ bool OpenWnnInputMethod::setInputMode(const QString &locale, DeclarativeInputEng return true; update(); switch (inputMode) { - case DeclarativeInputEngine::Hiragana: + case InputEngine::Hiragana: d->changeEngineMode(OpenWnnInputMethodPrivate::ENGINE_MODE_DEFAULT); break; - case DeclarativeInputEngine::Katakana: + case InputEngine::Katakana: d->changeEngineMode(OpenWnnInputMethodPrivate::ENGINE_MODE_FULL_KATAKANA); break; @@ -635,7 +635,7 @@ bool OpenWnnInputMethod::setInputMode(const QString &locale, DeclarativeInputEng return true; } -bool OpenWnnInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool OpenWnnInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -748,28 +748,28 @@ bool OpenWnnInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard return false; } -QList<DeclarativeSelectionListModel::Type> OpenWnnInputMethod::selectionLists() +QList<SelectionListModel::Type> OpenWnnInputMethod::selectionLists() { - return QList<DeclarativeSelectionListModel::Type>() << DeclarativeSelectionListModel::WordCandidateList; + return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; } -int OpenWnnInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) +int OpenWnnInputMethod::selectionListItemCount(SelectionListModel::Type type) { Q_UNUSED(type) Q_D(OpenWnnInputMethod); return d->candidateList.size(); } -QVariant OpenWnnInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) +QVariant OpenWnnInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) { QVariant result; Q_UNUSED(type) Q_D(OpenWnnInputMethod); switch (role) { - case DeclarativeSelectionListModel::DisplayRole: + case SelectionListModel::DisplayRole: result = QVariant(d->candidateList.at(index)->candidate); break; - case DeclarativeSelectionListModel::WordCompletionLengthRole: + case SelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: @@ -779,7 +779,7 @@ QVariant OpenWnnInputMethod::selectionListData(DeclarativeSelectionListModel::Ty return result; } -void OpenWnnInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void OpenWnnInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(OpenWnnInputMethod); diff --git a/src/virtualkeyboard/openwnninputmethod.h b/src/virtualkeyboard/openwnninputmethod.h index c49f0072..149b0c74 100644 --- a/src/virtualkeyboard/openwnninputmethod.h +++ b/src/virtualkeyboard/openwnninputmethod.h @@ -37,16 +37,16 @@ public: explicit OpenWnnInputMethod(QObject *parent = 0); ~OpenWnnInputMethod(); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); - QList<DeclarativeSelectionListModel::Type> selectionLists(); - int selectionListItemCount(DeclarativeSelectionListModel::Type type); - QVariant selectionListData(DeclarativeSelectionListModel::Type type, int index, int role); - void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); + QList<SelectionListModel::Type> selectionLists(); + int selectionListItemCount(SelectionListModel::Type type); + QVariant selectionListData(SelectionListModel::Type type, int index, int role); + void selectionListItemSelected(SelectionListModel::Type type, int index); void reset(); void update(); diff --git a/src/virtualkeyboard/pinyininputmethod.cpp b/src/virtualkeyboard/pinyininputmethod.cpp index 3f9a69c6..f7df0a7a 100644 --- a/src/virtualkeyboard/pinyininputmethod.cpp +++ b/src/virtualkeyboard/pinyininputmethod.cpp @@ -21,7 +21,7 @@ #include "pinyininputmethod.h" #include "pinyindecoderservice.h" -#include "declarativeinputcontext.h" +#include "inputcontext.h" #include "virtualkeyboarddebug.h" namespace QtVirtualKeyboard { @@ -40,7 +40,7 @@ public: PinyinInputMethodPrivate(PinyinInputMethod *q_ptr) : q_ptr(q_ptr), - inputMode(DeclarativeInputEngine::Pinyin), + inputMode(InputEngine::Pinyin), pinyinDecoderService(PinyinDecoderService::getInstance()), state(Idle), surface(), @@ -59,7 +59,7 @@ public: { Q_Q(PinyinInputMethod); - DeclarativeInputContext *inputContext = q->inputContext(); + InputContext *inputContext = q->inputContext(); // Disable the user dictionary when entering sensitive data if (inputContext) { @@ -270,16 +270,16 @@ public: void updateCandidateList() { Q_Q(PinyinInputMethod); - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, + emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, totalChoicesNum > 0 && state == PinyinInputMethodPrivate::Input ? 0 : -1); } bool canDoPrediction() { Q_Q(PinyinInputMethod); - DeclarativeInputContext *inputContext = q->inputContext(); - return inputMode == DeclarativeInputEngine::Pinyin && + InputContext *inputContext = q->inputContext(); + return inputMode == InputEngine::Pinyin && composingStr.length() == fixedLen && inputContext && !inputContext->inputMethodHints().testFlag(Qt::ImhNoPredictiveText); @@ -292,7 +292,7 @@ public: Q_Q(PinyinInputMethod); if (state != Predict) resetToIdleState(); - DeclarativeInputContext *inputContext = q->inputContext(); + InputContext *inputContext = q->inputContext(); int cursorPosition = inputContext->cursorPosition(); int historyStart = qMax(0, cursorPosition - 3); QString history = inputContext->surroundingText().mid(historyStart, cursorPosition - historyStart); @@ -309,7 +309,7 @@ public: } PinyinInputMethod *q_ptr; - DeclarativeInputEngine::InputMode inputMode; + InputEngine::InputMode inputMode; QPointer<PinyinDecoderService> pinyinDecoderService; State state; QString surface; @@ -362,29 +362,29 @@ PinyinInputMethod::~PinyinInputMethod() { } -QList<DeclarativeInputEngine::InputMode> PinyinInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> PinyinInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) Q_D(PinyinInputMethod); - QList<DeclarativeInputEngine::InputMode> result; + QList<InputEngine::InputMode> result; if (d->pinyinDecoderService) - result << DeclarativeInputEngine::Pinyin; - result << DeclarativeInputEngine::Latin; + result << InputEngine::Pinyin; + result << InputEngine::Latin; return result; } -bool PinyinInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool PinyinInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_D(PinyinInputMethod); reset(); - if (inputMode == DeclarativeInputEngine::Pinyin && !d->pinyinDecoderService) + if (inputMode == InputEngine::Pinyin && !d->pinyinDecoderService) return false; d->inputMode = inputMode; return true; } -bool PinyinInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool PinyinInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -394,7 +394,7 @@ bool PinyinInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardM { Q_UNUSED(modifiers) Q_D(PinyinInputMethod); - if (d->inputMode == DeclarativeInputEngine::Pinyin) { + if (d->inputMode == InputEngine::Pinyin) { ScopedCandidateListUpdate scopedCandidateListUpdate(d); Q_UNUSED(scopedCandidateListUpdate) if ((key >= Qt::Key_A && key <= Qt::Key_Z) || (key == Qt::Key_Apostrophe)) { @@ -428,28 +428,28 @@ bool PinyinInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardM return false; } -QList<DeclarativeSelectionListModel::Type> PinyinInputMethod::selectionLists() +QList<SelectionListModel::Type> PinyinInputMethod::selectionLists() { - return QList<DeclarativeSelectionListModel::Type>() << DeclarativeSelectionListModel::WordCandidateList; + return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; } -int PinyinInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) +int PinyinInputMethod::selectionListItemCount(SelectionListModel::Type type) { Q_UNUSED(type) Q_D(PinyinInputMethod); return d->candidatesCount(); } -QVariant PinyinInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) +QVariant PinyinInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) { QVariant result; Q_UNUSED(type) Q_D(PinyinInputMethod); switch (role) { - case DeclarativeSelectionListModel::DisplayRole: + case SelectionListModel::DisplayRole: result = QVariant(d->candidateAt(index)); break; - case DeclarativeSelectionListModel::WordCompletionLengthRole: + case SelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: @@ -459,7 +459,7 @@ QVariant PinyinInputMethod::selectionListData(DeclarativeSelectionListModel::Typ return result; } -void PinyinInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void PinyinInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(PinyinInputMethod); diff --git a/src/virtualkeyboard/pinyininputmethod.h b/src/virtualkeyboard/pinyininputmethod.h index aa3f55c0..3d432e00 100644 --- a/src/virtualkeyboard/pinyininputmethod.h +++ b/src/virtualkeyboard/pinyininputmethod.h @@ -37,16 +37,16 @@ public: explicit PinyinInputMethod(QObject *parent = 0); ~PinyinInputMethod(); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); - QList<DeclarativeSelectionListModel::Type> selectionLists(); - int selectionListItemCount(DeclarativeSelectionListModel::Type type); - QVariant selectionListData(DeclarativeSelectionListModel::Type type, int index, int role); - void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); + QList<SelectionListModel::Type> selectionLists(); + int selectionListItemCount(SelectionListModel::Type type); + QVariant selectionListData(SelectionListModel::Type type, int index, int role); + void selectionListItemSelected(SelectionListModel::Type type, int index); void reset(); void update(); diff --git a/src/virtualkeyboard/plaininputmethod.cpp b/src/virtualkeyboard/plaininputmethod.cpp index e28fffac..9c6e68cf 100644 --- a/src/virtualkeyboard/plaininputmethod.cpp +++ b/src/virtualkeyboard/plaininputmethod.cpp @@ -20,8 +20,8 @@ ******************************************************************************/ #include "plaininputmethod.h" -#include "declarativeinputengine.h" -#include "declarativeinputcontext.h" +#include "inputengine.h" +#include "inputcontext.h" namespace QtVirtualKeyboard { @@ -39,25 +39,25 @@ PlainInputMethod::~PlainInputMethod() { } -QList<DeclarativeInputEngine::InputMode> PlainInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> PlainInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) // Supports all input modes - return QList<DeclarativeInputEngine::InputMode>() - << DeclarativeInputEngine::Latin - << DeclarativeInputEngine::Numeric - << DeclarativeInputEngine::Dialable - << DeclarativeInputEngine::Pinyin; + return QList<InputEngine::InputMode>() + << InputEngine::Latin + << InputEngine::Numeric + << InputEngine::Dialable + << InputEngine::Pinyin; } -bool PlainInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool PlainInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_UNUSED(inputMode) return true; } -bool PlainInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool PlainInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; diff --git a/src/virtualkeyboard/plaininputmethod.h b/src/virtualkeyboard/plaininputmethod.h index 65eb81cb..479e0d78 100644 --- a/src/virtualkeyboard/plaininputmethod.h +++ b/src/virtualkeyboard/plaininputmethod.h @@ -34,9 +34,9 @@ public: explicit PlainInputMethod(QObject *parent = 0); ~PlainInputMethod(); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); diff --git a/src/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp index 94328e5b..ac808e84 100644 --- a/src/virtualkeyboard/platforminputcontext.cpp +++ b/src/virtualkeyboard/platforminputcontext.cpp @@ -20,7 +20,7 @@ ******************************************************************************/ #include "platforminputcontext.h" -#include "declarativeinputcontext.h" +#include "inputcontext.h" #include "abstractinputpanel.h" #ifdef QT_VIRTUALKEYBOARD_DESKTOP #include "desktopinputpanel.h" @@ -39,7 +39,7 @@ namespace QtVirtualKeyboard { */ PlatformInputContext::PlatformInputContext() : - m_declarativeContext(0), + m_inputContext(0), m_inputPanel(0), m_focusObject(0), m_locale(), @@ -61,15 +61,15 @@ bool PlatformInputContext::isValid() const void PlatformInputContext::reset() { VIRTUALKEYBOARD_DEBUG() << "PlatformInputContext::reset()"; - if (m_declarativeContext) - m_declarativeContext->reset(); + if (m_inputContext) + m_inputContext->reset(); } void PlatformInputContext::commit() { VIRTUALKEYBOARD_DEBUG() << "PlatformInputContext::commit()"; - if (m_declarativeContext) - m_declarativeContext->externalCommit(); + if (m_inputContext) + m_inputContext->externalCommit(); } void PlatformInputContext::update(Qt::InputMethodQueries queries) @@ -83,33 +83,33 @@ void PlatformInputContext::update(Qt::InputMethodQueries queries) } #endif - if (m_declarativeContext) { + if (m_inputContext) { if (enabled) { - m_declarativeContext->update(queries); + m_inputContext->update(queries); if (m_visible) updateInputPanelVisible(); } else { hideInputPanel(); } - m_declarativeContext->setFocus(enabled); + m_inputContext->setFocus(enabled); } } void PlatformInputContext::invokeAction(QInputMethod::Action action, int cursorPosition) { VIRTUALKEYBOARD_DEBUG() << "PlatformInputContext::invokeAction():" << action << cursorPosition; - if (m_declarativeContext) - m_declarativeContext->invokeAction(action, cursorPosition); + if (m_inputContext) + m_inputContext->invokeAction(action, cursorPosition); } QRectF PlatformInputContext::keyboardRect() const { - return m_declarativeContext ? m_declarativeContext->keyboardRectangle() : QRectF(); + return m_inputContext ? m_inputContext->keyboardRectangle() : QRectF(); } bool PlatformInputContext::isAnimating() const { - return m_declarativeContext ? m_declarativeContext->animating() : false; + return m_inputContext ? m_inputContext->animating() : false; } void PlatformInputContext::showInputPanel() @@ -182,15 +182,15 @@ void PlatformInputContext::setFocusObject(QObject *object) update(Qt::ImQueryAll); } -DeclarativeInputContext *PlatformInputContext::declarativeInputContext() const +InputContext *PlatformInputContext::inputContext() const { - return m_declarativeContext; + return m_inputContext; } bool PlatformInputContext::eventFilter(QObject *object, QEvent *event) { - if (event != m_filterEvent && object == m_focusObject && m_declarativeContext) - return m_declarativeContext->filterEvent(event); + if (event != m_filterEvent && object == m_focusObject && m_inputContext) + return m_inputContext->filterEvent(event); return false; } @@ -221,16 +221,16 @@ QVariant PlatformInputContext::inputMethodQuery(Qt::InputMethodQuery query) return event.value(query); } -void PlatformInputContext::setDeclarativeContext(DeclarativeInputContext *context) +void PlatformInputContext::setInputContext(InputContext *context) { - if (m_declarativeContext) { + if (m_inputContext) { disconnect(this, SLOT(keyboardRectangleChanged())); } - m_declarativeContext = context; - if (m_declarativeContext) { + m_inputContext = context; + if (m_inputContext) { if (!m_inputPanel) m_inputPanel = new AppInputPanel(this); - connect(m_declarativeContext, SIGNAL(keyboardRectangleChanged()), SLOT(keyboardRectangleChanged())); + connect(m_inputContext, SIGNAL(keyboardRectangleChanged()), SLOT(keyboardRectangleChanged())); } else if (m_inputPanel) { m_inputPanel = 0; } @@ -238,7 +238,7 @@ void PlatformInputContext::setDeclarativeContext(DeclarativeInputContext *contex void PlatformInputContext::keyboardRectangleChanged() { - m_inputPanel->setInputRect(m_declarativeContext->keyboardRectangle().toRect()); + m_inputPanel->setInputRect(m_inputContext->keyboardRectangle().toRect()); } void PlatformInputContext::updateInputPanelVisible() diff --git a/src/virtualkeyboard/platforminputcontext.h b/src/virtualkeyboard/platforminputcontext.h index ba56deca..a35e2a07 100644 --- a/src/virtualkeyboard/platforminputcontext.h +++ b/src/virtualkeyboard/platforminputcontext.h @@ -29,7 +29,7 @@ namespace QtVirtualKeyboard { -class DeclarativeInputContext; +class InputContext; class AbstractInputPanel; class PlatformInputContext : public QPlatformInputContext { @@ -60,7 +60,7 @@ public: QObject *focusObject(); virtual void setFocusObject(QObject *object); - DeclarativeInputContext *declarativeInputContext() const; + InputContext *inputContext() const; virtual bool eventFilter(QObject *object, QEvent *event); @@ -71,15 +71,15 @@ protected: void sendEvent(QEvent *event); void sendKeyEvent(QKeyEvent *event); QVariant inputMethodQuery(Qt::InputMethodQuery query); - void setDeclarativeContext(DeclarativeInputContext *context); + void setInputContext(InputContext *context); private slots: void keyboardRectangleChanged(); void updateInputPanelVisible(); private: - friend class DeclarativeInputContext; - QPointer<DeclarativeInputContext> m_declarativeContext; + friend class InputContext; + QPointer<InputContext> m_inputContext; QPointer<AbstractInputPanel> m_inputPanel; QPointer<QObject> m_focusObject; QLocale m_locale; diff --git a/src/virtualkeyboard/plugin.cpp b/src/virtualkeyboard/plugin.cpp index bc473f34..db76e9a3 100644 --- a/src/virtualkeyboard/plugin.cpp +++ b/src/virtualkeyboard/plugin.cpp @@ -20,9 +20,9 @@ ******************************************************************************/ #include "plugin.h" -#include "declarativeinputcontext.h" -#include "declarativeinputengine.h" -#include "declarativeshifthandler.h" +#include "inputcontext.h" +#include "inputengine.h" +#include "shifthandler.h" #include "plaininputmethod.h" #ifdef HAVE_HUNSPELL #include "hunspellinputmethod.h" @@ -45,12 +45,12 @@ #ifdef HAVE_T9WRITE #include "t9writeinputmethod.h" #endif -#include "declarativeinputmethod.h" -#include "declarativeselectionlistmodel.h" +#include "inputmethod.h" +#include "selectionlistmodel.h" #include "enterkeyaction.h" #include "enterkeyactionattachedtype.h" -#include "declarativesettings.h" -#include "declarativetrace.h" +#include "virtualkeyboardsettings.h" +#include "trace.h" using namespace QtVirtualKeyboard; @@ -86,7 +86,7 @@ static QObject *createInputContextModule(QQmlEngine *engine, QJSEngine *scriptEn #endif ; rootContext->setContextProperty(QStringLiteral("VirtualKeyboardInputMethods"), inputMethodList); - return new DeclarativeInputContext(platformInputContext); + return new InputContext(platformInputContext); } QStringList PlatformInputContextPlugin::keys() const @@ -107,20 +107,20 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system, if (!qEnvironmentVariableIsSet(inputMethodEnvVarName) || qgetenv(inputMethodEnvVarName) != pluginName) return Q_NULLPTR; - qmlRegisterSingletonType<DeclarativeInputContext>(pluginUri, 1, 0, "InputContext", createInputContextModule); - qmlRegisterSingletonType<DeclarativeInputContext>(pluginUri, 2, 0, "InputContext", createInputContextModule); - qmlRegisterUncreatableType<DeclarativeInputEngine>(pluginUri, 1, 0, "InputEngine", QLatin1String("Cannot create input method engine")); - qmlRegisterUncreatableType<DeclarativeInputEngine>(pluginUri, 2, 0, "InputEngine", QLatin1String("Cannot create input method engine")); - qmlRegisterUncreatableType<DeclarativeShiftHandler>(pluginUri, 1, 0, "ShiftHandler", QLatin1String("Cannot create shift handler")); - qmlRegisterUncreatableType<DeclarativeShiftHandler>(pluginUri, 2, 0, "ShiftHandler", QLatin1String("Cannot create shift handler")); - qmlRegisterUncreatableType<DeclarativeSelectionListModel>(pluginUri, 1, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); - qmlRegisterUncreatableType<DeclarativeSelectionListModel>(pluginUri, 2, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); + qmlRegisterSingletonType<InputContext>(pluginUri, 1, 0, "InputContext", createInputContextModule); + qmlRegisterSingletonType<InputContext>(pluginUri, 2, 0, "InputContext", createInputContextModule); + qmlRegisterUncreatableType<InputEngine>(pluginUri, 1, 0, "InputEngine", QLatin1String("Cannot create input method engine")); + qmlRegisterUncreatableType<InputEngine>(pluginUri, 2, 0, "InputEngine", QLatin1String("Cannot create input method engine")); + qmlRegisterUncreatableType<ShiftHandler>(pluginUri, 1, 0, "ShiftHandler", QLatin1String("Cannot create shift handler")); + qmlRegisterUncreatableType<ShiftHandler>(pluginUri, 2, 0, "ShiftHandler", QLatin1String("Cannot create shift handler")); + qmlRegisterUncreatableType<SelectionListModel>(pluginUri, 1, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); + qmlRegisterUncreatableType<SelectionListModel>(pluginUri, 2, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); qmlRegisterUncreatableType<AbstractInputMethod>(pluginUri, 1, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method")); qmlRegisterUncreatableType<AbstractInputMethod>(pluginUri, 2, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method")); qmlRegisterType<PlainInputMethod>(pluginUri, 1, 0, "PlainInputMethod"); qmlRegisterType<PlainInputMethod>(pluginUri, 2, 0, "PlainInputMethod"); - qmlRegisterType<DeclarativeInputMethod>(pluginUri, 1, 0, "InputMethod"); - qmlRegisterType<DeclarativeInputMethod>(pluginUri, 2, 0, "InputMethod"); + qmlRegisterType<InputMethod>(pluginUri, 1, 0, "InputMethod"); + qmlRegisterType<InputMethod>(pluginUri, 2, 0, "InputMethod"); #ifdef HAVE_HUNSPELL qmlRegisterType<HunspellInputMethod>(pluginUri, 1, 0, "HunspellInputMethod"); qmlRegisterType<HunspellInputMethod>(pluginUri, 2, 0, "HunspellInputMethod"); @@ -149,11 +149,11 @@ QPlatformInputContext *PlatformInputContextPlugin::create(const QString &system, qmlRegisterType<EnterKeyActionAttachedType>(); qmlRegisterType<EnterKeyAction>(pluginUri, 1, 0, "EnterKeyAction"); qmlRegisterType<EnterKeyAction>(pluginUri, 2, 0, "EnterKeyAction"); - qmlRegisterType<DeclarativeTrace>(pluginUri, 2, 0, "Trace"); - qmlRegisterSingletonType<DeclarativeSettings>(pluginSettingsUri, 1, 0, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); - qmlRegisterSingletonType<DeclarativeSettings>(pluginSettingsUri, 1, 1, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); - qmlRegisterSingletonType<DeclarativeSettings>(pluginSettingsUri, 1, 2, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); - qmlRegisterSingletonType<DeclarativeSettings>(pluginSettingsUri, 2, 0, "VirtualKeyboardSettings", DeclarativeSettings::registerSettingsModule); + qmlRegisterType<Trace>(pluginUri, 2, 0, "Trace"); + qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 1, 0, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); + qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 1, 1, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); + qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 1, 2, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); + qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 2, 0, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); const QString path(QStringLiteral("qrc:///content/")); qmlRegisterType(QUrl(path + QLatin1String("InputPanel.qml")), pluginUri, 1, 0, "InputPanel"); diff --git a/src/virtualkeyboard/declarativeselectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp index 6d8d6d6c..2135cdd2 100644 --- a/src/virtualkeyboard/declarativeselectionlistmodel.cpp +++ b/src/virtualkeyboard/selectionlistmodel.cpp @@ -19,32 +19,32 @@ ** ******************************************************************************/ -#include "declarativeselectionlistmodel.h" +#include "selectionlistmodel.h" #include "abstractinputmethod.h" #include <QtCore/private/qabstractitemmodel_p.h> namespace QtVirtualKeyboard { -class DeclarativeSelectionListModelPrivate : public QAbstractItemModelPrivate +class SelectionListModelPrivate : public QAbstractItemModelPrivate { public: - DeclarativeSelectionListModelPrivate() : + SelectionListModelPrivate() : QAbstractItemModelPrivate(), dataSource(0), - type(DeclarativeSelectionListModel::WordCandidateList), + type(SelectionListModel::WordCandidateList), rowCount(0) { } QHash<int, QByteArray> roles; AbstractInputMethod *dataSource; - DeclarativeSelectionListModel::Type type; + SelectionListModel::Type type; int rowCount; }; /*! \qmltype SelectionListModel - \instantiates QtVirtualKeyboard::DeclarativeSelectionListModel + \instantiates QtVirtualKeyboard::SelectionListModel \inqmlmodule QtQuick.Enterprise.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Provides a data model for the selection lists. @@ -73,7 +73,7 @@ public: */ /*! - \class QtVirtualKeyboard::DeclarativeSelectionListModel + \class QtVirtualKeyboard::SelectionListModel \inmodule InputFramework @@ -85,7 +85,7 @@ public: */ /*! - \enum QtVirtualKeyboard::DeclarativeSelectionListModel::Type + \enum QtVirtualKeyboard::SelectionListModel::Type This enum specifies the type of selection list. @@ -94,7 +94,7 @@ public: */ /*! - \enum QtVirtualKeyboard::DeclarativeSelectionListModel::Role + \enum QtVirtualKeyboard::SelectionListModel::Role This enum specifies a role of the data requested. @@ -107,10 +107,10 @@ public: end of the string. */ -DeclarativeSelectionListModel::DeclarativeSelectionListModel(QObject *parent) : - QAbstractListModel(*new DeclarativeSelectionListModelPrivate(), parent) +SelectionListModel::SelectionListModel(QObject *parent) : + QAbstractListModel(*new SelectionListModelPrivate(), parent) { - Q_D(DeclarativeSelectionListModel); + Q_D(SelectionListModel); d->roles[DisplayRole] = "display"; d->roles[WordCompletionLengthRole] = "wordCompletionLength"; } @@ -118,16 +118,16 @@ DeclarativeSelectionListModel::DeclarativeSelectionListModel(QObject *parent) : /*! \internal */ -DeclarativeSelectionListModel::~DeclarativeSelectionListModel() +SelectionListModel::~SelectionListModel() { } /*! \internal */ -void DeclarativeSelectionListModel::setDataSource(AbstractInputMethod *dataSource, Type type) +void SelectionListModel::setDataSource(AbstractInputMethod *dataSource, Type type) { - Q_D(DeclarativeSelectionListModel); + Q_D(SelectionListModel); if (d->dataSource) { disconnect(this, SLOT(selectionListChanged(int))); disconnect(this, SLOT(selectionListActiveItemChanged(int, int))); @@ -148,18 +148,18 @@ void DeclarativeSelectionListModel::setDataSource(AbstractInputMethod *dataSourc /*! \internal */ -AbstractInputMethod *DeclarativeSelectionListModel::dataSource() const +AbstractInputMethod *SelectionListModel::dataSource() const { - Q_D(const DeclarativeSelectionListModel); + Q_D(const SelectionListModel); return d->dataSource; } /*! \internal */ -int DeclarativeSelectionListModel::rowCount(const QModelIndex &parent) const +int SelectionListModel::rowCount(const QModelIndex &parent) const { - Q_D(const DeclarativeSelectionListModel); + Q_D(const SelectionListModel); Q_UNUSED(parent) return d->rowCount; } @@ -167,18 +167,18 @@ int DeclarativeSelectionListModel::rowCount(const QModelIndex &parent) const /*! \internal */ -QVariant DeclarativeSelectionListModel::data(const QModelIndex &index, int role) const +QVariant SelectionListModel::data(const QModelIndex &index, int role) const { - Q_D(const DeclarativeSelectionListModel); + Q_D(const SelectionListModel); return d->dataSource ? d->dataSource->selectionListData(d->type, index.row(), role) : QVariant(); } /*! \internal */ -QHash<int,QByteArray> DeclarativeSelectionListModel::roleNames() const +QHash<int,QByteArray> SelectionListModel::roleNames() const { - Q_D(const DeclarativeSelectionListModel); + Q_D(const SelectionListModel); return d->roles; } @@ -189,13 +189,15 @@ QHash<int,QByteArray> DeclarativeSelectionListModel::roleNames() const The selection is forwarded to the input method for further processing. */ /*! + \fn void QtVirtualKeyboard::SelectionListModel::selectItem(int index) + This method should be called when the user selects an item at position \a index from the list. The selection is forwarded to the input method for further processing. */ -void DeclarativeSelectionListModel::selectItem(int index) +void SelectionListModel::selectItem(int index) { - Q_D(DeclarativeSelectionListModel); + Q_D(SelectionListModel); if (index >= 0 && index < d->rowCount && d->dataSource) { emit itemSelected(index); d->dataSource->selectionListItemSelected(d->type, index); @@ -205,7 +207,7 @@ void DeclarativeSelectionListModel::selectItem(int index) /*! * \internal */ -QVariant DeclarativeSelectionListModel::dataAt(int index, int role) const +QVariant SelectionListModel::dataAt(int index, int role) const { return data(this->index(index, 0), role); } @@ -213,9 +215,9 @@ QVariant DeclarativeSelectionListModel::dataAt(int index, int role) const /*! \internal */ -void DeclarativeSelectionListModel::selectionListChanged(int type) +void SelectionListModel::selectionListChanged(int type) { - Q_D(DeclarativeSelectionListModel); + Q_D(SelectionListModel); if (static_cast<Type>(type) == d->type) { int oldCount = d->rowCount; int newCount = d->dataSource ? d->dataSource->selectionListItemCount(d->type) : 0; @@ -243,9 +245,9 @@ void DeclarativeSelectionListModel::selectionListChanged(int type) /*! \internal */ -void DeclarativeSelectionListModel::selectionListActiveItemChanged(int type, int index) +void SelectionListModel::selectionListActiveItemChanged(int type, int index) { - Q_D(DeclarativeSelectionListModel); + Q_D(SelectionListModel); if (static_cast<Type>(type) == d->type) { emit activeItemChanged(index); } @@ -259,7 +261,7 @@ void DeclarativeSelectionListModel::selectionListActiveItemChanged(int type, int the list. */ /*! - \fn void QtVirtualKeyboard::DeclarativeSelectionListModel::activeItemChanged(int index) + \fn void QtVirtualKeyboard::SelectionListModel::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 @@ -272,7 +274,7 @@ void DeclarativeSelectionListModel::selectionListActiveItemChanged(int type, int This signal is emitted when an item at \a index is selected by the user. */ /*! - \fn void QtVirtualKeyboard::DeclarativeSelectionListModel::itemSelected(int index) + \fn void QtVirtualKeyboard::SelectionListModel::itemSelected(int index) This signal is emitted when an item at \a index is selected by the user. */ diff --git a/src/virtualkeyboard/declarativeselectionlistmodel.h b/src/virtualkeyboard/selectionlistmodel.h index 9f2a76fa..eccd06b8 100644 --- a/src/virtualkeyboard/declarativeselectionlistmodel.h +++ b/src/virtualkeyboard/selectionlistmodel.h @@ -19,25 +19,25 @@ ** ******************************************************************************/ -#ifndef DECLARATIVESELECTIONLISTMODEL_H -#define DECLARATIVESELECTIONLISTMODEL_H +#ifndef SELECTIONLISTMODEL_H +#define SELECTIONLISTMODEL_H #include <QAbstractListModel> namespace QtVirtualKeyboard { class AbstractInputMethod; -class DeclarativeInputEngine; -class DeclarativeSelectionListModelPrivate; +class InputEngine; +class SelectionListModelPrivate; -class DeclarativeSelectionListModel : public QAbstractListModel +class SelectionListModel : public QAbstractListModel { Q_OBJECT Q_ENUMS(Type) Q_ENUMS(Role) - Q_DECLARE_PRIVATE(DeclarativeSelectionListModel) + Q_DECLARE_PRIVATE(SelectionListModel) - explicit DeclarativeSelectionListModel(QObject *parent = 0); + explicit SelectionListModel(QObject *parent = 0); public: enum Type @@ -50,7 +50,7 @@ public: WordCompletionLengthRole = Qt::UserRole + 1 }; - ~DeclarativeSelectionListModel(); + ~SelectionListModel(); void setDataSource(AbstractInputMethod *dataSource, Type type); AbstractInputMethod *dataSource() const; int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -69,12 +69,12 @@ protected slots: void selectionListActiveItemChanged(int type, int index); private: - friend class DeclarativeInputEngine; + friend class InputEngine; }; } // namespace QtVirtualKeyboard -Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeSelectionListModel::Type) -Q_DECLARE_METATYPE(QtVirtualKeyboard::DeclarativeSelectionListModel::Role) +Q_DECLARE_METATYPE(QtVirtualKeyboard::SelectionListModel::Type) +Q_DECLARE_METATYPE(QtVirtualKeyboard::SelectionListModel::Role) -#endif // DECLARATIVESELECTIONLISTMODEL_H +#endif // SELECTIONLISTMODEL_H diff --git a/src/virtualkeyboard/declarativeshifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index 96a5cb31..287ac807 100644 --- a/src/virtualkeyboard/declarativeshifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -19,18 +19,18 @@ ** ******************************************************************************/ -#include "declarativeshifthandler.h" -#include "declarativeinputcontext.h" -#include "declarativeinputengine.h" +#include "shifthandler.h" +#include "inputcontext.h" +#include "inputengine.h" #include <QtCore/private/qobject_p.h> #include <QSet> namespace QtVirtualKeyboard { -class DeclarativeShiftHandlerPrivate : public QObjectPrivate +class ShiftHandlerPrivate : public QObjectPrivate { public: - DeclarativeShiftHandlerPrivate() : + ShiftHandlerPrivate() : QObjectPrivate(), inputContext(0), sentenceEndingCharacters(QString(".!?") + QChar(Qt::Key_exclamdown) + QChar(Qt::Key_questiondown)), @@ -38,42 +38,42 @@ public: toggleShiftEnabled(false), shiftChanged(false), manualShiftLanguageFilter(QSet<QLocale::Language>() << QLocale::Arabic << QLocale::Persian << QLocale::Hindi << QLocale::Korean), - manualCapsInputModeFilter(QSet<DeclarativeInputEngine::InputMode>() << DeclarativeInputEngine::Cangjie), - noAutoUppercaseInputModeFilter(QSet<DeclarativeInputEngine::InputMode>() << DeclarativeInputEngine::FullwidthLatin << DeclarativeInputEngine::Pinyin << DeclarativeInputEngine::Cangjie), - allCapsInputModeFilter(QSet<DeclarativeInputEngine::InputMode>() << DeclarativeInputEngine::Hiragana << DeclarativeInputEngine::Katakana) + manualCapsInputModeFilter(QSet<InputEngine::InputMode>() << InputEngine::Cangjie), + noAutoUppercaseInputModeFilter(QSet<InputEngine::InputMode>() << InputEngine::FullwidthLatin << InputEngine::Pinyin << InputEngine::Cangjie), + allCapsInputModeFilter(QSet<InputEngine::InputMode>() << InputEngine::Hiragana << InputEngine::Katakana) { } - DeclarativeInputContext *inputContext; + InputContext *inputContext; QString sentenceEndingCharacters; bool autoCapitalizationEnabled; bool toggleShiftEnabled; bool shiftChanged; QLocale locale; const QSet<QLocale::Language> manualShiftLanguageFilter; - const QSet<DeclarativeInputEngine::InputMode> manualCapsInputModeFilter; - const QSet<DeclarativeInputEngine::InputMode> noAutoUppercaseInputModeFilter; - const QSet<DeclarativeInputEngine::InputMode> allCapsInputModeFilter; + const QSet<InputEngine::InputMode> manualCapsInputModeFilter; + const QSet<InputEngine::InputMode> noAutoUppercaseInputModeFilter; + const QSet<InputEngine::InputMode> allCapsInputModeFilter; }; /*! \qmltype ShiftHandler \inqmlmodule QtQuick.Enterprise.VirtualKeyboard \ingroup qtvirtualkeyboard-qml - \instantiates QtVirtualKeyboard::DeclarativeShiftHandler + \instantiates QtVirtualKeyboard::ShiftHandler \brief Manages the shift state. */ /*! - \class QtVirtualKeyboard::DeclarativeShiftHandler + \class QtVirtualKeyboard::ShiftHandler \inmodule InputFramework \brief Manages the shift state. */ -DeclarativeShiftHandler::DeclarativeShiftHandler(DeclarativeInputContext *parent) : - QObject(*new DeclarativeShiftHandlerPrivate(), parent) +ShiftHandler::ShiftHandler(InputContext *parent) : + QObject(*new ShiftHandlerPrivate(), parent) { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); d->inputContext = parent; if (d->inputContext) { connect(d->inputContext, SIGNAL(inputMethodHintsChanged()), SLOT(restart())); @@ -92,20 +92,20 @@ DeclarativeShiftHandler::DeclarativeShiftHandler(DeclarativeInputContext *parent /*! \internal */ -DeclarativeShiftHandler::~DeclarativeShiftHandler() +ShiftHandler::~ShiftHandler() { } -QString DeclarativeShiftHandler::sentenceEndingCharacters() const +QString ShiftHandler::sentenceEndingCharacters() const { - Q_D(const DeclarativeShiftHandler); + Q_D(const ShiftHandler); return d->sentenceEndingCharacters; } -void DeclarativeShiftHandler::setSentenceEndingCharacters(const QString &value) +void ShiftHandler::setSentenceEndingCharacters(const QString &value) { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); if (d->sentenceEndingCharacters != value) { d->sentenceEndingCharacters = value; autoCapitalize(); @@ -113,15 +113,15 @@ void DeclarativeShiftHandler::setSentenceEndingCharacters(const QString &value) } } -bool DeclarativeShiftHandler::autoCapitalizationEnabled() const +bool ShiftHandler::autoCapitalizationEnabled() const { - Q_D(const DeclarativeShiftHandler); + Q_D(const ShiftHandler); return d->autoCapitalizationEnabled; } -bool DeclarativeShiftHandler::toggleShiftEnabled() const +bool ShiftHandler::toggleShiftEnabled() const { - Q_D(const DeclarativeShiftHandler); + Q_D(const ShiftHandler); return d->toggleShiftEnabled; } @@ -139,15 +139,17 @@ bool DeclarativeShiftHandler::toggleShiftEnabled() const /*! \since 1.2 + \fn void QtVirtualKeyboard::ShiftHandler::toggleShift() + Toggles the current shift state. This method provides the functionality of the shift key. \sa toggleShiftEnabled */ -void DeclarativeShiftHandler::toggleShift() +void ShiftHandler::toggleShift() { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); if (!d->toggleShiftEnabled) return; if (d->manualShiftLanguageFilter.contains(d->locale.language())) { @@ -165,12 +167,12 @@ void DeclarativeShiftHandler::toggleShift() } } -void DeclarativeShiftHandler::reset() +void ShiftHandler::reset() { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); if (d->inputContext->inputItem()) { Qt::InputMethodHints inputMethodHints = d->inputContext->inputMethodHints(); - DeclarativeInputEngine::InputMode inputMode = d->inputContext->inputEngine()->inputMode(); + InputEngine::InputMode inputMode = d->inputContext->inputEngine()->inputMode(); bool preferUpperCase = (inputMethodHints & (Qt::ImhPreferUppercase | Qt::ImhUppercaseOnly)); bool autoCapitalizationEnabled = !(d->inputContext->inputMethodHints() & (Qt::ImhNoAutoUppercase | Qt::ImhUppercaseOnly | Qt::ImhLowercaseOnly | Qt::ImhEmailCharactersOnly | @@ -196,9 +198,9 @@ void DeclarativeShiftHandler::reset() } } -void DeclarativeShiftHandler::autoCapitalize() +void ShiftHandler::autoCapitalize() { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); if (d->inputContext->capsLock()) return; if (!d->autoCapitalizationEnabled || !d->inputContext->preeditText().isEmpty()) { @@ -222,37 +224,37 @@ void DeclarativeShiftHandler::autoCapitalize() } } -void DeclarativeShiftHandler::restart() +void ShiftHandler::restart() { reset(); autoCapitalize(); } -void DeclarativeShiftHandler::shiftChanged() +void ShiftHandler::shiftChanged() { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); d->shiftChanged = true; } -void DeclarativeShiftHandler::localeChanged() +void ShiftHandler::localeChanged() { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); d->locale = QLocale(d->inputContext->locale()); restart(); } -void DeclarativeShiftHandler::setAutoCapitalizationEnabled(bool enabled) +void ShiftHandler::setAutoCapitalizationEnabled(bool enabled) { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); if (d->autoCapitalizationEnabled != enabled) { d->autoCapitalizationEnabled = enabled; emit autoCapitalizationEnabledChanged(); } } -void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled) +void ShiftHandler::setToggleShiftEnabled(bool enabled) { - Q_D(DeclarativeShiftHandler); + Q_D(ShiftHandler); if (d->toggleShiftEnabled != enabled) { d->toggleShiftEnabled = enabled; emit toggleShiftEnabledChanged(); @@ -260,7 +262,7 @@ void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled) } /*! - \property QtVirtualKeyboard::DeclarativeShiftHandler::sentenceEndingCharacters + \property QtVirtualKeyboard::ShiftHandler::sentenceEndingCharacters This property specifies the sentence ending characters which will cause shift state change. @@ -282,7 +284,7 @@ void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled) /*! \since 1.2 - \property QtVirtualKeyboard::DeclarativeShiftHandler::autoCapitalizationEnabled + \property QtVirtualKeyboard::ShiftHandler::autoCapitalizationEnabled This property provides the current state of the automatic capitalization feature. @@ -300,7 +302,7 @@ void DeclarativeShiftHandler::setToggleShiftEnabled(bool enabled) /*! \since 1.2 - \property QtVirtualKeyboard::DeclarativeShiftHandler::toggleShiftEnabled + \property QtVirtualKeyboard::ShiftHandler::toggleShiftEnabled This property provides the current state of the toggleShift() method. When true, the current shift state can be changed by diff --git a/src/virtualkeyboard/declarativeshifthandler.h b/src/virtualkeyboard/shifthandler.h index d428012d..f6f2e795 100644 --- a/src/virtualkeyboard/declarativeshifthandler.h +++ b/src/virtualkeyboard/shifthandler.h @@ -19,29 +19,29 @@ ** ******************************************************************************/ -#ifndef DECLARATIVESHIFTHANDLER_H -#define DECLARATIVESHIFTHANDLER_H +#ifndef SHIFTHANDLER_H +#define SHIFTHANDLER_H #include <QObject> namespace QtVirtualKeyboard { -class DeclarativeInputContext; -class DeclarativeShiftHandlerPrivate; +class InputContext; +class ShiftHandlerPrivate; -class DeclarativeShiftHandler : public QObject +class ShiftHandler : public QObject { Q_OBJECT - Q_DISABLE_COPY(DeclarativeShiftHandler) - Q_DECLARE_PRIVATE(DeclarativeShiftHandler) + Q_DISABLE_COPY(ShiftHandler) + Q_DECLARE_PRIVATE(ShiftHandler) Q_PROPERTY(QString sentenceEndingCharacters READ sentenceEndingCharacters WRITE setSentenceEndingCharacters NOTIFY sentenceEndingCharactersChanged) Q_PROPERTY(bool autoCapitalizationEnabled READ autoCapitalizationEnabled NOTIFY autoCapitalizationEnabledChanged) Q_PROPERTY(bool toggleShiftEnabled READ toggleShiftEnabled NOTIFY toggleShiftEnabledChanged) - explicit DeclarativeShiftHandler(DeclarativeInputContext *parent = 0); + explicit ShiftHandler(InputContext *parent = 0); public: - ~DeclarativeShiftHandler(); + ~ShiftHandler(); QString sentenceEndingCharacters() const; void setSentenceEndingCharacters(const QString &value); @@ -67,9 +67,9 @@ private: void setToggleShiftEnabled(bool enabled); private: - friend class DeclarativeInputContext; + friend class InputContext; }; } // namespace QtVirtualKeyboard -#endif // DECLARATIVESHIFTHANDLER_H +#endif // SHIFTHANDLER_H diff --git a/src/virtualkeyboard/t9writeinputmethod.cpp b/src/virtualkeyboard/t9writeinputmethod.cpp index 019e3c7a..69e1024c 100644 --- a/src/virtualkeyboard/t9writeinputmethod.cpp +++ b/src/virtualkeyboard/t9writeinputmethod.cpp @@ -20,9 +20,9 @@ ******************************************************************************/ #include "t9writeinputmethod.h" -#include "declarativeinputengine.h" -#include "declarativeinputcontext.h" -#include "declarativetrace.h" +#include "inputengine.h" +#include "inputcontext.h" +#include "trace.h" #include "t9writeworker.h" #include "virtualkeyboarddebug.h" #include "QDirIterator" @@ -51,7 +51,7 @@ public: textCaseList.clear(); } - void ensureLength(int length, DeclarativeInputEngine::TextCase textCase) + void ensureLength(int length, InputEngine::TextCase textCase) { if (length <= 0) { textCaseList.clear(); @@ -66,11 +66,11 @@ public: QString formatString(const QString &str) const { QString result; - DeclarativeInputEngine::TextCase textCase = DeclarativeInputEngine::Lower; + InputEngine::TextCase textCase = InputEngine::Lower; for (int i = 0; i < str.length(); ++i) { if (i < textCaseList.length()) textCase = textCaseList.at(i); - result.append(textCase == DeclarativeInputEngine::Upper ? str.at(i).toUpper() : (preferLowercase ? str.at(i).toLower() : str.at(i))); + result.append(textCase == InputEngine::Upper ? str.at(i).toUpper() : (preferLowercase ? str.at(i).toLower() : str.at(i))); } return result; } @@ -78,7 +78,7 @@ public: bool preferLowercase; private: - QList<DeclarativeInputEngine::TextCase> textCaseList; + QList<InputEngine::TextCase> textCaseList; }; class T9WriteInputMethodPrivate : public AbstractInputMethodPrivate @@ -98,7 +98,7 @@ public: activeWordIndex(-1), arcAdditionStarted(false), ignoreUpdate(false), - textCase(DeclarativeInputEngine::Lower) + textCase(InputEngine::Lower) { } @@ -275,7 +275,7 @@ public: Q_ASSERT(*dictionary == 0); } - bool setInputMode(const QLocale &locale, DeclarativeInputEngine::InputMode inputMode) + bool setInputMode(const QLocale &locale, InputEngine::InputMode inputMode) { VIRTUALKEYBOARD_DEBUG() << "T9WriteInputMethodPrivate::setInputMode():" << locale << inputMode; @@ -306,7 +306,7 @@ public: Qt::InputMethodHints inputMethodHints = q->inputContext()->inputMethodHints(); symbolCategories.clear(); switch (inputMode) { - case DeclarativeInputEngine::Latin: + case InputEngine::Latin: if (inputMethodHints.testFlag(Qt::ImhEmailCharactersOnly)) { symbolCategories.append(DECUMA_CATEGORY_EMAIL); } else if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly)) { @@ -341,13 +341,13 @@ public: } break; - case DeclarativeInputEngine::Numeric: + case InputEngine::Numeric: symbolCategories.append(DECUMA_CATEGORY_DIGIT); if (!inputMethodHints.testFlag(Qt::ImhDigitsOnly)) symbolCategories.append(DECUMA_CATEGORY_NUM_SUP); break; - case DeclarativeInputEngine::Dialable: + case InputEngine::Dialable: symbolCategories.append(DECUMA_CATEGORY_PHONE_NUMBER); break; @@ -566,8 +566,8 @@ public: return language; } - DeclarativeTrace *traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) + Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_UNUSED(traceId) Q_UNUSED(patternRecognitionMode) @@ -614,13 +614,13 @@ public: return NULL; } - DeclarativeTrace *trace = new DeclarativeTrace(); + Trace *trace = new Trace(); traceList.append(trace); return trace; } - void traceEnd(DeclarativeTrace *trace) + void traceEnd(Trace *trace) { if (trace->isCanceled()) { decumaCancelArc(decumaSession, trace->traceId()); @@ -642,7 +642,7 @@ public: int countActiveTraces() const { int count = 0; - foreach (DeclarativeTrace *trace, traceList) { + foreach (Trace *trace, traceList) { if (!trace->isFinal()) count++; } @@ -655,7 +655,7 @@ public: traceList.clear(); } - void addPointsToTraceGroup(DeclarativeTrace *trace) + void addPointsToTraceGroup(Trace *trace) { Q_ASSERT(decumaSession != 0); @@ -737,8 +737,8 @@ public: activeWordIndex = -1; if (emitSelectionListChanged) { Q_Q(T9WriteInputMethod); - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); } result = true; } @@ -816,7 +816,7 @@ public: VIRTUALKEYBOARD_DEBUG() << "T9WriteInputMethodPrivate::processResult()"; Q_Q(T9WriteInputMethod); - DeclarativeInputContext *ic = q->inputContext(); + InputContext *ic = q->inputContext(); if (!ic) return; @@ -900,8 +900,8 @@ public: wordCandidates = newWordCandidates; wordCandidatesHwrResultIndex = newWordCandidatesHwrResultIndex; activeWordIndex = wordCandidates.isEmpty() ? -1 : 0; - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); } } @@ -918,7 +918,7 @@ public: { if (c.isPunct() || c.isSymbol()) { Q_Q(const T9WriteInputMethod); - DeclarativeInputContext *ic = q->inputContext(); + InputContext *ic = q->inputContext(); if (ic) { Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly) || inputMethodHints.testFlag(Qt::ImhEmailCharactersOnly)) @@ -939,7 +939,7 @@ public: QVector<DECUMA_UINT32> languageCategories; QVector<DECUMA_UINT32> symbolCategories; QScopedPointer<T9WriteWorker> worker; - QList<DeclarativeTrace *> traceList; + QList<Trace *> traceList; QMutex dictionaryLock; QString dictionaryFileName; void *convertedDictionary; @@ -957,7 +957,7 @@ public: int activeWordIndex; bool arcAdditionStarted; bool ignoreUpdate; - DeclarativeInputEngine::TextCase textCase; + InputEngine::TextCase textCase; T9WriteCaseFormatter caseFormatter; }; @@ -986,23 +986,23 @@ T9WriteInputMethod::~T9WriteInputMethod() d->exitEngine(); } -QList<DeclarativeInputEngine::InputMode> T9WriteInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> T9WriteInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<DeclarativeInputEngine::InputMode>() - << DeclarativeInputEngine::Latin - << DeclarativeInputEngine::Numeric - << DeclarativeInputEngine::Dialable; + return QList<InputEngine::InputMode>() + << InputEngine::Latin + << InputEngine::Numeric + << InputEngine::Dialable; } -bool T9WriteInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool T9WriteInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_D(T9WriteInputMethod); d->select(); return d->setInputMode(locale, inputMode); } -bool T9WriteInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool T9WriteInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_D(T9WriteInputMethod); d->textCase = textCase; @@ -1025,7 +1025,7 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard case Qt::Key_Backspace: { - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); QString preeditText = ic->preeditText(); if (preeditText.length() > 1) { preeditText.chop(1); @@ -1037,8 +1037,8 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard d->stringStart = preeditText; d->wordCandidates.append(preeditText); d->activeWordIndex = 0; - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); return true; } else { bool result = !preeditText.isEmpty(); @@ -1054,7 +1054,7 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard default: if (d->sessionSettings.recognitionMode == mcrMode && text.length() > 0) { - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); QString preeditText = ic->preeditText(); QChar c = text.at(0); bool addToWord = d->isValidInputChar(c) && (!preeditText.isEmpty() || !d->isJoiner(c)); @@ -1068,8 +1068,8 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard d->stringStart = preeditText; d->wordCandidates.append(preeditText); d->activeWordIndex = 0; - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); return true; } else { ic->clear(); @@ -1098,28 +1098,28 @@ void T9WriteInputMethod::update() d->select(); } -QList<DeclarativeSelectionListModel::Type> T9WriteInputMethod::selectionLists() +QList<SelectionListModel::Type> T9WriteInputMethod::selectionLists() { - return QList<DeclarativeSelectionListModel::Type>() << DeclarativeSelectionListModel::WordCandidateList; + return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; } -int T9WriteInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) +int T9WriteInputMethod::selectionListItemCount(SelectionListModel::Type type) { Q_UNUSED(type) Q_D(T9WriteInputMethod); return d->wordCandidates.count(); } -QVariant T9WriteInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) +QVariant T9WriteInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) { QVariant result; Q_UNUSED(type) Q_D(T9WriteInputMethod); switch (role) { - case DeclarativeSelectionListModel::DisplayRole: + case SelectionListModel::DisplayRole: result = QVariant(d->wordCandidates.at(index)); break; - case DeclarativeSelectionListModel::WordCompletionLengthRole: + case SelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: @@ -1129,48 +1129,48 @@ QVariant T9WriteInputMethod::selectionListData(DeclarativeSelectionListModel::Ty return result; } -void T9WriteInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void T9WriteInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(T9WriteInputMethod); d->select(index); } -QList<DeclarativeInputEngine::PatternRecognitionMode> T9WriteInputMethod::patternRecognitionModes() const +QList<InputEngine::PatternRecognitionMode> T9WriteInputMethod::patternRecognitionModes() const { - return QList<DeclarativeInputEngine::PatternRecognitionMode>() - << DeclarativeInputEngine::HandwritingRecoginition; + return QList<InputEngine::PatternRecognitionMode>() + << InputEngine::HandwritingRecoginition; } -DeclarativeTrace *T9WriteInputMethod::traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +Trace *T9WriteInputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_D(T9WriteInputMethod); return d->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); } -bool T9WriteInputMethod::traceEnd(DeclarativeTrace *trace) +bool T9WriteInputMethod::traceEnd(Trace *trace) { Q_D(T9WriteInputMethod); d->traceEnd(trace); return true; } -bool T9WriteInputMethod::reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags) +bool T9WriteInputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) { Q_D(T9WriteInputMethod); if (d->sessionSettings.recognitionMode == scrMode) return false; - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); if (!ic) return false; const QString surroundingText = ic->surroundingText(); int replaceFrom = 0; - if (reselectFlags.testFlag(DeclarativeInputEngine::WordBeforeCursor)) { + if (reselectFlags.testFlag(InputEngine::WordBeforeCursor)) { for (int i = cursorPosition - 1; i >= 0; --i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -1185,12 +1185,12 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const DeclarativeInputEngi } } - if (reselectFlags.testFlag(DeclarativeInputEngine::WordAtCursor) && replaceFrom == 0) { + if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == 0) { d->stringStart.clear(); return false; } - if (reselectFlags.testFlag(DeclarativeInputEngine::WordAfterCursor)) { + if (reselectFlags.testFlag(InputEngine::WordAfterCursor)) { for (int i = cursorPosition; i < surroundingText.length(); ++i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -1209,7 +1209,7 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const DeclarativeInputEngi if (d->stringStart.isEmpty()) return false; - if (reselectFlags.testFlag(DeclarativeInputEngine::WordAtCursor) && replaceFrom == -d->stringStart.length()) { + if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == -d->stringStart.length()) { d->stringStart.clear(); return false; } @@ -1226,11 +1226,11 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const DeclarativeInputEngi ic->setPreeditText(d->stringStart, QList<QInputMethodEvent::Attribute>(), replaceFrom, d->stringStart.length()); for (int i = 0; i < d->stringStart.length(); ++i) - d->caseFormatter.ensureLength(i + 1, d->stringStart.at(i).isUpper() ? DeclarativeInputEngine::Upper : DeclarativeInputEngine::Lower); + d->caseFormatter.ensureLength(i + 1, d->stringStart.at(i).isUpper() ? InputEngine::Upper : InputEngine::Lower); d->wordCandidates.append(d->stringStart); d->activeWordIndex = 0; - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); return true; } @@ -1261,7 +1261,7 @@ void T9WriteInputMethod::dictionaryLoadCompleted(const QString &fileUri, void *d if (!dictionary) return; - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); if (ic && fileUri == d->dictionaryFileName) { d->convertedDictionary = dictionary; if (d->sessionSettings.recognitionMode == mcrMode && diff --git a/src/virtualkeyboard/t9writeinputmethod.h b/src/virtualkeyboard/t9writeinputmethod.h index 87866d10..dc033529 100644 --- a/src/virtualkeyboard/t9writeinputmethod.h +++ b/src/virtualkeyboard/t9writeinputmethod.h @@ -37,26 +37,26 @@ public: explicit T9WriteInputMethod(QObject *parent = 0); ~T9WriteInputMethod(); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); void reset(); void update(); - QList<DeclarativeSelectionListModel::Type> selectionLists(); - int selectionListItemCount(DeclarativeSelectionListModel::Type type); - QVariant selectionListData(DeclarativeSelectionListModel::Type type, int index, int role); - void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); + QList<SelectionListModel::Type> selectionLists(); + int selectionListItemCount(SelectionListModel::Type type); + QVariant selectionListData(SelectionListModel::Type type, int index, int role); + void selectionListItemSelected(SelectionListModel::Type type, int index); - QList<DeclarativeInputEngine::PatternRecognitionMode> patternRecognitionModes() const; - DeclarativeTrace *traceBegin(int traceId, DeclarativeInputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); - bool traceEnd(DeclarativeTrace *trace); + QList<InputEngine::PatternRecognitionMode> patternRecognitionModes() const; + Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + bool traceEnd(Trace *trace); - bool reselect(int cursorPosition, const DeclarativeInputEngine::ReselectFlags &reselectFlags); + bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); protected: void timerEvent(QTimerEvent *timerEvent); diff --git a/src/virtualkeyboard/t9writeworker.h b/src/virtualkeyboard/t9writeworker.h index bfb65a86..476fec3c 100644 --- a/src/virtualkeyboard/t9writeworker.h +++ b/src/virtualkeyboard/t9writeworker.h @@ -22,7 +22,7 @@ #ifndef T9WRITEWORKER_H #define T9WRITEWORKER_H -#include "declarativetrace.h" +#include "trace.h" #include <QThread> #include <QSemaphore> diff --git a/src/virtualkeyboard/tcinputmethod.cpp b/src/virtualkeyboard/tcinputmethod.cpp index 25e239e9..b367e9e6 100644 --- a/src/virtualkeyboard/tcinputmethod.cpp +++ b/src/virtualkeyboard/tcinputmethod.cpp @@ -20,8 +20,8 @@ ******************************************************************************/ #include "tcinputmethod.h" -#include "declarativeinputengine.h" -#include "declarativeinputcontext.h" +#include "inputengine.h" +#include "inputcontext.h" #include "cangjiedictionary.h" #include "cangjietable.h" #include "phrasedictionary.h" @@ -71,8 +71,8 @@ public: { if (clearCandidates()) { Q_Q(TCInputMethod); - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); } input.clear(); } @@ -93,8 +93,8 @@ public: << QChar(0xFE5B) << QChar(0xFE5C) << QChar(0xFE43) << QChar(0xFE44); Q_Q(TCInputMethod); if (setCandidates(specialChars1, true)) { - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); } q->inputContext()->setPreeditText(candidates[highlightIndex]); return true; @@ -111,8 +111,8 @@ public: << QChar(0xFE4F) << QChar(0xFE34) << QChar(0xFE33); Q_Q(TCInputMethod); if (setCandidates(specialChars2, true)) { - emit q->selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); } q->inputContext()->setPreeditText(candidates[highlightIndex]); return true; @@ -154,7 +154,7 @@ void TCInputMethod::setSimplified(bool simplified) VIRTUALKEYBOARD_DEBUG() << "TCInputMethod::setSimplified(): " << simplified; if (d->cangjieDictionary.simplified() != simplified) { d->reset(); - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); if (ic) ic->clear(); d->cangjieDictionary.setSimplified(simplified); @@ -162,19 +162,19 @@ void TCInputMethod::setSimplified(bool simplified) } } -QList<DeclarativeInputEngine::InputMode> TCInputMethod::inputModes(const QString &locale) +QList<InputEngine::InputMode> TCInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<DeclarativeInputEngine::InputMode>() - << DeclarativeInputEngine::Cangjie; + return QList<InputEngine::InputMode>() + << InputEngine::Cangjie; } -bool TCInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode) +bool TCInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_UNUSED(inputMode) Q_D(TCInputMethod); - if (inputMode == DeclarativeInputEngine::Cangjie) { + if (inputMode == InputEngine::Cangjie) { if (d->cangjieDictionary.isEmpty()) { QString cangjieDictionary(QString::fromLatin1(qgetenv("QT_VIRTUALKEYBOARD_CANGJIE_DICTIONARY").constData())); if (cangjieDictionary.isEmpty()) @@ -192,7 +192,7 @@ bool TCInputMethod::setInputMode(const QString &locale, DeclarativeInputEngine:: return false; } -bool TCInputMethod::setTextCase(DeclarativeInputEngine::TextCase textCase) +bool TCInputMethod::setTextCase(InputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -204,7 +204,7 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif Q_UNUSED(text) Q_UNUSED(modifiers) Q_D(TCInputMethod); - DeclarativeInputContext *ic = inputContext(); + InputContext *ic = inputContext(); bool accept = false; switch (key) { case Qt::Key_Enter: @@ -229,14 +229,14 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif ic->setPreeditText(d->input); if (!d->checkSpecialCharInput()) { if (d->setCandidates(d->cangjieDictionary.getWords(d->input), true)) { - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); } } accept = true; } else if (d->clearCandidates()) { - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); } break; @@ -248,8 +248,8 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif d->input.append(c); ic->setPreeditText(d->input); if (d->setCandidates(d->cangjieDictionary.getWords(d->input), true)) { - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); } } accept = true; @@ -277,27 +277,27 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif return accept; } -QList<DeclarativeSelectionListModel::Type> TCInputMethod::selectionLists() +QList<SelectionListModel::Type> TCInputMethod::selectionLists() { - return QList<DeclarativeSelectionListModel::Type>() << DeclarativeSelectionListModel::WordCandidateList; + return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; } -int TCInputMethod::selectionListItemCount(DeclarativeSelectionListModel::Type type) +int TCInputMethod::selectionListItemCount(SelectionListModel::Type type) { Q_UNUSED(type) Q_D(TCInputMethod); return d->candidates.count(); } -QVariant TCInputMethod::selectionListData(DeclarativeSelectionListModel::Type type, int index, int role) +QVariant TCInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) { QVariant result; Q_D(TCInputMethod); switch (role) { - case DeclarativeSelectionListModel::DisplayRole: + case SelectionListModel::DisplayRole: result = QVariant(d->candidates.at(index)); break; - case DeclarativeSelectionListModel::WordCompletionLengthRole: + case SelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: @@ -307,7 +307,7 @@ QVariant TCInputMethod::selectionListData(DeclarativeSelectionListModel::Type ty return result; } -void TCInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index) +void TCInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(TCInputMethod); @@ -315,8 +315,8 @@ void TCInputMethod::selectionListItemSelected(DeclarativeSelectionListModel::Typ reset(); inputContext()->commit(finalWord); if (d->setCandidates(d->phraseDictionary.getWords(finalWord.left(1)), false)) { - emit selectionListChanged(DeclarativeSelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(DeclarativeSelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(SelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); } } diff --git a/src/virtualkeyboard/tcinputmethod.h b/src/virtualkeyboard/tcinputmethod.h index 216b93d8..b2f4d2e0 100644 --- a/src/virtualkeyboard/tcinputmethod.h +++ b/src/virtualkeyboard/tcinputmethod.h @@ -41,16 +41,16 @@ public: bool simplified() const; void setSimplified(bool simplified); - QList<DeclarativeInputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, DeclarativeInputEngine::InputMode inputMode); - bool setTextCase(DeclarativeInputEngine::TextCase textCase); + QList<InputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); + bool setTextCase(InputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); - QList<DeclarativeSelectionListModel::Type> selectionLists(); - int selectionListItemCount(DeclarativeSelectionListModel::Type type); - QVariant selectionListData(DeclarativeSelectionListModel::Type type, int index, int role); - void selectionListItemSelected(DeclarativeSelectionListModel::Type type, int index); + QList<SelectionListModel::Type> selectionLists(); + int selectionListItemCount(SelectionListModel::Type type); + QVariant selectionListData(SelectionListModel::Type type, int index, int role); + void selectionListItemSelected(SelectionListModel::Type type, int index); void reset(); void update(); diff --git a/src/virtualkeyboard/declarativetrace.cpp b/src/virtualkeyboard/trace.cpp index 51847139..82a881f9 100644 --- a/src/virtualkeyboard/declarativetrace.cpp +++ b/src/virtualkeyboard/trace.cpp @@ -19,15 +19,15 @@ ** ******************************************************************************/ -#include "declarativetrace.h" +#include "trace.h" #include <QtCore/private/qobject_p.h> namespace QtVirtualKeyboard { -class DeclarativeTracePrivate : public QObjectPrivate +class TracePrivate : public QObjectPrivate { public: - DeclarativeTracePrivate() : + TracePrivate() : QObjectPrivate(), traceId(0), final(false), @@ -42,7 +42,7 @@ public: }; /*! - \class QtVirtualKeyboard::DeclarativeTrace + \class QtVirtualKeyboard::Trace \inmodule qtvirtualkeyboard \since QtQuick.Enterprise.VirtualKeyboard 2.0 \brief Trace is a data model for touch input data. @@ -83,7 +83,7 @@ public: each point: \code - DeclarativeTrace *trace = new DeclarativeTrace(this); + Trace *trace = new Trace(this); trace->setChannels(QStringList() << "t"); \endcode @@ -105,7 +105,7 @@ public: /*! \qmltype Trace - \instantiates QtVirtualKeyboard::DeclarativeTrace + \instantiates QtVirtualKeyboard::Trace \inqmlmodule QtQuick.Enterprise.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \since QtQuick.Enterprise.VirtualKeyboard 2.0 @@ -147,7 +147,7 @@ public: each point: \code - DeclarativeTrace *trace = new DeclarativeTrace(this); + Trace *trace = new Trace(this); trace->setChannels(QStringList() << "t"); \endcode @@ -168,40 +168,40 @@ public: */ /*! \internal */ -DeclarativeTrace::DeclarativeTrace(QObject *parent) : - QObject(*new DeclarativeTracePrivate(), parent) +Trace::Trace(QObject *parent) : + QObject(*new TracePrivate(), parent) { } /*! \internal */ -DeclarativeTrace::~DeclarativeTrace() +Trace::~Trace() { } -int DeclarativeTrace::traceId() const +int Trace::traceId() const { - Q_D(const DeclarativeTrace); + Q_D(const Trace); return d->traceId; } -void DeclarativeTrace::setTraceId(int id) +void Trace::setTraceId(int id) { - Q_D(DeclarativeTrace); + Q_D(Trace); if (d->traceId != id) { d->traceId = id; emit traceIdChanged(id); } } -QStringList DeclarativeTrace::channels() const +QStringList Trace::channels() const { - Q_D(const DeclarativeTrace); + Q_D(const Trace); return d->channels.keys(); } -void DeclarativeTrace::setChannels(const QStringList &channels) +void Trace::setChannels(const QStringList &channels) { - Q_D(DeclarativeTrace); + Q_D(Trace); Q_ASSERT(d->points.isEmpty()); if (d->points.isEmpty()) { d->channels.clear(); @@ -213,9 +213,9 @@ void DeclarativeTrace::setChannels(const QStringList &channels) } } -int DeclarativeTrace::length() const +int Trace::length() const { - Q_D(const DeclarativeTrace); + Q_D(const Trace); return d->points.size(); } @@ -241,9 +241,9 @@ int DeclarativeTrace::length() const The returned list contains QPointF types. */ -QVariantList DeclarativeTrace::points(int pos, int count) const +QVariantList Trace::points(int pos, int count) const { - Q_D(const DeclarativeTrace); + Q_D(const Trace); return d->points.mid(pos, count); } @@ -267,9 +267,9 @@ QVariantList DeclarativeTrace::points(int pos, int count) const data with the point using the setChannelData() method. */ -int DeclarativeTrace::addPoint(const QPointF &point) +int Trace::addPoint(const QPointF &point) { - Q_D(DeclarativeTrace); + Q_D(Trace); int index; if (!d->final) { index = d->points.size(); @@ -297,9 +297,9 @@ int DeclarativeTrace::addPoint(const QPointF &point) arbitrary index, i.e., it must be added in synchronously with the point data. */ -void DeclarativeTrace::setChannelData(const QString &channel, int index, const QVariant &data) +void Trace::setChannelData(const QString &channel, int index, const QVariant &data) { - Q_D(DeclarativeTrace); + Q_D(Trace); if (!d->final && (index + 1) == d->points.size() && d->channels.contains(channel)) { QVariantList &channelData = d->channels[channel]; while (index > channelData.size()) @@ -327,36 +327,36 @@ void DeclarativeTrace::setChannelData(const QString &channel, int index, const Q returned. */ -QVariantList DeclarativeTrace::channelData(const QString &channel, int pos, int count) const +QVariantList Trace::channelData(const QString &channel, int pos, int count) const { - Q_D(const DeclarativeTrace); + Q_D(const Trace); return d->channels.value(channel).mid(pos, count); } -bool DeclarativeTrace::isFinal() const +bool Trace::isFinal() const { - Q_D(const DeclarativeTrace); + Q_D(const Trace); return d->final; } -void DeclarativeTrace::setFinal(bool final) +void Trace::setFinal(bool final) { - Q_D(DeclarativeTrace); + Q_D(Trace); if (d->final != final) { d->final = final; emit finalChanged(final); } } -bool DeclarativeTrace::isCanceled() const +bool Trace::isCanceled() const { - Q_D(const DeclarativeTrace); + Q_D(const Trace); return d->canceled; } -void DeclarativeTrace::setCanceled(bool canceled) +void Trace::setCanceled(bool canceled) { - Q_D(DeclarativeTrace); + Q_D(Trace); if (d->canceled != canceled) { d->canceled = canceled; emit canceledChanged(canceled); @@ -368,7 +368,7 @@ void DeclarativeTrace::setCanceled(bool canceled) Unique id of this Trace. */ -/*! \property QtVirtualKeyboard::DeclarativeTrace::traceId +/*! \property QtVirtualKeyboard::Trace::traceId \brief unique id of this Trace. */ @@ -379,7 +379,7 @@ void DeclarativeTrace::setCanceled(bool canceled) is added. */ -/*! \property QtVirtualKeyboard::DeclarativeTrace::channels +/*! \property QtVirtualKeyboard::Trace::channels \brief list of data channels in the Trace. This property must be initialized before the data @@ -391,7 +391,7 @@ void DeclarativeTrace::setCanceled(bool canceled) The number of points in the Trace. */ -/*! \property QtVirtualKeyboard::DeclarativeTrace::length +/*! \property QtVirtualKeyboard::Trace::length \brief the number of of points in the Trace. */ @@ -401,7 +401,7 @@ void DeclarativeTrace::setCanceled(bool canceled) If the value is true, no more data is accepted. */ -/*! \property QtVirtualKeyboard::DeclarativeTrace::isFinal +/*! \property QtVirtualKeyboard::Trace::isFinal \brief defines whether the Trace can accept more data. If the value is true, no more data is accepted. */ @@ -413,7 +413,7 @@ void DeclarativeTrace::setCanceled(bool canceled) whose isCanceled property set to true. */ -/*! \property QtVirtualKeyboard::DeclarativeTrace::isCanceled +/*! \property QtVirtualKeyboard::Trace::isCanceled \brief defines whether the Trace is canceled. The input data should not be processed from the Traces diff --git a/src/virtualkeyboard/declarativetrace.h b/src/virtualkeyboard/trace.h index 2cfb653c..4bc85d43 100644 --- a/src/virtualkeyboard/declarativetrace.h +++ b/src/virtualkeyboard/trace.h @@ -19,8 +19,8 @@ ** ******************************************************************************/ -#ifndef DECLARATIVETRACE_H -#define DECLARATIVETRACE_H +#ifndef TRACE_H +#define TRACE_H #include <QObject> #include <QVariant> @@ -28,20 +28,20 @@ namespace QtVirtualKeyboard { -class DeclarativeTracePrivate; +class TracePrivate; -class DeclarativeTrace : public QObject +class Trace : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(DeclarativeTrace) + Q_DECLARE_PRIVATE(Trace) Q_PROPERTY(int traceId READ traceId WRITE setTraceId NOTIFY traceIdChanged) Q_PROPERTY(QStringList channels READ channels WRITE setChannels NOTIFY channelsChanged) Q_PROPERTY(int length READ length NOTIFY lengthChanged) Q_PROPERTY(bool isFinal READ isFinal WRITE setFinal NOTIFY finalChanged) Q_PROPERTY(bool isCanceled READ isCanceled WRITE setCanceled NOTIFY canceledChanged) public: - explicit DeclarativeTrace(QObject *parent = 0); - ~DeclarativeTrace(); + explicit Trace(QObject *parent = 0); + ~Trace(); int traceId() const; void setTraceId(int id); @@ -73,4 +73,4 @@ signals: } // namespace QtVirtualKeyboard -#endif // DECLARATIVETRACE_H +#endif // TRACE_H diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index 17c67e45..42f5b7b8 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -18,39 +18,39 @@ win32 { !contains(CONFIG, no-pkg-config): CONFIG += link_pkgconfig SOURCES += platforminputcontext.cpp \ - declarativeinputcontext.cpp \ + inputcontext.cpp \ abstractinputmethod.cpp \ plaininputmethod.cpp \ - declarativeinputengine.cpp \ - declarativeshifthandler.cpp \ + inputengine.cpp \ + shifthandler.cpp \ plugin.cpp \ - declarativeinputmethod.cpp \ - declarativeselectionlistmodel.cpp \ + inputmethod.cpp \ + selectionlistmodel.cpp \ defaultinputmethod.cpp \ abstractinputpanel.cpp \ enterkeyaction.cpp \ enterkeyactionattachedtype.cpp \ settings.cpp \ - declarativesettings.cpp \ - declarativetrace.cpp \ + virtualkeyboardsettings.cpp \ + trace.cpp \ HEADERS += platforminputcontext.h \ - declarativeinputcontext.h \ + inputcontext.h \ abstractinputmethod.h \ plaininputmethod.h \ - declarativeinputengine.h \ - declarativeshifthandler.h \ - declarativeinputmethod.h \ - declarativeselectionlistmodel.h \ + inputengine.h \ + shifthandler.h \ + inputmethod.h \ + selectionlistmodel.h \ defaultinputmethod.h \ abstractinputpanel.h \ virtualkeyboarddebug.h \ enterkeyaction.h \ enterkeyactionattachedtype.h \ settings.h \ - declarativesettings.h \ + virtualkeyboardsettings.h \ plugin.h \ - declarativetrace.h \ + trace.h \ RESOURCES += \ content/styles/default/default_style.qrc \ diff --git a/src/virtualkeyboard/declarativesettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp index 5f83351c..b097092f 100644 --- a/src/virtualkeyboard/declarativesettings.cpp +++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp @@ -19,7 +19,7 @@ ** ******************************************************************************/ -#include "declarativesettings.h" +#include "virtualkeyboardsettings.h" #include "settings.h" #include "virtualkeyboarddebug.h" #include <QQmlEngine> @@ -29,10 +29,10 @@ namespace QtVirtualKeyboard { -class DeclarativeSettingsPrivate : public QObjectPrivate +class VirtualKeyboardSettingsPrivate : public QObjectPrivate { public: - DeclarativeSettingsPrivate() : + VirtualKeyboardSettingsPrivate() : QObjectPrivate(), engine() {} @@ -110,24 +110,24 @@ public: /*! \internal */ -QObject *DeclarativeSettings::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) +QObject *VirtualKeyboardSettings::registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine) { Q_UNUSED(jsEngine); - return new DeclarativeSettings(engine); + return new VirtualKeyboardSettings(engine); } /*! - \class QtVirtualKeyboard::DeclarativeSettings + \class QtVirtualKeyboard::VirtualKeyboardSettings \internal */ /*! \internal */ -DeclarativeSettings::DeclarativeSettings(QQmlEngine *engine) : - QObject(*new DeclarativeSettingsPrivate()) +VirtualKeyboardSettings::VirtualKeyboardSettings(QQmlEngine *engine) : + QObject(*new VirtualKeyboardSettingsPrivate()) { - Q_D(DeclarativeSettings); + Q_D(VirtualKeyboardSettings); d->engine = engine; Settings *settings = Settings::instance(); if (settings->styleName().isEmpty()) @@ -142,7 +142,7 @@ DeclarativeSettings::DeclarativeSettings(QQmlEngine *engine) : /*! \internal */ -QString DeclarativeSettings::style() const +QString VirtualKeyboardSettings::style() const { return Settings::instance()->style(); } @@ -150,7 +150,7 @@ QString DeclarativeSettings::style() const /*! \internal */ -QString DeclarativeSettings::styleName() const +QString VirtualKeyboardSettings::styleName() const { return Settings::instance()->styleName(); } @@ -158,9 +158,9 @@ QString DeclarativeSettings::styleName() const /*! \internal */ -void DeclarativeSettings::setStyleName(const QString &styleName) +void VirtualKeyboardSettings::setStyleName(const QString &styleName) { - Q_D(DeclarativeSettings); + Q_D(VirtualKeyboardSettings); Settings *settings = Settings::instance(); QString style = d->styleImportPath(styleName); if (style.isEmpty()) { @@ -171,34 +171,34 @@ void DeclarativeSettings::setStyleName(const QString &styleName) settings->setStyle(style); } -QString DeclarativeSettings::locale() const +QString VirtualKeyboardSettings::locale() const { return Settings::instance()->locale(); } -void DeclarativeSettings::setLocale(const QString &locale) +void VirtualKeyboardSettings::setLocale(const QString &locale) { Settings::instance()->setLocale(locale); } -QStringList DeclarativeSettings::availableLocales() const +QStringList VirtualKeyboardSettings::availableLocales() const { return Settings::instance()->availableLocales(); } -void DeclarativeSettings::setActiveLocales(const QStringList &activeLocales) +void VirtualKeyboardSettings::setActiveLocales(const QStringList &activeLocales) { Settings::instance()->setActiveLocales(activeLocales); } -QStringList DeclarativeSettings::activeLocales() const +QStringList VirtualKeyboardSettings::activeLocales() const { return Settings::instance()->activeLocales(); } -void DeclarativeSettings::resetStyle() +void VirtualKeyboardSettings::resetStyle() { - Q_D(DeclarativeSettings); + Q_D(VirtualKeyboardSettings); Settings *settings = Settings::instance(); QString styleName = QT_VIRTUALKEYBOARD_DEFAULT_STYLE; QString style = d->styleImportPath(styleName); diff --git a/src/virtualkeyboard/declarativesettings.h b/src/virtualkeyboard/virtualkeyboardsettings.h index ef115f02..593e3ac7 100644 --- a/src/virtualkeyboard/declarativesettings.h +++ b/src/virtualkeyboard/virtualkeyboardsettings.h @@ -19,19 +19,19 @@ ** ******************************************************************************/ -#ifndef DECLARATIVESETTINGS_H -#define DECLARATIVESETTINGS_H +#ifndef VIRTUALKEYBOARDSETTINGS_H +#define VIRTUALKEYBOARDSETTINGS_H #include "qqml.h" namespace QtVirtualKeyboard { -class DeclarativeSettingsPrivate; +class VirtualKeyboardSettingsPrivate; -class DeclarativeSettings : public QObject +class VirtualKeyboardSettings : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(DeclarativeSettings) + Q_DECLARE_PRIVATE(VirtualKeyboardSettings) Q_PROPERTY(QUrl style READ style NOTIFY styleChanged) Q_PROPERTY(QString styleName READ styleName WRITE setStyleName NOTIFY styleNameChanged) Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged) @@ -41,7 +41,7 @@ class DeclarativeSettings : public QObject public: static QObject *registerSettingsModule(QQmlEngine *engine, QJSEngine *jsEngine); - explicit DeclarativeSettings(QQmlEngine *engine); + explicit VirtualKeyboardSettings(QQmlEngine *engine); QString style() const; @@ -69,4 +69,4 @@ private: } -#endif // DECLARATIVESETTINGS_H +#endif // VIRTUALKEYBOARDSETTINGS_H |