Port from container::count() and length() to size()

This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:

  auto QtContainerClass = anyOf(
      expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
      expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o));
  makeRule(cxxMemberCallExpr(on(QtContainerClass),
                             callee(cxxMethodDecl(hasAnyName({"count", "length"),
                                                  parameterCountIs(0))))),
           changeTo(cat(access(o, cat("size"), "()"))),
           cat("use 'size()' instead of 'count()/length()'"))

a.k.a qt-port-to-std-compatible-api with config Scope: 'Container',
with the extended set of container classes recognized.

Done-with: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Change-Id: I28ad3f9b59bcfd2db9401c8d4ecc0800c57a3b17
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>

6 files changed, 10 insertions, 10 deletions

diff --git a/src/virtualkeyboard/handwritinggesturerecognizer.cpp b/src/virtualkeyboard/handwritinggesturerecognizer.cpp
index 2d64c3f7..27254245 100644
--- a/src/virtualkeyboard/handwritinggesturerecognizer.cpp
+++ b/src/virtualkeyboard/handwritinggesturerecognizer.cpp
@@ -27,7 +27,7 @@ int HandwritingGestureRecognizer::dpi() const
 
 QVariantMap HandwritingGestureRecognizer::recognize(const QList<QVirtualKeyboardTrace *> traceList)
 {
-    if (traceList.count() > 0 && traceList.count() < 3) {
+    if (traceList.size() > 0 && traceList.size() < 3) {
 
         // Swipe gesture detection
         // =======================
@@ -64,7 +64,7 @@ QVariantMap HandwritingGestureRecognizer::recognize(const QList<QVirtualKeyboard
             const QVirtualKeyboardTrace *trace = traceList.at(traceIndex);
             const QVariantList &points = trace->points();
             QVector2D swipeVector;
-            const int pointCount = points.count();
+            const int pointCount = points.size();
             int pointIndex = 0;
             if (pointCount >= 2) {
 
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
index 8c1ec631..5697b23b 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext.cpp
@@ -107,7 +107,7 @@ void QVirtualKeyboardInputContext::setPreeditText(const QString &text, QList<QIn
         if (!d->testAttribute(attributes, QInputMethodEvent::TextFormat)) {
             QTextCharFormat textFormat;
             textFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
-            attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, text.length(), textFormat));
+            attributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, 0, text.size(), textFormat));
         }
     } else if (d->_forceCursorPosition != -1) {
         d->addSelectionAttribute(attributes);
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 831d823f..0d35d25e 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -225,7 +225,7 @@ void QVirtualKeyboardInputContextPrivate::forceCursorPosition(int anchorPosition
         forceAnchorPosition = -1;
         _forceCursorPosition = cursorPosition;
         if (cursorPosition > this->cursorPosition)
-            _forceCursorPosition += preeditText.length();
+            _forceCursorPosition += preeditText.size();
         commit();
     } else {
         forceAnchorPosition = anchorPosition;
@@ -502,13 +502,13 @@ void QVirtualKeyboardInputContextPrivate::invokeAction(QInputMethod::Action acti
             if (inputEngine->clickPreeditText(cursorPosition))
                 break;
 
-            bool reselect = !inputMethodHints.testFlag(Qt::ImhNoPredictiveText) && selectedText.isEmpty() && cursorPosition < preeditText.length();
+            bool reselect = !inputMethodHints.testFlag(Qt::ImhNoPredictiveText) && selectedText.isEmpty() && cursorPosition < preeditText.size();
             if (reselect) {
                 QVirtualKeyboardScopedState reselectState(this, State::Reselect);
                 _forceCursorPosition = this->cursorPosition + cursorPosition;
                 commit();
                 inputEngine->reselect(this->cursorPosition, QVirtualKeyboardInputEngine::ReselectFlag::WordBeforeCursor);
-            } else if (!preeditText.isEmpty() && cursorPosition == preeditText.length()) {
+            } else if (!preeditText.isEmpty() && cursorPosition == preeditText.size()) {
                 commit();
             }
         }
@@ -611,7 +611,7 @@ bool QVirtualKeyboardInputContextPrivate::testAttribute(const QList<QInputMethod
 
 int QVirtualKeyboardInputContextPrivate::findAttribute(const QList<QInputMethodEvent::Attribute> &attributes, QInputMethodEvent::AttributeType attributeType) const
 {
-    const int count = attributes.count();
+    const int count = attributes.size();
     for (int i = 0; i < count; ++i) {
         if (attributes.at(i).type == attributeType)
             return i;
diff --git a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
index 0ccffe34..9cece734 100644
--- a/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardselectionlistmodel.cpp
@@ -296,7 +296,7 @@ void QVirtualKeyboardSelectionListModel::selectionListChanged(QVirtualKeyboardSe
         if (static_cast<QVirtualKeyboardSelectionListModel::Type>(type) == QVirtualKeyboardSelectionListModel::Type::WordCandidateList)
             d->wclAutoCommitWord = ((oldCount > 1 || (oldCount == 1 && d->wclAutoCommitWord)) && newCount == 1 &&
                                  Settings::instance()->wclAutoCommitWord() &&
-                                 dataAt(0).toString().length() > 1);
+                                 dataAt(0).toString().size() > 1);
         if (d->rowCount != oldCount)
             emit countChanged();
     }
diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp
index 78138eab..72c0c90f 100644
--- a/src/virtualkeyboard/shadowinputcontext.cpp
+++ b/src/virtualkeyboard/shadowinputcontext.cpp
@@ -185,7 +185,7 @@ void ShadowInputContext::update(Qt::InputMethodQueries queries)
                                                        newCursorPosition - newAnchorPosition, QVariant()));
         QInputMethodEvent inputEvent(QString(), attributes);
         if (updateSurroundingText)
-            inputEvent.setCommitString(newSurroundingText, -cursorPosition, surroundingText.length());
+            inputEvent.setCommitString(newSurroundingText, -cursorPosition, surroundingText.size());
         QGuiApplication::sendEvent(d->inputItem, &inputEvent);
     }
 
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index 13e44c31..559f9752 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -281,7 +281,7 @@ void ShiftHandler::autoCapitalize()
         } else { // space after sentence-ending character triggers auto-capitalization
             QString text = d->inputContext->surroundingText();
             text.truncate(cursorPosition);
-            if (text.trimmed().length() == 0)
+            if (text.trimmed().size() == 0)
                 setShiftActive(!preferLowerCase);
             else if (text.endsWith(QLatin1Char(' ')))
                 setShiftActive(d->sentenceEndingCharacters.contains(QStringView{text}.right(2)[0])