diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp | 4 | ||||
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardinputengine.cpp | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp | 9 |
5 files changed, 11 insertions, 10 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1bf9543a..f8cda0e7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.13.0 diff --git a/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp b/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp index 7326b839..b02c8fef 100644 --- a/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp +++ b/src/plugins/tcime/3rdparty/tcime/cangjiedictionary.cpp @@ -111,8 +111,8 @@ QStringList CangjieDictionary::searchWords(int secondaryIndex, const DictionaryE DictionaryEntry::ConstIterator start = data.constBegin(); DictionaryEntry::ConstIterator end = start + length; - DictionaryEntry::ConstIterator rangeStart = qBinaryFind(start, end, (DictionaryWord)secondaryIndex); - if (rangeStart == end) + DictionaryEntry::ConstIterator rangeStart = std::lower_bound(start, end, (DictionaryWord)secondaryIndex); + if (rangeStart == end || *rangeStart != secondaryIndex) return QStringList(); // There may be more than one words with the same index; look up words with diff --git a/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp b/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp index cdeaecdd..6bc62d84 100644 --- a/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp +++ b/src/plugins/tcime/3rdparty/tcime/phrasedictionary.cpp @@ -47,8 +47,8 @@ QStringList PhraseDictionary::getWords(const QString &input) const const DictionaryEntry &words = dict[0]; - DictionaryEntry::ConstIterator word = qBinaryFind(words, input.at(0)); - if (word == words.constEnd()) + DictionaryEntry::ConstIterator word = std::lower_bound(words.begin(), words.end(), input.at(0)); + if (word == words.constEnd() || *word != input.at(0)) return QStringList(); int index = word - words.constBegin(); diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp index c1675507..db38fb32 100644 --- a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp @@ -431,7 +431,7 @@ void QVirtualKeyboardInputEngine::setInputMode(QVirtualKeyboardInputEngine::Inpu updateInputModes(); Q_ASSERT(cachedInputModes == d->inputModes); #endif - if (d->inputModes.contains(static_cast<const int>(inputMode))) { + if (d->inputModes.contains(static_cast<int>(inputMode))) { d->inputMethod->setInputMode(d->inputContext->locale(), inputMode); if (d->inputMode != inputMode) { d->inputMode = inputMode; diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp index c26d2a0b..69e8cfe1 100644 --- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp +++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp @@ -147,10 +147,11 @@ QVirtualKeyboardSelectionListModel::QVirtualKeyboardSelectionListModel(QObject * QAbstractListModel(*new QVirtualKeyboardSelectionListModelPrivate(), parent) { Q_D(QVirtualKeyboardSelectionListModel); - d->roles[static_cast<const int>(Role::Display)] = "display"; - d->roles[static_cast<const int>(Role::WordCompletionLength)] = "wordCompletionLength"; - d->roles[static_cast<const int>(Role::Dictionary)] = "dictionary"; - d->roles[static_cast<const int>(Role::CanRemoveSuggestion)] = "canRemoveSuggestion"; + d->roles = + {{static_cast<int>(Role::Display), "display"}, + {static_cast<int>(Role::WordCompletionLength), "wordCompletionLength"}, + {static_cast<int>(Role::Dictionary), "dictionary"}, + {static_cast<int>(Role::CanRemoveSuggestion), "canRemoveSuggestion"}}; } /*! |