diff options
59 files changed, 1158 insertions, 1162 deletions
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp index b07ba0ec..db2553ea 100644 --- a/src/plugin/plugin.cpp +++ b/src/plugin/plugin.cpp @@ -74,7 +74,7 @@ static QObject *createInputContextModule(QQmlEngine *engine, QJSEngine *scriptEn Q_UNUSED(scriptEngine); QQmlContext *rootContext = engine->rootContext(); rootContext->setContextProperty(QStringLiteral("VirtualKeyboardInputMethods"), inputMethodList); - return new InputContext(platformInputContext); + return new QVirtualKeyboardInputContext(platformInputContext); } QStringList QVirtualKeyboardPlugin::keys() const @@ -101,22 +101,18 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con Q_VKB_IMPORT_PLUGIN(QtVirtualKeyboardStylesPlugin) #endif - qmlRegisterSingletonType<InputContext>(pluginUri, 1, 0, "InputContext", createInputContextModule); - qmlRegisterSingletonType<InputContext>(pluginUri, 2, 0, "InputContext", createInputContextModule); - qRegisterMetaType<InputContextPrivate *>("InputContextPrivate*"); - qmlRegisterUncreatableType<InputContextPrivate>(pluginUri, 1, 0, "InputContextPrivate", QLatin1String("Cannot create input context private")); - qRegisterMetaType<InputEngine *>("InputEngine*"); - qmlRegisterUncreatableType<InputEngine>(pluginUri, 1, 0, "InputEngine", QLatin1String("Cannot create input method engine")); - qmlRegisterUncreatableType<InputEngine>(pluginUri, 2, 0, "InputEngine", QLatin1String("Cannot create input method engine")); + qmlRegisterSingletonType<QVirtualKeyboardInputContext>(pluginUri, 1, 0, "InputContext", createInputContextModule); + qmlRegisterSingletonType<QVirtualKeyboardInputContext>(pluginUri, 2, 0, "InputContext", createInputContextModule); + qmlRegisterUncreatableType<QVirtualKeyboardInputContextPrivate>(pluginUri, 1, 0, "InputContextPrivate", QLatin1String("Cannot create input context private")); + qmlRegisterUncreatableType<QVirtualKeyboardInputEngine>(pluginUri, 1, 0, "InputEngine", QLatin1String("Cannot create input method engine")); + qmlRegisterUncreatableType<QVirtualKeyboardInputEngine>(pluginUri, 2, 0, "InputEngine", QLatin1String("Cannot create input method engine")); qRegisterMetaType<ShiftHandler *>("ShiftHandler*"); qmlRegisterUncreatableType<ShiftHandler>(pluginUri, 1, 0, "ShiftHandler", QLatin1String("Cannot create shift handler")); qmlRegisterUncreatableType<ShiftHandler>(pluginUri, 2, 0, "ShiftHandler", QLatin1String("Cannot create shift handler")); - qRegisterMetaType<SelectionListModel *>("SelectionListModel*"); - qmlRegisterUncreatableType<SelectionListModel>(pluginUri, 1, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); - qmlRegisterUncreatableType<SelectionListModel>(pluginUri, 2, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); - qRegisterMetaType<AbstractInputMethod *>("AbstractInputMethod*"); - qmlRegisterUncreatableType<AbstractInputMethod>(pluginUri, 1, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method")); - qmlRegisterUncreatableType<AbstractInputMethod>(pluginUri, 2, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method")); + qmlRegisterUncreatableType<QVirtualKeyboardSelectionListModel>(pluginUri, 1, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); + qmlRegisterUncreatableType<QVirtualKeyboardSelectionListModel>(pluginUri, 2, 0, "SelectionListModel", QLatin1String("Cannot create selection list model")); + qmlRegisterUncreatableType<QVirtualKeyboardAbstractInputMethod>(pluginUri, 1, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method")); + qmlRegisterUncreatableType<QVirtualKeyboardAbstractInputMethod>(pluginUri, 2, 0, "AbstractInputMethod", QLatin1String("Cannot create abstract input method")); qRegisterMetaType<PlainInputMethod *>("PlainInputMethod*"); qmlRegisterType<PlainInputMethod>(pluginUri, 1, 0, "PlainInputMethod"); qmlRegisterType<PlainInputMethod>(pluginUri, 2, 0, "PlainInputMethod"); @@ -125,9 +121,8 @@ QPlatformInputContext *QVirtualKeyboardPlugin::create(const QString &system, con qmlRegisterType<EnterKeyActionAttachedType>(); qmlRegisterType<EnterKeyAction>(pluginUri, 1, 0, "EnterKeyAction"); qmlRegisterType<EnterKeyAction>(pluginUri, 2, 0, "EnterKeyAction"); - qRegisterMetaType<Trace *>("Trace*"); - qmlRegisterType<Trace>(pluginUri, 2, 0, "Trace"); - qmlRegisterType<Trace>(pluginUri, 2, 4, "Trace"); + qmlRegisterType<QVirtualKeyboardTrace>(pluginUri, 2, 0, "Trace"); + qmlRegisterType<QVirtualKeyboardTrace>(pluginUri, 2, 4, "Trace"); qRegisterMetaType<ShadowInputContext *>("ShadowInputContext*"); qmlRegisterUncreatableType<ShadowInputContext>(pluginUri, 2, 2, "ShadowInputContext", QLatin1String("Cannot create shadow input context")); qmlRegisterSingletonType<VirtualKeyboardSettings>(pluginSettingsUri, 1, 0, "VirtualKeyboardSettings", VirtualKeyboardSettings::registerSettingsModule); diff --git a/src/plugins/hangul/hangulinputmethod.cpp b/src/plugins/hangul/hangulinputmethod.cpp index 8fcd5e96..07a3408e 100644 --- a/src/plugins/hangul/hangulinputmethod.cpp +++ b/src/plugins/hangul/hangulinputmethod.cpp @@ -40,7 +40,7 @@ namespace QtVirtualKeyboard { */ HangulInputMethod::HangulInputMethod(QObject *parent) : - AbstractInputMethod(parent) + QVirtualKeyboardAbstractInputMethod(parent) { } @@ -48,20 +48,20 @@ HangulInputMethod::~HangulInputMethod() { } -QList<InputEngine::InputMode> HangulInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> HangulInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<InputEngine::InputMode>() << InputEngine::Hangul; + return QList<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Hangul; } -bool HangulInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool HangulInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_UNUSED(inputMode) return true; } -bool HangulInputMethod::setTextCase(InputEngine::TextCase textCase) +bool HangulInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -70,7 +70,7 @@ bool HangulInputMethod::setTextCase(InputEngine::TextCase textCase) bool HangulInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) { Q_UNUSED(modifiers) - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); bool accept = false; int cursorPosition = ic->cursorPosition(); if (ic->cursorPosition() > 0) { diff --git a/src/plugins/hangul/hangulinputmethod_p.h b/src/plugins/hangul/hangulinputmethod_p.h index cdbd0841..80dd723a 100644 --- a/src/plugins/hangul/hangulinputmethod_p.h +++ b/src/plugins/hangul/hangulinputmethod_p.h @@ -48,7 +48,7 @@ namespace QtVirtualKeyboard { class HangulInputMethodPrivate; -class HangulInputMethod : public AbstractInputMethod +class HangulInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(HangulInputMethod) @@ -56,9 +56,9 @@ public: explicit HangulInputMethod(QObject *parent = nullptr); ~HangulInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp index ee8d31e3..2e81882f 100644 --- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp +++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod.cpp @@ -42,13 +42,13 @@ Q_LOGGING_CATEGORY(lcHunspell, "qt.virtualkeyboard.hunspell") */ HunspellInputMethod::HunspellInputMethod(HunspellInputMethodPrivate *d_ptr, QObject *parent) : - AbstractInputMethod(parent), + QVirtualKeyboardAbstractInputMethod(parent), d_ptr(d_ptr) { } HunspellInputMethod::HunspellInputMethod(QObject *parent) : - AbstractInputMethod(parent), + QVirtualKeyboardAbstractInputMethod(parent), d_ptr(new HunspellInputMethodPrivate(this)) { } @@ -57,38 +57,38 @@ HunspellInputMethod::~HunspellInputMethod() { } -QList<InputEngine::InputMode> HunspellInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> HunspellInputMethod::inputModes(const QString &locale) { - QList<InputEngine::InputMode> result; + QList<QVirtualKeyboardInputEngine::InputMode> result; switch (QLocale(locale).script()) { case QLocale::GreekScript: - result.append(InputEngine::Greek); + result.append(QVirtualKeyboardInputEngine::Greek); break; case QLocale::CyrillicScript: - result.append(InputEngine::Cyrillic); + result.append(QVirtualKeyboardInputEngine::Cyrillic); break; case QLocale::ArabicScript: - result.append(InputEngine::Arabic); + result.append(QVirtualKeyboardInputEngine::Arabic); break; case QLocale::HebrewScript: - result.append(InputEngine::Hebrew); + result.append(QVirtualKeyboardInputEngine::Hebrew); break; default: break; } - result.append(InputEngine::Latin); - result.append(InputEngine::Numeric); + result.append(QVirtualKeyboardInputEngine::Latin); + result.append(QVirtualKeyboardInputEngine::Numeric); return result; } -bool HunspellInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool HunspellInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(inputMode) Q_D(HunspellInputMethod); return d->createHunspell(locale); } -bool HunspellInputMethod::setTextCase(InputEngine::TextCase textCase) +bool HunspellInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -97,7 +97,7 @@ bool HunspellInputMethod::setTextCase(InputEngine::TextCase textCase) bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) { Q_D(HunspellInputMethod); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); bool accept = false; switch (key) { @@ -116,8 +116,8 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar if (!word.isEmpty()) { d->wordCandidates.updateWord(0, word); if (d->updateSuggestions()) { - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->wordCandidates.index()); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index()); } } else { d->reset(); @@ -167,8 +167,8 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar ic->setPreeditText(word); d->ignoreUpdate = false; if (d->updateSuggestions()) { - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->wordCandidates.index()); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index()); } accept = true; } else if (text.length() > 1) { @@ -192,34 +192,34 @@ bool HunspellInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar return accept; } -QList<SelectionListModel::Type> HunspellInputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> HunspellInputMethod::selectionLists() { Q_D(const HunspellInputMethod); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (!ic) - return QList<SelectionListModel::Type>(); + return QList<QVirtualKeyboardSelectionListModel::Type>(); Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); if (d->dictionaryState == HunspellInputMethodPrivate::DictionaryNotLoaded || inputMethodHints.testFlag(Qt::ImhNoPredictiveText) || inputMethodHints.testFlag(Qt::ImhHiddenText)) - return QList<SelectionListModel::Type>(); - return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; + return QList<QVirtualKeyboardSelectionListModel::Type>(); + return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList; } -int HunspellInputMethod::selectionListItemCount(SelectionListModel::Type type) +int HunspellInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { Q_UNUSED(type) Q_D(HunspellInputMethod); return d->wordCandidates.size(); } -QVariant HunspellInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant HunspellInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { QVariant result; Q_D(HunspellInputMethod); switch (role) { - case SelectionListModel::DisplayRole: + case QVirtualKeyboardSelectionListModel::DisplayRole: result = QVariant(d->wordCandidates.wordAt(index)); break; - case SelectionListModel::WordCompletionLengthRole: + case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole: { const QString wordCandidate(d->wordCandidates.wordAt(index)); const QString word(d->wordCandidates.wordAt(0)); @@ -227,26 +227,26 @@ QVariant HunspellInputMethod::selectionListData(SelectionListModel::Type type, i result.setValue((wordCompletionLength > 0 && wordCandidate.startsWith(word)) ? wordCompletionLength : 0); break; } - case SelectionListModel::DictionaryTypeRole: + case QVirtualKeyboardSelectionListModel::DictionaryTypeRole: { const QString wordCandidate(d->wordCandidates.wordAt(index)); - SelectionListModel::DictionaryType dictionaryType = + QVirtualKeyboardSelectionListModel::DictionaryType dictionaryType = d->userDictionaryWords && d->userDictionaryWords->contains(wordCandidate) ? - SelectionListModel::UserDictionary : SelectionListModel::DefaultDictionary; + QVirtualKeyboardSelectionListModel::UserDictionary : QVirtualKeyboardSelectionListModel::DefaultDictionary; result = QVariant(static_cast<int>(dictionaryType)); break; } - case SelectionListModel::CanRemoveSuggestionRole: + case QVirtualKeyboardSelectionListModel::CanRemoveSuggestionRole: result.setValue(index > 0 && d->wordCandidates.wordFlagsAt(index).testFlag(HunspellWordList::SpellCheckOk)); break; default: - result = AbstractInputMethod::selectionListData(type, index, role); + result = QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role); break; } return result; } -void HunspellInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void HunspellInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(HunspellInputMethod); @@ -258,7 +258,7 @@ void HunspellInputMethod::selectionListItemSelected(SelectionListModel::Type typ d->autoSpaceAllowed = true; } -bool HunspellInputMethod::selectionListRemoveItem(SelectionListModel::Type type, int index) +bool HunspellInputMethod::selectionListRemoveItem(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_D(HunspellInputMethod); Q_UNUSED(type) @@ -272,7 +272,7 @@ bool HunspellInputMethod::selectionListRemoveItem(SelectionListModel::Type type, return true; } -bool HunspellInputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) +bool HunspellInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags) { Q_D(HunspellInputMethod); QString word(d->wordCandidates.wordAt(0)); @@ -281,14 +281,14 @@ bool HunspellInputMethod::reselect(int cursorPosition, const InputEngine::Resele if (d->dictionaryState == HunspellInputMethodPrivate::DictionaryNotLoaded) return false; - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (!ic) return false; const QString surroundingText = ic->surroundingText(); int replaceFrom = 0; - if (reselectFlags.testFlag(InputEngine::WordBeforeCursor)) { + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordBeforeCursor)) { for (int i = cursorPosition - 1; i >= 0; --i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -303,10 +303,10 @@ bool HunspellInputMethod::reselect(int cursorPosition, const InputEngine::Resele } } - if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == 0) + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == 0) return false; - if (reselectFlags.testFlag(InputEngine::WordAfterCursor)) { + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAfterCursor)) { for (int i = cursorPosition; i < surroundingText.length(); ++i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -325,7 +325,7 @@ bool HunspellInputMethod::reselect(int cursorPosition, const InputEngine::Resele if (word.isEmpty()) return false; - if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == -word.length()) + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == -word.length()) return false; if (d->isJoiner(word.at(0))) @@ -339,8 +339,8 @@ bool HunspellInputMethod::reselect(int cursorPosition, const InputEngine::Resele d->autoSpaceAllowed = false; if (d->updateSuggestions()) { - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->wordCandidates.index()); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index()); } return true; @@ -384,21 +384,21 @@ void HunspellInputMethod::updateSuggestions(const QSharedPointer<HunspellWordLis d->wordCandidates = *wordList; if (d->wordCandidates.wordAt(0).compare(word) != 0) d->wordCandidates.updateWord(0, word); - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->wordCandidates.index()); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->wordCandidates.index()); } void HunspellInputMethod::dictionaryLoadCompleted(bool success) { Q_D(HunspellInputMethod); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (!ic) return; - QList<SelectionListModel::Type> oldSelectionLists = selectionLists(); + QList<QVirtualKeyboardSelectionListModel::Type> oldSelectionLists = selectionLists(); d->dictionaryState = success ? HunspellInputMethodPrivate::DictionaryReady : HunspellInputMethodPrivate::DictionaryNotLoaded; - QList<SelectionListModel::Type> newSelectionLists = selectionLists(); + QList<QVirtualKeyboardSelectionListModel::Type> newSelectionLists = selectionLists(); if (oldSelectionLists != newSelectionLists) emit selectionListsChanged(); } diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp index 2027a987..99c1137b 100644 --- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp +++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.cpp @@ -113,8 +113,8 @@ void HunspellInputMethodPrivate::reset() { if (clearSuggestions(true)) { Q_Q(HunspellInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, wordCandidates.index()); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, wordCandidates.index()); } autoSpaceAllowed = false; } @@ -187,9 +187,9 @@ bool HunspellInputMethodPrivate::isAutoSpaceAllowed() const Q_Q(const HunspellInputMethod); if (!autoSpaceAllowed) return false; - if (q->inputEngine()->inputMode() == InputEngine::Numeric) + if (q->inputEngine()->inputMode() == QVirtualKeyboardInputEngine::Numeric) return false; - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); if (!ic) return false; Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); @@ -212,7 +212,7 @@ bool HunspellInputMethodPrivate::isJoiner(const QChar &c) const { if (c.isPunct() || c.isSymbol()) { Q_Q(const HunspellInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); if (ic) { Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly) || inputMethodHints.testFlag(Qt::ImhEmailCharactersOnly)) diff --git a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h index bb9548c0..3b851964 100644 --- a/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h +++ b/src/plugins/hunspell/hunspellinputmethod/hunspellinputmethod_p.h @@ -49,7 +49,7 @@ namespace QtVirtualKeyboard { class HunspellInputMethodPrivate; class HunspellWordList; -class HunspellInputMethod : public AbstractInputMethod +class HunspellInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(HunspellInputMethod) @@ -59,19 +59,19 @@ public: explicit HunspellInputMethod(QObject *parent = nullptr); ~HunspellInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::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); - bool selectionListRemoveItem(SelectionListModel::Type type, int index); + QList<QVirtualKeyboardSelectionListModel::Type> selectionLists(); + int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type); + QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role); + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index); + bool selectionListRemoveItem(QVirtualKeyboardSelectionListModel::Type type, int index); - bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); + bool reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags); void reset(); void update(); diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp index 7afe1056..3ebd3bf5 100644 --- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp +++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp @@ -80,7 +80,7 @@ public: #endif q_ptr(q_ptr), recognizeTimer(0), - textCase(InputEngine::Lower) + textCase(QVirtualKeyboardInputEngine::Lower) #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT , unipenTrace(0) #endif @@ -92,7 +92,7 @@ public: cancelRecognition(); } - QByteArray getContext(InputEngine::PatternRecognitionMode patternRecognitionMode, + QByteArray getContext(QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) const { @@ -109,7 +109,7 @@ public: return hash.result(); } - void setContext(InputEngine::PatternRecognitionMode patternRecognitionMode, + void setContext(QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { @@ -158,8 +158,9 @@ public: currentContext = context; } - Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) + QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_UNUSED(traceId) @@ -180,14 +181,14 @@ public: } #endif - Trace *trace = new Trace(); + QVirtualKeyboardTrace *trace = new QVirtualKeyboardTrace(); trace->setChannels(QStringList("t")); traceList.append(trace); return trace; } - void traceEnd(Trace *trace) + void traceEnd(QVirtualKeyboardTrace *trace) { if (trace->isCanceled()) { qCDebug(lcLipi) << "LipiInputMethodPrivate::traceEnd(): discarded" << trace; @@ -204,7 +205,7 @@ public: int countActiveTraces() const { int count = 0; - for (Trace *trace : qAsConst(traceList)) { + for (QVirtualKeyboardTrace *trace : qAsConst(traceList)) { if (!trace->isFinal()) count++; } @@ -231,7 +232,7 @@ public: if (swipeLength >= SWIPE_MIN_LENGTH) { Q_Q(LipiInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); if (!ic) return; @@ -277,7 +278,7 @@ public: #ifdef HAVE_HUNSPELL int activeWordIndex = wordCandidates.index(); if (activeWordIndex != -1) { - q->selectionListItemSelected(SelectionListModel::WordCandidateList, activeWordIndex); + q->selectionListItemSelected(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex); return; } #endif @@ -296,9 +297,9 @@ public: #endif cancelRecognition(); if (!(ic->inputMethodHints() & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly))) { - InputEngine::InputMode inputMode = ic->inputEngine()->inputMode(); - inputMode = inputMode == InputEngine::Latin ? - InputEngine::Numeric : InputEngine::Latin; + QVirtualKeyboardInputEngine::InputMode inputMode = ic->inputEngine()->inputMode(); + inputMode = inputMode == QVirtualKeyboardInputEngine::Latin ? + QVirtualKeyboardInputEngine::Numeric : QVirtualKeyboardInputEngine::Latin; ic->inputEngine()->setInputMode(inputMode); } } else if (swipeTouchCount == 2) { @@ -319,7 +320,7 @@ public: traceGroup.emptyAllTraces(); } - void addPointsToTraceGroup(Trace *trace) + void addPointsToTraceGroup(QVirtualKeyboardTrace *trace) { vector<LTKChannel> channels; channels.push_back(LTKChannel("X", DT_INT, true)); @@ -421,7 +422,7 @@ public: #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT // In recording mode, the text case must match with the current text case if (unipenTrace) { - if (!ch.isLetter() || (ch.isUpper() == (textCase == InputEngine::Upper))) + if (!ch.isLetter() || (ch.isUpper() == (textCase == QVirtualKeyboardInputEngine::Upper))) saveTraces(ch.unicode(), qRound(result["confidence"].toDouble() * 100)); delete unipenTrace; unipenTrace = 0; @@ -429,7 +430,7 @@ public: #endif Q_Q(LipiInputMethod); q->inputContext()->inputEngine()->virtualKeyClick((Qt::Key)chUpper.unicode(), - textCase == InputEngine::Lower ? QString(ch.toLower()) : QString(chUpper), + textCase == QVirtualKeyboardInputEngine::Lower ? QString(ch.toLower()) : QString(chUpper), Qt::NoModifier); } @@ -461,9 +462,9 @@ public: QScopedPointer<LTKScreenContext> screenContext; QSharedPointer<LipiRecognitionTask> recognitionTask; LTKTraceGroup traceGroup; - QList<Trace *> traceList; + QList<QVirtualKeyboardTrace *> traceList; int recognizeTimer; - InputEngine::TextCase textCase; + QVirtualKeyboardInputEngine::TextCase textCase; vector<int> subsetOfClasses; QVariantMap delayedResult; HandwritingGestureRecognizer gestureRecognizer; @@ -491,25 +492,25 @@ LipiInputMethod::~LipiInputMethod() { } -QList<InputEngine::InputMode> LipiInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> LipiInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - QList<InputEngine::InputMode> availableInputModes; + QList<QVirtualKeyboardInputEngine::InputMode> availableInputModes; const Qt::InputMethodHints inputMethodHints(inputContext()->inputMethodHints()); if (inputMethodHints.testFlag(Qt::ImhDialableCharactersOnly) || inputMethodHints.testFlag(Qt::ImhDigitsOnly)) { - availableInputModes.append(InputEngine::Dialable); + availableInputModes.append(QVirtualKeyboardInputEngine::Dialable); } else if (inputMethodHints.testFlag(Qt::ImhFormattedNumbersOnly)) { - availableInputModes.append(InputEngine::Numeric); + availableInputModes.append(QVirtualKeyboardInputEngine::Numeric); } else { - availableInputModes.append(InputEngine::Latin); - availableInputModes.append(InputEngine::Numeric); + availableInputModes.append(QVirtualKeyboardInputEngine::Latin); + availableInputModes.append(QVirtualKeyboardInputEngine::Numeric); } return availableInputModes; } -bool LipiInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool LipiInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_D(LipiInputMethod); #ifdef HAVE_HUNSPELL @@ -522,11 +523,11 @@ bool LipiInputMethod::setInputMode(const QString &locale, InputEngine::InputMode return false; d->subsetOfClasses.clear(); switch (inputMode) { - case InputEngine::Latin: + case QVirtualKeyboardInputEngine::Latin: d->recognizer.subsetOfClasses(QStringLiteral("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz?,.@"), d->subsetOfClasses); break; - case InputEngine::Numeric: - case InputEngine::Dialable: + case QVirtualKeyboardInputEngine::Numeric: + case QVirtualKeyboardInputEngine::Dialable: d->recognizer.subsetOfClasses(QStringLiteral("1234567890,.+"), d->subsetOfClasses); break; default: @@ -535,7 +536,7 @@ bool LipiInputMethod::setInputMode(const QString &locale, InputEngine::InputMode return true; } -bool LipiInputMethod::setTextCase(InputEngine::TextCase textCase) +bool LipiInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_D(LipiInputMethod); d->textCase = textCase; @@ -582,27 +583,28 @@ void LipiInputMethod::update() LipiInputMethodBase::update(); } -void LipiInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void LipiInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { LipiInputMethodBase::selectionListItemSelected(type, index); Q_D(LipiInputMethod); d->cancelRecognition(); } -QList<InputEngine::PatternRecognitionMode> LipiInputMethod::patternRecognitionModes() const +QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> LipiInputMethod::patternRecognitionModes() const { - return QList<InputEngine::PatternRecognitionMode>() - << InputEngine::HandwritingRecoginition; + return QList<QVirtualKeyboardInputEngine::PatternRecognitionMode>() + << QVirtualKeyboardInputEngine::HandwritingRecoginition; } -Trace *LipiInputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +QVirtualKeyboardTrace *LipiInputMethod::traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_D(LipiInputMethod); return d->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); } -bool LipiInputMethod::traceEnd(Trace *trace) +bool LipiInputMethod::traceEnd(QVirtualKeyboardTrace *trace) { Q_D(LipiInputMethod); d->traceEnd(trace); diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h index 767be004..bc2981e0 100644 --- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h +++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h @@ -46,7 +46,7 @@ #define LipiInputMethodBase HunspellInputMethod #else #include <QtVirtualKeyboard/abstractinputmethod.h> -#define LipiInputMethodBase AbstractInputMethod +#define LipiInputMethodBase QVirtualKeyboardAbstractInputMethod #endif QT_BEGIN_NAMESPACE @@ -62,21 +62,22 @@ public: explicit LipiInputMethod(QObject *parent = nullptr); ~LipiInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); void reset(); void update(); - void selectionListItemSelected(SelectionListModel::Type type, int index); + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::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); + QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const; + QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + bool traceEnd(QVirtualKeyboardTrace *trace); protected: void timerEvent(QTimerEvent *timerEvent); diff --git a/src/plugins/myscript/plugin/myscriptinputmethod.cpp b/src/plugins/myscript/plugin/myscriptinputmethod.cpp index 95823679..d994272c 100644 --- a/src/plugins/myscript/plugin/myscriptinputmethod.cpp +++ b/src/plugins/myscript/plugin/myscriptinputmethod.cpp @@ -134,7 +134,7 @@ public: m_onManagingResult(false), m_isProcessing(false), m_commitTimer(0), - textCase(InputEngine::Lower), + textCase(QVirtualKeyboardInputEngine::Lower), wordIndex(-1), m_itemIndex(-1), m_preeditCursorPosition(0) @@ -147,7 +147,7 @@ public: destroyHwrEngine(); } - void setContext(InputEngine::PatternRecognitionMode patternRecognitionMode, + void setContext(QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { @@ -158,8 +158,9 @@ public: qCDebug(qlcVKMyScript) << Q_FUNC_INFO; } - Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) + QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_UNUSED(patternRecognitionMode); Q_UNUSED(traceCaptureDeviceInfo); @@ -179,13 +180,13 @@ public: traceList[i]->setOpacity(qMax(0.0, 1 - 0.25 * (traceList.size() - i))); } - Trace *trace = new Trace(); + QVirtualKeyboardTrace *trace = new QVirtualKeyboardTrace(); traceList.append(trace); return trace; } - void traceEnd(Trace *trace) + void traceEnd(QVirtualKeyboardTrace *trace) { if (trace->isCanceled()) { qCDebug(qlcVKMyScript) << Q_FUNC_INFO << "discarded" << trace; @@ -203,7 +204,7 @@ public: int countActiveTraces() const { int count = 0; - for (Trace *trace : qAsConst(traceList)) { + for (QVirtualKeyboardTrace *trace : qAsConst(traceList)) { if (!trace->isFinal()) count++; } @@ -227,7 +228,7 @@ public: q->inputContext()->commit(); } - void addPointsToTraceGroup(Trace *trace) + void addPointsToTraceGroup(QVirtualKeyboardTrace *trace) { const QVariantList sourcePoints = trace->points(); @@ -876,15 +877,15 @@ public: { Q_Q(MyScriptInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, wordIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, wordIndex); } void updatePreeditTextCursor(int cursorPosition) { Q_Q(MyScriptInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); if (!ic) return; @@ -935,9 +936,9 @@ public: bool m_isProcessing; int m_commitTimer; - QList<Trace *> traceList; + QList<QVirtualKeyboardTrace *> traceList; - InputEngine::TextCase textCase; + QVirtualKeyboardInputEngine::TextCase textCase; QStringList wordCandidates; QString word; int wordIndex; @@ -959,7 +960,7 @@ public: */ MyScriptInputMethod::MyScriptInputMethod(QObject *parent) : - AbstractInputMethod(parent), + QVirtualKeyboardAbstractInputMethod(parent), d_ptr(new MyScriptInputMethodPrivate(this)) { connect(this, SIGNAL(preeditTextChanged(QString, bool, int, int, int)), this, SLOT(setPreeditText(QString, bool, int, int, int))); @@ -971,18 +972,18 @@ MyScriptInputMethod::~MyScriptInputMethod() } -QList<InputEngine::InputMode> MyScriptInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> MyScriptInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale); - return QList<InputEngine::InputMode>() - << InputEngine::Latin; + return QList<QVirtualKeyboardInputEngine::InputMode>() + << QVirtualKeyboardInputEngine::Latin; } -bool MyScriptInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool MyScriptInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(inputMode); Q_D(MyScriptInputMethod); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (d->setMode(locale, ic->inputMethodHints())) { d->m_locale = locale; return true; @@ -990,7 +991,7 @@ bool MyScriptInputMethod::setInputMode(const QString &locale, InputEngine::Input return false; } -bool MyScriptInputMethod::setTextCase(InputEngine::TextCase textCase) +bool MyScriptInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_D(MyScriptInputMethod); d->textCase = textCase; @@ -1018,7 +1019,7 @@ bool MyScriptInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboar void MyScriptInputMethod::reset() { - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (ic) { Q_D(MyScriptInputMethod); d->clearCandidates(); @@ -1035,56 +1036,56 @@ void MyScriptInputMethod::update() reset(); } -QList<SelectionListModel::Type> MyScriptInputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> MyScriptInputMethod::selectionLists() { - return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; + return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList; } -int MyScriptInputMethod::selectionListItemCount(SelectionListModel::Type type) +int MyScriptInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { Q_D(MyScriptInputMethod); - if (type != SelectionListModel::WordCandidateList) + if (type != QVirtualKeyboardSelectionListModel::WordCandidateList) return 0; return d->wordCandidates.count(); } -QVariant MyScriptInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant MyScriptInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { Q_D(MyScriptInputMethod); - if (type != SelectionListModel::WordCandidateList) + if (type != QVirtualKeyboardSelectionListModel::WordCandidateList) return QVariant(); switch (role) { - case SelectionListModel::DisplayRole: + case QVirtualKeyboardSelectionListModel::DisplayRole: return QVariant(d->wordCandidates.at(index)); - case SelectionListModel::WordCompletionLengthRole: + case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole: { const QString wordCandidate(d->wordCandidates.at(index)); int wordCompletionLength = wordCandidate.length() - d->word.length(); return QVariant((wordCompletionLength > 0 && wordCandidate.startsWith(d->word)) ? wordCompletionLength : 0); } default: - return AbstractInputMethod::selectionListData(type, index, role); + return QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role); } } -void MyScriptInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void MyScriptInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_D(MyScriptInputMethod); if (d->m_isProcessing) return; - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (!ic) return; qCDebug(qlcVKMyScript) << Q_FUNC_INFO; - AbstractInputMethod::selectionListItemSelected(type, index); + QVirtualKeyboardAbstractInputMethod::selectionListItemSelected(type, index); int itemIndex = d->m_itemIndex; CandidateItem *candidateItem = d->m_items.at(itemIndex).second; @@ -1099,21 +1100,22 @@ void MyScriptInputMethod::selectionListItemSelected(SelectionListModel::Type typ d->updatePreeditTextCursor(d->m_preeditCursorPosition); } -QList<InputEngine::PatternRecognitionMode> MyScriptInputMethod::patternRecognitionModes() const +QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> MyScriptInputMethod::patternRecognitionModes() const { - return QList<InputEngine::PatternRecognitionMode>() - << InputEngine::HandwritingRecoginition; + return QList<QVirtualKeyboardInputEngine::PatternRecognitionMode>() + << QVirtualKeyboardInputEngine::HandwritingRecoginition; } -Trace *MyScriptInputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +QVirtualKeyboardTrace *MyScriptInputMethod::traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_D(MyScriptInputMethod); return d->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); } -bool MyScriptInputMethod::traceEnd(Trace *trace) +bool MyScriptInputMethod::traceEnd(QVirtualKeyboardTrace *trace) { Q_D(MyScriptInputMethod); @@ -1128,7 +1130,7 @@ bool MyScriptInputMethod::clickPreeditText(int cursorPosition) if (d->m_isProcessing) return true; - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (ic) { setPreeditText(ic->preeditText(), true, cursorPosition); } @@ -1206,7 +1208,7 @@ void MyScriptInputMethod::doGestureAction(const int gestureType, const int gestu Q_D(MyScriptInputMethod); d->cancelRecognition(); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (ic) { switch (gestureType) { case GESTURE_TYPE_LEFT_TO_RIGHT: diff --git a/src/plugins/myscript/plugin/myscriptinputmethod_p.h b/src/plugins/myscript/plugin/myscriptinputmethod_p.h index d62523b1..aae9f188 100644 --- a/src/plugins/myscript/plugin/myscriptinputmethod_p.h +++ b/src/plugins/myscript/plugin/myscriptinputmethod_p.h @@ -50,7 +50,7 @@ namespace QtVirtualKeyboard { class MyScriptInputMethodPrivate; -class MyScriptInputMethod : public AbstractInputMethod +class MyScriptInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(MyScriptInputMethod) @@ -59,24 +59,25 @@ public: explicit MyScriptInputMethod(QObject *parent = nullptr); ~MyScriptInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale) override; - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode) override; - bool setTextCase(InputEngine::TextCase textCase) override; + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale) override; + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) override; + bool setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) override; bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) override; void reset() override; void update() override; - QList<SelectionListModel::Type> selectionLists() override; - int selectionListItemCount(SelectionListModel::Type type) override; - QVariant selectionListData(SelectionListModel::Type type, int index, int role) override; - void selectionListItemSelected(SelectionListModel::Type type, int index) override; + QList<QVirtualKeyboardSelectionListModel::Type> selectionLists() override; + int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) override; + QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) override; + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) override; - QList<InputEngine::PatternRecognitionMode> patternRecognitionModes() const override; - Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) override; - bool traceEnd(Trace *trace) override; + QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const override; + QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) override; + bool traceEnd(QVirtualKeyboardTrace *trace) override; bool clickPreeditText(int cursorPosition) override; diff --git a/src/plugins/openwnn/plugin/openwnninputmethod.cpp b/src/plugins/openwnn/plugin/openwnninputmethod.cpp index ce7496a7..4ec43134 100644 --- a/src/plugins/openwnn/plugin/openwnninputmethod.cpp +++ b/src/plugins/openwnn/plugin/openwnninputmethod.cpp @@ -65,7 +65,7 @@ public: OpenWnnInputMethodPrivate(OpenWnnInputMethod *q_ptr) : q_ptr(q_ptr), - inputMode(InputEngine::Latin), + inputMode(QVirtualKeyboardInputEngine::Latin), exactMatchMode(false), converter(nullptr), converterJAJP(), @@ -318,9 +318,9 @@ public: Q_Q(OpenWnnInputMethod); if (!candidateList.isEmpty() || !wasEmpty) - emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); if (previousActiveWordIndex != activeWordIndex) - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex); } void clearCandidates(bool deferUpdate = false) @@ -329,7 +329,7 @@ public: candidateList.clear(); if (!deferUpdate) { Q_Q(OpenWnnInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); } clearFocusCandidate(deferUpdate); } @@ -343,7 +343,7 @@ public: activeWordIndex++; if (activeWordIndex >= candidateList.size()) activeWordIndex = 0; - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex); return candidateList.at(activeWordIndex); } @@ -353,7 +353,7 @@ public: if (activeWordIndex != -1) { activeWordIndex = -1; if (!deferUpdate) - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex); } } @@ -373,7 +373,7 @@ public: enableConverter = false; } - if (inputMode != InputEngine::Hiragana || + if (inputMode != QVirtualKeyboardInputEngine::Hiragana || inputMethodHints.testFlag(Qt::ImhHiddenText) || inputMethodHints.testFlag(Qt::ImhSensitiveData) || inputMethodHints.testFlag(Qt::ImhNoPredictiveText)) { @@ -381,7 +381,7 @@ public: enablePrediction = false; emit q->selectionListsChanged(); } - } else if (inputMode == InputEngine::Hiragana && !enablePrediction) { + } else if (inputMode == QVirtualKeyboardInputEngine::Hiragana && !enablePrediction) { enablePrediction = true; emit q->selectionListsChanged(); } @@ -584,7 +584,7 @@ public: } OpenWnnInputMethod *q_ptr; - InputEngine::InputMode inputMode; + QVirtualKeyboardInputEngine::InputMode inputMode; bool exactMatchMode; QString displayText; OpenWnnEngineJAJP *converter; @@ -608,7 +608,7 @@ public: */ OpenWnnInputMethod::OpenWnnInputMethod(QObject *parent) : - AbstractInputMethod(parent), + QVirtualKeyboardAbstractInputMethod(parent), d_ptr(new OpenWnnInputMethodPrivate(this)) { } @@ -617,17 +617,17 @@ OpenWnnInputMethod::~OpenWnnInputMethod() { } -QList<InputEngine::InputMode> OpenWnnInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> OpenWnnInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<InputEngine::InputMode>() - << InputEngine::Hiragana - << InputEngine::Katakana - << InputEngine::FullwidthLatin - << InputEngine::Latin; + return QList<QVirtualKeyboardInputEngine::InputMode>() + << QVirtualKeyboardInputEngine::Hiragana + << QVirtualKeyboardInputEngine::Katakana + << QVirtualKeyboardInputEngine::FullwidthLatin + << QVirtualKeyboardInputEngine::Latin; } -bool OpenWnnInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool OpenWnnInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_D(OpenWnnInputMethod); @@ -635,11 +635,11 @@ bool OpenWnnInputMethod::setInputMode(const QString &locale, InputEngine::InputM return true; update(); switch (inputMode) { - case InputEngine::Hiragana: + case QVirtualKeyboardInputEngine::Hiragana: d->changeEngineMode(OpenWnnInputMethodPrivate::ENGINE_MODE_DEFAULT); break; - case InputEngine::Katakana: + case QVirtualKeyboardInputEngine::Katakana: d->changeEngineMode(OpenWnnInputMethodPrivate::ENGINE_MODE_FULL_KATAKANA); break; @@ -652,7 +652,7 @@ bool OpenWnnInputMethod::setInputMode(const QString &locale, InputEngine::InputM return true; } -bool OpenWnnInputMethod::setTextCase(InputEngine::TextCase textCase) +bool OpenWnnInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -768,40 +768,40 @@ bool OpenWnnInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard return false; } -QList<SelectionListModel::Type> OpenWnnInputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> OpenWnnInputMethod::selectionLists() { Q_D(OpenWnnInputMethod); if (!d->enablePrediction) - return QList<SelectionListModel::Type>(); - return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; + return QList<QVirtualKeyboardSelectionListModel::Type>(); + return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList; } -int OpenWnnInputMethod::selectionListItemCount(SelectionListModel::Type type) +int OpenWnnInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { Q_UNUSED(type) Q_D(OpenWnnInputMethod); return d->candidateList.size(); } -QVariant OpenWnnInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant OpenWnnInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { QVariant result; Q_D(OpenWnnInputMethod); switch (role) { - case SelectionListModel::DisplayRole: + case QVirtualKeyboardSelectionListModel::DisplayRole: result = QVariant(d->candidateList.at(index)->candidate); break; - case SelectionListModel::WordCompletionLengthRole: + case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: - result = AbstractInputMethod::selectionListData(type, index, role); + result = QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role); break; } return result; } -void OpenWnnInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void OpenWnnInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(OpenWnnInputMethod); diff --git a/src/plugins/openwnn/plugin/openwnninputmethod_p.h b/src/plugins/openwnn/plugin/openwnninputmethod_p.h index fa8cd4f4..c7b2938c 100644 --- a/src/plugins/openwnn/plugin/openwnninputmethod_p.h +++ b/src/plugins/openwnn/plugin/openwnninputmethod_p.h @@ -48,7 +48,7 @@ namespace QtVirtualKeyboard { class OpenWnnInputMethodPrivate; -class OpenWnnInputMethod : public AbstractInputMethod +class OpenWnnInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(OpenWnnInputMethod) @@ -57,16 +57,16 @@ public: explicit OpenWnnInputMethod(QObject *parent = nullptr); ~OpenWnnInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::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<QVirtualKeyboardSelectionListModel::Type> selectionLists(); + int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type); + QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role); + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index); void reset(); void update(); diff --git a/src/plugins/pinyin/plugin/pinyininputmethod.cpp b/src/plugins/pinyin/plugin/pinyininputmethod.cpp index 601d5e56..f7aaf991 100644 --- a/src/plugins/pinyin/plugin/pinyininputmethod.cpp +++ b/src/plugins/pinyin/plugin/pinyininputmethod.cpp @@ -51,7 +51,7 @@ public: PinyinInputMethodPrivate(PinyinInputMethod *q_ptr) : q_ptr(q_ptr), - inputMode(InputEngine::Pinyin), + inputMode(QVirtualKeyboardInputEngine::Pinyin), pinyinDecoderService(PinyinDecoderService::getInstance()), state(Idle), surface(), @@ -70,7 +70,7 @@ public: { Q_Q(PinyinInputMethod); - InputContext *inputContext = q->inputContext(); + QVirtualKeyboardInputContext *inputContext = q->inputContext(); // Disable the user dictionary when entering sensitive data if (inputContext) { @@ -281,16 +281,16 @@ public: void updateCandidateList() { Q_Q(PinyinInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, totalChoicesNum > 0 && state == PinyinInputMethodPrivate::Input ? 0 : -1); } bool canDoPrediction() { Q_Q(PinyinInputMethod); - InputContext *inputContext = q->inputContext(); - return inputMode == InputEngine::Pinyin && + QVirtualKeyboardInputContext *inputContext = q->inputContext(); + return inputMode == QVirtualKeyboardInputEngine::Pinyin && composingStr.length() == fixedLen && inputContext && !inputContext->inputMethodHints().testFlag(Qt::ImhNoPredictiveText); @@ -303,7 +303,7 @@ public: Q_Q(PinyinInputMethod); if (state != Predict) resetToIdleState(); - InputContext *inputContext = q->inputContext(); + QVirtualKeyboardInputContext *inputContext = q->inputContext(); int cursorPosition = inputContext->cursorPosition(); int historyStart = qMax(0, cursorPosition - 3); QString history = inputContext->surroundingText().mid(historyStart, cursorPosition - historyStart); @@ -320,7 +320,7 @@ public: } PinyinInputMethod *q_ptr; - InputEngine::InputMode inputMode; + QVirtualKeyboardInputEngine::InputMode inputMode; QPointer<PinyinDecoderService> pinyinDecoderService; State state; QString surface; @@ -365,7 +365,7 @@ private: */ PinyinInputMethod::PinyinInputMethod(QObject *parent) : - AbstractInputMethod(parent), + QVirtualKeyboardAbstractInputMethod(parent), d_ptr(new PinyinInputMethodPrivate(this)) { } @@ -374,29 +374,29 @@ PinyinInputMethod::~PinyinInputMethod() { } -QList<InputEngine::InputMode> PinyinInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> PinyinInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) Q_D(PinyinInputMethod); - QList<InputEngine::InputMode> result; + QList<QVirtualKeyboardInputEngine::InputMode> result; if (d->pinyinDecoderService) - result << InputEngine::Pinyin; - result << InputEngine::Latin; + result << QVirtualKeyboardInputEngine::Pinyin; + result << QVirtualKeyboardInputEngine::Latin; return result; } -bool PinyinInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool PinyinInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_D(PinyinInputMethod); reset(); - if (inputMode == InputEngine::Pinyin && !d->pinyinDecoderService) + if (inputMode == QVirtualKeyboardInputEngine::Pinyin && !d->pinyinDecoderService) return false; d->inputMode = inputMode; return true; } -bool PinyinInputMethod::setTextCase(InputEngine::TextCase textCase) +bool PinyinInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -406,7 +406,7 @@ bool PinyinInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardM { Q_UNUSED(modifiers) Q_D(PinyinInputMethod); - if (d->inputMode == InputEngine::Pinyin) { + if (d->inputMode == QVirtualKeyboardInputEngine::Pinyin) { ScopedCandidateListUpdate scopedCandidateListUpdate(d); Q_UNUSED(scopedCandidateListUpdate) if ((key >= Qt::Key_A && key <= Qt::Key_Z) || (key == Qt::Key_Apostrophe)) { @@ -440,38 +440,38 @@ bool PinyinInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardM return false; } -QList<SelectionListModel::Type> PinyinInputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> PinyinInputMethod::selectionLists() { - return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; + return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList; } -int PinyinInputMethod::selectionListItemCount(SelectionListModel::Type type) +int PinyinInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { Q_UNUSED(type) Q_D(PinyinInputMethod); return d->candidatesCount(); } -QVariant PinyinInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant PinyinInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { QVariant result; Q_UNUSED(type) Q_D(PinyinInputMethod); switch (role) { - case SelectionListModel::DisplayRole: + case QVirtualKeyboardSelectionListModel::DisplayRole: result = QVariant(d->candidateAt(index)); break; - case SelectionListModel::WordCompletionLengthRole: + case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: - result = AbstractInputMethod::selectionListData(type, index, role); + result = QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role); break; } return result; } -void PinyinInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void PinyinInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(PinyinInputMethod); diff --git a/src/plugins/pinyin/plugin/pinyininputmethod_p.h b/src/plugins/pinyin/plugin/pinyininputmethod_p.h index 7c613069..0875e679 100644 --- a/src/plugins/pinyin/plugin/pinyininputmethod_p.h +++ b/src/plugins/pinyin/plugin/pinyininputmethod_p.h @@ -48,7 +48,7 @@ namespace QtVirtualKeyboard { class PinyinInputMethodPrivate; -class PinyinInputMethod : public AbstractInputMethod +class PinyinInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(PinyinInputMethod) @@ -57,16 +57,16 @@ public: explicit PinyinInputMethod(QObject *parent = nullptr); ~PinyinInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::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<QVirtualKeyboardSelectionListModel::Type> selectionLists(); + int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type); + QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role); + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index); void reset(); void update(); diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp index 071826c5..5f1b055b 100644 --- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp +++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp @@ -73,7 +73,7 @@ public: textCaseList.clear(); } - void ensureLength(int length, InputEngine::TextCase textCase) + void ensureLength(int length, QVirtualKeyboardInputEngine::TextCase textCase) { if (length <= 0) { textCaseList.clear(); @@ -88,11 +88,11 @@ public: QString formatString(const QString &str) const { QString result; - InputEngine::TextCase textCase = InputEngine::Lower; + QVirtualKeyboardInputEngine::TextCase textCase = QVirtualKeyboardInputEngine::Lower; for (int i = 0; i < str.length(); ++i) { if (i < textCaseList.length()) textCase = textCaseList.at(i); - result.append(textCase == InputEngine::Upper ? str.at(i).toUpper() : (preferLowercase ? str.at(i).toLower() : str.at(i))); + result.append(textCase == QVirtualKeyboardInputEngine::Upper ? str.at(i).toUpper() : (preferLowercase ? str.at(i).toLower() : str.at(i))); } return result; } @@ -100,7 +100,7 @@ public: bool preferLowercase; private: - QList<InputEngine::TextCase> textCaseList; + QList<QVirtualKeyboardInputEngine::TextCase> textCaseList; }; class T9WriteInputMethodPrivate @@ -136,7 +136,7 @@ public: activeWordIndex(-1), arcAdditionStarted(false), ignoreUpdate(false), - textCase(InputEngine::Lower) + textCase(QVirtualKeyboardInputEngine::Lower) #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT , unipenTrace() #endif @@ -416,7 +416,7 @@ public: Q_ASSERT(status == decumaNoError); } - bool setInputMode(const QLocale &locale, InputEngine::InputMode inputMode) + bool setInputMode(const QLocale &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_Q(T9WriteInputMethod); qCDebug(lcT9Write) << "T9WriteInputMethodPrivate::setInputMode():" << locale << inputMode; @@ -517,7 +517,7 @@ public: #endif } - DECUMA_UINT32 mapToDecumaLanguage(const QLocale &locale, InputEngine::InputMode inputMode) + DECUMA_UINT32 mapToDecumaLanguage(const QLocale &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { static const QLocale::Language maxLanguage = QLocale::Vietnamese; static const DECUMA_UINT32 languageMap[maxLanguage + 1] = { @@ -662,24 +662,24 @@ public: DECUMA_UINT32 language = languageMap[localeLanguage]; if (language == DECUMA_LANG_PRC) { - if (inputMode != InputEngine::ChineseHandwriting) + if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting) language = DECUMA_LANG_EN; else if (locale.script() == QLocale::TraditionalChineseScript) language = (locale.country() == QLocale::HongKong) ? DECUMA_LANG_HK : DECUMA_LANG_TW; } else if (language == DECUMA_LANG_JP) { - if (inputMode != InputEngine::JapaneseHandwriting) + if (inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting) language = DECUMA_LANG_EN; } else if (language == DECUMA_LANG_KO) { - if (inputMode != InputEngine::KoreanHandwriting) + if (inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) language = DECUMA_LANG_EN; } else if (language == DECUMA_LANG_SRCY) { - if (inputMode != InputEngine::Cyrillic) + if (inputMode != QVirtualKeyboardInputEngine::Cyrillic) language = DECUMA_LANG_SRLA; } else if (language == DECUMA_LANG_AR || language == DECUMA_LANG_FA) { - if (inputMode != InputEngine::Arabic && inputMode != InputEngine::Numeric) + if (inputMode != QVirtualKeyboardInputEngine::Arabic && inputMode != QVirtualKeyboardInputEngine::Numeric) language = DECUMA_LANG_EN; } else if (language == DECUMA_LANG_IW) { - if (inputMode != InputEngine::Hebrew) + if (inputMode != QVirtualKeyboardInputEngine::Hebrew) language = DECUMA_LANG_EN; } @@ -687,7 +687,7 @@ public: } void updateRecognitionMode(DECUMA_UINT32 language, const QLocale &locale, - InputEngine::InputMode inputMode) + QVirtualKeyboardInputEngine::InputMode inputMode) { Q_Q(T9WriteInputMethod); Q_UNUSED(language) @@ -702,7 +702,7 @@ public: #if T9WRITEAPIMAJORVERNUM >= 21 if (!cjk) { switch (inputMode) { - case InputEngine::Latin: + case QVirtualKeyboardInputEngine::Latin: switch (language) { case DECUMA_LANG_EN: case DECUMA_LANG_FR: @@ -715,7 +715,7 @@ public: break; } break; - case InputEngine::Arabic: + case QVirtualKeyboardInputEngine::Arabic: sessionSettings.recognitionMode = ucrMode; break; default: @@ -725,9 +725,9 @@ public: #endif // Use scrMode with hidden text or with no predictive mode - if (inputMode != InputEngine::ChineseHandwriting && - inputMode != InputEngine::JapaneseHandwriting && - inputMode != InputEngine::KoreanHandwriting) { + if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting && + inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting && + inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) { const Qt::InputMethodHints inputMethodHints = q->inputContext()->inputMethodHints(); if (inputMethodHints.testFlag(Qt::ImhHiddenText) || inputMethodHints.testFlag(Qt::ImhNoPredictiveText)) sessionSettings.recognitionMode = scrMode; @@ -735,7 +735,7 @@ public: } bool updateSymbolCategories(DECUMA_UINT32 language, const QLocale &locale, - InputEngine::InputMode inputMode) + QVirtualKeyboardInputEngine::InputMode inputMode) { // Handle CJK in separate method if (cjk) @@ -748,7 +748,7 @@ public: Q_Q(T9WriteInputMethod); const Qt::InputMethodHints inputMethodHints = q->inputContext()->inputMethodHints(); switch (inputMode) { - case InputEngine::Latin: + case QVirtualKeyboardInputEngine::Latin: if (inputMethodHints.testFlag(Qt::ImhEmailCharactersOnly)) { symbolCategories.append(DECUMA_CATEGORY_EMAIL); } else if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly)) { @@ -769,7 +769,7 @@ public: } break; - case InputEngine::Numeric: + case QVirtualKeyboardInputEngine::Numeric: if (language == DECUMA_LANG_AR || language == DECUMA_LANG_FA) { symbolCategories.append(DECUMA_CATEGORY_ARABIC_NUM_MODE); symbolCategories.append(DECUMA_CATEGORY_ARABIC_GESTURES); @@ -781,11 +781,11 @@ public: symbolCategories.append(DECUMA_CATEGORY_NUM_SUP); break; - case InputEngine::Dialable: + case QVirtualKeyboardInputEngine::Dialable: symbolCategories.append(DECUMA_CATEGORY_PHONE_NUMBER); break; - case InputEngine::Greek: + case QVirtualKeyboardInputEngine::Greek: symbolCategories.append(DECUMA_CATEGORY_GREEK); symbolCategories.append(DECUMA_CATEGORY_QUEST_EXCL_MARK_PUNCTUATIONS); symbolCategories.append(DECUMA_CATEGORY_PERIOD_COMMA_PUNCTUATIONS); @@ -794,7 +794,7 @@ public: symbolCategories.append(DECUMA_CATEGORY_CONTRACTION_MARK); break; - case InputEngine::Cyrillic: + case QVirtualKeyboardInputEngine::Cyrillic: symbolCategories.append(DECUMA_CATEGORY_CYRILLIC); symbolCategories.append(DECUMA_CATEGORY_QUEST_EXCL_MARK_PUNCTUATIONS); symbolCategories.append(DECUMA_CATEGORY_PERIOD_COMMA_PUNCTUATIONS); @@ -803,13 +803,13 @@ public: symbolCategories.append(DECUMA_CATEGORY_CONTRACTION_MARK); break; - case InputEngine::Arabic: + case QVirtualKeyboardInputEngine::Arabic: symbolCategories.append(DECUMA_CATEGORY_ARABIC_ISOLATED_LETTER_MODE); symbolCategories.append(DECUMA_CATEGORY_ARABIC_GESTURES); leftToRightGestures = false; break; - case InputEngine::Hebrew: + case QVirtualKeyboardInputEngine::Hebrew: symbolCategories.append(DECUMA_CATEGORY_HEBREW_GL_HEBREW_CURSIVE_MODE); symbolCategories.append(DECUMA_CATEGORY_HEBREW_GL_HEBREW_LETTERSYMBOLS); symbolCategories.append(DECUMA_CATEGORY_HEBREW_SHEQEL); @@ -832,31 +832,31 @@ public: } bool updateSymbolCategoriesCjk(DECUMA_UINT32 language, const QLocale &locale, - InputEngine::InputMode inputMode) + QVirtualKeyboardInputEngine::InputMode inputMode) { Q_ASSERT(cjk); symbolCategories.clear(); switch (inputMode) { - case InputEngine::Latin: + case QVirtualKeyboardInputEngine::Latin: symbolCategories.append(DECUMA_CATEGORY_ANSI); symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL); symbolCategories.append(DECUMA_CATEGORY_PUNCTUATIONS); break; - case InputEngine::Numeric: + case QVirtualKeyboardInputEngine::Numeric: symbolCategories.append(DECUMA_CATEGORY_DIGIT); symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL); symbolCategories.append(DECUMA_CATEGORY_PUNCTUATIONS); break; - case InputEngine::Dialable: + case QVirtualKeyboardInputEngine::Dialable: symbolCategories.append(DECUMA_CATEGORY_DIGIT); symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL); break; - case InputEngine::ChineseHandwriting: + case QVirtualKeyboardInputEngine::ChineseHandwriting: switch (locale.script()) { case QLocale::SimplifiedChineseScript: symbolCategories.append(DECUMA_CATEGORY_GB2312_A); @@ -883,7 +883,7 @@ public: } break; - case InputEngine::JapaneseHandwriting: + case QVirtualKeyboardInputEngine::JapaneseHandwriting: symbolCategories.append(DECUMA_CATEGORY_JIS_LEVEL_1); symbolCategories.append(DECUMA_CATEGORY_JIS_LEVEL_2); symbolCategories.append(DECUMA_CATEGORY_HIRAGANA); @@ -895,7 +895,7 @@ public: symbolCategories.append(DECUMA_CATEGORY_PUNCTUATIONS); break; - case InputEngine::KoreanHandwriting: + case QVirtualKeyboardInputEngine::KoreanHandwriting: symbolCategories.append(DECUMA_CATEGORY_HANGUL_1001_A); symbolCategories.append(DECUMA_CATEGORY_HANGUL_1001_B); symbolCategories.append(DECUMA_CATEGORY_CJK_SYMBOL); @@ -984,7 +984,7 @@ public: } } - QByteArray getContext(InputEngine::PatternRecognitionMode patternRecognitionMode, + QByteArray getContext(QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) const { @@ -1001,7 +1001,7 @@ public: return hash.result(); } - void setContext(InputEngine::PatternRecognitionMode patternRecognitionMode, + void setContext(QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo, const QByteArray &context) @@ -1027,8 +1027,8 @@ public: stringStart = preeditText; wordCandidates.append(preeditText); activeWordIndex = 0; - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex); } const int dpi = traceCaptureDeviceInfo.value("dpi", 96).toInt(); @@ -1056,8 +1056,9 @@ public: Q_ASSERT(status == decumaNoError); } - Trace *traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) + QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { if (!worker) return nullptr; @@ -1102,7 +1103,7 @@ public: arcAdditionStarted = true; } - Trace *trace = new Trace(); + QVirtualKeyboardTrace *trace = new QVirtualKeyboardTrace(); #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT trace->setChannels(QStringList("t")); #endif @@ -1111,7 +1112,7 @@ public: return trace; } - void traceEnd(Trace *trace) + void traceEnd(QVirtualKeyboardTrace *trace) { if (trace->isCanceled()) { traceList.removeOne(trace); @@ -1135,7 +1136,7 @@ public: int countActiveTraces() const { int count = 0; - for (Trace *trace : qAsConst(traceList)) { + for (QVirtualKeyboardTrace *trace : qAsConst(traceList)) { if (!trace->isFinal()) count++; } @@ -1238,8 +1239,8 @@ public: activeWordIndex = -1; if (emitSelectionListChanged) { Q_Q(T9WriteInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex); } result = true; } @@ -1283,7 +1284,7 @@ public: if (finalWord.length() == 1) { // In recording mode, the text case must match with the current text case QChar ch(finalWord.at(0)); - if (!ch.isLetter() || (ch.isUpper() == (textCase == InputEngine::Upper))) { + if (!ch.isLetter() || (ch.isUpper() == (textCase == QVirtualKeyboardInputEngine::Upper))) { QStringList homeLocations = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); if (!homeLocations.isEmpty()) { unipenTrace->setDirectory(QStringLiteral("%1/%2").arg(homeLocations.at(0)).arg("VIRTUAL_KEYBOARD_TRACES")); @@ -1332,7 +1333,7 @@ public: { qCDebug(lcT9Write) << "T9WriteInputMethodPrivate::processResult()"; Q_Q(T9WriteInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); if (!ic) return; @@ -1359,7 +1360,7 @@ public: if (i == 0) { if (ic->shift()) { caseFormatter.ensureLength(1, textCase); - caseFormatter.ensureLength(resultChars.length(), InputEngine::Lower); + caseFormatter.ensureLength(resultChars.length(), QVirtualKeyboardInputEngine::Lower); } else { caseFormatter.ensureLength(resultChars.length(), textCase); } @@ -1415,14 +1416,14 @@ public: #ifndef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT // Delete trace history // Note: We have to be sure there are no background tasks - // running since the Trace objects consumed there. + // running since the QVirtualKeyboardTrace objects consumed there. if (worker->numberOfPendingTasks() == 0) { - const InputEngine::InputMode inputMode = q->inputEngine()->inputMode(); + const QVirtualKeyboardInputEngine::InputMode inputMode = q->inputEngine()->inputMode(); if (sessionSettings.recognitionMode == mcrMode && !symbolStrokes.isEmpty() && - inputMode != InputEngine::ChineseHandwriting && - inputMode != InputEngine::JapaneseHandwriting && - inputMode != InputEngine::KoreanHandwriting) { + inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting && + inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting && + inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) { int activeTraces = symbolStrokes.at(symbolStrokes.count() - 1).toInt(); if (symbolStrokes.count() > 1) activeTraces += symbolStrokes.at(symbolStrokes.count() - 2).toInt(); @@ -1462,8 +1463,8 @@ public: wordCandidates = newWordCandidates; wordCandidatesHwrResultIndex = newWordCandidatesHwrResultIndex; activeWordIndex = wordCandidates.isEmpty() ? -1 : 0; - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, activeWordIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, activeWordIndex); } if (arcAdditionStarted && traceList.isEmpty() && worker->numberOfPendingTasks() == 0) { @@ -1499,7 +1500,7 @@ public: bool applyGesture(const QChar &gesture) { Q_Q(T9WriteInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); switch (gesture.unicode()) { case '\b': return ic->inputEngine()->virtualKeyClick(Qt::Key_Backspace, QString(), Qt::NoModifier); @@ -1531,7 +1532,7 @@ public: if (swipeLength >= instantGestureSettings.widthThreshold) { Q_Q(T9WriteInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); if (!ic) return false; @@ -1549,10 +1550,10 @@ public: } // Swipe right - const InputEngine::InputMode inputMode = q->inputEngine()->inputMode(); - if (inputMode != InputEngine::ChineseHandwriting && - inputMode != InputEngine::JapaneseHandwriting && - inputMode != InputEngine::KoreanHandwriting) { + const QVirtualKeyboardInputEngine::InputMode inputMode = q->inputEngine()->inputMode(); + if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting && + inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting && + inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) { if (swipeAngle <= SWIPE_ANGLE_THRESHOLD || swipeAngle >= 360 - SWIPE_ANGLE_THRESHOLD) { if (swipeTouchCount == 1) { // Single swipe: space @@ -1571,17 +1572,17 @@ public: if (!(ic->inputMethodHints() & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly))) { QList<int> inputModes = ic->inputEngine()->inputModes(); // Filter out duplicate numeric mode (in favor of Numeric) - int indexOfNumericInputMode = inputModes.indexOf(InputEngine::Numeric); - int indexOfDialableInputMode = inputModes.indexOf(InputEngine::Dialable); + int indexOfNumericInputMode = inputModes.indexOf(QVirtualKeyboardInputEngine::Numeric); + int indexOfDialableInputMode = inputModes.indexOf(QVirtualKeyboardInputEngine::Dialable); if (indexOfNumericInputMode != -1 && indexOfDialableInputMode != -1) - inputModes.removeAt(inputMode != InputEngine::Dialable ? + inputModes.removeAt(inputMode != QVirtualKeyboardInputEngine::Dialable ? indexOfDialableInputMode : indexOfNumericInputMode); if (inputModes.count() > 1) { int inputModeIndex = inputModes.indexOf((int)inputMode) + 1; if (inputModeIndex >= inputModes.count()) inputModeIndex = 0; - ic->inputEngine()->setInputMode((InputEngine::InputMode)inputModes.at(inputModeIndex)); + ic->inputEngine()->setInputMode((QVirtualKeyboardInputEngine::InputMode)inputModes.at(inputModeIndex)); } } return true; @@ -1606,7 +1607,7 @@ public: { if (c.isPunct() || c.isSymbol()) { Q_Q(const T9WriteInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); if (ic) { Qt::InputMethodHints inputMethodHints = ic->inputMethodHints(); if (inputMethodHints.testFlag(Qt::ImhUrlCharactersOnly) || inputMethodHints.testFlag(Qt::ImhEmailCharactersOnly)) @@ -1632,7 +1633,7 @@ public: QVector<DECUMA_UINT32> languageCategories; QVector<DECUMA_UINT32> symbolCategories; QScopedPointer<T9WriteWorker> worker; - QList<Trace *> traceList; + QList<QVirtualKeyboardTrace *> traceList; int traceListHardLimit; QMutex dictionaryLock; QString dictionaryFileName; @@ -1655,7 +1656,7 @@ public: int activeWordIndex; bool arcAdditionStarted; bool ignoreUpdate; - InputEngine::TextCase textCase; + QVirtualKeyboardInputEngine::TextCase textCase; T9WriteCaseFormatter caseFormatter; HandwritingGestureRecognizer gestureRecognizer; #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT @@ -1676,7 +1677,7 @@ const DECUMA_MEM_FUNCTIONS T9WriteInputMethodPrivate::memFuncs = { */ T9WriteInputMethod::T9WriteInputMethod(QObject *parent) : - AbstractInputMethod(parent), + QVirtualKeyboardAbstractInputMethod(parent), d_ptr(new T9WriteInputMethodPrivate(this)) { } @@ -1687,10 +1688,10 @@ T9WriteInputMethod::~T9WriteInputMethod() d->exitEngine(); } -QList<InputEngine::InputMode> T9WriteInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> T9WriteInputMethod::inputModes(const QString &locale) { Q_D(T9WriteInputMethod); - QList<InputEngine::InputMode> availableInputModes; + QList<QVirtualKeyboardInputEngine::InputMode> availableInputModes; const Qt::InputMethodHints inputMethodHints(inputContext()->inputMethodHints()); const QLocale loc(locale); T9WriteInputMethodPrivate::EngineMode mode = d->mapLocaleToEngineMode(loc); @@ -1704,28 +1705,28 @@ QList<InputEngine::InputMode> T9WriteInputMethod::inputModes(const QString &loca if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly))) { switch (loc.script()) { case QLocale::GreekScript: - availableInputModes.append(InputEngine::Greek); + availableInputModes.append(QVirtualKeyboardInputEngine::Greek); break; case QLocale::CyrillicScript: - availableInputModes.append(InputEngine::Cyrillic); + availableInputModes.append(QVirtualKeyboardInputEngine::Cyrillic); break; default: break; } - availableInputModes.append(InputEngine::Latin); + availableInputModes.append(QVirtualKeyboardInputEngine::Latin); } break; case T9WriteInputMethodPrivate::Arabic: if (d->findHwrDb(T9WriteInputMethodPrivate::Arabic, d->defaultHwrDbPath).isEmpty()) return availableInputModes; if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly))) - availableInputModes.append(InputEngine::Arabic); + availableInputModes.append(QVirtualKeyboardInputEngine::Arabic); break; case T9WriteInputMethodPrivate::Hebrew: if (d->findHwrDb(T9WriteInputMethodPrivate::Hebrew, d->defaultHwrDbPath).isEmpty()) return availableInputModes; if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly))) - availableInputModes.append(InputEngine::Hebrew); + availableInputModes.append(QVirtualKeyboardInputEngine::Hebrew); break; #endif #ifdef HAVE_T9WRITE_CJK @@ -1735,19 +1736,19 @@ QList<InputEngine::InputMode> T9WriteInputMethod::inputModes(const QString &loca if (d->findHwrDb(mode, d->defaultHwrDbPath).isEmpty()) return availableInputModes; if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly))) - availableInputModes.append(InputEngine::ChineseHandwriting); + availableInputModes.append(QVirtualKeyboardInputEngine::ChineseHandwriting); break; case T9WriteInputMethodPrivate::Japanese: if (d->findHwrDb(T9WriteInputMethodPrivate::Japanese, d->defaultHwrDbPath).isEmpty()) return availableInputModes; if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly))) - availableInputModes.append(InputEngine::JapaneseHandwriting); + availableInputModes.append(QVirtualKeyboardInputEngine::JapaneseHandwriting); break; case T9WriteInputMethodPrivate::Korean: if (d->findHwrDb(T9WriteInputMethodPrivate::Korean, d->defaultHwrDbPath).isEmpty()) return availableInputModes; if (!(inputMethodHints & (Qt::ImhDialableCharactersOnly | Qt::ImhFormattedNumbersOnly | Qt::ImhDigitsOnly | Qt::ImhLatinOnly))) - availableInputModes.append(InputEngine::KoreanHandwriting); + availableInputModes.append(QVirtualKeyboardInputEngine::KoreanHandwriting); break; #endif default: @@ -1756,30 +1757,30 @@ QList<InputEngine::InputMode> T9WriteInputMethod::inputModes(const QString &loca // Add exclusive input modes if (inputMethodHints.testFlag(Qt::ImhDialableCharactersOnly) || inputMethodHints.testFlag(Qt::ImhDigitsOnly)) { - availableInputModes.append(InputEngine::Dialable); + availableInputModes.append(QVirtualKeyboardInputEngine::Dialable); } else if (inputMethodHints.testFlag(Qt::ImhFormattedNumbersOnly)) { - availableInputModes.append(InputEngine::Numeric); + availableInputModes.append(QVirtualKeyboardInputEngine::Numeric); } else if (inputMethodHints.testFlag(Qt::ImhLatinOnly)) { - availableInputModes.append(InputEngine::Latin); + availableInputModes.append(QVirtualKeyboardInputEngine::Latin); } else { // Add other input modes Q_ASSERT(!availableInputModes.isEmpty()); - if (!availableInputModes.contains(InputEngine::Latin)) - availableInputModes.append(InputEngine::Latin); - availableInputModes.append(InputEngine::Numeric); + if (!availableInputModes.contains(QVirtualKeyboardInputEngine::Latin)) + availableInputModes.append(QVirtualKeyboardInputEngine::Latin); + availableInputModes.append(QVirtualKeyboardInputEngine::Numeric); } return availableInputModes; } -bool T9WriteInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool T9WriteInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_D(T9WriteInputMethod); d->select(); return d->setInputMode(QLocale(locale), inputMode); } -bool T9WriteInputMethod::setTextCase(InputEngine::TextCase textCase) +bool T9WriteInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_D(T9WriteInputMethod); d->textCase = textCase; @@ -1801,7 +1802,7 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard case Qt::Key_Backspace: { - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); QString preeditText = ic->preeditText(); if (preeditText.length() > 1) { preeditText.chop(1); @@ -1821,8 +1822,8 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard d->stringStart = preeditText; d->wordCandidates.append(preeditText); d->activeWordIndex = 0; - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->activeWordIndex); return true; } else { bool result = !preeditText.isEmpty(); @@ -1839,7 +1840,7 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard default: if (d->sessionSettings.recognitionMode != scrMode && text.length() > 0) { d->waitForRecognitionResults(); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); QString preeditText = ic->preeditText(); QChar c = text.at(0); bool addToWord = d->isValidInputChar(c) && (!preeditText.isEmpty() || !d->isJoiner(c)); @@ -1853,8 +1854,8 @@ bool T9WriteInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::Keyboard d->stringStart = preeditText; d->wordCandidates.append(preeditText); d->activeWordIndex = 0; - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->activeWordIndex); return true; } else { ic->commit(); @@ -1883,82 +1884,83 @@ void T9WriteInputMethod::update() d->select(); } -QList<SelectionListModel::Type> T9WriteInputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> T9WriteInputMethod::selectionLists() { - return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; + return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList; } -int T9WriteInputMethod::selectionListItemCount(SelectionListModel::Type type) +int T9WriteInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { Q_UNUSED(type) Q_D(T9WriteInputMethod); return d->wordCandidates.count(); } -QVariant T9WriteInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant T9WriteInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { QVariant result; Q_D(T9WriteInputMethod); switch (role) { - case SelectionListModel::DisplayRole: + case QVirtualKeyboardSelectionListModel::DisplayRole: result = QVariant(d->wordCandidates.at(index)); break; - case SelectionListModel::WordCompletionLengthRole: + case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: - result = AbstractInputMethod::selectionListData(type, index, role); + result = QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role); break; } return result; } -void T9WriteInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void T9WriteInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(T9WriteInputMethod); d->select(index); } -QList<InputEngine::PatternRecognitionMode> T9WriteInputMethod::patternRecognitionModes() const +QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> T9WriteInputMethod::patternRecognitionModes() const { - return QList<InputEngine::PatternRecognitionMode>() - << InputEngine::HandwritingRecoginition; + return QList<QVirtualKeyboardInputEngine::PatternRecognitionMode>() + << QVirtualKeyboardInputEngine::HandwritingRecoginition; } -Trace *T9WriteInputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +QVirtualKeyboardTrace *T9WriteInputMethod::traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_D(T9WriteInputMethod); return d->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); } -bool T9WriteInputMethod::traceEnd(Trace *trace) +bool T9WriteInputMethod::traceEnd(QVirtualKeyboardTrace *trace) { Q_D(T9WriteInputMethod); d->traceEnd(trace); return true; } -bool T9WriteInputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) +bool T9WriteInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags) { Q_D(T9WriteInputMethod); if (d->sessionSettings.recognitionMode == scrMode) return false; - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (!ic) return false; - const InputEngine::InputMode inputMode = inputEngine()->inputMode(); - const int maxLength = (inputMode == InputEngine::ChineseHandwriting || - inputMode == InputEngine::JapaneseHandwriting || - inputMode == InputEngine::KoreanHandwriting) ? 0 : 32; + const QVirtualKeyboardInputEngine::InputMode inputMode = inputEngine()->inputMode(); + const int maxLength = (inputMode == QVirtualKeyboardInputEngine::ChineseHandwriting || + inputMode == QVirtualKeyboardInputEngine::JapaneseHandwriting || + inputMode == QVirtualKeyboardInputEngine::KoreanHandwriting) ? 0 : 32; const QString surroundingText = ic->surroundingText(); int replaceFrom = 0; - if (reselectFlags.testFlag(InputEngine::WordBeforeCursor)) { + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordBeforeCursor)) { for (int i = cursorPosition - 1; i >= 0 && d->stringStart.length() < maxLength; --i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -1973,12 +1975,12 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const InputEngine::Reselec } } - if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == 0) { + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == 0) { d->stringStart.clear(); return false; } - if (reselectFlags.testFlag(InputEngine::WordAfterCursor)) { + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAfterCursor)) { for (int i = cursorPosition; i < surroundingText.length() && d->stringStart.length() < maxLength; ++i) { QChar c = surroundingText.at(i); if (!d->isValidInputChar(c)) @@ -1997,7 +1999,7 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const InputEngine::Reselec if (d->stringStart.isEmpty()) return false; - if (reselectFlags.testFlag(InputEngine::WordAtCursor) && replaceFrom == -d->stringStart.length() && d->stringStart.length() < maxLength) { + if (reselectFlags.testFlag(QVirtualKeyboardInputEngine::WordAtCursor) && replaceFrom == -d->stringStart.length() && d->stringStart.length() < maxLength) { d->stringStart.clear(); return false; } @@ -2014,11 +2016,11 @@ bool T9WriteInputMethod::reselect(int cursorPosition, const InputEngine::Reselec 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() ? InputEngine::Upper : InputEngine::Lower); + d->caseFormatter.ensureLength(i + 1, d->stringStart.at(i).isUpper() ? QVirtualKeyboardInputEngine::Upper : QVirtualKeyboardInputEngine::Lower); d->wordCandidates.append(d->stringStart); d->activeWordIndex = 0; - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->activeWordIndex); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->activeWordIndex); return true; } @@ -2048,10 +2050,10 @@ void T9WriteInputMethod::timerEvent(QTimerEvent *timerEvent) return; } - const InputEngine::InputMode inputMode = inputEngine()->inputMode(); - if (inputMode != InputEngine::ChineseHandwriting && - inputMode != InputEngine::JapaneseHandwriting && - inputMode != InputEngine::KoreanHandwriting) { + const QVirtualKeyboardInputEngine::InputMode inputMode = inputEngine()->inputMode(); + if (inputMode != QVirtualKeyboardInputEngine::ChineseHandwriting && + inputMode != QVirtualKeyboardInputEngine::JapaneseHandwriting && + inputMode != QVirtualKeyboardInputEngine::KoreanHandwriting) { d->clearTraces(); } #endif @@ -2073,7 +2075,7 @@ void T9WriteInputMethod::dictionaryLoadCompleted(QSharedPointer<T9WriteDictionar qCDebug(lcT9Write) << "T9WriteInputMethod::dictionaryLoadCompleted():" << dictionary->fileName() << dictionary->data() << dictionary->size(); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (ic && dictionary->fileName() == d->dictionaryFileName) { d->loadedDictionary = dictionary; if (d->sessionSettings.recognitionMode != scrMode && diff --git a/src/plugins/t9write/plugin/t9writeinputmethod_p.h b/src/plugins/t9write/plugin/t9writeinputmethod_p.h index 26f48a93..c1b570a2 100644 --- a/src/plugins/t9write/plugin/t9writeinputmethod_p.h +++ b/src/plugins/t9write/plugin/t9writeinputmethod_p.h @@ -50,7 +50,7 @@ namespace QtVirtualKeyboard { class T9WriteInputMethodPrivate; class T9WriteDictionary; -class T9WriteInputMethod : public AbstractInputMethod +class T9WriteInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(T9WriteInputMethod) @@ -59,26 +59,27 @@ public: explicit T9WriteInputMethod(QObject *parent = nullptr); ~T9WriteInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); void reset(); void update(); - 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<QVirtualKeyboardSelectionListModel::Type> selectionLists(); + int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type); + QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role); + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::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); + QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const; + QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + bool traceEnd(QVirtualKeyboardTrace *trace); - bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); + bool reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags); signals: void resultListChanged(); diff --git a/src/plugins/t9write/plugin/t9writeworker.cpp b/src/plugins/t9write/plugin/t9writeworker.cpp index a18ae6ea..68fadf27 100644 --- a/src/plugins/t9write/plugin/t9writeworker.cpp +++ b/src/plugins/t9write/plugin/t9writeworker.cpp @@ -92,7 +92,7 @@ void T9WriteDictionaryTask::run() emit completed(dictionary); } -T9WriteAddArcTask::T9WriteAddArcTask(Trace *trace) : +T9WriteAddArcTask::T9WriteAddArcTask(QVirtualKeyboardTrace *trace) : trace(trace) { } diff --git a/src/plugins/t9write/plugin/t9writeworker_p.h b/src/plugins/t9write/plugin/t9writeworker_p.h index f49e7519..52e3d7cd 100644 --- a/src/plugins/t9write/plugin/t9writeworker_p.h +++ b/src/plugins/t9write/plugin/t9writeworker_p.h @@ -102,12 +102,12 @@ class T9WriteAddArcTask : public T9WriteTask { Q_OBJECT public: - explicit T9WriteAddArcTask(Trace *trace); + explicit T9WriteAddArcTask(QVirtualKeyboardTrace *trace); void run(); private: - Trace *trace; + QVirtualKeyboardTrace *trace; }; class T9WriteRecognitionResult diff --git a/src/plugins/tcime/plugin/tcinputmethod.cpp b/src/plugins/tcime/plugin/tcinputmethod.cpp index e6acb859..2285284e 100644 --- a/src/plugins/tcime/plugin/tcinputmethod.cpp +++ b/src/plugins/tcime/plugin/tcinputmethod.cpp @@ -58,7 +58,7 @@ public: TCInputMethodPrivate(TCInputMethod *q_ptr) : q_ptr(q_ptr), - inputMode(InputEngine::Latin), + inputMode(QVirtualKeyboardInputEngine::Latin), wordDictionary(nullptr), highlightIndex(-1) {} @@ -90,8 +90,8 @@ public: { if (clearCandidates()) { Q_Q(TCInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex); } input.clear(); } @@ -100,16 +100,16 @@ public: { bool accept; Q_Q(TCInputMethod); - InputContext *ic = q->inputContext(); + QVirtualKeyboardInputContext *ic = q->inputContext(); switch (inputMode) { #if defined(HAVE_TCIME_CANGJIE) - case InputEngine::Cangjie: + case QVirtualKeyboardInputEngine::Cangjie: accept = composeCangjie(ic, c); break; #endif #if defined(HAVE_TCIME_ZHUYIN) - case InputEngine::Zhuyin: + case QVirtualKeyboardInputEngine::Zhuyin: accept = composeZhuyin(ic, c); break; #endif @@ -121,7 +121,7 @@ public: } #if defined(HAVE_TCIME_CANGJIE) - bool composeCangjie(InputContext *ic, const QChar &c) + bool composeCangjie(QVirtualKeyboardInputContext *ic, const QChar &c) { bool accept = false; if (!input.contains(0x91CD) && CangjieTable::isLetter(c)) { @@ -130,8 +130,8 @@ public: ic->setPreeditText(input); if (setCandidates(wordDictionary->getWords(input), true)) { Q_Q(TCInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex); } } accept = true; @@ -170,8 +170,8 @@ public: << QChar(0xFE5B) << QChar(0xFE5C) << QChar(0xFE43) << QChar(0xFE44); Q_Q(TCInputMethod); if (setCandidates(specialChars1, true)) { - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex); } q->inputContext()->setPreeditText(candidates[highlightIndex]); return true; @@ -188,8 +188,8 @@ public: << QChar(0xFE4F) << QChar(0xFE34) << QChar(0xFE33); Q_Q(TCInputMethod); if (setCandidates(specialChars2, true)) { - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex); } q->inputContext()->setPreeditText(candidates[highlightIndex]); return true; @@ -199,7 +199,7 @@ public: #endif #if defined(HAVE_TCIME_ZHUYIN) - bool composeZhuyin(InputContext *ic, const QChar &c) + bool composeZhuyin(QVirtualKeyboardInputContext *ic, const QChar &c) { if (ZhuyinTable::isTone(c)) { if (input.isEmpty()) @@ -251,8 +251,8 @@ public: ic->setPreeditText(input); if (setCandidates(wordDictionary->getWords(input), true)) { Q_Q(TCInputMethod); - emit q->selectionListChanged(SelectionListModel::WordCandidateList); - emit q->selectionListActiveItemChanged(SelectionListModel::WordCandidateList, highlightIndex); + emit q->selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit q->selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, highlightIndex); } return true; @@ -291,7 +291,7 @@ public: #endif TCInputMethod *q_ptr; - InputEngine::InputMode inputMode; + QVirtualKeyboardInputEngine::InputMode inputMode; #if defined(HAVE_TCIME_CANGJIE) CangjieDictionary cangjieDictionary; #endif @@ -311,7 +311,7 @@ public: */ TCInputMethod::TCInputMethod(QObject *parent) : - AbstractInputMethod(parent), + QVirtualKeyboardAbstractInputMethod(parent), d_ptr(new TCInputMethodPrivate(this)) { } @@ -337,7 +337,7 @@ void TCInputMethod::setSimplified(bool simplified) Q_D(TCInputMethod); if (d->cangjieDictionary.simplified() != simplified) { d->reset(); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); if (ic) ic->clear(); d->cangjieDictionary.setSimplified(simplified); @@ -348,20 +348,20 @@ void TCInputMethod::setSimplified(bool simplified) #endif } -QList<InputEngine::InputMode> TCInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> TCInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<InputEngine::InputMode>() + return QList<QVirtualKeyboardInputEngine::InputMode>() #if defined(HAVE_TCIME_ZHUYIN) - << InputEngine::Zhuyin + << QVirtualKeyboardInputEngine::Zhuyin #endif #if defined(HAVE_TCIME_CANGJIE) - << InputEngine::Cangjie + << QVirtualKeyboardInputEngine::Cangjie #endif ; } -bool TCInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool TCInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_D(TCInputMethod); @@ -372,7 +372,7 @@ bool TCInputMethod::setInputMode(const QString &locale, InputEngine::InputMode i d->inputMode = inputMode; d->wordDictionary = nullptr; #if defined(HAVE_TCIME_CANGJIE) - if (inputMode == InputEngine::Cangjie) { + if (inputMode == QVirtualKeyboardInputEngine::Cangjie) { if (d->cangjieDictionary.isEmpty()) { QString cangjieDictionary(qEnvironmentVariable("QT_VIRTUALKEYBOARD_CANGJIE_DICTIONARY")); if (!QFileInfo::exists(cangjieDictionary)) { @@ -386,7 +386,7 @@ bool TCInputMethod::setInputMode(const QString &locale, InputEngine::InputMode i } #endif #if defined(HAVE_TCIME_ZHUYIN) - if (inputMode == InputEngine::Zhuyin) { + if (inputMode == QVirtualKeyboardInputEngine::Zhuyin) { if (d->zhuyinDictionary.isEmpty()) { QString zhuyinDictionary(qEnvironmentVariable("QT_VIRTUALKEYBOARD_ZHUYIN_DICTIONARY")); if (!QFileInfo::exists(zhuyinDictionary)) { @@ -410,11 +410,11 @@ bool TCInputMethod::setInputMode(const QString &locale, InputEngine::InputMode i d->phraseDictionary.load(phraseDictionary); } if (!result) - inputMode = InputEngine::Latin; + inputMode = QVirtualKeyboardInputEngine::Latin; return result; } -bool TCInputMethod::setTextCase(InputEngine::TextCase textCase) +bool TCInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; @@ -426,7 +426,7 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif Q_UNUSED(text) Q_UNUSED(modifiers) Q_D(TCInputMethod); - InputContext *ic = inputContext(); + QVirtualKeyboardInputContext *ic = inputContext(); bool accept = false; switch (key) { case Qt::Key_Context1: @@ -448,8 +448,8 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif d->reset(); inputContext()->commit(finalWord); if (d->setCandidates(d->phraseDictionary.getWords(finalWord.left(1)), false)) { - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex); } } } else { @@ -465,16 +465,16 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif if (!d->checkSpecialCharInput()) { #endif if (d->setCandidates(d->wordDictionary->getWords(d->input), true)) { - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex); } #if defined(HAVE_TCIME_CANGJIE) } #endif accept = true; } else if (d->clearCandidates()) { - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex); } break; @@ -488,37 +488,37 @@ bool TCInputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModif return accept; } -QList<SelectionListModel::Type> TCInputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> TCInputMethod::selectionLists() { - return QList<SelectionListModel::Type>() << SelectionListModel::WordCandidateList; + return QList<QVirtualKeyboardSelectionListModel::Type>() << QVirtualKeyboardSelectionListModel::WordCandidateList; } -int TCInputMethod::selectionListItemCount(SelectionListModel::Type type) +int TCInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { Q_UNUSED(type) Q_D(TCInputMethod); return d->candidates.count(); } -QVariant TCInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant TCInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { QVariant result; Q_D(TCInputMethod); switch (role) { - case SelectionListModel::DisplayRole: + case QVirtualKeyboardSelectionListModel::DisplayRole: result = QVariant(d->candidates.at(index)); break; - case SelectionListModel::WordCompletionLengthRole: + case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole: result.setValue(0); break; default: - result = AbstractInputMethod::selectionListData(type, index, role); + result = QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role); break; } return result; } -void TCInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void TCInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_UNUSED(type) Q_D(TCInputMethod); @@ -526,8 +526,8 @@ void TCInputMethod::selectionListItemSelected(SelectionListModel::Type type, int reset(); inputContext()->commit(finalWord); if (d->setCandidates(d->phraseDictionary.getWords(finalWord.left(1)), false)) { - emit selectionListChanged(SelectionListModel::WordCandidateList); - emit selectionListActiveItemChanged(SelectionListModel::WordCandidateList, d->highlightIndex); + emit selectionListChanged(QVirtualKeyboardSelectionListModel::WordCandidateList); + emit selectionListActiveItemChanged(QVirtualKeyboardSelectionListModel::WordCandidateList, d->highlightIndex); } } diff --git a/src/plugins/tcime/plugin/tcinputmethod_p.h b/src/plugins/tcime/plugin/tcinputmethod_p.h index d7275fdc..68e46a2a 100644 --- a/src/plugins/tcime/plugin/tcinputmethod_p.h +++ b/src/plugins/tcime/plugin/tcinputmethod_p.h @@ -48,7 +48,7 @@ namespace QtVirtualKeyboard { class TCInputMethodPrivate; -class TCInputMethod : public AbstractInputMethod +class TCInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT Q_DECLARE_PRIVATE(TCInputMethod) @@ -61,16 +61,16 @@ public: bool simplified() const; void setSimplified(bool simplified); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::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<QVirtualKeyboardSelectionListModel::Type> selectionLists(); + int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type); + QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role); + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index); void reset(); void update(); diff --git a/src/plugins/thai/plugin/thaiinputmethod.cpp b/src/plugins/thai/plugin/thaiinputmethod.cpp index 0330d105..4a862542 100644 --- a/src/plugins/thai/plugin/thaiinputmethod.cpp +++ b/src/plugins/thai/plugin/thaiinputmethod.cpp @@ -45,22 +45,22 @@ ThaiInputMethod::ThaiInputMethod(QObject *parent) : } #ifndef HAVE_HUNSPELL -QList<InputEngine::InputMode> ThaiInputMethod::inputModes( +QList<QVirtualKeyboardInputEngine::InputMode> ThaiInputMethod::inputModes( const QString &locale) { Q_UNUSED(locale) - return QList<InputEngine::InputMode>() << InputEngine::Latin; + return QList<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Latin; } bool ThaiInputMethod::setInputMode(const QString &locale, - InputEngine::InputMode inputMode) + QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_UNUSED(inputMode) return true; } -bool ThaiInputMethod::setTextCase(InputEngine::TextCase textCase) +bool ThaiInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; diff --git a/src/plugins/thai/plugin/thaiinputmethod_p.h b/src/plugins/thai/plugin/thaiinputmethod_p.h index d59cfac6..4d126d5c 100644 --- a/src/plugins/thai/plugin/thaiinputmethod_p.h +++ b/src/plugins/thai/plugin/thaiinputmethod_p.h @@ -35,7 +35,7 @@ #define ThaiInputMethodBase HunspellInputMethod #else #include <QtVirtualKeyboard/abstractinputmethod.h> -#define ThaiInputMethodBase AbstractInputMethod +#define ThaiInputMethodBase QVirtualKeyboardAbstractInputMethod #endif QT_BEGIN_NAMESPACE @@ -51,9 +51,9 @@ public: explicit ThaiInputMethod(QObject *parent = nullptr); #ifndef HAVE_HUNSPELL - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::TextCase textCase); #endif bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp index 622e6333..f7e48336 100644 --- a/src/virtualkeyboard/abstractinputmethod.cpp +++ b/src/virtualkeyboard/abstractinputmethod.cpp @@ -31,28 +31,27 @@ #include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { -class AbstractInputMethodPrivate : public QObjectPrivate +class QVirtualKeyboardAbstractInputMethodPrivate : public QObjectPrivate { public: - AbstractInputMethodPrivate(); + QVirtualKeyboardAbstractInputMethodPrivate(); - InputEngine *inputEngine; + QVirtualKeyboardInputEngine *inputEngine; }; /*! - \class QtVirtualKeyboard::AbstractInputMethodPrivate + \class AbstractInputMethodPrivate \internal */ -AbstractInputMethodPrivate::AbstractInputMethodPrivate() : +QVirtualKeyboardAbstractInputMethodPrivate::QVirtualKeyboardAbstractInputMethodPrivate() : inputEngine(nullptr) { } /*! - \class QtVirtualKeyboard::AbstractInputMethod + \class QVirtualKeyboardAbstractInputMethod \inmodule QtVirtualKeyboard @@ -65,15 +64,15 @@ AbstractInputMethodPrivate::AbstractInputMethodPrivate() : /*! Constructs an input method with \a parent. */ -AbstractInputMethod::AbstractInputMethod(QObject *parent) : - QObject(*new AbstractInputMethodPrivate(), parent) +QVirtualKeyboardAbstractInputMethod::QVirtualKeyboardAbstractInputMethod(QObject *parent) : + QObject(*new QVirtualKeyboardAbstractInputMethodPrivate(), parent) { } /*! Destroys the input method and frees all allocated resources. */ -AbstractInputMethod::~AbstractInputMethod() +QVirtualKeyboardAbstractInputMethod::~QVirtualKeyboardAbstractInputMethod() { } @@ -81,9 +80,9 @@ AbstractInputMethod::~AbstractInputMethod() Returns the input context associated with the input method. This method returns \c NULL if the input method is not active. */ -InputContext *AbstractInputMethod::inputContext() const +QVirtualKeyboardInputContext *QVirtualKeyboardAbstractInputMethod::inputContext() const { - Q_D(const AbstractInputMethod); + Q_D(const QVirtualKeyboardAbstractInputMethod); return d->inputEngine ? d->inputEngine->inputContext() : nullptr; } @@ -91,9 +90,9 @@ InputContext *AbstractInputMethod::inputContext() const Returns the input engine associated with the input method. This method returns \c NULL if the input method is not active. */ -InputEngine *AbstractInputMethod::inputEngine() const +QVirtualKeyboardInputEngine *QVirtualKeyboardAbstractInputMethod::inputEngine() const { - Q_D(const AbstractInputMethod); + Q_D(const QVirtualKeyboardAbstractInputMethod); return d->inputEngine; } @@ -103,7 +102,7 @@ InputEngine *AbstractInputMethod::inputEngine() const difference to the update() method is that reset() modifies only the input method state, i.e. it must not modify the input context. */ -void AbstractInputMethod::reset() +void QVirtualKeyboardAbstractInputMethod::reset() { } @@ -112,7 +111,7 @@ void AbstractInputMethod::reset() updated. The input method must close the current pre-edit text and restore its internal state to the default. */ -void AbstractInputMethod::update() +void QVirtualKeyboardAbstractInputMethod::update() { } @@ -121,9 +120,9 @@ void AbstractInputMethod::update() Called by the input engine when the input method is activated and deactivated. */ -void AbstractInputMethod::setInputEngine(InputEngine *inputEngine) +void QVirtualKeyboardAbstractInputMethod::setInputEngine(QVirtualKeyboardInputEngine *inputEngine) { - Q_D(AbstractInputMethod); + Q_D(QVirtualKeyboardAbstractInputMethod); if (d->inputEngine) { d->inputEngine->disconnect(this, SLOT(reset())); d->inputEngine->disconnect(this, SLOT(update())); @@ -135,37 +134,37 @@ void AbstractInputMethod::setInputEngine(InputEngine *inputEngine) } } -QList<SelectionListModel::Type> AbstractInputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> QVirtualKeyboardAbstractInputMethod::selectionLists() { - return QList<SelectionListModel::Type>(); + return QList<QVirtualKeyboardSelectionListModel::Type>(); } -int AbstractInputMethod::selectionListItemCount(SelectionListModel::Type type) +int QVirtualKeyboardAbstractInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { Q_UNUSED(type) return 0; } -QVariant AbstractInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant QVirtualKeyboardAbstractInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { Q_UNUSED(type) Q_UNUSED(index) switch (role) { - case SelectionListModel::DisplayRole: + case QVirtualKeyboardSelectionListModel::DisplayRole: return QVariant(""); - case SelectionListModel::WordCompletionLengthRole: + case QVirtualKeyboardSelectionListModel::WordCompletionLengthRole: return QVariant(0); } return QVariant(); } -void AbstractInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void QVirtualKeyboardAbstractInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_UNUSED(type) Q_UNUSED(index) } -bool AbstractInputMethod::selectionListRemoveItem(SelectionListModel::Type type, int index) +bool QVirtualKeyboardAbstractInputMethod::selectionListRemoveItem(QVirtualKeyboardSelectionListModel::Type type, int index) { Q_UNUSED(type) Q_UNUSED(index) @@ -180,9 +179,9 @@ bool AbstractInputMethod::selectionListRemoveItem(SelectionListModel::Type type, This method is called by the input engine to query the list of supported pattern recognition modes. */ -QList<InputEngine::PatternRecognitionMode> AbstractInputMethod::patternRecognitionModes() const +QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> QVirtualKeyboardAbstractInputMethod::patternRecognitionModes() const { - return QList<InputEngine::PatternRecognitionMode>(); + return QList<QVirtualKeyboardInputEngine::PatternRecognitionMode>(); } /*! @@ -194,11 +193,12 @@ QList<InputEngine::PatternRecognitionMode> AbstractInputMethod::patternRecogniti \a traceScreenInfo provides information about the screen context. If the input method accepts the event and wants to capture the trace input, it must return - 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. + a new QVirtualKeyboardTrace object. This object must remain valid until the traceEnd() method is called. If the + QVirtualKeyboardTrace is rendered on screen, it remains there until the QVirtualKeyboardTrace object is destroyed. */ -Trace *AbstractInputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +QVirtualKeyboardTrace *QVirtualKeyboardAbstractInputMethod::traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { Q_UNUSED(traceId) Q_UNUSED(patternRecognitionMode) @@ -211,12 +211,12 @@ Trace *AbstractInputMethod::traceBegin(int traceId, InputEngine::PatternRecognit \since QtQuick.VirtualKeyboard 2.0 This method is called when the trace interaction ends. The input method should destroy the \a trace object - at some point after this function is called. See the \l Trace API how to access the gathered + at some point after this function is called. See the \l {Trace API for Input Methods} how to access the gathered data. The method returns \c true if the trace interaction is accepted. */ -bool AbstractInputMethod::traceEnd(Trace *trace) +bool QVirtualKeyboardAbstractInputMethod::traceEnd(QVirtualKeyboardTrace *trace) { Q_UNUSED(trace) return false; @@ -231,7 +231,7 @@ bool AbstractInputMethod::traceEnd(Trace *trace) The function returns \c true if the word was successfully reselected. */ -bool AbstractInputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) +bool QVirtualKeyboardAbstractInputMethod::reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags) { Q_UNUSED(cursorPosition) Q_UNUSED(reselectFlags) @@ -246,34 +246,34 @@ bool AbstractInputMethod::reselect(int cursorPosition, const InputEngine::Resele The function should return \c true if it handles the event. Otherwise the input falls back to \l reselect() for further processing. */ -bool AbstractInputMethod::clickPreeditText(int cursorPosition) +bool QVirtualKeyboardAbstractInputMethod::clickPreeditText(int cursorPosition) { Q_UNUSED(cursorPosition) return false; } /*! - \fn QList<QtVirtualKeyboard::InputEngine::InputMode> QtVirtualKeyboard::AbstractInputMethod::inputModes(const QString& locale) + \fn QList<QVirtualKeyboardInputEngine::InputMode> QVirtualKeyboardAbstractInputMethod::inputModes(const QString& locale) Returns the list of input modes for \a locale. */ /*! - \fn bool QtVirtualKeyboard::AbstractInputMethod::setInputMode(const QString& locale, InputEngine::InputMode inputMode) + \fn bool QVirtualKeyboardAbstractInputMethod::setInputMode(const QString& locale, QVirtualKeyboardInputEngine::InputMode inputMode) Sets the \a inputMode and \a locale for this input method. Returns \c true if successful. */ /*! - \fn bool QtVirtualKeyboard::AbstractInputMethod::setTextCase(InputEngine::TextCase textCase) + \fn bool QVirtualKeyboardAbstractInputMethod::setTextCase(QVirtualKeyboardInputEngine::::TextCase textCase) Updates the \a textCase for this input method. The method returns \c true if successful. */ /*! - \fn bool QtVirtualKeyboard::AbstractInputMethod::keyEvent(Qt::Key key, const QString& text, Qt::KeyboardModifiers modifiers) + \fn bool QVirtualKeyboardAbstractInputMethod::keyEvent(Qt::Key key, const QString& text, Qt::KeyboardModifiers modifiers) The purpose of this method is to handle the key events generated by the the input engine. @@ -289,7 +289,7 @@ bool AbstractInputMethod::clickPreeditText(int cursorPosition) */ /*! - \fn QList<SelectionListModel::Type> QtVirtualKeyboard::AbstractInputMethod::selectionLists() + \fn QList<QVirtualKeyboardSelectionListModel::Type> QVirtualKeyboardAbstractInputMethod::selectionLists() Returns the list of selection lists used by this input method. @@ -304,28 +304,28 @@ bool AbstractInputMethod::clickPreeditText(int cursorPosition) */ /*! - \fn int QtVirtualKeyboard::AbstractInputMethod::selectionListItemCount(SelectionListModel::Type type) + \fn int QVirtualKeyboardAbstractInputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) Returns the number of items in the selection list identified by \a type. */ /*! - \fn QVariant QtVirtualKeyboard::AbstractInputMethod::selectionListData(SelectionListModel::Type type, int index, int role) + \fn QVariant QVirtualKeyboardAbstractInputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) - Returns item data for the selection list identified by \a type. The \a \l {QtVirtualKeyboard::SelectionListModel::Role}{role} + Returns item data for the selection list identified by \a type. The \a \l {QVirtualKeyboardSelectionListModel::Role}{role} parameter specifies which data is requested. The \a index parameter is a zero based index into the list. */ /*! - \fn void QtVirtualKeyboard::AbstractInputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) + \fn void QVirtualKeyboardAbstractInputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::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. */ /*! - \fn bool QtVirtualKeyboard::AbstractInputMethod::selectionListRemoveItem(SelectionListModel::Type type, int index) + \fn bool QVirtualKeyboardAbstractInputMethod::selectionListRemoveItem(QVirtualKeyboardSelectionListModel::Type type, int index) This method is called when an item at \a index must be removed from dictionary. The selection list is identified by the \a type parameter. @@ -333,7 +333,7 @@ bool AbstractInputMethod::clickPreeditText(int cursorPosition) */ /*! - \fn void QtVirtualKeyboard::AbstractInputMethod::selectionListChanged(int type) + \fn void QVirtualKeyboardAbstractInputMethod::selectionListChanged(int type) The input method emits this signal when the contents of the selection list has changed. The \a type parameter specifies which selection list has @@ -341,14 +341,14 @@ bool AbstractInputMethod::clickPreeditText(int cursorPosition) */ /*! - \fn void QtVirtualKeyboard::AbstractInputMethod::selectionListActiveItemChanged(int type, int index) + \fn void QVirtualKeyboardAbstractInputMethod::selectionListActiveItemChanged(int type, int index) The input method emits this signal when the current \a index has changed in the selection list identified by \a type. */ /*! - \fn void QtVirtualKeyboard::AbstractInputMethod::selectionListsChanged() + \fn void QVirtualKeyboardAbstractInputMethod::selectionListsChanged() \since QtQuick.VirtualKeyboard 2.2 The input method emits this signal when the selection list types have @@ -356,5 +356,4 @@ bool AbstractInputMethod::clickPreeditText(int cursorPosition) allowing the input method to update the selection list types. */ -} // namespace QtVirtualKeyboard QT_END_NAMESPACE diff --git a/src/virtualkeyboard/abstractinputmethod.h b/src/virtualkeyboard/abstractinputmethod.h index 8689d84d..8398c781 100644 --- a/src/virtualkeyboard/abstractinputmethod.h +++ b/src/virtualkeyboard/abstractinputmethod.h @@ -34,40 +34,40 @@ #include <QtVirtualKeyboard/selectionlistmodel.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { -class AbstractInputMethodPrivate; +class QVirtualKeyboardAbstractInputMethodPrivate; -class QVIRTUALKEYBOARD_EXPORT AbstractInputMethod : public QObject +class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardAbstractInputMethod : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(AbstractInputMethod) + Q_DECLARE_PRIVATE(QVirtualKeyboardAbstractInputMethod) public: - explicit AbstractInputMethod(QObject *parent = nullptr); - ~AbstractInputMethod(); + explicit QVirtualKeyboardAbstractInputMethod(QObject *parent = nullptr); + ~QVirtualKeyboardAbstractInputMethod(); - InputContext *inputContext() const; - InputEngine *inputEngine() const; + QVirtualKeyboardInputContext *inputContext() const; + QVirtualKeyboardInputEngine *inputEngine() const; - 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 QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale) = 0; + virtual bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) = 0; + virtual bool setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) = 0; virtual bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) = 0; - 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 bool selectionListRemoveItem(SelectionListModel::Type type, int index); + virtual QList<QVirtualKeyboardSelectionListModel::Type> selectionLists(); + virtual int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type); + virtual QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role); + virtual void selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index); + virtual bool selectionListRemoveItem(QVirtualKeyboardSelectionListModel::Type type, int index); - 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 QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const; + virtual QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + virtual bool traceEnd(QVirtualKeyboardTrace *trace); - virtual bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); + virtual bool reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags); virtual bool clickPreeditText(int cursorPosition); Q_SIGNALS: @@ -80,12 +80,11 @@ public Q_SLOTS: virtual void update(); private: - void setInputEngine(InputEngine *inputEngine); + void setInputEngine(QVirtualKeyboardInputEngine *inputEngine); - friend class InputEngine; + friend class QVirtualKeyboardInputEngine; }; -} // namespace QtVirtualKeyboard QT_END_NAMESPACE #endif diff --git a/src/virtualkeyboard/content/components/InputModeKey.qml b/src/virtualkeyboard/content/components/InputModeKey.qml index c4463a8e..68255d9e 100644 --- a/src/virtualkeyboard/content/components/InputModeKey.qml +++ b/src/virtualkeyboard/content/components/InputModeKey.qml @@ -39,7 +39,7 @@ import QtQuick.VirtualKeyboard 2.3 \brief Input mode key for keyboard layouts. - This key toggles between available \l {InputEngine::inputModes} {InputEngine.inputModes}. + This key toggles between available \l {QVirtualKeyboardInputEngine::inputModes} {InputEngine.inputModes}. */ Key { @@ -55,7 +55,7 @@ Key { /*! List of input mode names. - The default list contains all known input modes for \l {InputEngine::inputMode} {InputEngine.inputMode}. + The default list contains all known input modes for \l {QVirtualKeyboardInputEngine::inputMode} {InputEngine.inputMode}. */ property var inputModeNameList: [ "ABC", // InputEngine.Latin diff --git a/src/virtualkeyboard/content/components/TraceInputArea.qml b/src/virtualkeyboard/content/components/TraceInputArea.qml index cdc4ecdd..72448730 100644 --- a/src/virtualkeyboard/content/components/TraceInputArea.qml +++ b/src/virtualkeyboard/content/components/TraceInputArea.qml @@ -52,7 +52,7 @@ MultiPointTouchArea { /*! Pattern recognition mode of this input area. - The default value is \l {QtVirtualKeyboard::InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. + The default value is \l {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 444208e9..fbc0dfe8 100644 --- a/src/virtualkeyboard/content/components/TraceInputKey.qml +++ b/src/virtualkeyboard/content/components/TraceInputKey.qml @@ -57,7 +57,7 @@ Item { /*! Pattern recognition mode of this input area. - The default value is \l {QtVirtualKeyboard::InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. + The default value is \l {InputEngine::PatternRecognitionDisabled} {InputEngine.PatternRecognitionDisabled}. */ property alias patternRecognitionMode: traceInputArea.patternRecognitionMode diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp index 907e4e62..510141ff 100644 --- a/src/virtualkeyboard/desktopinputpanel.cpp +++ b/src/virtualkeyboard/desktopinputpanel.cpp @@ -172,13 +172,13 @@ void DesktopInputPanel::repositionView(const QRect &rect) Q_D(DesktopInputPanel); VIRTUALKEYBOARD_DEBUG() << "DesktopInputPanel::repositionView():" << rect; if (d->view && d->view->geometry() != rect) { - InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); + QVirtualKeyboardInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); if (inputContext) { inputContext->setAnimating(true); if (!d->previewBindingActive) { - InputContextPrivate *inputContextPrivate = inputContext->priv(); - QObject::connect(inputContextPrivate, &InputContextPrivate::previewRectangleChanged, this, &DesktopInputPanel::previewRectangleChanged); - QObject::connect(inputContextPrivate, &InputContextPrivate::previewVisibleChanged, this, &DesktopInputPanel::previewVisibleChanged); + QVirtualKeyboardInputContextPrivate *inputContextPrivate = inputContext->priv(); + QObject::connect(inputContextPrivate, &QVirtualKeyboardInputContextPrivate::previewRectangleChanged, this, &DesktopInputPanel::previewRectangleChanged); + QObject::connect(inputContextPrivate, &QVirtualKeyboardInputContextPrivate::previewVisibleChanged, this, &DesktopInputPanel::previewVisibleChanged); d->previewBindingActive = true; } } @@ -201,7 +201,7 @@ void DesktopInputPanel::focusWindowChanged(QWindow *focusWindow) void DesktopInputPanel::focusWindowVisibleChanged(bool visible) { if (!visible) { - InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); + QVirtualKeyboardInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); if (inputContext) inputContext->priv()->hideInputPanel(); } @@ -210,7 +210,7 @@ void DesktopInputPanel::focusWindowVisibleChanged(bool visible) void DesktopInputPanel::previewRectangleChanged() { Q_D(DesktopInputPanel); - InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); + QVirtualKeyboardInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); d->previewRect = inputContext->priv()->previewRectangle(); if (d->previewVisible) updateInputRegion(); @@ -219,7 +219,7 @@ void DesktopInputPanel::previewRectangleChanged() void DesktopInputPanel::previewVisibleChanged() { Q_D(DesktopInputPanel); - InputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); + QVirtualKeyboardInputContext *inputContext = qobject_cast<PlatformInputContext *>(parent())->inputContext(); d->previewVisible = inputContext->priv()->previewVisible(); if (d->view->isVisible()) updateInputRegion(); diff --git a/src/virtualkeyboard/desktopinputselectioncontrol.cpp b/src/virtualkeyboard/desktopinputselectioncontrol.cpp index 98dee491..f93a0dde 100644 --- a/src/virtualkeyboard/desktopinputselectioncontrol.cpp +++ b/src/virtualkeyboard/desktopinputselectioncontrol.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -DesktopInputSelectionControl::DesktopInputSelectionControl(QObject *parent, InputContext *inputContext) +DesktopInputSelectionControl::DesktopInputSelectionControl(QObject *parent, QVirtualKeyboardInputContext *inputContext) : QObject(parent), m_inputContext(inputContext), m_anchorSelectionHandle(), @@ -56,7 +56,7 @@ DesktopInputSelectionControl::DesktopInputSelectionControl(QObject *parent, Inpu { QWindow *focusWindow = QGuiApplication::focusWindow(); Q_ASSERT(focusWindow); - connect(m_inputContext, &InputContext::selectionControlVisibleChanged, this, &DesktopInputSelectionControl::updateVisibility); + connect(m_inputContext, &QVirtualKeyboardInputContext::selectionControlVisibleChanged, this, &DesktopInputSelectionControl::updateVisibility); } /* @@ -202,19 +202,19 @@ void DesktopInputSelectionControl::setEnabled(bool enable) m_enabled = enable; QWindow *focusWindow = QGuiApplication::focusWindow(); if (enable) { - connect(m_inputContext, &InputContext::anchorRectangleChanged, this, &DesktopInputSelectionControl::updateAnchorHandlePosition); - connect(m_inputContext, &InputContext::cursorRectangleChanged, this, &DesktopInputSelectionControl::updateCursorHandlePosition); - connect(m_inputContext, &InputContext::anchorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); - connect(m_inputContext, &InputContext::cursorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); + connect(m_inputContext, &QVirtualKeyboardInputContext::anchorRectangleChanged, this, &DesktopInputSelectionControl::updateAnchorHandlePosition); + connect(m_inputContext, &QVirtualKeyboardInputContext::cursorRectangleChanged, this, &DesktopInputSelectionControl::updateCursorHandlePosition); + connect(m_inputContext, &QVirtualKeyboardInputContext::anchorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); + connect(m_inputContext, &QVirtualKeyboardInputContext::cursorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); if (focusWindow) focusWindow->installEventFilter(this); } else { if (focusWindow) focusWindow->removeEventFilter(this); - disconnect(m_inputContext, &InputContext::cursorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); - disconnect(m_inputContext, &InputContext::anchorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); - disconnect(m_inputContext, &InputContext::anchorRectangleChanged, this, &DesktopInputSelectionControl::updateAnchorHandlePosition); - disconnect(m_inputContext, &InputContext::cursorRectangleChanged, this, &DesktopInputSelectionControl::updateCursorHandlePosition); + disconnect(m_inputContext, &QVirtualKeyboardInputContext::cursorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); + disconnect(m_inputContext, &QVirtualKeyboardInputContext::anchorRectIntersectsClipRectChanged, this, &DesktopInputSelectionControl::updateVisibility); + disconnect(m_inputContext, &QVirtualKeyboardInputContext::anchorRectangleChanged, this, &DesktopInputSelectionControl::updateAnchorHandlePosition); + disconnect(m_inputContext, &QVirtualKeyboardInputContext::cursorRectangleChanged, this, &DesktopInputSelectionControl::updateCursorHandlePosition); } updateVisibility(); } diff --git a/src/virtualkeyboard/desktopinputselectioncontrol_p.h b/src/virtualkeyboard/desktopinputselectioncontrol_p.h index 4c498de9..c9f81c0e 100644 --- a/src/virtualkeyboard/desktopinputselectioncontrol_p.h +++ b/src/virtualkeyboard/desktopinputselectioncontrol_p.h @@ -47,11 +47,12 @@ #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE + class QMouseEvent; +class QVirtualKeyboardInputContext; namespace QtVirtualKeyboard { -class InputContext; class InputSelectionHandle; class QVIRTUALKEYBOARD_EXPORT DesktopInputSelectionControl : public QObject @@ -59,7 +60,7 @@ class QVIRTUALKEYBOARD_EXPORT DesktopInputSelectionControl : public QObject Q_OBJECT public: - DesktopInputSelectionControl(QObject *parent, InputContext *inputContext); + DesktopInputSelectionControl(QObject *parent, QVirtualKeyboardInputContext *inputContext); ~DesktopInputSelectionControl() {} void createHandles(); @@ -81,7 +82,7 @@ private: QRect handleRectForCursorRect(const QRectF &cursorRect) const; private: - InputContext *m_inputContext; + QVirtualKeyboardInputContext *m_inputContext; QSharedPointer<InputSelectionHandle> m_anchorSelectionHandle; QSharedPointer<InputSelectionHandle> m_cursorSelectionHandle; QImage m_handleImage; diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc index 51057b30..39b4e1bc 100644 --- a/src/virtualkeyboard/doc/src/technical-guide.qdoc +++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc @@ -51,11 +51,14 @@ input methods and keyboard layouts to be loaded at runtime. The input framework provides the following main interfaces: \list - \li InputContext: provides contextual information for the virtual keyboard + \li QVirtualKeyboardInputContext: provides contextual information for the virtual keyboard and other input components. Acts as an interface to the underlying text input component. - \li InputEngine: exposes an API to integrate user input events (key + \li QVirtualKeyboardInputEngine: exposes an API to integrate user input events (key presses, etc.) and acts as a host for input methods. + \li QVirtualKeyboardAbstractInputMethod: a base type for C++-based input methods. The input method + usually handles key events, but can also handle mouse and touch input + events. \li InputMethod: a base type for QML-based input methods. The input method usually handles key events, but can also handle mouse and touch input events. @@ -123,21 +126,21 @@ 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 InputEngine -and the current InputMethod instances. +Internally, the current input locale is also updated to the QVirtualKeyboardInputEngine +and the current input method instances. \section1 Input Engine The input engine object is owned by InputContext. Like the InputContext, there is -only one instance of the InputEngine. The input engine contains API functions which +only one instance of the QVirtualKeyboardInputEngine. The input engine contains API functions which the keyboard uses to map user interactions, such as key press and release events, to the input method. For example, virtual keyboard key events are mapped through the following methods: \list - \li InputEngine::virtualKeyPress - \li InputEngine::virtualKeyRelease + \li QVirtualKeyboardInputEngine::virtualKeyPress + \li QVirtualKeyboardInputEngine::virtualKeyRelease \endlist The above-mentioned methods are intended for the integration of the virtual @@ -147,13 +150,13 @@ consequence of the fact that the actual action is performed only when the key is released. If the key press is interrupted before the key release event, the keyboard invokes -the InputEngine::virtualKeyCancel method. +the QVirtualKeyboardInputEngine::virtualKeyCancel method. \section2 Input Method The input method is a concrete implementation of the keypress handler. It's main function is to handle keypress events and maintain state information for the -user input. It interacts with the text editor through \l InputContext via +user input. It interacts with the text editor through \l QVirtualKeyboardInputContext via pre-edit text or key events. The input method instance can be created in various ways, depending on the use @@ -193,7 +196,7 @@ Qt Virtual Keyboard is similar to the standard way of creating a Qt plugin: QT += virtualkeyboard \endcode - This allows the plugin to access \l InputContext and other interfaces. + This allows the plugin to access \l QVirtualKeyboardInputContext and other interfaces. \li \b {Implement a subclass of QVirtualKeyboardExtensionPlugin.} The plugin provides the virtual keyboard with the necessary metadata, @@ -222,7 +225,7 @@ The plugin can register an input method that other keyboard layouts can use by default (such as \c DefaultInputMethod) or an input method that is used privately in the plugin. -The input method must implement \l {QtVirtualKeyboard::AbstractInputMethod} {AbstractInputMethod} (C++) or InputMethod (QML) +The input method must implement \l {QVirtualKeyboardAbstractInputMethod} (C++) or InputMethod (QML) interface and the plugin must register it as a QML type in {QVirtualKeyboardExtensionPlugin::registerTypes} method. @@ -395,15 +398,6 @@ function selectionListItemSelected(type, index) { } \endcode -\section1 Integrating Selection Lists into the UI - -The input engine provides a list model for each selection list type. -The model is null while the list is not allocated, allowing the UI -to hide the list if necessary. - -The list model's word candidate list is provided by the -InputEngine::wordCandidateListModel property. - \section1 Integrating Handwriting Recognition Since version 2.0 of the virtual keyboard, input methods can consume @@ -420,9 +414,9 @@ processing. \section2 Data Model for Handwriting Input -Virtual keyboard collects the handwriting data in a special data model Trace. +Virtual keyboard collects the handwriting data in a special data model QVirtualKeyboardTrace. Each trace represents a collection of data sampled from one touch (e.g. -a swipe on the screen). There will be as many instances of Trace as there are +a swipe on the screen). There will be as many instances of QVirtualKeyboardTrace as there are touches on the handwriting input area. By definition, \e trace is a set of data sampled from one touch. In addition to @@ -432,7 +426,7 @@ in the beginning of a trace event. The input method does not participate in the actual collection of trace data. However, the input method has full control over the input since it can -either accept or reject a Trace (e.g. if there are too many instances to handle). +either accept or reject a QVirtualKeyboardTrace (e.g. if there are too many instances to handle). This also allows for precise control over how many fingers can be used simultaneously. The input method can collect as many traces as it sees fit and it can begin @@ -448,9 +442,9 @@ The trace API consists of the following virtual methods, which the input method must implement in order to receive and process trace input data. \list - \li \l { AbstractInputMethod::patternRecognitionModes } { patternRecognitionModes } - \li \l { AbstractInputMethod::traceBegin } { traceBegin } - \li \l { AbstractInputMethod::traceEnd } { traceEnd } + \li \l { QVirtualKeyboardAbstractInputMethod::patternRecognitionModes } { patternRecognitionModes } + \li \l { QVirtualKeyboardAbstractInputMethod::traceBegin } { traceBegin } + \li \l { QVirtualKeyboardAbstractInputMethod::traceEnd } { traceEnd } \endlist By implementing these methods, the input method can receive and process data @@ -458,7 +452,7 @@ from a variety of input sources (e.g. keyboard layout or full screen). The patternRecognitionModes method returns a list of pattern recognition modes, which are supported by the input method. A pattern recognition mode, such as -\l { InputEngine::HandwritingRecoginition } { HandwritingRecoginition }, +\l { QVirtualKeyboardInputEngine::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/fallbackinputmethod.cpp b/src/virtualkeyboard/fallbackinputmethod.cpp index 8dc976af..c395f443 100644 --- a/src/virtualkeyboard/fallbackinputmethod.cpp +++ b/src/virtualkeyboard/fallbackinputmethod.cpp @@ -39,24 +39,24 @@ namespace QtVirtualKeyboard { */ FallbackInputMethod::FallbackInputMethod(QObject *parent) : - AbstractInputMethod(parent) + QVirtualKeyboardAbstractInputMethod(parent) { } -QList<InputEngine::InputMode> FallbackInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> FallbackInputMethod::inputModes(const QString &locale) { Q_UNUSED(locale) - return QList<InputEngine::InputMode>(); + return QList<QVirtualKeyboardInputEngine::InputMode>(); } -bool FallbackInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool FallbackInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_UNUSED(inputMode) return true; } -bool FallbackInputMethod::setTextCase(InputEngine::TextCase textCase) +bool FallbackInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; diff --git a/src/virtualkeyboard/fallbackinputmethod_p.h b/src/virtualkeyboard/fallbackinputmethod_p.h index d4f40e89..37b94660 100644 --- a/src/virtualkeyboard/fallbackinputmethod_p.h +++ b/src/virtualkeyboard/fallbackinputmethod_p.h @@ -46,16 +46,16 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT FallbackInputMethod : public AbstractInputMethod +class QVIRTUALKEYBOARD_EXPORT FallbackInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT public: explicit FallbackInputMethod(QObject *parent = nullptr); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::TextCase textCase); bool keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers); diff --git a/src/virtualkeyboard/gesturerecognizer_p.h b/src/virtualkeyboard/gesturerecognizer_p.h index 431656eb..b27c006f 100644 --- a/src/virtualkeyboard/gesturerecognizer_p.h +++ b/src/virtualkeyboard/gesturerecognizer_p.h @@ -55,7 +55,7 @@ class QVIRTUALKEYBOARD_EXPORT GestureRecognizer : public QObject public: explicit GestureRecognizer(QObject *parent = nullptr); - virtual QVariantMap recognize(const QList<Trace *> traceList) = 0; + virtual QVariantMap recognize(const QList<QVirtualKeyboardTrace *> traceList) = 0; }; } // namespace QtVirtualKeyboard diff --git a/src/virtualkeyboard/handwritinggesturerecognizer.cpp b/src/virtualkeyboard/handwritinggesturerecognizer.cpp index f420410a..36fe8cf8 100644 --- a/src/virtualkeyboard/handwritinggesturerecognizer.cpp +++ b/src/virtualkeyboard/handwritinggesturerecognizer.cpp @@ -51,7 +51,7 @@ int HandwritingGestureRecognizer::dpi() const return m_dpi; } -QVariantMap HandwritingGestureRecognizer::recognize(const QList<Trace *> traceList) +QVariantMap HandwritingGestureRecognizer::recognize(const QList<QVirtualKeyboardTrace *> traceList) { if (traceList.count() > 0 && traceList.count() < 3) { @@ -87,7 +87,7 @@ QVariantMap HandwritingGestureRecognizer::recognize(const QList<Trace *> traceLi const int traceCount = traceList.size(); for (traceIndex = 0; traceIndex < traceCount; ++traceIndex) { - const Trace *trace = traceList.at(traceIndex); + const QVirtualKeyboardTrace *trace = traceList.at(traceIndex); const QVariantList &points = trace->points(); QVector2D swipeVector; const int pointCount = points.count(); diff --git a/src/virtualkeyboard/handwritinggesturerecognizer_p.h b/src/virtualkeyboard/handwritinggesturerecognizer_p.h index 21991cef..99a9c89a 100644 --- a/src/virtualkeyboard/handwritinggesturerecognizer_p.h +++ b/src/virtualkeyboard/handwritinggesturerecognizer_p.h @@ -55,7 +55,7 @@ public: void setDpi(int dpi); int dpi() const; - QVariantMap recognize(const QList<Trace *> traceList); + QVariantMap recognize(const QList<QVirtualKeyboardTrace *> traceList); private: int m_dpi; diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp index 6c7774b0..7010c75a 100644 --- a/src/virtualkeyboard/inputcontext.cpp +++ b/src/virtualkeyboard/inputcontext.cpp @@ -44,11 +44,11 @@ */ QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { +using namespace QtVirtualKeyboard; /*! \qmltype InputContext - \instantiates QtVirtualKeyboard::InputContext + \instantiates QVirtualKeyboardInputContext \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Provides access to an input context. @@ -57,7 +57,7 @@ namespace QtVirtualKeyboard { */ /*! - \class QtVirtualKeyboard::InputContext + \class QVirtualKeyboardInputContext \inmodule QtVirtualKeyboard \brief Provides access to an input context. */ @@ -67,70 +67,70 @@ namespace QtVirtualKeyboard { Constructs an input context with \a parent as the platform input context. */ -InputContext::InputContext(PlatformInputContext *parent) : - d_ptr(new InputContextPrivate(this, parent)) +QVirtualKeyboardInputContext::QVirtualKeyboardInputContext(QtVirtualKeyboard::PlatformInputContext *parent) : + d_ptr(new QVirtualKeyboardInputContextPrivate(this, parent)) { - Q_D(InputContext); + Q_D(QVirtualKeyboardInputContext); d->init(); - QObject::connect(d->_shiftHandler, &ShiftHandler::shiftChanged, this, &InputContext::shiftChanged); - QObject::connect(d->_shiftHandler, &ShiftHandler::capsLockChanged, this, &InputContext::capsLockChanged); - QObject::connect(d->_shiftHandler, &ShiftHandler::uppercaseChanged, this, &InputContext::uppercaseChanged); - QObject::connect(d, &InputContextPrivate::localeChanged, this, &InputContext::localeChanged); + QObject::connect(d->_shiftHandler, &ShiftHandler::shiftChanged, this, &QVirtualKeyboardInputContext::shiftChanged); + QObject::connect(d->_shiftHandler, &ShiftHandler::capsLockChanged, this, &QVirtualKeyboardInputContext::capsLockChanged); + QObject::connect(d->_shiftHandler, &ShiftHandler::uppercaseChanged, this, &QVirtualKeyboardInputContext::uppercaseChanged); + QObject::connect(d, &QVirtualKeyboardInputContextPrivate::localeChanged, this, &QVirtualKeyboardInputContext::localeChanged); } /*! \internal Destroys the input context and frees all allocated resources. */ -InputContext::~InputContext() +QVirtualKeyboardInputContext::~QVirtualKeyboardInputContext() { } -bool InputContext::shift() const +bool QVirtualKeyboardInputContext::shift() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->_shiftHandler->shift(); } -bool InputContext::capsLock() const +bool QVirtualKeyboardInputContext::capsLock() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->_shiftHandler->capsLock(); } -bool InputContext::uppercase() const +bool QVirtualKeyboardInputContext::uppercase() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->_shiftHandler->uppercase(); } -int InputContext::anchorPosition() const +int QVirtualKeyboardInputContext::anchorPosition() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->anchorPosition; } -int InputContext::cursorPosition() const +int QVirtualKeyboardInputContext::cursorPosition() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->cursorPosition; } -Qt::InputMethodHints InputContext::inputMethodHints() const +Qt::InputMethodHints QVirtualKeyboardInputContext::inputMethodHints() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->inputMethodHints; } -QString InputContext::preeditText() const +QString QVirtualKeyboardInputContext::preeditText() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->preeditText; } -void InputContext::setPreeditText(const QString &text, QList<QInputMethodEvent::Attribute> attributes, int replaceFrom, int replaceLength) +void QVirtualKeyboardInputContext::setPreeditText(const QString &text, QList<QInputMethodEvent::Attribute> attributes, int replaceFrom, int replaceLength) { - Q_D(InputContext); + Q_D(QVirtualKeyboardInputContext); // Add default attributes if (!text.isEmpty()) { if (!d->testAttribute(attributes, QInputMethodEvent::TextFormat)) { @@ -145,62 +145,62 @@ void InputContext::setPreeditText(const QString &text, QList<QInputMethodEvent:: d->sendPreedit(text, attributes, replaceFrom, replaceLength); } -QList<QInputMethodEvent::Attribute> InputContext::preeditTextAttributes() const +QList<QInputMethodEvent::Attribute> QVirtualKeyboardInputContext::preeditTextAttributes() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->preeditTextAttributes; } -QString InputContext::surroundingText() const +QString QVirtualKeyboardInputContext::surroundingText() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->surroundingText; } -QString InputContext::selectedText() const +QString QVirtualKeyboardInputContext::selectedText() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->selectedText; } -QRectF InputContext::anchorRectangle() const +QRectF QVirtualKeyboardInputContext::anchorRectangle() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->anchorRectangle; } -QRectF InputContext::cursorRectangle() const +QRectF QVirtualKeyboardInputContext::cursorRectangle() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->cursorRectangle; } -bool InputContext::animating() const +bool QVirtualKeyboardInputContext::animating() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->animating; } -void InputContext::setAnimating(bool animating) +void QVirtualKeyboardInputContext::setAnimating(bool animating) { - Q_D(InputContext); + Q_D(QVirtualKeyboardInputContext); if (d->animating != animating) { - VIRTUALKEYBOARD_DEBUG() << "InputContext::setAnimating():" << animating; + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContext::setAnimating():" << animating; d->animating = animating; emit animatingChanged(); d->platformInputContext->emitAnimatingChanged(); } } -QString InputContext::locale() const +QString QVirtualKeyboardInputContext::locale() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->locale(); } -InputEngine *InputContext::inputEngine() const +QVirtualKeyboardInputEngine *QVirtualKeyboardInputContext::inputEngine() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->inputEngine; } @@ -214,21 +214,21 @@ InputEngine *InputContext::inputEngine() const Sends a key click event with the given \a key, \a text and \a modifiers to the input item that currently has focus. */ -void InputContext::sendKeyClick(int key, const QString &text, int modifiers) +void QVirtualKeyboardInputContext::sendKeyClick(int key, const QString &text, int modifiers) { - Q_D(InputContext); + Q_D(QVirtualKeyboardInputContext); if (d->_focus && d->platformInputContext) { QKeyEvent pressEvent(QEvent::KeyPress, key, Qt::KeyboardModifiers(modifiers), text); QKeyEvent releaseEvent(QEvent::KeyRelease, key, Qt::KeyboardModifiers(modifiers), text); - VIRTUALKEYBOARD_DEBUG() << "InputContext::sendKeyClick():" << key; + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContext::sendKeyClick():" << key; - d->stateFlags |= InputContextPrivate::KeyEventState; + d->stateFlags |= QVirtualKeyboardInputContextPrivate::KeyEventState; d->platformInputContext->sendKeyEvent(&pressEvent); d->platformInputContext->sendKeyEvent(&releaseEvent); if (d->activeKeys.isEmpty()) - d->stateFlags &= ~InputContextPrivate::KeyEventState; + d->stateFlags &= ~QVirtualKeyboardInputContextPrivate::KeyEventState; } else { - qWarning() << "InputContext::sendKeyClick(): no focus to send key click" << key << text + qWarning() << "QVirtualKeyboardInputContext::sendKeyClick(): no focus to send key click" << key << text << "- QGuiApplication::focusWindow() is:" << QGuiApplication::focusWindow(); } } @@ -239,13 +239,13 @@ void InputContext::sendKeyClick(int key, const QString &text, int modifiers) Commits the current pre-edit text. */ /*! - \fn void QtVirtualKeyboard::InputContext::commit() + \fn void QVirtualKeyboardInputContext::commit() Commits the current pre-edit text. */ -void InputContext::commit() +void QVirtualKeyboardInputContext::commit() { - Q_D(InputContext); + Q_D(QVirtualKeyboardInputContext); QString text = d->preeditText; commit(text); } @@ -266,10 +266,10 @@ void InputContext::commit() contents relative to \a replaceFrom with a length of \a replaceLength. */ -void InputContext::commit(const QString &text, int replaceFrom, int replaceLength) +void QVirtualKeyboardInputContext::commit(const QString &text, int replaceFrom, int replaceLength) { - Q_D(InputContext); - VIRTUALKEYBOARD_DEBUG() << "InputContext::commit():" << text << replaceFrom << replaceLength; + Q_D(QVirtualKeyboardInputContext); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContext::commit():" << text << replaceFrom << replaceLength; bool preeditChanged = !d->preeditText.isEmpty(); if (d->platformInputContext) { @@ -279,9 +279,9 @@ void InputContext::commit(const QString &text, int replaceFrom, int replaceLengt d->preeditTextAttributes.clear(); QInputMethodEvent inputEvent(QString(), attributes); inputEvent.setCommitString(text, replaceFrom, replaceLength); - d->stateFlags |= InputContextPrivate::InputMethodEventState; + d->stateFlags |= QVirtualKeyboardInputContextPrivate::InputMethodEventState; d->platformInputContext->sendEvent(&inputEvent); - d->stateFlags &= ~InputContextPrivate::InputMethodEventState; + d->stateFlags &= ~QVirtualKeyboardInputContextPrivate::InputMethodEventState; } else { d->preeditText.clear(); d->preeditTextAttributes.clear(); @@ -297,13 +297,13 @@ void InputContext::commit(const QString &text, int replaceFrom, int replaceLengt Clears the pre-edit text. */ /*! - \fn void QtVirtualKeyboard::InputContext::clear() + \fn void QVirtualKeyboardInputContext::clear() Clears the pre-edit text. */ -void InputContext::clear() +void QVirtualKeyboardInputContext::clear() { - Q_D(InputContext); + Q_D(QVirtualKeyboardInputContext); bool preeditChanged = !d->preeditText.isEmpty(); d->preeditText.clear(); d->preeditTextAttributes.clear(); @@ -312,9 +312,9 @@ void InputContext::clear() QList<QInputMethodEvent::Attribute> attributes; d->addSelectionAttribute(attributes); QInputMethodEvent event(QString(), attributes); - d->stateFlags |= InputContextPrivate::InputMethodEventState; + d->stateFlags |= QVirtualKeyboardInputContextPrivate::InputMethodEventState; d->platformInputContext->sendEvent(&event); - d->stateFlags &= ~InputContextPrivate::InputMethodEventState; + d->stateFlags &= ~QVirtualKeyboardInputContextPrivate::InputMethodEventState; } if (preeditChanged) @@ -324,33 +324,33 @@ void InputContext::clear() /*! \internal */ -void InputContext::setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos) +void QVirtualKeyboardInputContext::setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos) { QPlatformInputContext::setSelectionOnFocusObject(anchorPos, cursorPos); } -bool InputContext::anchorRectIntersectsClipRect() const +bool QVirtualKeyboardInputContext::anchorRectIntersectsClipRect() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->anchorRectIntersectsClipRect; } -bool InputContext::cursorRectIntersectsClipRect() const +bool QVirtualKeyboardInputContext::cursorRectIntersectsClipRect() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->cursorRectIntersectsClipRect; } -bool InputContext::selectionControlVisible() const +bool QVirtualKeyboardInputContext::selectionControlVisible() const { - Q_D(const InputContext); + Q_D(const QVirtualKeyboardInputContext); return d->selectionControlVisible; } -InputContextPrivate *InputContext::priv() const +QVirtualKeyboardInputContextPrivate *QVirtualKeyboardInputContext::priv() const { - Q_D(const InputContext); - return const_cast<InputContextPrivate *>(d); + Q_D(const QVirtualKeyboardInputContext); + return const_cast<QVirtualKeyboardInputContextPrivate *>(d); } /*! @@ -360,7 +360,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::shift + \property QVirtualKeyboardInputContext::shift \brief the shift status. This property is changed when the shift status changes. @@ -373,7 +373,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::capsLock + \property QVirtualKeyboardInputContext::capsLock \brief the caps lock status. This property is changed when the caps lock status changes. @@ -387,7 +387,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::uppercase + \property QVirtualKeyboardInputContext::uppercase \brief the uppercase status. This property is \c true when either \l shift or \l capsLock is \c true. @@ -401,7 +401,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::anchorPosition + \property QVirtualKeyboardInputContext::anchorPosition \brief the anchor position. This property is changed when the anchor position changes. @@ -414,7 +414,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::cursorPosition + \property QVirtualKeyboardInputContext::cursorPosition \brief the cursor position. This property is changed when the cursor position changes. @@ -427,7 +427,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::inputMethodHints + \property QVirtualKeyboardInputContext::inputMethodHints \brief the input method hints. This property is changed when the input method hints changes. @@ -440,7 +440,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::preeditText + \property QVirtualKeyboardInputContext::preeditText \brief the pre-edit text. This property sets the pre-edit text. @@ -453,7 +453,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::surroundingText + \property QVirtualKeyboardInputContext::surroundingText \brief the surrounding text around cursor. This property is changed when the surrounding text around the cursor changes. @@ -466,7 +466,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::selectedText + \property QVirtualKeyboardInputContext::selectedText \brief the selected text. This property is changed when the selected text changes. @@ -480,7 +480,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::anchorRectangle + \property QVirtualKeyboardInputContext::anchorRectangle \brief the anchor rectangle. This property is changed when the anchor rectangle changes. @@ -493,7 +493,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::cursorRectangle + \property QVirtualKeyboardInputContext::cursorRectangle \brief the cursor rectangle. This property is changed when the cursor rectangle changes. @@ -507,7 +507,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::animating + \property QVirtualKeyboardInputContext::animating \brief the animating status. Use this property to set the animating status, for example @@ -521,7 +521,7 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::locale + \property QVirtualKeyboardInputContext::locale \brief the locale. This property is changed when the input locale changes. @@ -534,11 +534,10 @@ InputContextPrivate *InputContext::priv() const */ /*! - \property QtVirtualKeyboard::InputContext::inputEngine + \property QVirtualKeyboardInputContext::inputEngine \brief the input engine. This property stores the input engine. */ -} // namespace QtVirtualKeyboard QT_END_NAMESPACE diff --git a/src/virtualkeyboard/inputcontext.h b/src/virtualkeyboard/inputcontext.h index 6b2ba379..09f7456f 100644 --- a/src/virtualkeyboard/inputcontext.h +++ b/src/virtualkeyboard/inputcontext.h @@ -38,17 +38,18 @@ #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { +namespace QtVirtualKeyboard { class PlatformInputContext; -class InputEngine; -class InputContextPrivate; +} +class QVirtualKeyboardInputEngine; +class QVirtualKeyboardInputContextPrivate; -class QVIRTUALKEYBOARD_EXPORT InputContext : public QObject +class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContext : public QObject { Q_OBJECT - Q_DISABLE_COPY(InputContext) - Q_DECLARE_PRIVATE(InputContext) + Q_DISABLE_COPY(QVirtualKeyboardInputContext) + Q_DECLARE_PRIVATE(QVirtualKeyboardInputContext) Q_PROPERTY(bool shift READ shift NOTIFY shiftChanged) Q_PROPERTY(bool capsLock READ capsLock NOTIFY capsLockChanged) Q_PROPERTY(bool uppercase READ uppercase NOTIFY uppercaseChanged) @@ -62,15 +63,15 @@ class QVIRTUALKEYBOARD_EXPORT InputContext : public QObject Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged) Q_PROPERTY(bool animating READ animating WRITE setAnimating NOTIFY animatingChanged) Q_PROPERTY(QString locale READ locale NOTIFY localeChanged) - Q_PROPERTY(InputEngine *inputEngine READ inputEngine CONSTANT) + Q_PROPERTY(QVirtualKeyboardInputEngine *inputEngine READ inputEngine CONSTANT) Q_PROPERTY(bool selectionControlVisible READ selectionControlVisible NOTIFY selectionControlVisibleChanged) Q_PROPERTY(bool anchorRectIntersectsClipRect READ anchorRectIntersectsClipRect NOTIFY anchorRectIntersectsClipRectChanged) Q_PROPERTY(bool cursorRectIntersectsClipRect READ cursorRectIntersectsClipRect NOTIFY cursorRectIntersectsClipRectChanged) - Q_PROPERTY(InputContextPrivate *priv READ priv CONSTANT) + Q_PROPERTY(QVirtualKeyboardInputContextPrivate *priv READ priv CONSTANT) public: - explicit InputContext(PlatformInputContext *parent = nullptr); - ~InputContext(); + explicit QVirtualKeyboardInputContext(QtVirtualKeyboard::PlatformInputContext *parent = nullptr); + ~QVirtualKeyboardInputContext(); bool shift() const; bool capsLock() const; @@ -88,11 +89,11 @@ public: bool animating() const; void setAnimating(bool animating); QString locale() const; - InputEngine *inputEngine() const; + QVirtualKeyboardInputEngine *inputEngine() const; bool selectionControlVisible() const; bool anchorRectIntersectsClipRect() const; bool cursorRectIntersectsClipRect() const; - InputContextPrivate *priv() const; + QVirtualKeyboardInputContextPrivate *priv() const; Q_INVOKABLE void sendKeyClick(int key, const QString &text, int modifiers = 0); Q_INVOKABLE void commit(); @@ -121,12 +122,11 @@ Q_SIGNALS: void cursorRectIntersectsClipRectChanged(); private: - friend class InputContextPrivate; + friend class QVirtualKeyboardInputContextPrivate; - QScopedPointer<InputContextPrivate> d_ptr; + QScopedPointer<QVirtualKeyboardInputContextPrivate> d_ptr; }; -} // namespace QtVirtualKeyboard QT_END_NAMESPACE #endif diff --git a/src/virtualkeyboard/inputcontext_p.cpp b/src/virtualkeyboard/inputcontext_p.cpp index 4f956645..c9312c1e 100644 --- a/src/virtualkeyboard/inputcontext_p.cpp +++ b/src/virtualkeyboard/inputcontext_p.cpp @@ -47,9 +47,9 @@ bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMeth attribute1.value == attribute2.value; } -namespace QtVirtualKeyboard { +using namespace QtVirtualKeyboard; -InputContextPrivate::InputContextPrivate(InputContext *q_ptr, PlatformInputContext *platformInputContext) : +QVirtualKeyboardInputContextPrivate::QVirtualKeyboardInputContextPrivate(QVirtualKeyboardInputContext *q_ptr, PlatformInputContext *platformInputContext) : QObject(nullptr), q_ptr(q_ptr), platformInputContext(platformInputContext), @@ -80,46 +80,46 @@ InputContextPrivate::InputContextPrivate(InputContext *q_ptr, PlatformInputConte { } -void InputContextPrivate::init() +void QVirtualKeyboardInputContextPrivate::init() { - Q_Q(InputContext); + Q_Q(QVirtualKeyboardInputContext); Q_ASSERT(inputEngine == nullptr); - inputEngine = new InputEngine(q); + inputEngine = new QVirtualKeyboardInputEngine(q); _shiftHandler = new ShiftHandler(q); inputEngine->init(); _shiftHandler->init(); _shadow.setInputContext(q); if (platformInputContext) { platformInputContext->setInputContext(q); - QObject::connect(platformInputContext, &PlatformInputContext::focusObjectChanged, this, &InputContextPrivate::onInputItemChanged); - QObject::connect(platformInputContext, &PlatformInputContext::focusObjectChanged, this, &InputContextPrivate::inputItemChanged); + QObject::connect(platformInputContext, &PlatformInputContext::focusObjectChanged, this, &QVirtualKeyboardInputContextPrivate::onInputItemChanged); + QObject::connect(platformInputContext, &PlatformInputContext::focusObjectChanged, this, &QVirtualKeyboardInputContextPrivate::inputItemChanged); } } -InputContextPrivate::~InputContextPrivate() +QVirtualKeyboardInputContextPrivate::~QVirtualKeyboardInputContextPrivate() { } -bool InputContextPrivate::focus() const +bool QVirtualKeyboardInputContextPrivate::focus() const { return _focus; } -void InputContextPrivate::setFocus(bool focus) +void QVirtualKeyboardInputContextPrivate::setFocus(bool focus) { if (_focus != focus) { - VIRTUALKEYBOARD_DEBUG() << "InputContextPrivate::setFocus():" << focus; + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::setFocus():" << focus; _focus = focus; emit focusChanged(); } } -QRectF InputContextPrivate::keyboardRectangle() const +QRectF QVirtualKeyboardInputContextPrivate::keyboardRectangle() const { return keyboardRect; } -void InputContextPrivate::setKeyboardRectangle(QRectF rectangle) +void QVirtualKeyboardInputContextPrivate::setKeyboardRectangle(QRectF rectangle) { if (keyboardRect != rectangle) { keyboardRect = rectangle; @@ -128,12 +128,12 @@ void InputContextPrivate::setKeyboardRectangle(QRectF rectangle) } } -QRectF InputContextPrivate::previewRectangle() const +QRectF QVirtualKeyboardInputContextPrivate::previewRectangle() const { return previewRect; } -void InputContextPrivate::setPreviewRectangle(QRectF rectangle) +void QVirtualKeyboardInputContextPrivate::setPreviewRectangle(QRectF rectangle) { if (previewRect != rectangle) { previewRect = rectangle; @@ -141,12 +141,12 @@ void InputContextPrivate::setPreviewRectangle(QRectF rectangle) } } -bool InputContextPrivate::previewVisible() const +bool QVirtualKeyboardInputContextPrivate::previewVisible() const { return _previewVisible; } -void InputContextPrivate::setPreviewVisible(bool visible) +void QVirtualKeyboardInputContextPrivate::setPreviewVisible(bool visible) { if (_previewVisible != visible) { _previewVisible = visible; @@ -154,14 +154,14 @@ void InputContextPrivate::setPreviewVisible(bool visible) } } -QString InputContextPrivate::locale() const +QString QVirtualKeyboardInputContextPrivate::locale() const { return platformInputContext->locale().name(); } -void InputContextPrivate::setLocale(const QString &locale) +void QVirtualKeyboardInputContextPrivate::setLocale(const QString &locale) { - VIRTUALKEYBOARD_DEBUG() << "InputContextPrivate::setLocale():" << locale; + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::setLocale():" << locale; QLocale newLocale(locale); if (newLocale != platformInputContext->locale()) { platformInputContext->setLocale(newLocale); @@ -170,22 +170,22 @@ void InputContextPrivate::setLocale(const QString &locale) } } -QObject *InputContextPrivate::inputItem() const +QObject *QVirtualKeyboardInputContextPrivate::inputItem() const { return platformInputContext ? platformInputContext->focusObject() : nullptr; } -ShiftHandler *InputContextPrivate::shiftHandler() const +ShiftHandler *QVirtualKeyboardInputContextPrivate::shiftHandler() const { return _shiftHandler; } -ShadowInputContext *InputContextPrivate::shadow() const +ShadowInputContext *QVirtualKeyboardInputContextPrivate::shadow() const { return const_cast<ShadowInputContext *>(&_shadow); } -bool InputContextPrivate::fileExists(const QUrl &fileUrl) +bool QVirtualKeyboardInputContextPrivate::fileExists(const QUrl &fileUrl) { QString fileName; if (fileUrl.scheme() == QLatin1String("qrc")) { @@ -196,35 +196,35 @@ bool InputContextPrivate::fileExists(const QUrl &fileUrl) return !fileName.isEmpty() && QFile::exists(fileName); } -bool InputContextPrivate::hasEnterKeyAction(QObject *item) const +bool QVirtualKeyboardInputContextPrivate::hasEnterKeyAction(QObject *item) const { return item != nullptr && qmlAttachedPropertiesObject<EnterKeyAction>(item, false); } -void InputContextPrivate::hideInputPanel() +void QVirtualKeyboardInputContextPrivate::hideInputPanel() { platformInputContext->hideInputPanel(); } -void InputContextPrivate::updateAvailableLocales(const QStringList &availableLocales) +void QVirtualKeyboardInputContextPrivate::updateAvailableLocales(const QStringList &availableLocales) { Settings *settings = Settings::instance(); if (settings) settings->setAvailableLocales(availableLocales); } -void InputContextPrivate::forceCursorPosition(int anchorPosition, int cursorPosition) +void QVirtualKeyboardInputContextPrivate::forceCursorPosition(int anchorPosition, int cursorPosition) { if (!_shadow.inputItem()) return; if (!platformInputContext->m_visible) return; - if (stateFlags.testFlag(InputContextPrivate::ReselectEventState)) + if (stateFlags.testFlag(QVirtualKeyboardInputContextPrivate::ReselectEventState)) return; - if (stateFlags.testFlag(InputContextPrivate::SyncShadowInputState)) + if (stateFlags.testFlag(QVirtualKeyboardInputContextPrivate::SyncShadowInputState)) return; - VIRTUALKEYBOARD_DEBUG() << "InputContextPrivate::forceCursorPosition():" << cursorPosition << "anchorPosition:" << anchorPosition; + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::forceCursorPosition():" << cursorPosition << "anchorPosition:" << anchorPosition; if (!preeditText.isEmpty()) { forceAnchorPosition = -1; _forceCursorPosition = cursorPosition; @@ -234,31 +234,31 @@ void InputContextPrivate::forceCursorPosition(int anchorPosition, int cursorPosi } else { forceAnchorPosition = anchorPosition; _forceCursorPosition = cursorPosition; - Q_Q(InputContext); + Q_Q(QVirtualKeyboardInputContext); q->setPreeditText(QString()); if (!inputMethodHints.testFlag(Qt::ImhNoPredictiveText) && cursorPosition > 0 && selectedText.isEmpty()) { - stateFlags |= InputContextPrivate::ReselectEventState; - if (inputEngine->reselect(cursorPosition, InputEngine::WordAtCursor)) - stateFlags |= InputContextPrivate::InputMethodClickState; - stateFlags &= ~InputContextPrivate::ReselectEventState; + stateFlags |= QVirtualKeyboardInputContextPrivate::ReselectEventState; + if (inputEngine->reselect(cursorPosition, QVirtualKeyboardInputEngine::WordAtCursor)) + stateFlags |= QVirtualKeyboardInputContextPrivate::InputMethodClickState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::ReselectEventState; } } } -void InputContextPrivate::onInputItemChanged() +void QVirtualKeyboardInputContextPrivate::onInputItemChanged() { if (!inputItem() && !activeKeys.isEmpty()) { // After losing keyboard focus it is impossible to track pressed keys activeKeys.clear(); - stateFlags &= ~InputContextPrivate::KeyEventState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::KeyEventState; } - stateFlags &= ~InputContextPrivate::InputMethodClickState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::InputMethodClickState; } -void InputContextPrivate::sendPreedit(const QString &text, const QList<QInputMethodEvent::Attribute> &attributes, int replaceFrom, int replaceLength) +void QVirtualKeyboardInputContextPrivate::sendPreedit(const QString &text, const QList<QInputMethodEvent::Attribute> &attributes, int replaceFrom, int replaceLength) { - VIRTUALKEYBOARD_DEBUG() << "InputContextPrivate::sendPreedit():" << text << replaceFrom << replaceLength; + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::sendPreedit():" << text << replaceFrom << replaceLength; bool textChanged = preeditText != text; bool attributesChanged = preeditTextAttributes != attributes; @@ -272,23 +272,23 @@ void InputContextPrivate::sendPreedit(const QString &text, const QList<QInputMet const bool replace = replaceFrom != 0 || replaceLength > 0; if (replace) event.setCommitString(QString(), replaceFrom, replaceLength); - stateFlags |= InputContextPrivate::InputMethodEventState; + stateFlags |= QVirtualKeyboardInputContextPrivate::InputMethodEventState; platformInputContext->sendEvent(&event); - stateFlags &= ~InputContextPrivate::InputMethodEventState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::InputMethodEventState; // Send also to shadow input if only attributes changed. // In this case the update() may not be called, so the shadow // input may be out of sync. if (_shadow.inputItem() && !replace && !text.isEmpty() && !textChanged && attributesChanged) { - VIRTUALKEYBOARD_DEBUG() << "InputContextPrivate::sendPreedit(shadow):" << text << replaceFrom << replaceLength; + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputContextPrivate::sendPreedit(shadow):" << text << replaceFrom << replaceLength; event.setAccepted(true); QGuiApplication::sendEvent(_shadow.inputItem(), &event); } } if (textChanged) { - Q_Q(InputContext); + Q_Q(QVirtualKeyboardInputContext); emit q->preeditTextChanged(); } } @@ -297,19 +297,19 @@ void InputContextPrivate::sendPreedit(const QString &text, const QList<QInputMet preeditTextAttributes.clear(); } -void InputContextPrivate::reset() +void QVirtualKeyboardInputContextPrivate::reset() { inputEngine->reset(); } -void InputContextPrivate::commit() +void QVirtualKeyboardInputContextPrivate::commit() { inputEngine->update(); } -void InputContextPrivate::update(Qt::InputMethodQueries queries) +void QVirtualKeyboardInputContextPrivate::update(Qt::InputMethodQueries queries) { - Q_Q(InputContext); + Q_Q(QVirtualKeyboardInputContext); // No need to fetch input clip rectangle during animation if (!(queries & ~Qt::ImInputItemClipRectangle) && animating) @@ -369,7 +369,7 @@ void InputContextPrivate::update(Qt::InputMethodQueries queries) // update input engine if ((newSurroundingText || newCursorPosition) && - !stateFlags.testFlag(InputContextPrivate::InputMethodEventState)) { + !stateFlags.testFlag(QVirtualKeyboardInputContextPrivate::InputMethodEventState)) { commit(); } if (newInputMethodHints) { @@ -410,24 +410,24 @@ void InputContextPrivate::update(Qt::InputMethodQueries queries) // word reselection if (newInputMethodHints || newSurroundingText || newSelectedText) - stateFlags &= ~InputContextPrivate::InputMethodClickState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::InputMethodClickState; if ((newSurroundingText || newCursorPosition) && !newSelectedText && (int)stateFlags == 0 && !inputMethodHints.testFlag(Qt::ImhNoPredictiveText) && cursorPosition > 0 && this->selectedText.isEmpty()) { - stateFlags |= InputContextPrivate::ReselectEventState; - if (inputEngine->reselect(cursorPosition, InputEngine::WordAtCursor)) - stateFlags |= InputContextPrivate::InputMethodClickState; - stateFlags &= ~InputContextPrivate::ReselectEventState; + stateFlags |= QVirtualKeyboardInputContextPrivate::ReselectEventState; + if (inputEngine->reselect(cursorPosition, QVirtualKeyboardInputEngine::WordAtCursor)) + stateFlags |= QVirtualKeyboardInputContextPrivate::InputMethodClickState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::ReselectEventState; } - if (!stateFlags.testFlag(InputContextPrivate::SyncShadowInputState)) { - stateFlags |= InputContextPrivate::SyncShadowInputState; + if (!stateFlags.testFlag(QVirtualKeyboardInputContextPrivate::SyncShadowInputState)) { + stateFlags |= QVirtualKeyboardInputContextPrivate::SyncShadowInputState; _shadow.update(queries); - stateFlags &= ~InputContextPrivate::SyncShadowInputState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::SyncShadowInputState; } } -void InputContextPrivate::invokeAction(QInputMethod::Action action, int cursorPosition) +void QVirtualKeyboardInputContextPrivate::invokeAction(QInputMethod::Action action, int cursorPosition) { switch (action) { case QInputMethod::Click: @@ -437,16 +437,16 @@ void InputContextPrivate::invokeAction(QInputMethod::Action action, int cursorPo bool reselect = !inputMethodHints.testFlag(Qt::ImhNoPredictiveText) && selectedText.isEmpty() && cursorPosition < preeditText.length(); if (reselect) { - stateFlags |= InputContextPrivate::ReselectEventState; + stateFlags |= QVirtualKeyboardInputContextPrivate::ReselectEventState; _forceCursorPosition = this->cursorPosition + cursorPosition; commit(); - inputEngine->reselect(this->cursorPosition, InputEngine::WordBeforeCursor); - stateFlags &= ~InputContextPrivate::ReselectEventState; + inputEngine->reselect(this->cursorPosition, QVirtualKeyboardInputEngine::WordBeforeCursor); + stateFlags &= ~QVirtualKeyboardInputContextPrivate::ReselectEventState; } else if (!preeditText.isEmpty() && cursorPosition == preeditText.length()) { commit(); } } - stateFlags &= ~InputContextPrivate::InputMethodClickState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::InputMethodClickState; break; case QInputMethod::ContextMenu: @@ -454,7 +454,7 @@ void InputContextPrivate::invokeAction(QInputMethod::Action action, int cursorPo } } -bool InputContextPrivate::filterEvent(const QEvent *event) +bool QVirtualKeyboardInputContextPrivate::filterEvent(const QEvent *event) { QEvent::Type type = event->type(); if (type == QEvent::KeyPress || type == QEvent::KeyRelease) { @@ -467,9 +467,9 @@ bool InputContextPrivate::filterEvent(const QEvent *event) activeKeys -= keyEvent->nativeScanCode(); if (activeKeys.isEmpty()) - stateFlags &= ~InputContextPrivate::KeyEventState; + stateFlags &= ~QVirtualKeyboardInputContextPrivate::KeyEventState; else - stateFlags |= InputContextPrivate::KeyEventState; + stateFlags |= QVirtualKeyboardInputContextPrivate::KeyEventState; #ifdef QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION int key = keyEvent->key(); @@ -493,7 +493,7 @@ bool InputContextPrivate::filterEvent(const QEvent *event) return false; } -void InputContextPrivate::addSelectionAttribute(QList<QInputMethodEvent::Attribute> &attributes) +void QVirtualKeyboardInputContextPrivate::addSelectionAttribute(QList<QInputMethodEvent::Attribute> &attributes) { if (!testAttribute(attributes, QInputMethodEvent::Selection)) { // Convert Cursor attribute to Selection attribute. @@ -517,7 +517,7 @@ void InputContextPrivate::addSelectionAttribute(QList<QInputMethodEvent::Attribu _forceCursorPosition = -1; } -bool InputContextPrivate::testAttribute(const QList<QInputMethodEvent::Attribute> &attributes, QInputMethodEvent::AttributeType attributeType) const +bool QVirtualKeyboardInputContextPrivate::testAttribute(const QList<QInputMethodEvent::Attribute> &attributes, QInputMethodEvent::AttributeType attributeType) const { for (const QInputMethodEvent::Attribute &attribute : qAsConst(attributes)) { if (attribute.type == attributeType) @@ -526,7 +526,7 @@ bool InputContextPrivate::testAttribute(const QList<QInputMethodEvent::Attribute return false; } -int InputContextPrivate::findAttribute(const QList<QInputMethodEvent::Attribute> &attributes, QInputMethodEvent::AttributeType attributeType) const +int QVirtualKeyboardInputContextPrivate::findAttribute(const QList<QInputMethodEvent::Attribute> &attributes, QInputMethodEvent::AttributeType attributeType) const { const int count = attributes.count(); for (int i = 0; i < count; ++i) { @@ -536,5 +536,4 @@ int InputContextPrivate::findAttribute(const QList<QInputMethodEvent::Attribute> return -1; } -} // namespace QtVirtualKeyboard QT_END_NAMESPACE diff --git a/src/virtualkeyboard/inputcontext_p.h b/src/virtualkeyboard/inputcontext_p.h index be0d6c2b..fdffee79 100644 --- a/src/virtualkeyboard/inputcontext_p.h +++ b/src/virtualkeyboard/inputcontext_p.h @@ -48,28 +48,28 @@ #include <QtVirtualKeyboard/private/shadowinputcontext_p.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { +namespace QtVirtualKeyboard { class PlatformInputContext; -class ShadowInputContext; -class InputEngine; class ShiftHandler; -class InputContextPrivate; +} +class QVirtualKeyboardInputEngine; +class QVirtualKeyboardInputContextPrivate; -class QVIRTUALKEYBOARD_EXPORT InputContextPrivate : public QObject +class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputContextPrivate : public QObject { Q_OBJECT - Q_DECLARE_PUBLIC(InputContext) + Q_DECLARE_PUBLIC(QVirtualKeyboardInputContext) Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged) Q_PROPERTY(QRectF keyboardRectangle READ keyboardRectangle WRITE setKeyboardRectangle NOTIFY keyboardRectangleChanged) Q_PROPERTY(QRectF previewRectangle READ previewRectangle WRITE setPreviewRectangle NOTIFY previewRectangleChanged) Q_PROPERTY(bool previewVisible READ previewVisible WRITE setPreviewVisible NOTIFY previewVisibleChanged) Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged) Q_PROPERTY(QObject *inputItem READ inputItem NOTIFY inputItemChanged) - Q_PROPERTY(ShiftHandler *shiftHandler READ shiftHandler CONSTANT) - Q_PROPERTY(ShadowInputContext *shadow READ shadow CONSTANT) + Q_PROPERTY(QtVirtualKeyboard::ShiftHandler *shiftHandler READ shiftHandler CONSTANT) + Q_PROPERTY(QtVirtualKeyboard::ShadowInputContext *shadow READ shadow CONSTANT) - explicit InputContextPrivate(InputContext *q_ptr, PlatformInputContext *platformInputContext); + explicit QVirtualKeyboardInputContextPrivate(QVirtualKeyboardInputContext *q_ptr, QtVirtualKeyboard::PlatformInputContext *platformInputContext); void init(); public: @@ -82,7 +82,7 @@ public: }; Q_DECLARE_FLAGS(StateFlags, StateFlag) - ~InputContextPrivate(); + ~QVirtualKeyboardInputContextPrivate(); bool focus() const; void setFocus(bool focus); @@ -95,8 +95,8 @@ public: QString locale() const; void setLocale(const QString &locale); QObject *inputItem() const; - ShiftHandler *shiftHandler() const; - ShadowInputContext *shadow() const; + QtVirtualKeyboard::ShiftHandler *shiftHandler() const; + QtVirtualKeyboard::ShadowInputContext *shadow() const; // Helper functions Q_INVOKABLE bool fileExists(const QUrl &fileUrl); @@ -132,10 +132,10 @@ private: int findAttribute(const QList<QInputMethodEvent::Attribute> &attributes, QInputMethodEvent::AttributeType attributeType) const; private: - InputContext *q_ptr; - PlatformInputContext *platformInputContext; - InputEngine *inputEngine; - ShiftHandler *_shiftHandler; + QVirtualKeyboardInputContext *q_ptr; + QtVirtualKeyboard::PlatformInputContext *platformInputContext; + QVirtualKeyboardInputEngine *inputEngine; + QtVirtualKeyboard::ShiftHandler *_shiftHandler; QRectF keyboardRect; QRectF previewRect; bool _previewVisible; @@ -160,14 +160,13 @@ private: QSet<int> activeNavigationKeys; #endif QSet<quint32> activeKeys; - ShadowInputContext _shadow; + QtVirtualKeyboard::ShadowInputContext _shadow; - friend class PlatformInputContext; + friend class QtVirtualKeyboard::PlatformInputContext; }; -Q_DECLARE_OPERATORS_FOR_FLAGS(InputContextPrivate::StateFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(QVirtualKeyboardInputContextPrivate::StateFlags) -} // namespace QtVirtualKeyboard QT_END_NAMESPACE #endif // INPUTCONTEXT_P_H diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp index 23956401..cead3491 100644 --- a/src/virtualkeyboard/inputengine.cpp +++ b/src/virtualkeyboard/inputengine.cpp @@ -39,20 +39,20 @@ #include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { +using namespace QtVirtualKeyboard; -class InputEnginePrivate : public QObjectPrivate +class QVirtualKeyboardInputEnginePrivate : public QObjectPrivate { - Q_DECLARE_PUBLIC(InputEngine) + Q_DECLARE_PUBLIC(QVirtualKeyboardInputEngine) public: - InputEnginePrivate(InputEngine *q_ptr) : + QVirtualKeyboardInputEnginePrivate(QVirtualKeyboardInputEngine *q_ptr) : QObjectPrivate(), q_ptr(q_ptr), inputContext(nullptr), fallbackInputMethod(nullptr), - textCase(InputEngine::Lower), - inputMode(InputEngine::Latin), + textCase(QVirtualKeyboardInputEngine::Lower), + inputMode(QVirtualKeyboardInputEngine::Latin), activeKey(Qt::Key_unknown), activeKeyModifiers(Qt::NoModifier), previousKey(Qt::Key_unknown), @@ -62,13 +62,13 @@ public: { } - virtual ~InputEnginePrivate() + virtual ~QVirtualKeyboardInputEnginePrivate() { } bool virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool isAutoRepeat) { - Q_Q(InputEngine); + Q_Q(QVirtualKeyboardInputEngine); bool accept = false; if (inputMethod) { accept = inputMethod->keyEvent(key, text, modifiers); @@ -82,14 +82,14 @@ public: return accept; } - InputEngine* q_ptr; - InputContext *inputContext; - QPointer<AbstractInputMethod> inputMethod; - AbstractInputMethod *fallbackInputMethod; - InputEngine::TextCase textCase; - InputEngine::InputMode inputMode; + QVirtualKeyboardInputEngine* q_ptr; + QVirtualKeyboardInputContext *inputContext; + QPointer<QVirtualKeyboardAbstractInputMethod> inputMethod; + QVirtualKeyboardAbstractInputMethod *fallbackInputMethod; + QVirtualKeyboardInputEngine::TextCase textCase; + QVirtualKeyboardInputEngine::InputMode inputMode; QList<int> inputModes; - QMap<SelectionListModel::Type, SelectionListModel *> selectionListModels; + QMap<QVirtualKeyboardSelectionListModel::Type, QVirtualKeyboardSelectionListModel *> selectionListModels; Qt::Key activeKey; QString activeKeyText; Qt::KeyboardModifiers activeKeyModifiers; @@ -122,7 +122,7 @@ private: \qmltype InputEngine \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml - \instantiates QtVirtualKeyboard::InputEngine + \instantiates QVirtualKeyboardInputEngine \brief Maps the user input to the input methods. The input engine is responsible for routing input events to input @@ -134,7 +134,7 @@ private: */ /*! - \class QtVirtualKeyboard::InputEngine + \class QVirtualKeyboardInputEngine \inmodule QtVirtualKeyboard \brief The InputEngine class provides an input engine that supports C++ and QML integration. @@ -151,33 +151,33 @@ private: \internal Constructs an input engine with input context as \a parent. */ -InputEngine::InputEngine(InputContext *parent) : - QObject(*new InputEnginePrivate(this), parent) +QVirtualKeyboardInputEngine::QVirtualKeyboardInputEngine(QVirtualKeyboardInputContext *parent) : + QObject(*new QVirtualKeyboardInputEnginePrivate(this), parent) { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); d->inputContext = parent; } -void InputEngine::init() +void QVirtualKeyboardInputEngine::init() { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); ShiftHandler *shiftHandler = d->inputContext->priv()->shiftHandler(); - QObject::connect(shiftHandler, &ShiftHandler::shiftChanged, this, &InputEngine::shiftChanged); - QObject::connect(d->inputContext, &InputContext::localeChanged, this, &InputEngine::update); - QObject::connect(d->inputContext, &InputContext::inputMethodHintsChanged, this, &InputEngine::updateSelectionListModels); - QObject::connect(d->inputContext, &InputContext::localeChanged, this, &InputEngine::updateInputModes); - QObject::connect(this, &InputEngine::inputMethodChanged, this, &InputEngine::updateInputModes); + QObject::connect(shiftHandler, &ShiftHandler::shiftChanged, this, &QVirtualKeyboardInputEngine::shiftChanged); + QObject::connect(d->inputContext, &QVirtualKeyboardInputContext::localeChanged, this, &QVirtualKeyboardInputEngine::update); + QObject::connect(d->inputContext, &QVirtualKeyboardInputContext::inputMethodHintsChanged, this, &QVirtualKeyboardInputEngine::updateSelectionListModels); + QObject::connect(d->inputContext, &QVirtualKeyboardInputContext::localeChanged, this, &QVirtualKeyboardInputEngine::updateInputModes); + QObject::connect(this, &QVirtualKeyboardInputEngine::inputMethodChanged, this, &QVirtualKeyboardInputEngine::updateInputModes); d->fallbackInputMethod = new FallbackInputMethod(this); if (d->fallbackInputMethod) d->fallbackInputMethod->setInputEngine(this); - d->selectionListModels[SelectionListModel::WordCandidateList] = new SelectionListModel(this); + d->selectionListModels[QVirtualKeyboardSelectionListModel::WordCandidateList] = new QVirtualKeyboardSelectionListModel(this); } /*! \internal Destroys the input engine and frees all allocated resources. */ -InputEngine::~InputEngine() +QVirtualKeyboardInputEngine::~QVirtualKeyboardInputEngine() { } @@ -211,10 +211,10 @@ InputEngine::~InputEngine() \sa virtualKeyCancel(), virtualKeyRelease() */ -bool InputEngine::virtualKeyPress(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool repeat) +bool QVirtualKeyboardInputEngine::virtualKeyPress(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool repeat) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyPress():" << key << text << modifiers << repeat; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyPress():" << key << text << modifiers << repeat; bool accept = false; if (d->activeKey == Qt::Key_unknown || d->activeKey == key) { d->activeKey = key; @@ -239,16 +239,16 @@ bool InputEngine::virtualKeyPress(Qt::Key key, const QString &text, Qt::Keyboard the key state needs to be restored. */ /*! - \fn void QtVirtualKeyboard::InputEngine::virtualKeyCancel() + \fn void QVirtualKeyboardInputEngine::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 InputEngine::virtualKeyCancel() +void QVirtualKeyboardInputEngine::virtualKeyCancel() { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyCancel()"; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyCancel()"; if (d->activeKey != Qt::Key_unknown) { d->activeKey = Qt::Key_unknown; d->activeKeyText = QString(); @@ -278,10 +278,10 @@ void InputEngine::virtualKeyCancel() Returns \c true if the key was accepted by the input engine. */ -bool InputEngine::virtualKeyRelease(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) +bool QVirtualKeyboardInputEngine::virtualKeyRelease(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyRelease():" << key << text << modifiers; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyRelease():" << key << text << modifiers; bool accept = false; if (d->activeKey == key) { if (!d->repeatCount) { @@ -318,10 +318,10 @@ bool InputEngine::virtualKeyRelease(Qt::Key key, const QString &text, Qt::Keyboa 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 InputEngine::virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) +bool QVirtualKeyboardInputEngine::virtualKeyClick(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::virtualKeyClick():" << key << text << modifiers; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::virtualKeyClick():" << key << text << modifiers; return d->virtualKeyClick(key, text, modifiers, false); } @@ -329,18 +329,18 @@ bool InputEngine::virtualKeyClick(Qt::Key key, const QString &text, Qt::Keyboard Returns the \c InputContext instance associated with the input engine. */ -InputContext *InputEngine::inputContext() const +QVirtualKeyboardInputContext *QVirtualKeyboardInputEngine::inputContext() const { - Q_D(const InputEngine); + Q_D(const QVirtualKeyboardInputEngine); return d->inputContext; } /*! Returns the currently active key, or Qt::Key_unknown if no key is active. */ -Qt::Key InputEngine::activeKey() const +Qt::Key QVirtualKeyboardInputEngine::activeKey() const { - Q_D(const InputEngine); + Q_D(const QVirtualKeyboardInputEngine); return d->activeKey; } @@ -348,38 +348,38 @@ Qt::Key InputEngine::activeKey() const Returns the previously active key, or Qt::Key_unknown if no key has been active. */ -Qt::Key InputEngine::previousKey() const +Qt::Key QVirtualKeyboardInputEngine::previousKey() const { - Q_D(const InputEngine); + Q_D(const QVirtualKeyboardInputEngine); return d->previousKey; } /*! Returns the active input method. */ -AbstractInputMethod *InputEngine::inputMethod() const +QVirtualKeyboardAbstractInputMethod *QVirtualKeyboardInputEngine::inputMethod() const { - Q_D(const InputEngine); + Q_D(const QVirtualKeyboardInputEngine); return d->inputMethod; } /*! Sets \a inputMethod as the active input method. */ -void InputEngine::setInputMethod(AbstractInputMethod *inputMethod) +void QVirtualKeyboardInputEngine::setInputMethod(QVirtualKeyboardAbstractInputMethod *inputMethod) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::setInputMethod():" << inputMethod; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::setInputMethod():" << inputMethod; if (d->inputMethod != inputMethod) { update(); if (d->inputMethod) { - QObject::disconnect(d->inputMethod.data(), &AbstractInputMethod::selectionListsChanged, this, &InputEngine::updateSelectionListModels); + QObject::disconnect(d->inputMethod.data(), &QVirtualKeyboardAbstractInputMethod::selectionListsChanged, this, &QVirtualKeyboardInputEngine::updateSelectionListModels); d->inputMethod->setInputEngine(nullptr); } d->inputMethod = inputMethod; if (d->inputMethod) { d->inputMethod->setInputEngine(this); - QObject::connect(d->inputMethod.data(), &AbstractInputMethod::selectionListsChanged, this, &InputEngine::updateSelectionListModels); + QObject::connect(d->inputMethod.data(), &QVirtualKeyboardAbstractInputMethod::selectionListsChanged, this, &QVirtualKeyboardInputEngine::updateSelectionListModels); // Set current text case d->inputMethod->setTextCase(d->textCase); @@ -393,22 +393,22 @@ void InputEngine::setInputMethod(AbstractInputMethod *inputMethod) /*! Returns the list of available input modes. */ -QList<int> InputEngine::inputModes() const +QList<int> QVirtualKeyboardInputEngine::inputModes() const { - Q_D(const InputEngine); + Q_D(const QVirtualKeyboardInputEngine); return d->inputModes; } -InputEngine::InputMode InputEngine::inputMode() const +QVirtualKeyboardInputEngine::InputMode QVirtualKeyboardInputEngine::inputMode() const { - Q_D(const InputEngine); + Q_D(const QVirtualKeyboardInputEngine); return d->inputMode; } -void InputEngine::setInputMode(InputEngine::InputMode inputMode) +void QVirtualKeyboardInputEngine::setInputMode(QVirtualKeyboardInputEngine::InputMode inputMode) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::setInputMode():" << inputMode; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::setInputMode():" << inputMode; if (d->inputMethod) { #ifdef QT_DEBUG // Cached input modes should be in sync with the input method @@ -430,16 +430,16 @@ void InputEngine::setInputMode(InputEngine::InputMode inputMode) } } -SelectionListModel *InputEngine::wordCandidateListModel() const +QVirtualKeyboardSelectionListModel *QVirtualKeyboardInputEngine::wordCandidateListModel() const { - Q_D(const InputEngine); - return d->selectionListModels[SelectionListModel::WordCandidateList]; + Q_D(const QVirtualKeyboardInputEngine); + return d->selectionListModels[QVirtualKeyboardSelectionListModel::WordCandidateList]; } -bool InputEngine::wordCandidateListVisibleHint() const +bool QVirtualKeyboardInputEngine::wordCandidateListVisibleHint() const { - Q_D(const InputEngine); - const auto it = d->selectionListModels.constFind(SelectionListModel::WordCandidateList); + Q_D(const QVirtualKeyboardInputEngine); + const auto it = d->selectionListModels.constFind(QVirtualKeyboardSelectionListModel::WordCandidateList); if (it == d->selectionListModels.cend()) return false; return it.value()->dataSource() != nullptr; @@ -448,9 +448,9 @@ bool InputEngine::wordCandidateListVisibleHint() const /*! Returns list of supported pattern recognition modes. */ -QList<int> InputEngine::patternRecognitionModes() const +QList<int> QVirtualKeyboardInputEngine::patternRecognitionModes() const { - Q_D(const InputEngine); + Q_D(const QVirtualKeyboardInputEngine); QList<PatternRecognitionMode> patterRecognitionModeList; if (d->inputMethod) patterRecognitionModeList = d->inputMethod->patternRecognitionModes(); @@ -464,7 +464,7 @@ QList<int> InputEngine::patternRecognitionModes() const } /*! - \qmlmethod Trace InputEngine::traceBegin(int traceId, int patternRecognitionMode, var traceCaptureDeviceInfo, var traceScreenInfo) + \qmlmethod QVirtualKeyboardTrace InputEngine::traceBegin(int traceId, int patternRecognitionMode, var traceCaptureDeviceInfo, var traceScreenInfo) \since QtQuick.VirtualKeyboard 2.0 Starts a trace interaction with the input engine. @@ -490,26 +490,26 @@ QList<int> InputEngine::patternRecognitionModes() const Starts a trace interaction with the input engine. The trace is uniquely identified by the \a traceId. The input engine will assign - the id to the Trace object if the input method accepts the event. + the id to the QVirtualKeyboardTrace object if the input method accepts the event. The \a patternRecognitionMode specifies the recognition mode used for the pattern. - If the current input method accepts the event it returns a Trace object associated with this interaction. + If the current input method accepts the event it returns a QVirtualKeyboardTrace object associated with this interaction. If the input method discards the event, it returns a NULL value. The \a traceCaptureDeviceInfo provides information about the source device and the \a traceScreenInfo provides information about the screen context. - By definition, the Trace object remains valid until the traceEnd() method is called. + By definition, the QVirtualKeyboardTrace object remains valid until the traceEnd() method is called. The trace interaction is ended by calling the traceEnd() method. */ -Trace *InputEngine::traceBegin( +QVirtualKeyboardTrace *QVirtualKeyboardInputEngine::traceBegin( int traceId, PatternRecognitionMode patternRecognitionMode, const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::traceBegin():" + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::traceBegin():" << "traceId:" << traceId << "patternRecognitionMode:" << patternRecognitionMode << "traceCaptureDeviceInfo:" << traceCaptureDeviceInfo @@ -520,7 +520,7 @@ Trace *InputEngine::traceBegin( return nullptr; if (!d->inputMethod->patternRecognitionModes().contains(patternRecognitionMode)) return nullptr; - Trace *trace = d->inputMethod->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); + QVirtualKeyboardTrace *trace = d->inputMethod->traceBegin(traceId, patternRecognitionMode, traceCaptureDeviceInfo, traceScreenInfo); if (trace) trace->setTraceId(traceId); return trace; @@ -544,10 +544,10 @@ Trace *InputEngine::traceBegin( The function returns true if the trace interaction was accepted (i.e. the touch events should not be used for anything else). */ -bool InputEngine::traceEnd(Trace *trace) +bool QVirtualKeyboardInputEngine::traceEnd(QVirtualKeyboardTrace *trace) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::traceEnd():" << trace; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::traceEnd():" << trace; Q_ASSERT(trace); if (!d->inputMethod) return false; @@ -563,10 +563,10 @@ bool InputEngine::traceEnd(Trace *trace) The function returns \c true if the word was successfully reselected. */ -bool InputEngine::reselect(int cursorPosition, const ReselectFlags &reselectFlags) +bool QVirtualKeyboardInputEngine::reselect(int cursorPosition, const ReselectFlags &reselectFlags) { - Q_D(InputEngine); - VIRTUALKEYBOARD_DEBUG() << "InputEngine::reselect():" << cursorPosition << reselectFlags; + Q_D(QVirtualKeyboardInputEngine); + VIRTUALKEYBOARD_DEBUG() << "QVirtualKeyboardInputEngine::reselect():" << cursorPosition << reselectFlags; if (!d->inputMethod || !wordCandidateListVisibleHint()) return false; return d->inputMethod->reselect(cursorPosition, reselectFlags); @@ -576,9 +576,9 @@ bool InputEngine::reselect(int cursorPosition, const ReselectFlags &reselectFlag \internal This method is called when the current preedit text is clicked. */ -bool InputEngine::clickPreeditText(int cursorPosition) +bool QVirtualKeyboardInputEngine::clickPreeditText(int cursorPosition) { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); if (!d->inputMethod) return false; return d->inputMethod->clickPreeditText(cursorPosition); @@ -588,9 +588,9 @@ bool InputEngine::clickPreeditText(int cursorPosition) \internal Resets the input method. */ -void InputEngine::reset() +void QVirtualKeyboardInputEngine::reset() { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); if (d->inputMethod) { RecursiveMethodGuard guard(d->recursiveMethodLock); if (!guard.locked()) { @@ -607,9 +607,9 @@ void InputEngine::reset() Updates the input method's state. This method is called whenever the input context is changed. */ -void InputEngine::update() +void QVirtualKeyboardInputEngine::update() { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); if (d->inputMethod) { RecursiveMethodGuard guard(d->recursiveMethodLock); if (!guard.locked()) { @@ -622,9 +622,9 @@ void InputEngine::update() \internal Updates the text case for the input method. */ -void InputEngine::shiftChanged() +void QVirtualKeyboardInputEngine::shiftChanged() { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); TextCase newCase = d->inputContext->priv()->shiftHandler()->shift() ? Upper : Lower; if (d->textCase != newCase) { d->textCase = newCase; @@ -637,33 +637,33 @@ void InputEngine::shiftChanged() /*! \internal */ -void InputEngine::updateSelectionListModels() +void QVirtualKeyboardInputEngine::updateSelectionListModels() { - Q_D(InputEngine); - QList<SelectionListModel::Type> inactiveSelectionLists = d->selectionListModels.keys(); + Q_D(QVirtualKeyboardInputEngine); + QList<QVirtualKeyboardSelectionListModel::Type> inactiveSelectionLists = d->selectionListModels.keys(); if (d->inputMethod) { // Allocate selection lists for the input method - const QList<SelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists(); - for (const SelectionListModel::Type &selectionListType : activeSelectionLists) { + const QList<QVirtualKeyboardSelectionListModel::Type> activeSelectionLists = d->inputMethod->selectionLists(); + for (const QVirtualKeyboardSelectionListModel::Type &selectionListType : activeSelectionLists) { auto it = d->selectionListModels.find(selectionListType); if (it == d->selectionListModels.end()) { - it = d->selectionListModels.insert(selectionListType, new SelectionListModel(this)); - if (selectionListType == SelectionListModel::WordCandidateList) + it = d->selectionListModels.insert(selectionListType, new QVirtualKeyboardSelectionListModel(this)); + if (selectionListType == QVirtualKeyboardSelectionListModel::WordCandidateList) emit wordCandidateListModelChanged(); } it.value()->setDataSource(d->inputMethod, selectionListType); - if (selectionListType == SelectionListModel::WordCandidateList) + if (selectionListType == QVirtualKeyboardSelectionListModel::WordCandidateList) emit wordCandidateListVisibleHintChanged(); inactiveSelectionLists.removeAll(selectionListType); } } // Deallocate inactive selection lists - for (const SelectionListModel::Type &selectionListType : qAsConst(inactiveSelectionLists)) { + for (const QVirtualKeyboardSelectionListModel::Type &selectionListType : qAsConst(inactiveSelectionLists)) { const auto it = d->selectionListModels.constFind(selectionListType); if (it != d->selectionListModels.cend()) { it.value()->setDataSource(nullptr, selectionListType); - if (selectionListType == SelectionListModel::WordCandidateList) + if (selectionListType == QVirtualKeyboardSelectionListModel::WordCandidateList) emit wordCandidateListVisibleHintChanged(); } } @@ -672,9 +672,9 @@ void InputEngine::updateSelectionListModels() /*! \internal */ -void InputEngine::updateInputModes() +void QVirtualKeyboardInputEngine::updateInputModes() { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); QList<int> newInputModes; if (d->inputMethod) { QList<InputMode> tmpList(d->inputMethod->inputModes(d->inputContext->locale())); @@ -695,9 +695,9 @@ void InputEngine::updateInputModes() /*! \internal */ -void InputEngine::timerEvent(QTimerEvent *timerEvent) +void QVirtualKeyboardInputEngine::timerEvent(QTimerEvent *timerEvent) { - Q_D(InputEngine); + Q_D(QVirtualKeyboardInputEngine); if (timerEvent->timerId() == d->repeatTimer) { d->repeatTimer = 0; d->virtualKeyClick(d->activeKey, d->activeKeyText, d->activeKeyModifiers, true); @@ -713,7 +713,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::InputEngine::activeKey + \property QVirtualKeyboardInputEngine::activeKey \brief the active key. Currently pressed key. @@ -725,7 +725,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) Previously pressed key. */ /*! - \property QtVirtualKeyboard::InputEngine::previousKey + \property QVirtualKeyboardInputEngine::previousKey \brief the previous active key. Previously pressed key. @@ -739,7 +739,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::InputEngine::inputMethod + \property QVirtualKeyboardInputEngine::inputMethod \brief the active input method. Use this property to set active the input method, or to monitor when the @@ -754,7 +754,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::InputEngine::inputModes + \property QVirtualKeyboardInputEngine::inputModes \brief the available input modes for active input method. The list of available input modes is dependent on the input method and @@ -792,7 +792,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::InputEngine::inputMode + \property QVirtualKeyboardInputEngine::inputMode \brief the current input mode. Use this property to get or set the current input mode. The @@ -801,14 +801,14 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \qmlproperty SelectionListModel InputEngine::wordCandidateListModel + \qmlproperty QVirtualKeyboardSelectionListModel InputEngine::wordCandidateListModel Use this property to access the list model for the word candidate list. */ /*! - \property QtVirtualKeyboard::InputEngine::wordCandidateListModel + \property QVirtualKeyboardInputEngine::wordCandidateListModel \brief list model for the word candidate list. Use this property to access the list model for the word candidate @@ -823,7 +823,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::InputEngine::wordCandidateListVisibleHint + \property QVirtualKeyboardInputEngine::wordCandidateListVisibleHint \brief visible hint for the word candidate list. Use this property to check if the word candidate list should be visible @@ -831,7 +831,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::InputEngine::InputMode + \enum QVirtualKeyboardInputEngine::InputMode This enum specifies the input mode for the input method. @@ -866,7 +866,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::InputEngine::TextCase + \enum QVirtualKeyboardInputEngine::TextCase This enum specifies the text case for the input method. @@ -877,7 +877,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::InputEngine::PatternRecognitionMode + \enum QVirtualKeyboardInputEngine::PatternRecognitionMode This enum specifies the input mode for the input method. @@ -888,7 +888,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \enum QtVirtualKeyboard::InputEngine::ReselectFlag + \enum QVirtualKeyboardInputEngine::ReselectFlag This enum specifies the rules for word reselection. @@ -909,7 +909,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::InputEngine::virtualKeyClicked(Qt::Key key, const QString &text, Qt::KeyboardModifiers modifiers, bool isAutoRepeat) + \fn void QVirtualKeyboardInputEngine::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 @@ -925,7 +925,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \property QtVirtualKeyboard::InputEngine::patternRecognitionModes + \property QVirtualKeyboardInputEngine::patternRecognitionModes \since QtQuick.VirtualKeyboard 2.0 \brief the list of available pattern recognition modes. @@ -939,7 +939,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::InputEngine::activeKeyChanged(Qt::Key key) + \fn void QVirtualKeyboardInputEngine::activeKeyChanged(Qt::Key key) Indicates that the active \a key has changed. */ @@ -951,7 +951,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::InputEngine::previousKeyChanged(Qt::Key key) + \fn void QVirtualKeyboardInputEngine::previousKeyChanged(Qt::Key key) Indicates that the previous \a key has changed. */ @@ -963,7 +963,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::InputEngine::inputMethodChanged() + \fn void QVirtualKeyboardInputEngine::inputMethodChanged() Indicates that the input method has changed. */ @@ -973,30 +973,30 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) Emitted when the input method needs to be reset. - \note This signal is automatically connected to AbstractInputMethod::reset() + \note This signal is automatically connected to QVirtualKeyboardAbstractInputMethod::reset() and InputMethod::reset() when the input method is activated. */ /*! - \fn void QtVirtualKeyboard::InputEngine::inputMethodReset() + \fn void QVirtualKeyboardInputEngine::inputMethodReset() Emitted when the input method needs to be reset. - \note This signal is automatically connected to AbstractInputMethod::reset() + \note This signal is automatically connected to QVirtualKeyboardAbstractInputMethod::reset() and InputMethod::reset() when the input method is activated. */ /*! \qmlsignal void InputEngine::inputMethodUpdate() - \note This signal is automatically connected to AbstractInputMethod::update() + \note This signal is automatically connected to QVirtualKeyboardAbstractInputMethod::update() and InputMethod::update() when the input method is activated. */ /*! - \fn void QtVirtualKeyboard::InputEngine::inputMethodUpdate() + \fn void QVirtualKeyboardInputEngine::inputMethodUpdate() - \note This signal is automatically connected to AbstractInputMethod::update() + \note This signal is automatically connected to QVirtualKeyboardAbstractInputMethod::update() and InputMethod::update() when the input method is activated. */ @@ -1007,7 +1007,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::InputEngine::inputModesChanged() + \fn void QVirtualKeyboardInputEngine::inputModesChanged() Indicates that the available input modes have changed. */ @@ -1019,7 +1019,7 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::InputEngine::inputModeChanged() + \fn void QVirtualKeyboardInputEngine::inputModeChanged() Indicates that the input mode has changed. */ @@ -1039,11 +1039,10 @@ void InputEngine::timerEvent(QTimerEvent *timerEvent) */ /*! - \fn void QtVirtualKeyboard::InputEngine::patternRecognitionModesChanged() + \fn void QVirtualKeyboardInputEngine::patternRecognitionModesChanged() \since QtQuick.VirtualKeyboard 2.0 Indicates that the available pattern recognition modes have changed. */ -} // namespace QtVirtualKeyboard QT_END_NAMESPACE diff --git a/src/virtualkeyboard/inputengine.h b/src/virtualkeyboard/inputengine.h index f4f5881c..a177051f 100644 --- a/src/virtualkeyboard/inputengine.h +++ b/src/virtualkeyboard/inputengine.h @@ -35,30 +35,29 @@ #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { -class InputContext; -class SelectionListModel; -class AbstractInputMethod; -class InputEnginePrivate; -class Trace; +class QVirtualKeyboardInputContext; +class QVirtualKeyboardSelectionListModel; +class QVirtualKeyboardAbstractInputMethod; +class QVirtualKeyboardInputEnginePrivate; +class QVirtualKeyboardTrace; -class QVIRTUALKEYBOARD_EXPORT InputEngine : public QObject +class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardInputEngine : public QObject { Q_OBJECT - Q_DISABLE_COPY(InputEngine) - Q_DECLARE_PRIVATE(InputEngine) + Q_DISABLE_COPY(QVirtualKeyboardInputEngine) + Q_DECLARE_PRIVATE(QVirtualKeyboardInputEngine) Q_FLAGS(ReselectFlags) Q_PROPERTY(Qt::Key activeKey READ activeKey NOTIFY activeKeyChanged) Q_PROPERTY(Qt::Key previousKey READ previousKey NOTIFY previousKeyChanged) - Q_PROPERTY(AbstractInputMethod *inputMethod READ inputMethod WRITE setInputMethod NOTIFY inputMethodChanged) + Q_PROPERTY(QVirtualKeyboardAbstractInputMethod *inputMethod READ inputMethod WRITE setInputMethod NOTIFY inputMethodChanged) Q_PROPERTY(QList<int> inputModes READ inputModes NOTIFY inputModesChanged) Q_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode NOTIFY inputModeChanged) Q_PROPERTY(QList<int> patternRecognitionModes READ patternRecognitionModes NOTIFY patternRecognitionModesChanged) - Q_PROPERTY(SelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged) + Q_PROPERTY(QVirtualKeyboardSelectionListModel *wordCandidateListModel READ wordCandidateListModel NOTIFY wordCandidateListModelChanged) Q_PROPERTY(bool wordCandidateListVisibleHint READ wordCandidateListVisibleHint NOTIFY wordCandidateListVisibleHintChanged) - explicit InputEngine(InputContext *parent = nullptr); + explicit QVirtualKeyboardInputEngine(QVirtualKeyboardInputContext *parent = nullptr); void init(); public: @@ -101,32 +100,33 @@ public: Q_DECLARE_FLAGS(ReselectFlags, ReselectFlag) public: - ~InputEngine(); + ~QVirtualKeyboardInputEngine(); 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); - InputContext *inputContext() const; + QVirtualKeyboardInputContext *inputContext() const; Qt::Key activeKey() const; Qt::Key previousKey() const; - AbstractInputMethod *inputMethod() const; - void setInputMethod(AbstractInputMethod *inputMethod); + QVirtualKeyboardAbstractInputMethod *inputMethod() const; + void setInputMethod(QVirtualKeyboardAbstractInputMethod *inputMethod); QList<int> inputModes() const; InputMode inputMode() const; void setInputMode(InputMode inputMode); - SelectionListModel *wordCandidateListModel() const; + QVirtualKeyboardSelectionListModel *wordCandidateListModel() const; bool wordCandidateListVisibleHint() const; QList<int> patternRecognitionModes() const; - Q_INVOKABLE Trace *traceBegin(int traceId, PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); - Q_INVOKABLE bool traceEnd(Trace *trace); + Q_INVOKABLE QVirtualKeyboardTrace *traceBegin( + int traceId, PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + Q_INVOKABLE bool traceEnd(QVirtualKeyboardTrace *trace); Q_INVOKABLE bool reselect(int cursorPosition, const ReselectFlags &reselectFlags); bool clickPreeditText(int cursorPosition); @@ -155,15 +155,14 @@ protected: void timerEvent(QTimerEvent *timerEvent); private: - friend class InputContext; - friend class InputContextPrivate; + friend class QVirtualKeyboardInputContext; + friend class QVirtualKeyboardInputContextPrivate; }; -} // namespace QtVirtualKeyboard QT_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::InputEngine::TextCase) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::InputEngine::InputMode) -Q_DECLARE_OPERATORS_FOR_FLAGS(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::InputEngine::ReselectFlags) +Q_DECLARE_METATYPE(QVirtualKeyboardInputEngine::TextCase) +Q_DECLARE_METATYPE(QVirtualKeyboardInputEngine::InputMode) +Q_DECLARE_OPERATORS_FOR_FLAGS(QVirtualKeyboardInputEngine::ReselectFlags) #endif diff --git a/src/virtualkeyboard/inputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp index 7ee4317e..393ce603 100644 --- a/src/virtualkeyboard/inputmethod.cpp +++ b/src/virtualkeyboard/inputmethod.cpp @@ -207,7 +207,7 @@ namespace QtVirtualKeyboard { \since QtQuick.VirtualKeyboard 2.0 This method is called when the trace interaction ends. The input method should destroy the \a trace object - at some point after this function is called. See the \l Trace API how to access the gathered + at some point after this function is called. See the \l {Trace API for Input Methods} how to access the gathered data. */ @@ -244,7 +244,7 @@ namespace QtVirtualKeyboard { */ InputMethod::InputMethod(QObject *parent) : - AbstractInputMethod(parent) + QVirtualKeyboardAbstractInputMethod(parent) { } @@ -252,21 +252,21 @@ InputMethod::~InputMethod() { } -QList<InputEngine::InputMode> InputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> InputMethod::inputModes(const QString &locale) { QVariant result; QMetaObject::invokeMethod(this, "inputModes", Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, locale)); - QList<InputEngine::InputMode> inputModeList; + QList<QVirtualKeyboardInputEngine::InputMode> inputModeList; const auto resultList = result.toList(); inputModeList.reserve(resultList.size()); for (const QVariant &inputMode : resultList) - inputModeList.append(static_cast<InputEngine::InputMode>(inputMode.toInt())); + inputModeList.append(static_cast<QVirtualKeyboardInputEngine::InputMode>(inputMode.toInt())); return inputModeList; } -bool InputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool InputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { QVariant result; QMetaObject::invokeMethod(this, "setInputMode", @@ -276,7 +276,7 @@ bool InputMethod::setInputMode(const QString &locale, InputEngine::InputMode inp return result.toBool(); } -bool InputMethod::setTextCase(InputEngine::TextCase textCase) +bool InputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { QVariant result; QMetaObject::invokeMethod(this, "setTextCase", @@ -296,21 +296,21 @@ bool InputMethod::keyEvent(Qt::Key key, const QString &text, Qt::KeyboardModifie return result.toBool(); } -QList<SelectionListModel::Type> InputMethod::selectionLists() +QList<QVirtualKeyboardSelectionListModel::Type> InputMethod::selectionLists() { QVariant result; QMetaObject::invokeMethod(this, "selectionLists", Q_RETURN_ARG(QVariant, result)); - QList<SelectionListModel::Type> selectionListsList; + QList<QVirtualKeyboardSelectionListModel::Type> selectionListsList; const auto resultList = result.toList(); selectionListsList.reserve(resultList.size()); for (const QVariant &selectionListType : resultList) - selectionListsList.append(static_cast<SelectionListModel::Type>(selectionListType.toInt())); + selectionListsList.append(static_cast<QVirtualKeyboardSelectionListModel::Type>(selectionListType.toInt())); return selectionListsList; } -int InputMethod::selectionListItemCount(SelectionListModel::Type type) +int InputMethod::selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type) { QVariant result; QMetaObject::invokeMethod(this, "selectionListItemCount", @@ -319,7 +319,7 @@ int InputMethod::selectionListItemCount(SelectionListModel::Type type) return result.toInt(); } -QVariant InputMethod::selectionListData(SelectionListModel::Type type, int index, int role) +QVariant InputMethod::selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role) { QVariant result; QMetaObject::invokeMethod(this, "selectionListData", @@ -328,34 +328,35 @@ QVariant InputMethod::selectionListData(SelectionListModel::Type type, int index Q_ARG(QVariant, index), Q_ARG(QVariant, role)); if (result.isNull()) { - result = AbstractInputMethod::selectionListData(type, index, role); + result = QVirtualKeyboardAbstractInputMethod::selectionListData(type, index, role); } return result; } -void InputMethod::selectionListItemSelected(SelectionListModel::Type type, int index) +void InputMethod::selectionListItemSelected(QVirtualKeyboardSelectionListModel::Type type, int index) { QMetaObject::invokeMethod(this, "selectionListItemSelected", Q_ARG(QVariant, static_cast<int>(type)), Q_ARG(QVariant, index)); } -QList<InputEngine::PatternRecognitionMode> InputMethod::patternRecognitionModes() const +QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> InputMethod::patternRecognitionModes() const { QVariant result; QMetaObject::invokeMethod(const_cast<InputMethod *>(this), "patternRecognitionModes", Q_RETURN_ARG(QVariant, result)); - QList<InputEngine::PatternRecognitionMode> patterRecognitionModeList; + QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patterRecognitionModeList; const auto resultList = result.toList(); patterRecognitionModeList.reserve(resultList.size()); for (const QVariant &patterRecognitionMode : resultList) - patterRecognitionModeList.append(static_cast<InputEngine::PatternRecognitionMode>(patterRecognitionMode.toInt())); + patterRecognitionModeList.append(static_cast<QVirtualKeyboardInputEngine::PatternRecognitionMode>(patterRecognitionMode.toInt())); return patterRecognitionModeList; } -Trace *InputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode patternRecognitionMode, - const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) +QVirtualKeyboardTrace *InputMethod::traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo) { QVariant result; QMetaObject::invokeMethod(this, "traceBegin", @@ -364,10 +365,10 @@ Trace *InputMethod::traceBegin(int traceId, InputEngine::PatternRecognitionMode Q_ARG(int, (int)patternRecognitionMode), Q_ARG(QVariant, traceCaptureDeviceInfo), Q_ARG(QVariant, traceScreenInfo)); - return result.value<Trace *>(); + return result.value<QVirtualKeyboardTrace *>(); } -bool InputMethod::traceEnd(Trace *trace) +bool InputMethod::traceEnd(QVirtualKeyboardTrace *trace) { QVariant result; QMetaObject::invokeMethod(this, "traceEnd", @@ -376,7 +377,7 @@ bool InputMethod::traceEnd(Trace *trace) return result.toBool(); } -bool InputMethod::reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags) +bool InputMethod::reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags) { QVariant result; QMetaObject::invokeMethod(this, "reselect", diff --git a/src/virtualkeyboard/inputmethod_p.h b/src/virtualkeyboard/inputmethod_p.h index e480a82a..1e718d5f 100644 --- a/src/virtualkeyboard/inputmethod_p.h +++ b/src/virtualkeyboard/inputmethod_p.h @@ -46,33 +46,34 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT InputMethod : public AbstractInputMethod +class QVIRTUALKEYBOARD_EXPORT InputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT - Q_PROPERTY(InputContext *inputContext READ inputContext CONSTANT) - Q_PROPERTY(InputEngine *inputEngine READ inputEngine CONSTANT) + Q_PROPERTY(QVirtualKeyboardInputContext *inputContext READ inputContext CONSTANT) + Q_PROPERTY(QVirtualKeyboardInputEngine *inputEngine READ inputEngine CONSTANT) public: explicit InputMethod(QObject *parent = nullptr); ~InputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::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<QVirtualKeyboardSelectionListModel::Type> selectionLists(); + int selectionListItemCount(QVirtualKeyboardSelectionListModel::Type type); + QVariant selectionListData(QVirtualKeyboardSelectionListModel::Type type, int index, int role); + void selectionListItemSelected(QVirtualKeyboardSelectionListModel::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); + QList<QVirtualKeyboardInputEngine::PatternRecognitionMode> patternRecognitionModes() const; + QVirtualKeyboardTrace *traceBegin( + int traceId, QVirtualKeyboardInputEngine::PatternRecognitionMode patternRecognitionMode, + const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo); + bool traceEnd(QVirtualKeyboardTrace *trace); - bool reselect(int cursorPosition, const InputEngine::ReselectFlags &reselectFlags); + bool reselect(int cursorPosition, const QVirtualKeyboardInputEngine::ReselectFlags &reselectFlags); bool clickPreeditText(int cursorPosition); void reset(); diff --git a/src/virtualkeyboard/plaininputmethod.cpp b/src/virtualkeyboard/plaininputmethod.cpp index 7c63ca1d..7700db6e 100644 --- a/src/virtualkeyboard/plaininputmethod.cpp +++ b/src/virtualkeyboard/plaininputmethod.cpp @@ -40,7 +40,7 @@ namespace QtVirtualKeyboard { */ PlainInputMethod::PlainInputMethod(QObject *parent) : - AbstractInputMethod(parent) + QVirtualKeyboardAbstractInputMethod(parent) { } @@ -48,38 +48,38 @@ PlainInputMethod::~PlainInputMethod() { } -QList<InputEngine::InputMode> PlainInputMethod::inputModes(const QString &locale) +QList<QVirtualKeyboardInputEngine::InputMode> PlainInputMethod::inputModes(const QString &locale) { - QList<InputEngine::InputMode> result; + QList<QVirtualKeyboardInputEngine::InputMode> result; switch (QLocale(locale).script()) { case QLocale::GreekScript: - result.append(InputEngine::Greek); + result.append(QVirtualKeyboardInputEngine::Greek); break; case QLocale::CyrillicScript: - result.append(InputEngine::Cyrillic); + result.append(QVirtualKeyboardInputEngine::Cyrillic); break; case QLocale::ArabicScript: - result.append(InputEngine::Arabic); + result.append(QVirtualKeyboardInputEngine::Arabic); break; case QLocale::HebrewScript: - result.append(InputEngine::Hebrew); + result.append(QVirtualKeyboardInputEngine::Hebrew); break; default: break; } - result.append(InputEngine::Latin); - result.append(InputEngine::Numeric); + result.append(QVirtualKeyboardInputEngine::Latin); + result.append(QVirtualKeyboardInputEngine::Numeric); return result; } -bool PlainInputMethod::setInputMode(const QString &locale, InputEngine::InputMode inputMode) +bool PlainInputMethod::setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode) { Q_UNUSED(locale) Q_UNUSED(inputMode) return true; } -bool PlainInputMethod::setTextCase(InputEngine::TextCase textCase) +bool PlainInputMethod::setTextCase(QVirtualKeyboardInputEngine::TextCase textCase) { Q_UNUSED(textCase) return true; diff --git a/src/virtualkeyboard/plaininputmethod_p.h b/src/virtualkeyboard/plaininputmethod_p.h index 44f97a6a..dd087897 100644 --- a/src/virtualkeyboard/plaininputmethod_p.h +++ b/src/virtualkeyboard/plaininputmethod_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class QVIRTUALKEYBOARD_EXPORT PlainInputMethod : public AbstractInputMethod +class QVIRTUALKEYBOARD_EXPORT PlainInputMethod : public QVirtualKeyboardAbstractInputMethod { Q_OBJECT @@ -54,9 +54,9 @@ public: explicit PlainInputMethod(QObject *parent = nullptr); ~PlainInputMethod(); - QList<InputEngine::InputMode> inputModes(const QString &locale); - bool setInputMode(const QString &locale, InputEngine::InputMode inputMode); - bool setTextCase(InputEngine::TextCase textCase); + QList<QVirtualKeyboardInputEngine::InputMode> inputModes(const QString &locale); + bool setInputMode(const QString &locale, QVirtualKeyboardInputEngine::InputMode inputMode); + bool setTextCase(QVirtualKeyboardInputEngine::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 f575a5c0..da79a826 100644 --- a/src/virtualkeyboard/platforminputcontext.cpp +++ b/src/virtualkeyboard/platforminputcontext.cpp @@ -200,7 +200,7 @@ void PlatformInputContext::setFocusObject(QObject *object) update(Qt::ImQueryAll); } -InputContext *PlatformInputContext::inputContext() const +QVirtualKeyboardInputContext *PlatformInputContext::inputContext() const { return m_inputContext; } @@ -239,7 +239,7 @@ QVariant PlatformInputContext::inputMethodQuery(Qt::InputMethodQuery query) return event.value(query); } -void PlatformInputContext::setInputContext(InputContext *context) +void PlatformInputContext::setInputContext(QVirtualKeyboardInputContext *context) { if (m_inputContext) { disconnect(this, SLOT(keyboardRectangleChanged())); @@ -248,7 +248,7 @@ void PlatformInputContext::setInputContext(InputContext *context) if (m_inputContext) { if (!m_inputPanel) m_inputPanel = new AppInputPanel(this); - QObject::connect(m_inputContext->priv(), &InputContextPrivate::keyboardRectangleChanged, this, &PlatformInputContext::keyboardRectangleChanged); + QObject::connect(m_inputContext->priv(), &QVirtualKeyboardInputContextPrivate::keyboardRectangleChanged, this, &PlatformInputContext::keyboardRectangleChanged); } else if (m_inputPanel) { m_inputPanel = nullptr; } diff --git a/src/virtualkeyboard/platforminputcontext_p.h b/src/virtualkeyboard/platforminputcontext_p.h index 3c072bbd..70f3a781 100644 --- a/src/virtualkeyboard/platforminputcontext_p.h +++ b/src/virtualkeyboard/platforminputcontext_p.h @@ -49,10 +49,14 @@ #include <QtVirtualKeyboard/private/desktopinputselectioncontrol_p.h> QT_BEGIN_NAMESPACE + +class QVirtualKeyboardInputContext; +class QVirtualKeyboardInputContextPrivate; + namespace QtVirtualKeyboard { -class InputContext; class AbstractInputPanel; + class QVIRTUALKEYBOARD_EXPORT PlatformInputContext : public QPlatformInputContext { Q_OBJECT @@ -82,7 +86,7 @@ public: QObject *focusObject(); virtual void setFocusObject(QObject *object); - InputContext *inputContext() const; + QVirtualKeyboardInputContext *inputContext() const; virtual bool eventFilter(QObject *object, QEvent *event); @@ -93,16 +97,16 @@ protected: void sendEvent(QEvent *event); void sendKeyEvent(QKeyEvent *event); QVariant inputMethodQuery(Qt::InputMethodQuery query); - void setInputContext(InputContext *context); + void setInputContext(QVirtualKeyboardInputContext *context); private slots: void keyboardRectangleChanged(); void updateInputPanelVisible(); private: - friend class InputContext; - friend class InputContextPrivate; - QPointer<InputContext> m_inputContext; + friend class ::QVirtualKeyboardInputContext; + friend class ::QVirtualKeyboardInputContextPrivate; + QPointer<QVirtualKeyboardInputContext> m_inputContext; QPointer<AbstractInputPanel> m_inputPanel; QPointer<DesktopInputSelectionControl> m_selectionControl; QPointer<QObject> m_focusObject; diff --git a/src/virtualkeyboard/qvirtualkeyboard_global.h b/src/virtualkeyboard/qvirtualkeyboard_global.h index 2e81867b..f14375e5 100644 --- a/src/virtualkeyboard/qvirtualkeyboard_global.h +++ b/src/virtualkeyboard/qvirtualkeyboard_global.h @@ -33,7 +33,6 @@ #include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { #ifndef QT_STATIC # if defined(QVIRTUALKEYBOARD_LIBRARY) @@ -45,7 +44,6 @@ namespace QtVirtualKeyboard { # define QVIRTUALKEYBOARD_EXPORT #endif -} // namespace QtVirtualKeyboard QT_END_NAMESPACE #endif diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp index 33ec8de9..d88622fc 100644 --- a/src/virtualkeyboard/selectionlistmodel.cpp +++ b/src/virtualkeyboard/selectionlistmodel.cpp @@ -34,38 +34,39 @@ #include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { -class SelectionListModelPrivate : public QAbstractItemModelPrivate +using namespace QtVirtualKeyboard; + +class QVirtualKeyboardSelectionListModelPrivate : public QAbstractItemModelPrivate { public: - SelectionListModelPrivate() : + QVirtualKeyboardSelectionListModelPrivate() : QAbstractItemModelPrivate(), dataSource(nullptr), - type(SelectionListModel::WordCandidateList), + type(QVirtualKeyboardSelectionListModel::WordCandidateList), rowCount(0), wclAutoCommitWord(false) { } QHash<int, QByteArray> roles; - QPointer<AbstractInputMethod> dataSource; - SelectionListModel::Type type; + QPointer<QVirtualKeyboardAbstractInputMethod> dataSource; + QVirtualKeyboardSelectionListModel::Type type; int rowCount; bool wclAutoCommitWord; }; /*! - \qmltype SelectionListModel - \instantiates QtVirtualKeyboard::SelectionListModel + \qmltype QVirtualKeyboardSelectionListModel + \instantiates QVirtualKeyboardSelectionListModel \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \brief Provides a data model for the selection lists. - The SelectionListModel is a data model for word candidates + The QVirtualKeyboardSelectionListModel is a data model for word candidates provided by the input method. - An instance of SelectionListModel cannot be created directly. + An instance of QVirtualKeyboardSelectionListModel cannot be created directly. Instead, the InputEngine manages the instances and provides access to the model by InputEngine::wordCandidateListModel property. @@ -86,7 +87,7 @@ public: */ /*! - \class QtVirtualKeyboard::SelectionListModel + \class QVirtualKeyboardSelectionListModel \inmodule QtVirtualKeyboard @@ -98,7 +99,7 @@ public: */ /*! - \enum QtVirtualKeyboard::SelectionListModel::Type + \enum QVirtualKeyboardSelectionListModel::Type This enum specifies the type of selection list. @@ -107,7 +108,7 @@ public: */ /*! - \enum QtVirtualKeyboard::SelectionListModel::Role + \enum QVirtualKeyboardSelectionListModel::Role This enum specifies a role of the data requested. @@ -119,14 +120,14 @@ public: number of characters counted from the end of the string. \value DictionaryTypeRole - An integer specifying \ l {QtVirtualKeyboard::SelectionListModel::DictionaryType}{dictionary type}. + An integer specifying \ l {QVirtualKeyboardSelectionListModel::DictionaryType}{dictionary type}. \value CanRemoveSuggestionRole A boolean value indicating if the word candidate can be removed from dictionary. */ /*! - \enum QtVirtualKeyboard::SelectionListModel::DictionaryType + \enum QVirtualKeyboardSelectionListModel::DictionaryType This enum specifies the dictionary type of a word. @@ -136,10 +137,10 @@ public: The word candidate is from the user dictionary. */ -SelectionListModel::SelectionListModel(QObject *parent) : - QAbstractListModel(*new SelectionListModelPrivate(), parent) +QVirtualKeyboardSelectionListModel::QVirtualKeyboardSelectionListModel(QObject *parent) : + QAbstractListModel(*new QVirtualKeyboardSelectionListModelPrivate(), parent) { - Q_D(SelectionListModel); + Q_D(QVirtualKeyboardSelectionListModel); d->roles[DisplayRole] = "display"; d->roles[WordCompletionLengthRole] = "wordCompletionLength"; } @@ -147,16 +148,16 @@ SelectionListModel::SelectionListModel(QObject *parent) : /*! \internal */ -SelectionListModel::~SelectionListModel() +QVirtualKeyboardSelectionListModel::~QVirtualKeyboardSelectionListModel() { } /*! \internal */ -void SelectionListModel::setDataSource(AbstractInputMethod *dataSource, Type type) +void QVirtualKeyboardSelectionListModel::setDataSource(QVirtualKeyboardAbstractInputMethod *dataSource, Type type) { - Q_D(SelectionListModel); + Q_D(QVirtualKeyboardSelectionListModel); if (d->dataSource) { disconnect(this, SLOT(selectionListChanged(int))); disconnect(this, SLOT(selectionListActiveItemChanged(int, int))); @@ -177,18 +178,18 @@ void SelectionListModel::setDataSource(AbstractInputMethod *dataSource, Type typ /*! \internal */ -AbstractInputMethod *SelectionListModel::dataSource() const +QVirtualKeyboardAbstractInputMethod *QVirtualKeyboardSelectionListModel::dataSource() const { - Q_D(const SelectionListModel); + Q_D(const QVirtualKeyboardSelectionListModel); return d->dataSource; } /*! \internal */ -int SelectionListModel::rowCount(const QModelIndex &parent) const +int QVirtualKeyboardSelectionListModel::rowCount(const QModelIndex &parent) const { - Q_D(const SelectionListModel); + Q_D(const QVirtualKeyboardSelectionListModel); Q_UNUSED(parent) return d->rowCount; } @@ -196,55 +197,55 @@ int SelectionListModel::rowCount(const QModelIndex &parent) const /*! \internal */ -QVariant SelectionListModel::data(const QModelIndex &index, int role) const +QVariant QVirtualKeyboardSelectionListModel::data(const QModelIndex &index, int role) const { - Q_D(const SelectionListModel); + Q_D(const QVirtualKeyboardSelectionListModel); return d->dataSource ? d->dataSource->selectionListData(d->type, index.row(), role) : QVariant(); } /*! \internal */ -QHash<int,QByteArray> SelectionListModel::roleNames() const +QHash<int,QByteArray> QVirtualKeyboardSelectionListModel::roleNames() const { - Q_D(const SelectionListModel); + Q_D(const QVirtualKeyboardSelectionListModel); return d->roles; } /*! \internal */ -int SelectionListModel::count() const +int QVirtualKeyboardSelectionListModel::count() const { - Q_D(const SelectionListModel); + Q_D(const QVirtualKeyboardSelectionListModel); return d->rowCount; } -/*! \qmlmethod void SelectionListModel::selectItem(int index) +/*! \qmlmethod void QVirtualKeyboardSelectionListModel::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. */ /*! - \fn void QtVirtualKeyboard::SelectionListModel::selectItem(int index) + \fn void QVirtualKeyboardSelectionListModel::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 SelectionListModel::selectItem(int index) +void QVirtualKeyboardSelectionListModel::selectItem(int index) { - Q_D(SelectionListModel); + Q_D(QVirtualKeyboardSelectionListModel); if (index >= 0 && index < d->rowCount && d->dataSource) { emit itemSelected(index); d->dataSource->selectionListItemSelected(d->type, index); } } -void SelectionListModel::removeItem(int index) +void QVirtualKeyboardSelectionListModel::removeItem(int index) { - Q_D(SelectionListModel); + Q_D(QVirtualKeyboardSelectionListModel); if (index >= 0 && index < d->rowCount && d->dataSource) { d->dataSource->selectionListRemoveItem(d->type, index); } @@ -253,7 +254,7 @@ void SelectionListModel::removeItem(int index) /*! * \internal */ -QVariant SelectionListModel::dataAt(int index, int role) const +QVariant QVirtualKeyboardSelectionListModel::dataAt(int index, int role) const { return data(this->index(index, 0), role); } @@ -261,9 +262,9 @@ QVariant SelectionListModel::dataAt(int index, int role) const /*! \internal */ -void SelectionListModel::selectionListChanged(int type) +void QVirtualKeyboardSelectionListModel::selectionListChanged(int type) { - Q_D(SelectionListModel); + Q_D(QVirtualKeyboardSelectionListModel); if (static_cast<Type>(type) == d->type) { int oldCount = d->rowCount; int newCount = d->dataSource ? d->dataSource->selectionListItemCount(d->type) : 0; @@ -285,7 +286,7 @@ void SelectionListModel::selectionListChanged(int type) d->rowCount = 0; endResetModel(); } - if (type == SelectionListModel::WordCandidateList) + if (type == QVirtualKeyboardSelectionListModel::WordCandidateList) d->wclAutoCommitWord = ((oldCount > 1 || (oldCount == 1 && d->wclAutoCommitWord)) && newCount == 1 && Settings::instance()->wclAutoCommitWord() && dataAt(0).toString().length() > 1); @@ -297,9 +298,9 @@ void SelectionListModel::selectionListChanged(int type) /*! \internal */ -void SelectionListModel::selectionListActiveItemChanged(int type, int index) +void QVirtualKeyboardSelectionListModel::selectionListActiveItemChanged(int type, int index) { - Q_D(SelectionListModel); + Q_D(QVirtualKeyboardSelectionListModel); if (static_cast<Type>(type) == d->type && index < d->rowCount) { emit activeItemChanged(index); if (index == 0 && d->wclAutoCommitWord) @@ -308,14 +309,14 @@ void SelectionListModel::selectionListActiveItemChanged(int type, int index) } /*! - \qmlsignal void SelectionListModel::activeItemChanged(int index) + \qmlsignal void QVirtualKeyboardSelectionListModel::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 the list. */ /*! - \fn void QtVirtualKeyboard::SelectionListModel::activeItemChanged(int index) + \fn void QVirtualKeyboardSelectionListModel::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 @@ -323,15 +324,14 @@ void SelectionListModel::selectionListActiveItemChanged(int type, int index) */ /*! - \qmlsignal void SelectionListModel::itemSelected(int index) + \qmlsignal void QVirtualKeyboardSelectionListModel::itemSelected(int index) This signal is emitted when an item at \a index is selected by the user. */ /*! - \fn void QtVirtualKeyboard::SelectionListModel::itemSelected(int index) + \fn void QVirtualKeyboardSelectionListModel::itemSelected(int index) This signal is emitted when an item at \a index is selected by the user. */ -} // namespace QtVirtualKeyboard QT_END_NAMESPACE diff --git a/src/virtualkeyboard/selectionlistmodel.h b/src/virtualkeyboard/selectionlistmodel.h index 22d0ed3d..19347ddf 100644 --- a/src/virtualkeyboard/selectionlistmodel.h +++ b/src/virtualkeyboard/selectionlistmodel.h @@ -34,19 +34,18 @@ #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { -class AbstractInputMethod; -class InputEngine; -class SelectionListModelPrivate; +class QVirtualKeyboardAbstractInputMethod; +class QVirtualKeyboardInputEngine; +class QVirtualKeyboardSelectionListModelPrivate; -class QVIRTUALKEYBOARD_EXPORT SelectionListModel : public QAbstractListModel +class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardSelectionListModel : public QAbstractListModel { Q_OBJECT - Q_DECLARE_PRIVATE(SelectionListModel) + Q_DECLARE_PRIVATE(QVirtualKeyboardSelectionListModel) Q_PROPERTY(int count READ count NOTIFY countChanged) - explicit SelectionListModel(QObject *parent = nullptr); + explicit QVirtualKeyboardSelectionListModel(QObject *parent = nullptr); public: enum Type @@ -70,9 +69,9 @@ public: Q_ENUM(Role) Q_ENUM(DictionaryType) - ~SelectionListModel(); - void setDataSource(AbstractInputMethod *dataSource, Type type); - AbstractInputMethod *dataSource() const; + ~QVirtualKeyboardSelectionListModel(); + void setDataSource(QVirtualKeyboardAbstractInputMethod *dataSource, Type type); + QVirtualKeyboardAbstractInputMethod *dataSource() const; int rowCount(const QModelIndex &parent = QModelIndex()) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QHash<int,QByteArray> roleNames() const; @@ -93,14 +92,13 @@ protected Q_SLOTS: void selectionListActiveItemChanged(int type, int index); private: - friend class InputEngine; + friend class QVirtualKeyboardInputEngine; }; -} // namespace QtVirtualKeyboard QT_END_NAMESPACE -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::SelectionListModel::Type) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::SelectionListModel::Role) -Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QtVirtualKeyboard)::SelectionListModel::DictionaryType) +Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::Type) +Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::Role) +Q_DECLARE_METATYPE(QVirtualKeyboardSelectionListModel::DictionaryType) #endif // SELECTIONLISTMODEL_H diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp index 3cc04316..7c63bb7a 100644 --- a/src/virtualkeyboard/shadowinputcontext.cpp +++ b/src/virtualkeyboard/shadowinputcontext.cpp @@ -52,7 +52,7 @@ public: { } - InputContext *inputContext; + QVirtualKeyboardInputContext *inputContext; QPointer<QObject> inputItem; QString preeditText; QList<QInputMethodEvent::Attribute> preeditTextAttributes; @@ -68,7 +68,7 @@ ShadowInputContext::ShadowInputContext(QObject *parent) : { } -void ShadowInputContext::setInputContext(InputContext *inputContext) +void ShadowInputContext::setInputContext(QVirtualKeyboardInputContext *inputContext) { Q_D(ShadowInputContext); d->inputContext = inputContext; diff --git a/src/virtualkeyboard/shadowinputcontext_p.h b/src/virtualkeyboard/shadowinputcontext_p.h index 3f9effa1..f77aba08 100644 --- a/src/virtualkeyboard/shadowinputcontext_p.h +++ b/src/virtualkeyboard/shadowinputcontext_p.h @@ -48,9 +48,12 @@ #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE + +class QVirtualKeyboardInputContext; +class QVirtualKeyboardInputContextPrivate; + namespace QtVirtualKeyboard { -class InputContext; class ShadowInputContextPrivate; class QVIRTUALKEYBOARD_EXPORT ShadowInputContext : public QObject @@ -67,7 +70,7 @@ class QVIRTUALKEYBOARD_EXPORT ShadowInputContext : public QObject explicit ShadowInputContext(QObject *parent = nullptr); - void setInputContext(InputContext *inputContext); + void setInputContext(QVirtualKeyboardInputContext *inputContext); public: QObject *inputItem() const; @@ -94,8 +97,8 @@ private: QVariant queryFocusObject(Qt::InputMethodQuery query, QVariant argument); private: - friend class InputContextPrivate; - friend class InputContext; + friend class ::QVirtualKeyboardInputContextPrivate; + friend class ::QVirtualKeyboardInputContext; }; } // namespace QtVirtualKeyboard diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index 7da1cb4e..b7a0a715 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -54,13 +54,13 @@ public: capsLock(false), resetWhenVisible(false), manualShiftLanguageFilter(QSet<QLocale::Language>() << QLocale::Arabic << QLocale::Persian << QLocale::Hindi << QLocale::Korean << QLocale::Thai), - manualCapsInputModeFilter(QSet<InputEngine::InputMode>() << InputEngine::Cangjie << InputEngine::Zhuyin << InputEngine::Hebrew), - noAutoUppercaseInputModeFilter(QSet<InputEngine::InputMode>() << InputEngine::FullwidthLatin << InputEngine::Pinyin << InputEngine::Cangjie << InputEngine::Zhuyin << InputEngine::ChineseHandwriting << InputEngine::JapaneseHandwriting << InputEngine::KoreanHandwriting), - allCapsInputModeFilter(QSet<InputEngine::InputMode>() << InputEngine::Hiragana << InputEngine::Katakana) + manualCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Cangjie << QVirtualKeyboardInputEngine::Zhuyin << QVirtualKeyboardInputEngine::Hebrew), + noAutoUppercaseInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::FullwidthLatin << QVirtualKeyboardInputEngine::Pinyin << QVirtualKeyboardInputEngine::Cangjie << QVirtualKeyboardInputEngine::Zhuyin << QVirtualKeyboardInputEngine::ChineseHandwriting << QVirtualKeyboardInputEngine::JapaneseHandwriting << QVirtualKeyboardInputEngine::KoreanHandwriting), + allCapsInputModeFilter(QSet<QVirtualKeyboardInputEngine::InputMode>() << QVirtualKeyboardInputEngine::Hiragana << QVirtualKeyboardInputEngine::Katakana) { } - InputContext *inputContext; + QVirtualKeyboardInputContext *inputContext; QString sentenceEndingCharacters; bool autoCapitalizationEnabled; bool toggleShiftEnabled; @@ -71,9 +71,9 @@ public: QLocale locale; QTime timer; const QSet<QLocale::Language> manualShiftLanguageFilter; - const QSet<InputEngine::InputMode> manualCapsInputModeFilter; - const QSet<InputEngine::InputMode> noAutoUppercaseInputModeFilter; - const QSet<InputEngine::InputMode> allCapsInputModeFilter; + const QSet<QVirtualKeyboardInputEngine::InputMode> manualCapsInputModeFilter; + const QSet<QVirtualKeyboardInputEngine::InputMode> noAutoUppercaseInputModeFilter; + const QSet<QVirtualKeyboardInputEngine::InputMode> allCapsInputModeFilter; }; /*! @@ -91,7 +91,7 @@ public: \brief Manages the shift state. */ -ShiftHandler::ShiftHandler(InputContext *parent) : +ShiftHandler::ShiftHandler(QVirtualKeyboardInputContext *parent) : QObject(*new ShiftHandlerPrivate(), parent) { Q_D(ShiftHandler); @@ -257,7 +257,7 @@ void ShiftHandler::reset() Q_D(ShiftHandler); if (d->inputContext->priv()->inputItem()) { Qt::InputMethodHints inputMethodHints = d->inputContext->inputMethodHints(); - InputEngine::InputMode inputMode = d->inputContext->inputEngine()->inputMode(); + QVirtualKeyboardInputEngine::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 | diff --git a/src/virtualkeyboard/shifthandler_p.h b/src/virtualkeyboard/shifthandler_p.h index 437b52fa..0f2c6332 100644 --- a/src/virtualkeyboard/shifthandler_p.h +++ b/src/virtualkeyboard/shifthandler_p.h @@ -45,9 +45,12 @@ #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE + +class QVirtualKeyboardInputContext; +class QVirtualKeyboardInputContextPrivate; + namespace QtVirtualKeyboard { -class InputContext; class ShiftHandlerPrivate; class QVIRTUALKEYBOARD_EXPORT ShiftHandler : public QObject @@ -62,7 +65,7 @@ class QVIRTUALKEYBOARD_EXPORT ShiftHandler : public QObject Q_PROPERTY(bool capsLock READ capsLock WRITE setCapsLock NOTIFY capsLockChanged) Q_PROPERTY(bool uppercase READ uppercase NOTIFY uppercaseChanged) - explicit ShiftHandler(InputContext *parent = nullptr); + explicit ShiftHandler(QVirtualKeyboardInputContext *parent = nullptr); void init(); public: @@ -101,8 +104,8 @@ private: void setToggleShiftEnabled(bool enabled); private: - friend class InputContext; - friend class InputContextPrivate; + friend class ::QVirtualKeyboardInputContext; + friend class ::QVirtualKeyboardInputContextPrivate; }; } // namespace QtVirtualKeyboard diff --git a/src/virtualkeyboard/trace.cpp b/src/virtualkeyboard/trace.cpp index 80b55e25..7e24ef13 100644 --- a/src/virtualkeyboard/trace.cpp +++ b/src/virtualkeyboard/trace.cpp @@ -31,12 +31,11 @@ #include <QtCore/private/qobject_p.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { -class TracePrivate : public QObjectPrivate +class QVirtualKeyboardTracePrivate : public QObjectPrivate { public: - TracePrivate() : + QVirtualKeyboardTracePrivate() : QObjectPrivate(), traceId(0), final(false), @@ -53,7 +52,7 @@ public: }; /*! - \class QtVirtualKeyboard::Trace + \class QVirtualKeyboardTrace \inmodule QtVirtualKeyboard \since QtQuick.VirtualKeyboard 2.0 \brief Trace is a data model for touch input data. @@ -94,7 +93,7 @@ public: each point: \code - Trace *trace = new Trace(this); + QVirtualKeyboardTrace *trace = new QVirtualKeyboardTrace(this); trace->setChannels(QStringList() << "t"); \endcode @@ -104,7 +103,7 @@ public: QVariantList timeData = trace->channelData("t"); \endcode - Trace objects are owned by their creator, which is the input method in + QVirtualKeyboardTrace objects are owned by their creator, which is the input method in normal case. This means the objects are constructed in the \l {InputMethod::traceBegin()}{InputMethod.traceBegin()} (QML) method. @@ -114,7 +113,7 @@ public: /*! \qmltype Trace - \instantiates QtVirtualKeyboard::Trace + \instantiates QVirtualKeyboardTrace \inqmlmodule QtQuick.VirtualKeyboard \ingroup qtvirtualkeyboard-qml \since QtQuick.VirtualKeyboard 2.0 @@ -156,7 +155,7 @@ public: each point: \code - Trace *trace = new Trace(this); + QVirtualKeyboardTrace *trace = new QVirtualKeyboardTrace(this); trace->setChannels(QStringList() << "t"); \endcode @@ -175,40 +174,40 @@ public: */ /*! \internal */ -Trace::Trace(QObject *parent) : - QObject(*new TracePrivate(), parent) +QVirtualKeyboardTrace::QVirtualKeyboardTrace(QObject *parent) : + QObject(*new QVirtualKeyboardTracePrivate(), parent) { } /*! \internal */ -Trace::~Trace() +QVirtualKeyboardTrace::~QVirtualKeyboardTrace() { } -int Trace::traceId() const +int QVirtualKeyboardTrace::traceId() const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->traceId; } -void Trace::setTraceId(int id) +void QVirtualKeyboardTrace::setTraceId(int id) { - Q_D(Trace); + Q_D(QVirtualKeyboardTrace); if (d->traceId != id) { d->traceId = id; emit traceIdChanged(id); } } -QStringList Trace::channels() const +QStringList QVirtualKeyboardTrace::channels() const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->channels.keys(); } -void Trace::setChannels(const QStringList &channels) +void QVirtualKeyboardTrace::setChannels(const QStringList &channels) { - Q_D(Trace); + Q_D(QVirtualKeyboardTrace); Q_ASSERT(d->points.isEmpty()); if (d->points.isEmpty()) { d->channels.clear(); @@ -220,9 +219,9 @@ void Trace::setChannels(const QStringList &channels) } } -int Trace::length() const +int QVirtualKeyboardTrace::length() const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->points.size(); } @@ -248,9 +247,9 @@ int Trace::length() const The returned list contains QPointF types. */ -QVariantList Trace::points(int pos, int count) const +QVariantList QVirtualKeyboardTrace::points(int pos, int count) const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->points.mid(pos, count); } @@ -265,7 +264,7 @@ QVariantList Trace::points(int pos, int count) const data with the point using the setChannelData() function. */ -/*! Adds a \a point to the Trace. +/*! Adds a \a point to the QVirtualKeyboardTrace. The method returns index of the point added, or -1 if the points cannot be added (i.e. the isFinal is true). @@ -274,9 +273,9 @@ QVariantList Trace::points(int pos, int count) const data with the point using the setChannelData() method. */ -int Trace::addPoint(const QPointF &point) +int QVirtualKeyboardTrace::addPoint(const QPointF &point) { - Q_D(Trace); + Q_D(QVirtualKeyboardTrace); int index; if (!d->final) { index = d->points.size(); @@ -304,9 +303,9 @@ int Trace::addPoint(const QPointF &point) arbitrary index, i.e., it must be added in synchronously with the point data. */ -void Trace::setChannelData(const QString &channel, int index, const QVariant &data) +void QVirtualKeyboardTrace::setChannelData(const QString &channel, int index, const QVariant &data) { - Q_D(Trace); + Q_D(QVirtualKeyboardTrace); if (!d->final && (index + 1) == d->points.size() && d->channels.contains(channel)) { QVariantList &channelData = d->channels[channel]; while (index > channelData.size()) @@ -334,51 +333,51 @@ void Trace::setChannelData(const QString &channel, int index, const QVariant &da returned. */ -QVariantList Trace::channelData(const QString &channel, int pos, int count) const +QVariantList QVirtualKeyboardTrace::channelData(const QString &channel, int pos, int count) const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->channels.value(channel).mid(pos, count); } -bool Trace::isFinal() const +bool QVirtualKeyboardTrace::isFinal() const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->final; } -void Trace::setFinal(bool final) +void QVirtualKeyboardTrace::setFinal(bool final) { - Q_D(Trace); + Q_D(QVirtualKeyboardTrace); if (d->final != final) { d->final = final; emit finalChanged(final); } } -bool Trace::isCanceled() const +bool QVirtualKeyboardTrace::isCanceled() const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->canceled; } -void Trace::setCanceled(bool canceled) +void QVirtualKeyboardTrace::setCanceled(bool canceled) { - Q_D(Trace); + Q_D(QVirtualKeyboardTrace); if (d->canceled != canceled) { d->canceled = canceled; emit canceledChanged(canceled); } } -qreal Trace::opacity() const +qreal QVirtualKeyboardTrace::opacity() const { - Q_D(const Trace); + Q_D(const QVirtualKeyboardTrace); return d->opacity; } -void Trace::setOpacity(qreal opacity) +void QVirtualKeyboardTrace::setOpacity(qreal opacity) { - Q_D(Trace); + Q_D(QVirtualKeyboardTrace); if (d->opacity != opacity) { d->opacity = opacity; emit opacityChanged(opacity); @@ -390,8 +389,8 @@ void Trace::setOpacity(qreal opacity) Unique id of this Trace. */ -/*! \property QtVirtualKeyboard::Trace::traceId - \brief unique id of this Trace. +/*! \property QVirtualKeyboardTrace::traceId + \brief unique id of this QVirtualKeyboardTrace. */ /*! \qmlproperty list<strings> Trace::channels @@ -401,20 +400,20 @@ void Trace::setOpacity(qreal opacity) is added. */ -/*! \property QtVirtualKeyboard::Trace::channels - \brief list of data channels in the Trace. +/*! \property QVirtualKeyboardTrace::channels + \brief list of data channels in the QQTrace. This property must be initialized before the data is added. */ -/*! \qmlproperty int Trace::length +/*! \qmlproperty int QVirtualKeyboardTrace::length - The number of points in the Trace. + The number of points in the QVirtualKeyboardTrace. */ -/*! \property QtVirtualKeyboard::Trace::length - \brief the number of of points in the Trace. +/*! \property QVirtualKeyboardTrace::length + \brief the number of of points in the QVirtualKeyboardTrace. */ /*! \qmlproperty bool Trace::isFinal @@ -423,8 +422,8 @@ void Trace::setOpacity(qreal opacity) If the value is true, no more data is accepted. */ -/*! \property QtVirtualKeyboard::Trace::isFinal - \brief defines whether the Trace can accept more data. +/*! \property QVirtualKeyboardTrace::isFinal + \brief defines whether the QVirtualKeyboardTrace can accept more data. If the value is true, no more data is accepted. */ @@ -435,8 +434,8 @@ void Trace::setOpacity(qreal opacity) whose isCanceled property set to true. */ -/*! \property QtVirtualKeyboard::Trace::isCanceled - \brief defines whether the Trace is canceled. +/*! \property QVirtualKeyboardTrace::isCanceled + \brief defines whether the QVirtualKeyboardTrace is canceled. The input data should not be processed from the Traces whose isCanceled property set to true. @@ -454,9 +453,9 @@ void Trace::setOpacity(qreal opacity) ones are added. */ -/*! \property QtVirtualKeyboard::Trace::opacity +/*! \property QVirtualKeyboardTrace::opacity - This property defines how opaque the Trace is. + This property defines how opaque the QVirtualKeyboardTrace is. A lower value results in a more transparent trace: \c 0.0 is fully transparent, and \c 1.0 is fully opaque. @@ -465,5 +464,4 @@ void Trace::setOpacity(qreal opacity) ones are added. */ -} // namespace QtVirtualKeyboard QT_END_NAMESPACE diff --git a/src/virtualkeyboard/trace.h b/src/virtualkeyboard/trace.h index 26491f17..a0c5ad81 100644 --- a/src/virtualkeyboard/trace.h +++ b/src/virtualkeyboard/trace.h @@ -36,14 +36,13 @@ #include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE -namespace QtVirtualKeyboard { -class TracePrivate; +class QVirtualKeyboardTracePrivate; -class QVIRTUALKEYBOARD_EXPORT Trace : public QObject +class QVIRTUALKEYBOARD_EXPORT QVirtualKeyboardTrace : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE(Trace) + Q_DECLARE_PRIVATE(QVirtualKeyboardTrace) 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) @@ -51,8 +50,8 @@ class QVIRTUALKEYBOARD_EXPORT Trace : public QObject Q_PROPERTY(bool isCanceled READ isCanceled WRITE setCanceled NOTIFY canceledChanged) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) public: - explicit Trace(QObject *parent = nullptr); - ~Trace(); + explicit QVirtualKeyboardTrace(QObject *parent = nullptr); + ~QVirtualKeyboardTrace(); int traceId() const; void setTraceId(int id); @@ -86,7 +85,6 @@ Q_SIGNALS: void opacityChanged(qreal opacity); }; -} // namespace QtVirtualKeyboard QT_END_NAMESPACE #endif // TRACE_H diff --git a/src/virtualkeyboard/unipentrace.cpp b/src/virtualkeyboard/unipentrace.cpp index 3d153801..1ced292d 100644 --- a/src/virtualkeyboard/unipentrace.cpp +++ b/src/virtualkeyboard/unipentrace.cpp @@ -62,10 +62,10 @@ UnipenTrace::UnipenTrace(const QVariantMap &traceCaptureDeviceInfo, m_lines.append(QStringLiteral(".POINTS_PER_SECOND %1").arg(sampleRate)); } -void UnipenTrace::record(const QList<Trace *> &traceList) +void UnipenTrace::record(const QList<QVirtualKeyboardTrace *> &traceList) { qlonglong t0 = 0; - for (const Trace *trace : qAsConst(traceList)) { + for (const QVirtualKeyboardTrace *trace : qAsConst(traceList)) { const QVariantList &points = trace->points(); const bool hasTime = trace->channels().contains("t"); const QVariantList timeData = hasTime ? trace->channelData("t") : QVariantList(); diff --git a/src/virtualkeyboard/unipentrace_p.h b/src/virtualkeyboard/unipentrace_p.h index 73872056..0ba6d1fe 100644 --- a/src/virtualkeyboard/unipentrace_p.h +++ b/src/virtualkeyboard/unipentrace_p.h @@ -54,7 +54,7 @@ class QVIRTUALKEYBOARD_EXPORT UnipenTrace : public QObject public: explicit UnipenTrace(const QVariantMap &traceCaptureDeviceInfo, const QVariantMap &traceScreenInfo, QObject *parent = nullptr); - void record(const QList<Trace *> &traceList); + void record(const QList<QVirtualKeyboardTrace *> &traceList); void save(uint unicode, uint confidence); QString directory() const; |