Port from container.count()/length() to size()

This is semantic patch using ClangTidyTransformator:

  auto QtContainerClass = 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'.

<classes> are:

    // sequential:
    "QByteArray",
    "QList",
    "QQueue",
    "QStack",
    "QString",
    "QVarLengthArray",
    "QVector",
    // associative:
    "QHash",
    "QMultiHash",
    "QMap",
    "QMultiMap",
    "QSet",
    // Qt has no QMultiSet

Change-Id: Ibe8837be96e8d30d1846881ecd65180c1bc459af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

12 files changed, 138 insertions, 138 deletions

diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
index 4ab2d1adb3..037964f42b 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
@@ -126,7 +126,7 @@ void tst_QAbstractTextDocumentLayout::anchorAt()
     QAbstractTextDocumentLayout *documentLayout = doc.documentLayout();
     QTextBlock firstBlock = doc.begin();
     QTextLayout *layout = firstBlock.layout();
-    layout->setPreeditArea(doc.toPlainText().length(), "xxx");
+    layout->setPreeditArea(doc.toPlainText().size(), "xxx");
 
     doc.setPageSize(QSizeF(1000, 1000));
     QFontMetrics metrics(layout->font());
@@ -156,7 +156,7 @@ void tst_QAbstractTextDocumentLayout::imageAt()
     QAbstractTextDocumentLayout *documentLayout = doc.documentLayout();
     QTextBlock firstBlock = doc.begin();
     QTextLayout *layout = firstBlock.layout();
-    layout->setPreeditArea(doc.toPlainText().length(), "xxx");
+    layout->setPreeditArea(doc.toPlainText().size(), "xxx");
 
     doc.setPageSize(QSizeF(1000, 1000));
     QFontMetrics metrics(layout->font());
@@ -181,7 +181,7 @@ void tst_QAbstractTextDocumentLayout::formatAt()
     QAbstractTextDocumentLayout *documentLayout = doc.documentLayout();
     QTextBlock firstBlock = doc.begin();
     QTextLayout *layout = firstBlock.layout();
-    layout->setPreeditArea(doc.toPlainText().length(), "xxx");
+    layout->setPreeditArea(doc.toPlainText().size(), "xxx");
 
     doc.setPageSize(QSizeF(1000, 1000));
     QFontMetrics metrics(layout->font());
diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
index 31ca1ef4e7..571dbc3a84 100644
--- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
@@ -126,7 +126,7 @@ static const char *tokenName(QCss::TokenType t)
 static void debug(const QList<QCss::Symbol> &symbols, int index = -1)
 {
     qDebug() << "all symbols:";
-    for (int i = 0; i < symbols.count(); ++i)
+    for (int i = 0; i < symbols.size(); ++i)
         qDebug() << '(' << i << "); Token:" << tokenName(symbols.at(i).token) << "; Lexem:" << symbols.at(i).lexem();
     if (index != -1)
         qDebug() << "failure at index" << index;
@@ -144,10 +144,10 @@ void tst_QCssParser::scanner()
     QList<QCss::Symbol> symbols;
     QCss::Scanner::scan(QCss::Scanner::preprocess(QString::fromUtf8(inputFile.readAll())), &symbols);
 
-    QVERIFY(symbols.count() > 1);
+    QVERIFY(symbols.size() > 1);
     QCOMPARE(symbols.last().token, QCss::S);
     QCOMPARE(symbols.last().lexem(), QLatin1String("\n"));
-    symbols.remove(symbols.count() - 1, 1);
+    symbols.remove(symbols.size() - 1, 1);
 
     QFile outputFile(output);
     QVERIFY(outputFile.open(QIODevice::ReadOnly|QIODevice::Text));
@@ -159,9 +159,9 @@ void tst_QCssParser::scanner()
         lines.append(line);
     }
 
-    if (lines.count() != symbols.count()) {
+    if (lines.count() != symbols.size()) {
         debug(symbols);
-        QCOMPARE(lines.count(), symbols.count());
+        QCOMPARE(lines.count(), symbols.size());
     }
 
     for (int i = 0; i < lines.count(); ++i) {
@@ -350,9 +350,9 @@ void tst_QCssParser::expr()
     QVERIFY(parser.testExpr());
     QCOMPARE(parser.parseExpr(&values), parseSuccess);
     if (parseSuccess) {
-        QCOMPARE(values.count(), expectedValues.count());
+        QCOMPARE(values.size(), expectedValues.size());
 
-        for (int i = 0; i < values.count(); ++i) {
+        for (int i = 0; i < values.size(); ++i) {
             QCOMPARE(int(values.at(i).type), int(expectedValues.at(i).type));
             QCOMPARE(values.at(i).variant, expectedValues.at(i).variant);
         }
@@ -405,8 +405,8 @@ void tst_QCssParser::ruleset()
         QVERIFY(parser.testRuleset());
         QCss::StyleRule rule;
         QVERIFY(parser.parseRuleset(&rule));
-        QCOMPARE(rule.selectors.count(), 1);
-        QCOMPARE(rule.selectors.at(0).basicSelectors.count(), 1);
+        QCOMPARE(rule.selectors.size(), 1);
+        QCOMPARE(rule.selectors.at(0).basicSelectors.size(), 1);
         QCOMPARE(rule.selectors.at(0).basicSelectors.at(0).elementName, QString("p"));
         QVERIFY(rule.declarations.isEmpty());
     }
@@ -416,10 +416,10 @@ void tst_QCssParser::ruleset()
         QVERIFY(parser.testRuleset());
         QCss::StyleRule rule;
         QVERIFY(parser.parseRuleset(&rule));
-        QCOMPARE(rule.selectors.count(), 2);
-        QCOMPARE(rule.selectors.at(0).basicSelectors.count(), 1);
+        QCOMPARE(rule.selectors.size(), 2);
+        QCOMPARE(rule.selectors.at(0).basicSelectors.size(), 1);
         QCOMPARE(rule.selectors.at(0).basicSelectors.at(0).elementName, QString("p"));
-        QCOMPARE(rule.selectors.at(1).basicSelectors.count(), 1);
+        QCOMPARE(rule.selectors.at(1).basicSelectors.size(), 1);
         QCOMPARE(rule.selectors.at(1).basicSelectors.at(0).elementName, QString("div"));
         QVERIFY(rule.declarations.isEmpty());
     }
@@ -429,14 +429,14 @@ void tst_QCssParser::ruleset()
         QVERIFY(parser.testRuleset());
         QCss::StyleRule rule;
         QVERIFY(parser.parseRuleset(&rule));
-        QCOMPARE(rule.selectors.count(), 2);
+        QCOMPARE(rule.selectors.size(), 2);
 
-        QCOMPARE(rule.selectors.at(0).basicSelectors.count(), 1);
-        QCOMPARE(rule.selectors.at(0).basicSelectors.at(0).pseudos.count(), 1);
+        QCOMPARE(rule.selectors.at(0).basicSelectors.size(), 1);
+        QCOMPARE(rule.selectors.at(0).basicSelectors.at(0).pseudos.size(), 1);
         QCOMPARE(rule.selectors.at(0).basicSelectors.at(0).pseudos.at(0).name, QString("before"));
 
-        QCOMPARE(rule.selectors.at(1).basicSelectors.count(), 1);
-        QCOMPARE(rule.selectors.at(1).basicSelectors.at(0).pseudos.count(), 1);
+        QCOMPARE(rule.selectors.at(1).basicSelectors.size(), 1);
+        QCOMPARE(rule.selectors.at(1).basicSelectors.at(0).pseudos.size(), 1);
         QCOMPARE(rule.selectors.at(1).basicSelectors.at(0).pseudos.at(0).name, QString("after"));
 
         QVERIFY(rule.declarations.isEmpty());
@@ -688,21 +688,21 @@ void tst_QCssParser::selector()
     QCss::Selector selector;
     QVERIFY(parser.parseSelector(&selector));
 
-    QCOMPARE(selector.basicSelectors.count(), expectedSelector.basicSelectors.count());
-    for (int i = 0; i < selector.basicSelectors.count(); ++i) {
+    QCOMPARE(selector.basicSelectors.size(), expectedSelector.basicSelectors.size());
+    for (int i = 0; i < selector.basicSelectors.size(); ++i) {
         const QCss::BasicSelector sel = selector.basicSelectors.at(i);
         const QCss::BasicSelector expectedSel = expectedSelector.basicSelectors.at(i);
         QCOMPARE(sel.elementName, expectedSel.elementName);
         QCOMPARE(int(sel.relationToNext), int(expectedSel.relationToNext));
 
-        QCOMPARE(sel.pseudos.count(), expectedSel.pseudos.count());
-        for (int i = 0; i < sel.pseudos.count(); ++i) {
+        QCOMPARE(sel.pseudos.size(), expectedSel.pseudos.size());
+        for (int i = 0; i < sel.pseudos.size(); ++i) {
             QCOMPARE(sel.pseudos.at(i).name, expectedSel.pseudos.at(i).name);
             QCOMPARE(sel.pseudos.at(i).function, expectedSel.pseudos.at(i).function);
         }
 
-        QCOMPARE(sel.attributeSelectors.count(), expectedSel.attributeSelectors.count());
-        for (int i = 0; i < sel.attributeSelectors.count(); ++i) {
+        QCOMPARE(sel.attributeSelectors.size(), expectedSel.attributeSelectors.size());
+        for (int i = 0; i < sel.attributeSelectors.size(); ++i) {
             QCOMPARE(sel.attributeSelectors.at(i).name, expectedSel.attributeSelectors.at(i).name);
             QCOMPARE(sel.attributeSelectors.at(i).value, expectedSel.attributeSelectors.at(i).value);
             QCOMPARE(int(sel.attributeSelectors.at(i).valueMatchCriterium), int(expectedSel.attributeSelectors.at(i).valueMatchCriterium));
@@ -760,13 +760,13 @@ void tst_QCssParser::malformedDeclarations()
     QCss::StyleRule rule;
     QVERIFY(parser.parseRuleset(&rule));
 
-    QCOMPARE(rule.selectors.count(), 1);
-    QCOMPARE(rule.selectors.at(0).basicSelectors.count(), 1);
+    QCOMPARE(rule.selectors.size(), 1);
+    QCOMPARE(rule.selectors.at(0).basicSelectors.size(), 1);
     QCOMPARE(rule.selectors.at(0).basicSelectors.at(0).elementName, QString("p"));
 
-    QVERIFY(rule.declarations.count() >= 1);
+    QVERIFY(rule.declarations.size() >= 1);
     QCOMPARE(int(rule.declarations.last().d->propertyId), int(QCss::Color));
-    QCOMPARE(rule.declarations.last().d->values.count(), 1);
+    QCOMPARE(rule.declarations.last().d->values.size(), 1);
     QCOMPARE(int(rule.declarations.last().d->values.at(0).type), int(QCss::Value::Identifier));
     QCOMPARE(rule.declarations.last().d->values.at(0).variant.toString(), QString("green"));
 }
@@ -786,17 +786,17 @@ void tst_QCssParser::invalidAtKeywords()
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
 
-    QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count(), 1);
+    QCOMPARE(sheet.styleRules.size() + sheet.nameIndex.size(), 1);
     QCss::StyleRule rule =  (!sheet.styleRules.isEmpty()) ?
             sheet.styleRules.at(0) : *sheet.nameIndex.begin();
 
-    QCOMPARE(rule.selectors.count(), 1);
-    QCOMPARE(rule.selectors.at(0).basicSelectors.count(), 1);
+    QCOMPARE(rule.selectors.size(), 1);
+    QCOMPARE(rule.selectors.at(0).basicSelectors.size(), 1);
     QCOMPARE(rule.selectors.at(0).basicSelectors.at(0).elementName, QString("h1"));
 
-    QCOMPARE(rule.declarations.count(), 1);
+    QCOMPARE(rule.declarations.size(), 1);
     QCOMPARE(int(rule.declarations.at(0).d->propertyId), int(QCss::Color));
-    QCOMPARE(rule.declarations.at(0).d->values.count(), 1);
+    QCOMPARE(rule.declarations.at(0).d->values.size(), 1);
     QCOMPARE(int(rule.declarations.at(0).d->values.at(0).type), int(QCss::Value::Identifier));
     QCOMPARE(rule.declarations.at(0).d->values.at(0).variant.toString(), QString("blue"));
 }
@@ -1141,9 +1141,9 @@ void tst_QCssParser::styleSelector()
     QList<QCss::Declaration> decls = testSelector.declarationsForNode(n);
 
     if (match) {
-        QCOMPARE(decls.count(), 1);
+        QCOMPARE(decls.size(), 1);
         QCOMPARE(int(decls.at(0).d->propertyId), int(QCss::BackgroundColor));
-        QCOMPARE(decls.at(0).d->values.count(), 1);
+        QCOMPARE(decls.at(0).d->values.size(), 1);
         QCOMPARE(int(decls.at(0).d->values.at(0).type), int(QCss::Value::Identifier));
         QCOMPARE(decls.at(0).d->values.at(0).variant.toString(), QString("green"));
     } else {
@@ -1183,11 +1183,11 @@ void tst_QCssParser::specificity()
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
 
-    QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count() + sheet.idIndex.count() , 1);
+    QCOMPARE(sheet.styleRules.size() + sheet.nameIndex.size() + sheet.idIndex.size() , 1);
     QCss::StyleRule rule =  (!sheet.styleRules.isEmpty()) ? sheet.styleRules.at(0)
                         :  (!sheet.nameIndex.isEmpty())  ? *sheet.nameIndex.begin()
                         :  *sheet.idIndex.begin();
-    QCOMPARE(rule.selectors.count(), 1);
+    QCOMPARE(rule.selectors.size(), 1);
     QTEST(rule.selectors.at(0).specificity(), "specificity");
 }
 
@@ -1236,15 +1236,15 @@ void tst_QCssParser::specificitySort()
         n.ptr = &e;
         QList<QCss::Declaration> decls = testSelector.declarationsForNode(n);
 
-        QCOMPARE(decls.count(), 2);
+        QCOMPARE(decls.size(), 2);
 
         QCOMPARE(int(decls.at(0).d->propertyId), int(QCss::Color));
-        QCOMPARE(decls.at(0).d->values.count(), 1);
+        QCOMPARE(decls.at(0).d->values.size(), 1);
         QCOMPARE(int(decls.at(0).d->values.at(0).type), int(QCss::Value::Identifier));
         QCOMPARE(decls.at(0).d->values.at(0).variant.toString(), QString("green"));
 
         QCOMPARE(int(decls.at(1).d->propertyId), int(QCss::Color));
-        QCOMPARE(decls.at(1).d->values.count(), 1);
+        QCOMPARE(decls.at(1).d->values.size(), 1);
         QCOMPARE(int(decls.at(1).d->values.at(0).type), int(QCss::Value::Identifier));
         QCOMPARE(decls.at(1).d->values.at(0).variant.toString(), QString("red"));
     }
@@ -1319,7 +1319,7 @@ void tst_QCssParser::rulesForNode()
     QList<QCss::StyleRule> rules = testSelector.styleRulesForNode(n);
 
     QList<QCss::Declaration> decls;
-    for (int i = 0; i < rules.count(); i++) {
+    for (int i = 0; i < rules.size(); i++) {
         const QCss::Selector &selector = rules.at(i).selectors.at(0);
         quint64 negated = 0;
         quint64 cssClass = selector.pseudoClass(&negated);
@@ -1328,7 +1328,7 @@ void tst_QCssParser::rulesForNode()
             decls += rules.at(i).declarations;
     }
 
-    QCOMPARE(decls.count(), declCount);
+    QCOMPARE(decls.size(), declCount);
 
     if (declCount > 0)
         QCOMPARE(decls.at(0).d->values.at(0).variant.toString(), value0);
@@ -1455,14 +1455,14 @@ void tst_QCssParser::pseudoElement()
     n.ptr = &e;
     QList<QCss::StyleRule> rules = testSelector.styleRulesForNode(n);
     QList<QCss::Declaration> decls;
-    for (int i = 0; i < rules.count(); i++) {
+    for (int i = 0; i < rules.size(); i++) {
         const QCss::Selector& selector = rules.at(i).selectors.at(0);
         if (pseudoElement.compare(selector.pseudoElement(), Qt::CaseInsensitive) != 0)
             continue;
         decls += rules.at(i).declarations;
 
     }
-    QCOMPARE(decls.count(), declCount);
+    QCOMPARE(decls.size(), declCount);
 }
 
 void tst_QCssParser::gradient_data()
@@ -1596,7 +1596,7 @@ void tst_QCssParser::extractFontFamily()
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
 
-    QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count(), 1);
+    QCOMPARE(sheet.styleRules.size() + sheet.nameIndex.size(), 1);
     QCss::StyleRule rule =  (!sheet.styleRules.isEmpty()) ?
             sheet.styleRules.at(0) : *sheet.nameIndex.begin();
 
@@ -1654,7 +1654,7 @@ void tst_QCssParser::extractBorder()
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
 
-    QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count(), 1);
+    QCOMPARE(sheet.styleRules.size() + sheet.nameIndex.size(), 1);
     QCss::StyleRule rule =  (!sheet.styleRules.isEmpty()) ?
             sheet.styleRules.at(0) : *sheet.nameIndex.begin();
     const QList<QCss::Declaration> decls = rule.declarations;
@@ -1684,7 +1684,7 @@ void tst_QCssParser::noTextDecoration()
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
 
-    QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count(), 1);
+    QCOMPARE(sheet.styleRules.size() + sheet.nameIndex.size(), 1);
     QCss::StyleRule rule =  (!sheet.styleRules.isEmpty()) ?
             sheet.styleRules.at(0) : *sheet.nameIndex.begin();
     const QList<QCss::Declaration> decls = rule.declarations;
@@ -1709,7 +1709,7 @@ void tst_QCssParser::quotedAndUnquotedIdentifiers()
     QCss::StyleSheet sheet;
     QVERIFY(parser.parse(&sheet));
 
-    QCOMPARE(sheet.styleRules.count() + sheet.nameIndex.count(), 1);
+    QCOMPARE(sheet.styleRules.size() + sheet.nameIndex.size(), 1);
     QCss::StyleRule rule = (!sheet.styleRules.isEmpty()) ?
            sheet.styleRules.at(0) : *sheet.nameIndex.begin();
     const QList<QCss::Declaration> decls = rule.declarations;
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index 202d07ea1e..68312470cc 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -100,7 +100,7 @@ public:
 
             virtual void highlightBlock(const QString &text) override
             {
-                for (int i = 0; i < formats.count(); ++i) {
+                for (int i = 0; i < formats.size(); ++i) {
                     const QTextLayout::FormatRange &range = formats.at(i);
                     setFormat(range.start, range.length, range.format);
                 }
@@ -161,7 +161,7 @@ public:
             commentFormat.setForeground(Qt::darkGreen);
             commentFormat.setFontWeight(QFont::StyleItalic);
             commentFormat.setFontFixedPitch(true);
-            int textLength = text.length();
+            int textLength = text.size();
 
             if (text.startsWith(QLatin1Char(';'))){
                 // The entire line is a comment
@@ -414,7 +414,7 @@ void tst_QSyntaxHighlighter::preservePreeditArea()
     QCOMPARE(hl->callCount, 1);
 
     formats = layout->formats();
-    QCOMPARE(formats.count(), 3);
+    QCOMPARE(formats.size(), 3);
 
     range = formats.at(0);
 
diff --git a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
index cc6722af40..639e2e277f 100644
--- a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
@@ -1754,26 +1754,26 @@ void tst_QTextCursor::update_data()
     QTest::newRow("removeInsideSelection")
         << text
         << /*position*/ 0
-        << /*anchor*/ int(text.length())
+        << /*anchor*/ int(text.size())
         // delete 'big'
         << 6
         << 6 + charsToDelete
         << QString() // don't insert anything, just remove
         << /*expectedPosition*/ 0
-        << /*expectedAnchor*/ int(text.length() - charsToDelete)
+        << /*expectedAnchor*/ int(text.size() - charsToDelete)
         ;
 
     text = "Hello big world";
     charsToDelete = 3;
     QTest::newRow("removeInsideSelectionWithSwappedAnchorAndPosition")
         << text
-        << /*position*/ int(text.length())
+        << /*position*/ int(text.size())
         << /*anchor*/ 0
         // delete 'big'
         << 6
         << 6 + charsToDelete
         << QString() // don't insert anything, just remove
-        << /*expectedPosition*/ int(text.length() - charsToDelete)
+        << /*expectedPosition*/ int(text.size() - charsToDelete)
         << /*expectedAnchor*/ 0
         ;
 
@@ -1784,13 +1784,13 @@ void tst_QTextCursor::update_data()
     QTest::newRow("replaceInsideSelection")
         << text
         << /*position*/ 0
-        << /*anchor*/ int(text.length())
+        << /*anchor*/ int(text.size())
         // delete 'big' ...
         << 6
         << 6 + charsToDelete
         << textToInsert // ... and replace 'big' with 'small'
         << /*expectedPosition*/ 0
-        << /*expectedAnchor*/ int(text.length() - charsToDelete + textToInsert.length())
+        << /*expectedAnchor*/ int(text.size() - charsToDelete + textToInsert.size())
         ;
 
     text = "Hello big world";
@@ -1798,13 +1798,13 @@ void tst_QTextCursor::update_data()
     textToInsert = "small";
     QTest::newRow("replaceInsideSelectionWithSwappedAnchorAndPosition")
         << text
-        << /*position*/ int(text.length())
+        << /*position*/ int(text.size())
         << /*anchor*/ 0
         // delete 'big' ...
         << 6
         << 6 + charsToDelete
         << textToInsert // ... and replace 'big' with 'small'
-        << /*expectedPosition*/ int(text.length() - charsToDelete + textToInsert.length())
+        << /*expectedPosition*/ int(text.size() - charsToDelete + textToInsert.size())
         << /*expectedAnchor*/ 0
         ;
 
@@ -1813,14 +1813,14 @@ void tst_QTextCursor::update_data()
     charsToDelete = 3;
     QTest::newRow("removeBeforeSelection")
         << text
-        << /*position*/ int(text.length() - 5)
-        << /*anchor*/ int(text.length())
+        << /*position*/ int(text.size() - 5)
+        << /*anchor*/ int(text.size())
         // delete 'big'
         << 6
         << 6 + charsToDelete
         << QString() // don't insert anything, just remove
-        << /*expectedPosition*/ int(text.length() - 5 - charsToDelete)
-        << /*expectedAnchor*/ int(text.length() - charsToDelete)
+        << /*expectedPosition*/ int(text.size() - 5 - charsToDelete)
+        << /*expectedAnchor*/ int(text.size() - charsToDelete)
         ;
 
     text = "Hello big world";
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index d10027b7a0..a82fc19490 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -1945,7 +1945,7 @@ void tst_QTextDocument::toHtmlBodyBgColor()
     doc.rootFrame()->setFrameFormat(fmt);
 
     QString expectedHtml = htmlHead;
-    expectedHtml.insert(htmlHead.length() - 2, " bgcolor=\"#0000ff\"");
+    expectedHtml.insert(htmlHead.size() - 2, " bgcolor=\"#0000ff\"");
     expectedHtml += "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Blah</p>"
              + htmlTail;
 
@@ -1965,7 +1965,7 @@ void tst_QTextDocument::toHtmlBodyBgColorRgba()
     doc.rootFrame()->setFrameFormat(fmt);
 
     QString expectedHtml = htmlHead;
-    expectedHtml.insert(htmlHead.length() - 2, " bgcolor=\"rgba(255,0,0,0.2)\"");
+    expectedHtml.insert(htmlHead.size() - 2, " bgcolor=\"rgba(255,0,0,0.2)\"");
     expectedHtml += "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Blah</p>"
              + htmlTail;
 
@@ -1985,7 +1985,7 @@ void tst_QTextDocument::toHtmlBodyBgColorTransparent()
     doc.rootFrame()->setFrameFormat(fmt);
 
     QString expectedHtml = htmlHead;
-    expectedHtml.insert(htmlHead.length() - 2, " bgcolor=\"transparent\"");
+    expectedHtml.insert(htmlHead.size() - 2, " bgcolor=\"transparent\"");
     expectedHtml += "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Blah</p>"
              + htmlTail;
 
@@ -2051,7 +2051,7 @@ void tst_QTextDocument::toHtmlDefaultFontSpacingProperties()
     doc.setDefaultFont(fnt);
 
     QString expectedOutput = htmlHead;
-    expectedOutput.insert(htmlHead.length() - 3, " letter-spacing:13px; word-spacing:15px;");
+    expectedOutput.insert(htmlHead.size() - 3, " letter-spacing:13px; word-spacing:15px;");
     expectedOutput +=
             "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Blah</p>"
             + htmlTail;
@@ -2071,7 +2071,7 @@ void tst_QTextDocument::toHtmlTextDecorationUnderline()
     doc.setDefaultFont(fnt);
 
     QString expectedOutput = htmlHead;
-    expectedOutput.insert(htmlHead.length() - 3, " text-decoration: underline;");
+    expectedOutput.insert(htmlHead.size() - 3, " text-decoration: underline;");
     expectedOutput +=
             "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Some text</p>"
             + htmlTail;
@@ -2086,7 +2086,7 @@ void tst_QTextDocument::toHtmlTextDecorationUnderline()
     cursor.mergeCharFormat(format);
 
     expectedOutput = htmlHead;
-    expectedOutput.insert(htmlHead.length() - 3, " text-decoration: underline;");
+    expectedOutput.insert(htmlHead.size() - 3, " text-decoration: underline;");
     expectedOutput +=
             "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
             "margin-right:0px; -qt-block-indent:0; text-indent:0px;\">"
@@ -2740,11 +2740,11 @@ void tst_QTextDocument::defaultTableStyle()
                 brushes << sideProperty.value<QBrush>();
             }
             auto errorDetails = qScopeGuard([&]{
-                if (brushes.count() != borderBrushes.count()) {
-                    qWarning("Different count: %lld vs %lld", brushes.count(), borderBrushes.count());
+                if (brushes.size() != borderBrushes.size()) {
+                    qWarning("Different count: %lld vs %lld", brushes.size(), borderBrushes.size());
                     return;
                 }
-                for (int i = 0; i < brushes.count(); ++i) {
+                for (int i = 0; i < brushes.size(); ++i) {
                     QString side;
                     QDebug(&side) << QTextFormat::Property(QTextFormat::TableCellTopBorderBrush + i);
                     QString actual;
@@ -3070,12 +3070,12 @@ void tst_QTextDocument::characterAt()
     QString text("12345\n67890");
     cursor.insertText(text);
     int length = doc.characterCount();
-    QCOMPARE(length, text.length() + 1);
+    QCOMPARE(length, text.size() + 1);
     QCOMPARE(doc.characterAt(length-1), QChar(QChar::ParagraphSeparator));
     QCOMPARE(doc.characterAt(-1), QChar());
     QCOMPARE(doc.characterAt(length), QChar());
     QCOMPARE(doc.characterAt(length + 1), QChar());
-    for (int i = 0; i < text.length(); ++i) {
+    for (int i = 0; i < text.size(); ++i) {
         QChar c = text.at(i);
         if (c == QLatin1Char('\n'))
             c = QChar(QChar::ParagraphSeparator);
@@ -3788,7 +3788,7 @@ void tst_QTextDocument::mergeFontFamilies()
 
     QTextCursor cursor = QTextCursor(&td);
     cursor.setPosition(0);
-    cursor.setPosition(QByteArray("Hello World").length(), QTextCursor::KeepAnchor);
+    cursor.setPosition(QByteArray("Hello World").size(), QTextCursor::KeepAnchor);
     cursor.mergeCharFormat(newFormat);
 
     QVERIFY(td.toHtml().contains(QLatin1String("font-family:'Jokerman';")));
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 52708e1b14..4cc4a253ee 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -1175,7 +1175,7 @@ void tst_QTextDocumentFragment::copySubTable()
                 table->cellAt(row, col).firstCursorPosition().insertText(rowS + QString::number(col));
         }
 
-        QCOMPARE(table->format().columnWidthConstraints().count(), table->columns());
+        QCOMPARE(table->format().columnWidthConstraints().size(), table->columns());
 
         // select 2x2 subtable
         cursor = table->cellAt(1, 1).firstCursorPosition();
@@ -2235,7 +2235,7 @@ void tst_QTextDocumentFragment::html_frameImport()
     cursor.insertFragment(frag);
 
     QList<QTextFrame *> childFrames = doc->rootFrame()->childFrames();
-    QCOMPARE(childFrames.count(), 1);
+    QCOMPARE(childFrames.size(), 1);
     QTextFrame *frame = childFrames.first();
     QCOMPARE(frame->frameFormat().margin(), ffmt.margin());
     QCOMPARE(frame->frameFormat().border(), ffmt.border());
@@ -2263,7 +2263,7 @@ void tst_QTextDocumentFragment::html_frameImport2()
     cursor.insertFragment(frag);
 
     QList<QTextFrame *> childFrames = doc->rootFrame()->childFrames();
-    QCOMPARE(childFrames.count(), 1);
+    QCOMPARE(childFrames.size(), 1);
     QTextFrame *frame = childFrames.first();
     QCOMPARE(frame->frameFormat().topMargin(), ffmt.topMargin());
     QCOMPARE(frame->frameFormat().bottomMargin(), ffmt.bottomMargin());
@@ -2278,7 +2278,7 @@ void tst_QTextDocumentFragment::html_dontAddMarginsAcrossTableCells()
     cursor.insertFragment(QTextDocumentFragment::fromHtml(QString::fromLatin1(html)));
 
     QList<QTextFrame *> childFrames = doc->rootFrame()->childFrames();
-    QCOMPARE(childFrames.count(), 1);
+    QCOMPARE(childFrames.size(), 1);
     QTextFrame *frame = childFrames.first();
     cursor = frame->firstCursorPosition();
     QCOMPARE(cursor.blockFormat().leftMargin(), qreal(50.0));
@@ -2760,7 +2760,7 @@ void tst_QTextDocumentFragment::html_columnWidths()
     QTextTableFormat fmt = table->format();
 
     const QList<QTextLength> columnWidths = fmt.columnWidthConstraints();
-    QCOMPARE(columnWidths.count(), 2);
+    QCOMPARE(columnWidths.size(), 2);
     QCOMPARE(columnWidths.at(0).type(), QTextLength::VariableLength);
     QCOMPARE(columnWidths.at(1).type(), QTextLength::PercentageLength);
     QCOMPARE(columnWidths.at(1).rawValue(), qreal(1));
@@ -4168,7 +4168,7 @@ void tst_QTextDocumentFragment::html_entities()
     setHtml(html);
     QCOMPARE(doc->blockCount(), 1);
     QString txt = doc->begin().text();
-    QCOMPARE(txt.length(), 1);
+    QCOMPARE(txt.size(), 1);
     QCOMPARE(txt.at(0).unicode(), code);
 }
 
diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
index 9ef5842803..aeb59dcc27 100644
--- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
@@ -187,7 +187,7 @@ void tst_QTextFormat::resolveFont()
     QTextCursor(&doc).insertText("Test", fmt);
 
     QList<QTextFormat> formats = doc.allFormats();
-    QCOMPARE(formats.count(), 3);
+    QCOMPARE(formats.size(), 3);
 
     QCOMPARE(formats.at(2).type(), int(QTextFormat::CharFormat));
     fmt = formats.at(2).toCharFormat();
@@ -312,8 +312,8 @@ void tst_QTextFormat::getSetTabs()
       public:
         Comparator(const QList<QTextOption::Tab> &tabs, const QList<QTextOption::Tab> &tabs2)
         {
-            QCOMPARE(tabs.count(), tabs2.count());
-            for(int i=0; i < tabs.count(); i++) {
+            QCOMPARE(tabs.size(), tabs2.size());
+            for(int i=0; i < tabs.size(); i++) {
                 QTextOption::Tab t1 = tabs[i];
                 QTextOption::Tab t2 = tabs2[i];
                 QCOMPARE(t1.position, t2.position);
@@ -364,7 +364,7 @@ void tst_QTextFormat::testTabsUsed()
     QCOMPARE(line.cursorToX(4), 100.);
 
     QTextOption option = layout->textOption();
-    QCOMPARE(option.tabs().count(), tabs.count());
+    QCOMPARE(option.tabs().size(), tabs.size());
 
 }
 
@@ -649,15 +649,15 @@ void tst_QTextFormat::clearCollection()
     int formatIndex2 = collection.indexForFormat(charFormat2);
     QCOMPARE(formatIndex2, 1);
     QCOMPARE(collection.formats.count(), 2);
-    QCOMPARE(collection.hashes.count(), 2);
+    QCOMPARE(collection.hashes.size(), 2);
     QCOMPARE(collection.defaultFont(), f);
 
     collection.clear();
     QCOMPARE(collection.formats.count(), 0);
-    QCOMPARE(collection.hashes.count(), 0);
+    QCOMPARE(collection.hashes.size(), 0);
     QCOMPARE(collection.indexForFormat(charFormat2), 0);
     QCOMPARE(collection.formats.count(), 1);
-    QCOMPARE(collection.hashes.count(), 1);
+    QCOMPARE(collection.hashes.size(), 1);
     QCOMPARE(collection.defaultFont(), f); // kept, QTextDocument::clear or setPlainText should not reset the font set by setDefaultFont
 }
 
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index def7c88593..4ae1b33d79 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -289,14 +289,14 @@ void tst_QTextLayout::simpleBoundingRect()
 
     QString hello("hello world");
 
-    const int width = hello.length() * testFont.pixelSize();
+    const int width = hello.size() * testFont.pixelSize();
 
     QTextLayout layout(hello, testFont);
     layout.beginLayout();
 
     QTextLine line = layout.createLine();
     line.setLineWidth(width);
-    QCOMPARE(line.textLength(), hello.length());
+    QCOMPARE(line.textLength(), hello.size());
     QCOMPARE(layout.boundingRect(), QRectF(0, 0, width, QFontMetrics(testFont).height()));
 }
 
@@ -331,18 +331,18 @@ void tst_QTextLayout::threeLineBoundingRect()
     QString thirdWord("world");
     QString text(firstWord + wordBoundary1 + secondWord + wordBoundary2 + thirdWord);
 
-    int firstLineWidth = firstWord.length() * testFont.pixelSize();
-    int secondLineWidth = secondWord.length() * testFont.pixelSize();
-    int thirdLineWidth = thirdWord.length() * testFont.pixelSize();
+    int firstLineWidth = firstWord.size() * testFont.pixelSize();
+    int secondLineWidth = secondWord.size() * testFont.pixelSize();
+    int thirdLineWidth = thirdWord.size() * testFont.pixelSize();
     // Trailing spaces do not count to line width:
     if (!wordBoundary1.isSpace())
         firstLineWidth += testFont.pixelSize();
     if (!wordBoundary2.isSpace())
         secondLineWidth += testFont.pixelSize();
     // But trailing spaces do count to line length:
-    const int firstLineLength = firstWord.length() + 1;
-    const int secondLineLength = secondWord.length() + 1;
-    const int thirdLineLength = thirdWord.length();
+    const int firstLineLength = firstWord.size() + 1;
+    const int secondLineLength = secondWord.size() + 1;
+    const int thirdLineLength = thirdWord.size();
 
     const int longestLine = qMax(firstLineWidth, qMax(secondLineWidth, thirdLineWidth));
 
@@ -386,7 +386,7 @@ void tst_QTextLayout::boundingRectWithLongLineAndNoWrap()
 {
     QString longString("thisisaverylongstringthatcannotbewrappedatallitjustgoesonandonlikeonebigword");
 
-    const int width = longString.length() * testFont.pixelSize() / 20; // very small widthx
+    const int width = longString.size() * testFont.pixelSize() / 20; // very small widthx
 
     QTextLayout layout(longString, testFont);
     layout.beginLayout();
@@ -1139,7 +1139,7 @@ void tst_QTextLayout::xToCursorAtEndOfLine()
     QString text = "FirstLine SecondLine";
     text.replace('\n', QChar::LineSeparator);
 
-    const qreal firstLineWidth = QString("FirstLine").length() * testFont.pixelSize();
+    const qreal firstLineWidth = QString("FirstLine").size() * testFont.pixelSize();
 
     QTextLayout layout(text, testFont);
     layout.setCacheEnabled(true);
@@ -1282,7 +1282,7 @@ void tst_QTextLayout::integerOverflow()
 
     QVERIFY(line.isValid());
     line.setLineWidth(INT_MAX);
-    QCOMPARE(line.textLength(), txt.length());
+    QCOMPARE(line.textLength(), txt.size());
 
     QVERIFY(!layout.createLine().isValid());
 
@@ -2039,7 +2039,7 @@ void tst_QTextLayout::columnWrapWithTabs()
         textLayout.beginLayout();
         QTextLine line = textLayout.createLine();
         line.setNumColumns(30);
-        QCOMPARE(line.textLength(), text.length());
+        QCOMPARE(line.textLength(), text.size());
         textLayout.endLayout();
     }
 
@@ -2050,7 +2050,7 @@ void tst_QTextLayout::columnWrapWithTabs()
         textLayout.beginLayout();
         QTextLine line = textLayout.createLine();
         line.setNumColumns(30);
-        QVERIFY(line.textLength() < text.length());
+        QVERIFY(line.textLength() < text.size());
         textLayout.endLayout();
     }
 
@@ -2454,7 +2454,7 @@ void tst_QTextLayout::nbspWithFormat()
     layout.setText(s1 + s2 + nbsp + s3);
 
     QTextLayout::FormatRange formatRange;
-    formatRange.start = s1.length() + s2.length();
+    formatRange.start = s1.size() + s2.size();
     formatRange.length = 1;
     formatRange.format.setFontUnderline(true);
 
@@ -2471,9 +2471,9 @@ void tst_QTextLayout::nbspWithFormat()
 
     QCOMPARE(layout.lineCount(), 2);
     QCOMPARE(layout.lineAt(0).textStart(), 0);
-    QCOMPARE(layout.lineAt(0).textLength(), s1.length());
-    QCOMPARE(layout.lineAt(1).textStart(), s1.length());
-    QCOMPARE(layout.lineAt(1).textLength(), s2.length() + 1 + s3.length());
+    QCOMPARE(layout.lineAt(0).textLength(), s1.size());
+    QCOMPARE(layout.lineAt(1).textStart(), s1.size());
+    QCOMPARE(layout.lineAt(1).textLength(), s2.size() + 1 + s3.size());
 }
 
 void tst_QTextLayout::koreanWordWrap()
diff --git a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
index 30185e83b9..3ae6046bdb 100644
--- a/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -79,7 +79,7 @@ QString tst_QTextOdfWriter::getContentFromXml()
     if (index > 0) {
         index = stringContent.indexOf('>', index);
         if (index > 0)
-            ret = stringContent.mid(index+1, stringContent.length() - index - 10);
+            ret = stringContent.mid(index+1, stringContent.size() - index - 10);
     }
     return ret;
 }
@@ -279,7 +279,7 @@ file.open(QIODevice::WriteOnly);
 file.write(buffer->data());
 file.close();
 */
-    QVERIFY(buffer->data().length() > 80);
+    QVERIFY(buffer->data().size() > 80);
     QCOMPARE(buffer->data()[0], 'P'); // its a zip :)
     QCOMPARE(buffer->data()[1], 'K');
     QString mimetype(buffer->data().mid(38, 39));
diff --git a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
index 71afd31574..cac84de7e2 100644
--- a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -971,7 +971,7 @@ void tst_QTextPieceTable::checkFrames1()
     QVERIFY(root);
     QVERIFY(!root->parentFrame());
 
-    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().size(), 1);
     QVERIFY(frame->format() == ffmt);
     QCOMPARE(frame->firstPosition(), 2);
     QCOMPARE(frame->lastPosition(), 4);
@@ -979,10 +979,10 @@ void tst_QTextPieceTable::checkFrames1()
 
     QPointer<QTextFrame> frame2 = table->insertFrame(2, 3, ffmt);
 
-    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().size(), 1);
     QCOMPARE(root->childFrames().at(0), frame.data());
-    QCOMPARE(frame->childFrames().count(), 1);
-    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame->childFrames().size(), 1);
+    QCOMPARE(frame2->childFrames().size(), 0);
     QCOMPARE(frame2->parentFrame(), frame.data());
     QCOMPARE(frame2->firstPosition(), 3);
     QCOMPARE(frame2->lastPosition(), 4);
@@ -993,10 +993,10 @@ void tst_QTextPieceTable::checkFrames1()
 
     table->removeFrame(frame);
 
-    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().size(), 1);
     QCOMPARE(root->childFrames().at(0), frame2.data());
     QVERIFY(!frame);
-    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->childFrames().size(), 0);
     QCOMPARE(frame2->parentFrame(), root);
     QCOMPARE(frame2->firstPosition(), 2);
     QCOMPARE(frame2->lastPosition(), 3);
@@ -1005,11 +1005,11 @@ void tst_QTextPieceTable::checkFrames1()
 
     frame = table->frameAt(2);
 
-    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().size(), 1);
     QCOMPARE(root->childFrames().at(0), frame.data());
-    QCOMPARE(frame->childFrames().count(), 1);
+    QCOMPARE(frame->childFrames().size(), 1);
     QCOMPARE(frame->childFrames().at(0), frame2.data());
-    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->childFrames().size(), 0);
     QCOMPARE(frame2->parentFrame(), frame.data());
     QCOMPARE(frame2->firstPosition(), 3);
     QCOMPARE(frame2->lastPosition(), 4);
@@ -1019,9 +1019,9 @@ void tst_QTextPieceTable::checkFrames1()
 
     table->undo();
 
-    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().size(), 1);
     QCOMPARE(root->childFrames().at(0), frame.data());
-    QCOMPARE(frame->childFrames().count(), 0);
+    QCOMPARE(frame->childFrames().size(), 0);
     QVERIFY(!frame2);
 
     QCOMPARE(frame->firstPosition(), 2);
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index bfead23d4d..ae5502852c 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -121,7 +121,7 @@ void tst_QTextTable::variousTableModifications()
     QTextTableFormat tableFmt;
 
     QTextTable *tab = cursor.insertTable(2, 2, tableFmt);
-    QCOMPARE(doc->toPlainText().length(), 5);
+    QCOMPARE(doc->toPlainText().size(), 5);
     QCOMPARE(tab, cursor.currentTable());
     QCOMPARE(tab->columns(), 2);
     QCOMPARE(tab->rows(), 2);
@@ -176,14 +176,14 @@ void tst_QTextTable::variousTableModifications()
     cursor.movePosition(QTextCursor::NextBlock);
     QCOMPARE(cursor.position(), 1);
     cursor.deleteChar();
-    QCOMPARE(doc->toPlainText().length(), 5);
+    QCOMPARE(doc->toPlainText().size(), 5);
     cursor.movePosition(QTextCursor::NextBlock);
     QCOMPARE(cursor.position(), 2);
     cursor.deleteChar();
-    QCOMPARE(doc->toPlainText().length(), 5);
+    QCOMPARE(doc->toPlainText().size(), 5);
     cursor.deletePreviousChar();
     QCOMPARE(cursor.position(), 2);
-    QCOMPARE(doc->toPlainText().length(), 5);
+    QCOMPARE(doc->toPlainText().size(), 5);
 
     QTextTable *table = cursor.currentTable();
     QCOMPARE(table->rows(), 2);
@@ -192,16 +192,16 @@ void tst_QTextTable::variousTableModifications()
     table->insertRows(2, 1);
     QCOMPARE(table->rows(), 3);
     QCOMPARE(table->columns(), 2);
-    QCOMPARE(doc->toPlainText().length(), 7);
+    QCOMPARE(doc->toPlainText().size(), 7);
     table->insertColumns(2, 2);
     QCOMPARE(table->rows(), 3);
     QCOMPARE(table->columns(), 4);
-    QCOMPARE(doc->toPlainText().length(), 13);
+    QCOMPARE(doc->toPlainText().size(), 13);
 
     table->resize(4, 5);
     QCOMPARE(table->rows(), 4);
     QCOMPARE(table->columns(), 5);
-    QCOMPARE(doc->toPlainText().length(), 21);
+    QCOMPARE(doc->toPlainText().size(), 21);
 }
 
 void tst_QTextTable::tableShrinking()
@@ -209,7 +209,7 @@ void tst_QTextTable::tableShrinking()
     QTextTableFormat tableFmt;
 
     cursor.insertTable(3, 4, tableFmt);
-    QCOMPARE(doc->toPlainText().length(), 13);
+    QCOMPARE(doc->toPlainText().size(), 13);
 
     QTextTable *table = cursor.currentTable();
     QCOMPARE(table->rows(), 3);
@@ -218,16 +218,16 @@ void tst_QTextTable::tableShrinking()
     table->removeRows(1, 1);
     QCOMPARE(table->rows(), 2);
     QCOMPARE(table->columns(), 4);
-    QCOMPARE(doc->toPlainText().length(), 9);
+    QCOMPARE(doc->toPlainText().size(), 9);
     table->removeColumns(1, 2);
     QCOMPARE(table->rows(), 2);
     QCOMPARE(table->columns(), 2);
-    QCOMPARE(doc->toPlainText().length(), 5);
+    QCOMPARE(doc->toPlainText().size(), 5);
 
     table->resize(1, 1);
     QCOMPARE(table->rows(), 1);
     QCOMPARE(table->columns(), 1);
-    QCOMPARE(doc->toPlainText().length(), 2);
+    QCOMPARE(doc->toPlainText().size(), 2);
 }
 
 void tst_QTextTable::spans()
@@ -252,7 +252,7 @@ void tst_QTextTable::variousModifications2()
     QTextTableFormat tableFmt;
 
     cursor.insertTable(2, 5, tableFmt);
-    QCOMPARE(doc->toPlainText().length(), 11);
+    QCOMPARE(doc->toPlainText().size(), 11);
     QTextTable *table = cursor.currentTable();
     QCOMPARE(cursor.position(), 1);
     QCOMPARE(table->rows(), 2);
@@ -1148,8 +1148,8 @@ void tst_QTextTable::QTBUG31330_renderBackground()
     doc.print(&paintDevice);
 
     QVERIFY(paintDevice.pages >= 2);
-    QCOMPARE(engine.rects.count(), paintDevice.pages);
-    for (int i = 0; i < engine.rects.count(); ++i) {
+    QCOMPARE(engine.rects.size(), paintDevice.pages);
+    for (int i = 0; i < engine.rects.size(); ++i) {
         QRectF rect = engine.rects[i];
         QVERIFY(rect.top() > 0);
         QVERIFY(rect.bottom() < 1000);
diff --git a/tests/auto/gui/text/qzip/tst_qzip.cpp b/tests/auto/gui/text/qzip/tst_qzip.cpp
index 128f0b3200..3e2dc39983 100644
--- a/tests/auto/gui/text/qzip/tst_qzip.cpp
+++ b/tests/auto/gui/text/qzip/tst_qzip.cpp
@@ -23,7 +23,7 @@ void tst_QZip::basicUnpack()
 {
     QZipReader zip(QFINDTESTDATA("/testdata/test.zip"), QIODevice::ReadOnly);
     QList<QZipReader::FileInfo> files = zip.fileInfoList();
-    QCOMPARE(files.count(), 2);
+    QCOMPARE(files.size(), 2);
 
     QZipReader::FileInfo fi = files.at(0);
     QVERIFY(fi.isValid());
@@ -59,7 +59,7 @@ void tst_QZip::symlinks()
 {
     QZipReader zip(QFINDTESTDATA("/testdata/symlink.zip"), QIODevice::ReadOnly);
     QList<QZipReader::FileInfo> files = zip.fileInfoList();
-    QCOMPARE(files.count(), 2);
+    QCOMPARE(files.size(), 2);
 
     QZipReader::FileInfo fi = files.at(0);
     QVERIFY(fi.isValid());
@@ -82,7 +82,7 @@ void tst_QZip::readTest()
 {
     QZipReader zip("foobar.zip", QIODevice::ReadOnly); // non existing file.
     QList<QZipReader::FileInfo> files = zip.fileInfoList();
-    QCOMPARE(files.count(), 0);
+    QCOMPARE(files.size(), 0);
     QByteArray b = zip.fileData("foobar");
     QCOMPARE(b.size(), 0);
 }
@@ -101,7 +101,7 @@ void tst_QZip::createArchive()
     QBuffer buffer2(&zipFile);
     QZipReader zip2(&buffer2);
     QList<QZipReader::FileInfo> files = zip2.fileInfoList();
-    QCOMPARE(files.count(), 1);
+    QCOMPARE(files.size(), 1);
     QZipReader::FileInfo file = files.at(0);
     QCOMPARE(file.filePath, QString("My Filename"));
     QCOMPARE(uint(file.isDir), (uint) 0);