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>

28 files changed, 298 insertions, 298 deletions

diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 18f7b9b1ee..9c75031e32 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -602,7 +602,7 @@ QTextFormat QAbstractTextDocumentLayout::formatAt(const QPointF &pos) const
         if (blockBr.contains(pos)) {
             QTextLayout *layout = block.layout();
             int relativeCursorPos = cursorPos - block.position();
-            const int preeditLength = layout ? layout->preeditAreaText().length() : 0;
+            const int preeditLength = layout ? layout->preeditAreaText().size() : 0;
             if (preeditLength > 0 && relativeCursorPos > layout->preeditAreaPosition())
                 cursorPos -= qMin(cursorPos - layout->preeditAreaPosition(), preeditLength);
             break;
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 48f388984b..98293d436c 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -409,7 +409,7 @@ int ValueExtractor::lengthValue(const Declaration &decl)
 {
     if (decl.d->parsed.isValid())
         return  lengthValueFromData(qvariant_cast<LengthData>(decl.d->parsed), f);
-    if (decl.d->values.count() < 1)
+    if (decl.d->values.size() < 1)
         return 0;
     LengthData data = lengthValue(decl.d->values.at(0));
     decl.d->parsed = QVariant::fromValue<LengthData>(data);
@@ -428,7 +428,7 @@ void ValueExtractor::lengthValues(const Declaration &decl, int *m)
 
     LengthData datas[4];
     int i;
-    for (i = 0; i < qMin(decl.d->values.count(), 4); i++)
+    for (i = 0; i < qMin(decl.d->values.size(), 4); i++)
         datas[i] = lengthValue(decl.d->values[i]);
 
     if (i == 0) {
@@ -456,7 +456,7 @@ bool ValueExtractor::extractGeometry(int *w, int *h, int *minw, int *minh, int *
 {
     extractFont();
     bool hit = false;
-    for (int i = 0; i < declarations.count(); i++) {
+    for (int i = 0; i < declarations.size(); i++) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
         case Width: *w = lengthValue(decl); break;
@@ -478,7 +478,7 @@ bool ValueExtractor::extractPosition(int *left, int *top, int *right, int *botto
 {
     extractFont();
     bool hit = false;
-    for (int i = 0; i < declarations.count(); i++) {
+    for (int i = 0; i < declarations.size(); i++) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
         case Left: *left = lengthValue(decl); break;
@@ -501,7 +501,7 @@ bool ValueExtractor::extractBox(int *margins, int *paddings, int *spacing)
 {
     extractFont();
     bool hit = false;
-    for (int i = 0; i < declarations.count(); i++) {
+    for (int i = 0; i < declarations.size(); i++) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
         case PaddingLeft: paddings[LeftEdge] = lengthValue(decl); break;
@@ -528,7 +528,7 @@ bool ValueExtractor::extractBox(int *margins, int *paddings, int *spacing)
 int ValueExtractor::extractStyleFeatures()
 {
     int features = StyleFeature_None;
-    for (int i = 0; i < declarations.count(); i++) {
+    for (int i = 0; i < declarations.size(); i++) {
         const Declaration &decl = declarations.at(i);
         if (decl.d->propertyId == QtStyleFeatures)
             features = decl.styleFeaturesValue();
@@ -545,9 +545,9 @@ QSize ValueExtractor::sizeValue(const Declaration &decl)
     }
 
     LengthData x[2] = { {0, LengthData::None }, {0, LengthData::None} };
-    if (decl.d->values.count() > 0)
+    if (decl.d->values.size() > 0)
         x[0] = lengthValue(decl.d->values.at(0));
-    if (decl.d->values.count() > 1)
+    if (decl.d->values.size() > 1)
         x[1] = lengthValue(decl.d->values.at(1));
     else
         x[1] = x[0];
@@ -569,7 +569,7 @@ bool ValueExtractor::extractBorder(int *borders, QBrush *colors, BorderStyle *st
 {
     extractFont();
     bool hit = false;
-    for (int i = 0; i < declarations.count(); i++) {
+    for (int i = 0; i < declarations.size(); i++) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
         case BorderLeftWidth: borders[LeftEdge] = lengthValue(decl); break;
@@ -628,7 +628,7 @@ bool ValueExtractor::extractOutline(int *borders, QBrush *colors, BorderStyle *s
 {
     extractFont();
     bool hit = false;
-    for (int i = 0; i < declarations.count(); i++) {
+    for (int i = 0; i < declarations.size(); i++) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
         case OutlineWidth: lengthValues(decl, borders); break;
@@ -727,7 +727,7 @@ static ColorData parseColorValue(QCss::Value v)
     QList<QCss::Value> colorDigits;
     if (!p.parseExpr(&colorDigits))
         return ColorData();
-    const int tokenCount = colorDigits.count();
+    const int tokenCount = colorDigits.size();
 
     for (int i = 0; i < qMin(tokenCount, 7); i += 2) {
         if (colorDigits.at(i).type == Value::Percentage) {
@@ -960,7 +960,7 @@ void ValueExtractor::borderValue(const Declaration &decl, int *width, QCss::Bord
     if (decl.d->values.at(i).type == Value::Length || decl.d->values.at(i).type == Value::Number) {
         data.width = lengthValue(decl.d->values.at(i));
         *width = lengthValueFromData(data.width, f);
-        if (++i >= decl.d->values.count()) {
+        if (++i >= decl.d->values.size()) {
             decl.d->parsed = QVariant::fromValue<BorderData>(data);
             return;
         }
@@ -969,7 +969,7 @@ void ValueExtractor::borderValue(const Declaration &decl, int *width, QCss::Bord
     data.style = parseStyleValue(decl.d->values.at(i));
     if (data.style != BorderStyle_Unknown) {
         *style = data.style;
-        if (++i >= decl.d->values.count()) {
+        if (++i >= decl.d->values.size()) {
             decl.d->parsed = QVariant::fromValue<BorderData>(data);
             return;
         }
@@ -990,7 +990,7 @@ static void parseShorthandBackgroundProperty(const QList<QCss::Value> &values, B
     *repeat = Repeat_XY;
     *alignment = Qt::AlignTop | Qt::AlignLeft;
 
-    for (int i = 0; i < values.count(); ++i) {
+    for (int i = 0; i < values.size(); ++i) {
         const QCss::Value &v = values.at(i);
         if (v.type == Value::Uri) {
             *image = v.variant.toString();
@@ -1012,7 +1012,7 @@ static void parseShorthandBackgroundProperty(const QList<QCss::Value> &values, B
         if (v.type == Value::KnownIdentifier) {
             const int start = i;
             int count = 1;
-            if (i < values.count() - 1
+            if (i < values.size() - 1
                 && values.at(i + 1).type == Value::KnownIdentifier) {
                 ++i;
                 ++count;
@@ -1034,7 +1034,7 @@ bool ValueExtractor::extractBackground(QBrush *brush, QString *image, Repeat *re
                                        Origin *clip)
 {
     bool hit = false;
-    for (int i = 0; i < declarations.count(); ++i) {
+    for (int i = 0; i < declarations.size(); ++i) {
         const Declaration &decl = declarations.at(i);
         if (decl.d->values.isEmpty())
             continue;
@@ -1182,7 +1182,7 @@ static bool setFontFamilyFromValues(const QList<QCss::Value> &values, QFont *fon
     QString family;
     QStringList families;
     bool shouldAddSpace = false;
-    for (int i = start; i < values.count(); ++i) {
+    for (int i = start; i < values.size(); ++i) {
         const QCss::Value &v = values.at(i);
         if (v.type == Value::TermOperatorComma) {
             families << family;
@@ -1208,7 +1208,7 @@ static bool setFontFamilyFromValues(const QList<QCss::Value> &values, QFont *fon
 
 static void setTextDecorationFromValues(const QList<QCss::Value> &values, QFont *font)
 {
-    for (int i = 0; i < values.count(); ++i) {
+    for (int i = 0; i < values.size(); ++i) {
         if (values.at(i).type != Value::KnownIdentifier)
             continue;
         switch (values.at(i).variant.toInt()) {
@@ -1263,7 +1263,7 @@ static void parseShorthandFontProperty(const QList<QCss::Value> &values, QFont *
     *fontSizeAdjustment = -255;
 
     int i = 0;
-    while (i < values.count()) {
+    while (i < values.size()) {
         if (setFontStyleFromValue(values.at(i), font)
             || setFontWeightFromValue(values.at(i), font))
             ++i;
@@ -1271,12 +1271,12 @@ static void parseShorthandFontProperty(const QList<QCss::Value> &values, QFont *
             break;
     }
 
-    if (i < values.count()) {
+    if (i < values.size()) {
         setFontSizeFromValue(values.at(i), font, fontSizeAdjustment);
         ++i;
     }
 
-    if (i < values.count()) {
+    if (i < values.size()) {
         setFontFamilyFromValues(values, font, i);
     }
 }
@@ -1313,7 +1313,7 @@ bool ValueExtractor::extractFont(QFont *font, int *fontSizeAdjustment)
     }
 
     bool hit = false;
-    for (int i = 0; i < declarations.count(); ++i) {
+    for (int i = 0; i < declarations.size(); ++i) {
         const Declaration &decl = declarations.at(i);
         if (decl.d->values.isEmpty())
             continue;
@@ -1344,7 +1344,7 @@ bool ValueExtractor::extractFont(QFont *font, int *fontSizeAdjustment)
 bool ValueExtractor::extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg, QBrush *pfg)
 {
     bool hit = false;
-    for (int i = 0; i < declarations.count(); ++i) {
+    for (int i = 0; i < declarations.size(); ++i) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
         case Color: *fg = decl.brushValue(pal); break;
@@ -1370,12 +1370,12 @@ void ValueExtractor::extractFont()
 bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size)
 {
     bool hit = false;
-    for (int i = 0; i < declarations.count(); ++i) {
+    for (int i = 0; i < declarations.size(); ++i) {
         const Declaration &decl = declarations.at(i);
         switch (decl.d->propertyId) {
         case QtImage:
             *icon = decl.iconValue();
-            if (decl.d->values.count() > 0 && decl.d->values.at(0).type == Value::Uri) {
+            if (decl.d->values.size() > 0 && decl.d->values.at(0).type == Value::Uri) {
                 // try to pull just the size from the image...
                 QImageReader imageReader(decl.d->values.at(0).variant.toString());
                 if ((*size = imageReader.size()).isNull()) {
@@ -1428,7 +1428,7 @@ bool ValueExtractor::extractIcon(QIcon *icon, QSize *size)
 // Declaration
 QColor Declaration::colorValue(const QPalette &pal) const
 {
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return QColor();
 
     if (d->parsed.isValid()) {
@@ -1458,7 +1458,7 @@ QColor Declaration::colorValue(const QPalette &pal) const
 
 QBrush Declaration::brushValue(const QPalette &pal) const
 {
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return QBrush();
 
     if (d->parsed.isValid()) {
@@ -1489,7 +1489,7 @@ void Declaration::brushValues(QBrush *c, const QPalette &pal) const
         needParse = 0;
         Q_ASSERT(d->parsed.metaType() == QMetaType::fromType<QList<QVariant>>());
         QList<QVariant> v = d->parsed.toList();
-        for (i = 0; i < qMin(v.count(), 4); i++) {
+        for (i = 0; i < qMin(v.size(), 4); i++) {
             if (v.at(i).userType() == QMetaType::QBrush) {
                 c[i] = qvariant_cast<QBrush>(v.at(i));
             } else if (v.at(i).userType() == QMetaType::Int) {
@@ -1501,7 +1501,7 @@ void Declaration::brushValues(QBrush *c, const QPalette &pal) const
     }
     if (needParse != 0) {
         QList<QVariant> v;
-        for (i = 0; i < qMin(d->values.count(), 4); i++) {
+        for (i = 0; i < qMin(d->values.size(), 4); i++) {
             if (!(needParse & (1<<i)))
                 continue;
             BrushData data = parseBrushValue(d->values.at(i), pal);
@@ -1528,7 +1528,7 @@ void Declaration::brushValues(QBrush *c, const QPalette &pal) const
 
 bool Declaration::realValue(qreal *real, const char *unit) const
 {
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return false;
     const Value &v = d->values.at(0);
     if (unit && v.type != Value::Length)
@@ -1569,7 +1569,7 @@ static bool intValueHelper(const QCss::Value &v, int *i, const char *unit)
 
 bool Declaration::intValue(int *i, const char *unit) const
 {
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return false;
     return intValueHelper(d->values.at(0), i, unit);
 }
@@ -1580,7 +1580,7 @@ QSize Declaration::sizeValue() const
         return qvariant_cast<QSize>(d->parsed);
 
     int x[2] = { 0, 0 };
-    const int count = d->values.count();
+    const int count = d->values.size();
     for (int i = 0; i < count; ++i) {
         if (i > 1) {
             qWarning("QCssParser::sizeValue: Too many values provided");
@@ -1607,7 +1607,7 @@ QSize Declaration::sizeValue() const
 
 QRect Declaration::rectValue() const
 {
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return QRect();
 
     if (d->parsed.isValid())
@@ -1620,7 +1620,7 @@ QRect Declaration::rectValue() const
     if (func.count() != 2 || func.at(0).compare("rect"_L1) != 0)
         return QRect();
     const auto args = QStringView{func[1]}.split(u' ', Qt::SkipEmptyParts);
-    if (args.count() != 4)
+    if (args.size() != 4)
         return QRect();
     QRect rect(args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt());
     d->parsed = QVariant::fromValue<QRect>(rect);
@@ -1632,7 +1632,7 @@ void Declaration::colorValues(QColor *c, const QPalette &pal) const
     int i;
     if (d->parsed.isValid()) {
         QList<QVariant> v = d->parsed.toList();
-        for (i = 0; i < qMin(d->values.count(), 4); i++) {
+        for (i = 0; i < qMin(d->values.size(), 4); i++) {
             if (v.at(i).userType() == QMetaType::QColor) {
                 c[i] = qvariant_cast<QColor>(v.at(i));
             } else {
@@ -1641,7 +1641,7 @@ void Declaration::colorValues(QColor *c, const QPalette &pal) const
         }
     } else {
         QList<QVariant> v;
-        for (i = 0; i < qMin(d->values.count(), 4); i++) {
+        for (i = 0; i < qMin(d->values.size(), 4); i++) {
             ColorData color = parseColorValue(d->values.at(i));
             if (color.type == ColorData::Role) {
                 v += QVariant::fromValue<int>(color.role);
@@ -1662,7 +1662,7 @@ void Declaration::colorValues(QColor *c, const QPalette &pal) const
 
 BorderStyle Declaration::styleValue() const
 {
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return BorderStyle_None;
     return parseStyleValue(d->values.at(0));
 }
@@ -1670,7 +1670,7 @@ BorderStyle Declaration::styleValue() const
 void Declaration::styleValues(BorderStyle *s) const
 {
     int i;
-    for (i = 0; i < qMin(d->values.count(), 4); i++)
+    for (i = 0; i < qMin(d->values.size(), 4); i++)
         s[i] = parseStyleValue(d->values.at(i));
     if (i == 0) s[0] = s[1] = s[2] = s[3] = BorderStyle_None;
     else if (i == 1) s[3] = s[2] = s[1] = s[0];
@@ -1682,7 +1682,7 @@ Repeat Declaration::repeatValue() const
 {
     if (d->parsed.isValid())
         return static_cast<Repeat>(d->parsed.toInt());
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return Repeat_Unknown;
     int v = findKnownValue(d->values.at(0).variant.toString(),
                    repeats, NumKnownRepeats);
@@ -1694,7 +1694,7 @@ Origin Declaration::originValue() const
 {
     if (d->parsed.isValid())
         return static_cast<Origin>(d->parsed.toInt());
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return Origin_Unknown;
     int v = findKnownValue(d->values.at(0).variant.toString(),
                                origins, NumKnownOrigins);
@@ -1706,7 +1706,7 @@ PositionMode Declaration::positionValue() const
 {
     if (d->parsed.isValid())
         return static_cast<PositionMode>(d->parsed.toInt());
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return PositionMode_Unknown;
     int v = findKnownValue(d->values.at(0).variant.toString(),
                            positions, NumKnownPositionModes);
@@ -1718,7 +1718,7 @@ Attachment Declaration::attachmentValue() const
 {
     if (d->parsed.isValid())
         return static_cast<Attachment>(d->parsed.toInt());
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return Attachment_Unknown;
     int v = findKnownValue(d->values.at(0).variant.toString(),
                            attachments, NumKnownAttachments);
@@ -1732,7 +1732,7 @@ int Declaration::styleFeaturesValue() const
     if (d->parsed.isValid())
         return d->parsed.toInt();
     int features = StyleFeature_None;
-    for (int i = 0; i < d->values.count(); i++) {
+    for (int i = 0; i < d->values.size(); i++) {
         features |= static_cast<int>(findKnownValue(d->values.value(i).variant.toString(),
                                      styleFeatures, NumKnownStyleFeatures));
     }
@@ -1751,10 +1751,10 @@ Qt::Alignment Declaration::alignmentValue() const
 {
     if (d->parsed.isValid())
         return Qt::Alignment(d->parsed.toInt());
-    if (d->values.isEmpty() || d->values.count() > 2)
+    if (d->values.isEmpty() || d->values.size() > 2)
         return Qt::AlignLeft | Qt::AlignTop;
 
-    Qt::Alignment v = parseAlignment(d->values.constData(), d->values.count());
+    Qt::Alignment v = parseAlignment(d->values.constData(), d->values.size());
     d->parsed = int(v);
     return v;
 }
@@ -1768,12 +1768,12 @@ void Declaration::borderImageValue(QString *image, int *cuts,
         cuts[i] = -1;
     *h = *v = TileMode_Stretch;
 
-    if (d->values.count() < 2)
+    if (d->values.size() < 2)
         return;
 
     if (d->values.at(1).type == Value::Number) { // cuts!
         int i;
-        for (i = 0; i < qMin(d->values.count()-1, 4); i++) {
+        for (i = 0; i < qMin(d->values.size()-1, 4); i++) {
             const Value& v = d->values.at(i+1);
             if (v.type != Value::Number)
                 break;
@@ -1789,9 +1789,9 @@ void Declaration::borderImageValue(QString *image, int *cuts,
         *v = static_cast<TileMode>(findKnownValue(d->values.last().variant.toString(),
                                       tileModes, NumKnownTileModes));
     }
-    if (d->values[d->values.count() - 2].type == Value::Identifier) {
+    if (d->values[d->values.size() - 2].type == Value::Identifier) {
         *h = static_cast<TileMode>
-                (findKnownValue(d->values[d->values.count()-2].variant.toString(),
+                (findKnownValue(d->values[d->values.size()-2].variant.toString(),
                                         tileModes, NumKnownTileModes));
     } else
         *h = *v;
@@ -1799,7 +1799,7 @@ void Declaration::borderImageValue(QString *image, int *cuts,
 
 bool Declaration::borderCollapseValue() const
 {
-    if (d->values.count() != 1)
+    if (d->values.size() != 1)
         return false;
     else
         return d->values.at(0).toString() == "collapse"_L1;
@@ -1811,7 +1811,7 @@ QIcon Declaration::iconValue() const
         return qvariant_cast<QIcon>(d->parsed);
 
     QIcon icon;
-    for (int i = 0; i < d->values.count();) {
+    for (int i = 0; i < d->values.size();) {
         const Value &value = d->values.at(i++);
         if (value.type != Value::Uri)
             break;
@@ -1819,7 +1819,7 @@ QIcon Declaration::iconValue() const
         QIcon::Mode mode = QIcon::Normal;
         QIcon::State state = QIcon::Off;
         for (int j = 0; j < 2; j++) {
-            if (i != d->values.count() && d->values.at(i).type == Value::KnownIdentifier) {
+            if (i != d->values.size() && d->values.at(i).type == Value::KnownIdentifier) {
                 switch (d->values.at(i).variant.toInt()) {
                 case Value_Disabled: mode = QIcon::Disabled; break;
                 case Value_Active: mode = QIcon::Active; break;
@@ -1841,7 +1841,7 @@ QIcon Declaration::iconValue() const
         else
             icon.addPixmap(uri, mode, state);
 
-        if (i == d->values.count())
+        if (i == d->values.size())
             break;
 
         if (d->values.at(i).type == Value::TermOperatorComma)
@@ -1857,12 +1857,12 @@ QIcon Declaration::iconValue() const
 int Selector::specificity() const
 {
     int val = 0;
-    for (int i = 0; i < basicSelectors.count(); ++i) {
+    for (int i = 0; i < basicSelectors.size(); ++i) {
         const BasicSelector &sel = basicSelectors.at(i);
         if (!sel.elementName.isEmpty())
             val += 1;
 
-        val += (sel.pseudos.count() + sel.attributeSelectors.count()) * 0x10;
+        val += (sel.pseudos.size() + sel.attributeSelectors.size()) * 0x10;
         val += sel.ids.count() * 0x100;
     }
     return val;
@@ -1882,7 +1882,7 @@ quint64 Selector::pseudoClass(quint64 *negated) const
     if (bs.pseudos.isEmpty())
         return PseudoClass_Unspecified;
     quint64 pc = PseudoClass_Unknown;
-    for (int i = !pseudoElement().isEmpty(); i < bs.pseudos.count(); i++) {
+    for (int i = !pseudoElement().isEmpty(); i < bs.pseudos.size(); i++) {
         const Pseudo &pseudo = bs.pseudos.at(i);
         if (pseudo.type == PseudoClass_Unknown)
             return PseudoClass_Unknown;
@@ -1899,23 +1899,23 @@ quint64 Selector::pseudoClass(quint64 *negated) const
 void StyleSheet::buildIndexes(Qt::CaseSensitivity nameCaseSensitivity)
 {
     QList<StyleRule> universals;
-    for (int i = 0; i < styleRules.count(); ++i) {
+    for (int i = 0; i < styleRules.size(); ++i) {
         const StyleRule &rule = styleRules.at(i);
         QList<Selector> universalsSelectors;
-        for (int j = 0; j < rule.selectors.count(); ++j) {
+        for (int j = 0; j < rule.selectors.size(); ++j) {
             const Selector& selector = rule.selectors.at(j);
 
             if (selector.basicSelectors.isEmpty())
                 continue;
 
             if (selector.basicSelectors.at(0).relationToNext == BasicSelector::NoRelation) {
-                if (selector.basicSelectors.count() != 1)
+                if (selector.basicSelectors.size() != 1)
                     continue;
-            } else if (selector.basicSelectors.count() <= 1) {
+            } else if (selector.basicSelectors.size() <= 1) {
                 continue;
             }
 
-            const BasicSelector &sel = selector.basicSelectors.at(selector.basicSelectors.count() - 1);
+            const BasicSelector &sel = selector.basicSelectors.at(selector.basicSelectors.size() - 1);
 
             if (!sel.ids.isEmpty()) {
                 StyleRule nr;
@@ -1969,14 +1969,14 @@ bool StyleSelector::selectorMatches(const Selector &selector, NodePtr node)
         return false;
 
     if (selector.basicSelectors.at(0).relationToNext == BasicSelector::NoRelation) {
-        if (selector.basicSelectors.count() != 1)
+        if (selector.basicSelectors.size() != 1)
             return false;
         return basicSelectorMatches(selector.basicSelectors.at(0), node);
     }
-    if (selector.basicSelectors.count() <= 1)
+    if (selector.basicSelectors.size() <= 1)
         return false;
 
-    int i = selector.basicSelectors.count() - 1;
+    int i = selector.basicSelectors.size() - 1;
     node = duplicateNode(node);
     bool match = true;
 
@@ -1984,7 +1984,7 @@ bool StyleSelector::selectorMatches(const Selector &selector, NodePtr node)
     do {
         match = basicSelectorMatches(sel, node);
         if (!match) {
-            if (i == selector.basicSelectors.count() - 1) // first element must always match!
+            if (i == selector.basicSelectors.size() - 1) // first element must always match!
                 break;
             if (sel.relationToNext != BasicSelector::MatchNextSelectorIfAncestor &&
                 sel.relationToNext != BasicSelector::MatchNextSelectorIfIndirectAdjecent)
@@ -2029,7 +2029,7 @@ bool StyleSelector::basicSelectorMatches(const BasicSelector &sel, NodePtr node)
         if (!hasAttributes(node))
             return false;
 
-        for (int i = 0; i < sel.attributeSelectors.count(); ++i) {
+        for (int i = 0; i < sel.attributeSelectors.size(); ++i) {
             const QCss::AttributeSelector &a = sel.attributeSelectors.at(i);
 
             const QString attrValue = attributeValue(node, a);
@@ -2092,14 +2092,14 @@ bool StyleSelector::basicSelectorMatches(const BasicSelector &sel, NodePtr node)
 void StyleSelector::matchRule(NodePtr node, const StyleRule &rule, StyleSheetOrigin origin,
                                int depth, QMultiMap<uint, StyleRule> *weightedRules)
 {
-    for (int j = 0; j < rule.selectors.count(); ++j) {
+    for (int j = 0; j < rule.selectors.size(); ++j) {
         const Selector& selector = rule.selectors.at(j);
         if (selectorMatches(selector, node)) {
             uint weight = rule.order
                         + selector.specificity() *0x100
                         + (uint(origin) + depth)*0x100000;
             StyleRule newRule = rule;
-            if (rule.selectors.count() > 1) {
+            if (rule.selectors.size() > 1) {
                 newRule.selectors.resize(1);
                 newRule.selectors[0] = selector;
             }
@@ -2120,9 +2120,9 @@ QList<StyleRule> StyleSelector::styleRulesForNode(NodePtr node)
     QMultiMap<uint, StyleRule> weightedRules; // (spec, rule) that will be sorted below
 
     //prune using indexed stylesheet
-    for (int sheetIdx = 0; sheetIdx < styleSheets.count(); ++sheetIdx) {
+    for (int sheetIdx = 0; sheetIdx < styleSheets.size(); ++sheetIdx) {
         const StyleSheet &styleSheet = styleSheets.at(sheetIdx);
-        for (int i = 0; i < styleSheet.styleRules.count(); ++i) {
+        for (int i = 0; i < styleSheet.styleRules.size(); ++i) {
             matchRule(node, styleSheet.styleRules.at(i), styleSheet.origin, styleSheet.depth, &weightedRules);
         }
 
@@ -2151,9 +2151,9 @@ QList<StyleRule> StyleSelector::styleRulesForNode(NodePtr node)
             }
         }
         if (!medium.isEmpty()) {
-            for (int i = 0; i < styleSheet.mediaRules.count(); ++i) {
+            for (int i = 0; i < styleSheet.mediaRules.size(); ++i) {
                 if (styleSheet.mediaRules.at(i).media.contains(medium, Qt::CaseInsensitive)) {
-                    for (int j = 0; j < styleSheet.mediaRules.at(i).styleRules.count(); ++j) {
+                    for (int j = 0; j < styleSheet.mediaRules.at(i).styleRules.size(); ++j) {
                         matchRule(node, styleSheet.mediaRules.at(i).styleRules.at(j), styleSheet.origin,
                                styleSheet.depth, &weightedRules);
                     }
@@ -2162,7 +2162,7 @@ QList<StyleRule> StyleSelector::styleRulesForNode(NodePtr node)
         }
     }
 
-    rules.reserve(weightedRules.count());
+    rules.reserve(weightedRules.size());
     QMultiMap<uint, StyleRule>::const_iterator it = weightedRules.constBegin();
     for ( ; it != weightedRules.constEnd() ; ++it)
         rules += *it;
@@ -2176,7 +2176,7 @@ QList<Declaration> StyleSelector::declarationsForNode(NodePtr node, const char *
 {
     QList<Declaration> decls;
     QList<StyleRule> rules = styleRulesForNode(node);
-    for (int i = 0; i < rules.count(); i++) {
+    for (int i = 0; i < rules.size(); i++) {
         const Selector& selector = rules.at(i).selectors.at(0);
         const QString pseudoElement = selector.pseudoElement();
 
@@ -2890,7 +2890,7 @@ bool Parser::next(QCss::TokenType t)
 
 bool Parser::test(QCss::TokenType t)
 {
-    if (index >= symbols.count())
+    if (index >= symbols.size())
         return false;
     if (symbols.at(index).token == t) {
         ++index;
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 53399137d5..c4e8d17f3c 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -786,7 +786,7 @@ public:
 
     inline void skipSpace() { while (test(S)) {}; }
 
-    inline bool hasNext() const { return index < symbols.count(); }
+    inline bool hasNext() const { return index < symbols.size(); }
     inline TokenType next() { return symbols.at(index++).token; }
     bool next(TokenType t);
     bool test(TokenType t);
@@ -797,7 +797,7 @@ public:
     QString lexemUntil(TokenType t);
     bool until(TokenType target, TokenType target2 = NONE);
     inline TokenType lookup() const {
-        return (index - 1) < symbols.count() ? symbols.at(index - 1).token : NONE;
+        return (index - 1) < symbols.size() ? symbols.at(index - 1).token : NONE;
     }
 
     bool testTokenAndEndsWith(TokenType t, QLatin1StringView str);
diff --git a/src/gui/text/qcssscanner.cpp b/src/gui/text/qcssscanner.cpp
index 6b0d4c10ee..7bfa797782 100644
--- a/src/gui/text/qcssscanner.cpp
+++ b/src/gui/text/qcssscanner.cpp
@@ -8,7 +8,7 @@ public:
     QCssScanner_Generated(const QString &inp);
 
     inline QChar next() {
-        return (pos < input.length()) ? input.at(pos++) : QChar();
+        return (pos < input.size()) ? input.at(pos++) : QChar();
     }
     int handleCommentStart();
     int lex();
diff --git a/src/gui/text/qdistancefield.cpp b/src/gui/text/qdistancefield.cpp
index 013f40fed6..adbde11237 100644
--- a/src/gui/text/qdistancefield.cpp
+++ b/src/gui/text/qdistancefield.cpp
@@ -530,14 +530,14 @@ static void makeDistanceField(QDistanceFieldData *data, const QPainterPath &path
                                  || (to.y() < offs << 8) || (to.y() >= (imgHeight - offs) << 8));
         }
 
-        isConvex.resize(normals.count());
-        for (int next = 0, prev = normals.count() - 1; next < normals.count(); prev = next++) {
+        isConvex.resize(normals.size());
+        for (int next = 0, prev = normals.size() - 1; next < normals.size(); prev = next++) {
             isConvex[prev] = normals.at(prev).x() * normals.at(next).y()
                            - normals.at(prev).y() * normals.at(next).x() < 0;
         }
 
         // Draw quads.
-        for (int next = 0, prev = normals.count() - 1; next < normals.count(); prev = next++) {
+        for (int next = 0, prev = normals.size() - 1; next < normals.size(); prev = next++) {
             QPoint n = normals.at(next);
             QPoint intPrev = vertices.at(prev);
             QPoint extPrev = vertices.at(prev);
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 1e26bb4f32..3ff73baf92 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -2125,7 +2125,7 @@ bool QFont::fromString(const QString &descrip)
 {
     const auto sr = QStringView(descrip).trimmed();
     const auto l = sr.split(u',');
-    const int count = l.count();
+    const int count = l.size();
     if (!count || (count > 2 && count < 9) || count == 9 || count > 17 ||
         l.first().isEmpty()) {
         qWarning("QFont::fromString: Invalid description '%s'",
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 9dd70380dd..2e35d9dc01 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -439,7 +439,7 @@ static void parseFontName(const QString &name, QString &foundry, QString &family
     // capitalize the family/foundry names
     bool space = true;
     QChar *s = family.data();
-    int len = family.length();
+    int len = family.size();
     while(len--) {
         if (space) *s = s->toUpper();
         space = s->isSpace();
@@ -448,7 +448,7 @@ static void parseFontName(const QString &name, QString &foundry, QString &family
 
     space = true;
     s = foundry.data();
-    len = foundry.length();
+    len = foundry.size();
     while(len--) {
         if (space) *s = s->toUpper();
         space = s->isSpace();
@@ -1330,7 +1330,7 @@ QFontDatabasePrivate *QFontDatabasePrivate::ensureFontDatabase()
         auto *platformFontDatabase = QGuiApplicationPrivate::platformIntegration()->fontDatabase();
         platformFontDatabase->populateFontDatabase();
 
-        for (int i = 0; i < d->applicationFonts.count(); i++) {
+        for (int i = 0; i < d->applicationFonts.size(); i++) {
             auto *font = &d->applicationFonts[i];
             if (!font->isNull() && !font->isPopulated())
                 platformFontDatabase->addApplicationFont(font->data, font->fileName, font);
@@ -2159,12 +2159,12 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString &
     Q_TRACE(QFontDatabasePrivate_addAppFont, fileName);
 
     int i;
-    for (i = 0; i < applicationFonts.count(); ++i)
+    for (i = 0; i < applicationFonts.size(); ++i)
         if (applicationFonts.at(i).isNull())
             break;
-    if (i >= applicationFonts.count()) {
+    if (i >= applicationFonts.size()) {
         applicationFonts.append(ApplicationFont());
-        i = applicationFonts.count() - 1;
+        i = applicationFonts.size() - 1;
     }
 
     if (font.fileName.isEmpty() && !fontData.isEmpty())
@@ -2188,7 +2188,7 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString &
 
 bool QFontDatabasePrivate::isApplicationFont(const QString &fileName)
 {
-    for (int i = 0; i < applicationFonts.count(); ++i)
+    for (int i = 0; i < applicationFonts.size(); ++i)
         if (applicationFonts.at(i).fileName == fileName)
             return true;
     return false;
@@ -2320,7 +2320,7 @@ bool QFontDatabase::removeApplicationFont(int handle)
     QMutexLocker locker(fontDatabaseMutex());
 
     auto *db = QFontDatabasePrivate::instance();
-    if (handle < 0 || handle >= db->applicationFonts.count())
+    if (handle < 0 || handle >= db->applicationFonts.size())
         return false;
 
     db->applicationFonts[handle] = QFontDatabasePrivate::ApplicationFont();
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 7e6af54a56..cd00f0d710 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -499,7 +499,7 @@ int QFontMetrics::horizontalAdvance(const QString &text, int len) const
     if (pos != -1) {
         len = (len < 0) ? pos : qMin(pos, len);
     } else if (len < 0) {
-        len = text.length();
+        len = text.size();
     }
     if (len == 0)
         return 0;
@@ -525,7 +525,7 @@ int QFontMetrics::horizontalAdvance(const QString &text, const QTextOption &opti
     if (pos != -1) {
         len = (len < 0) ? pos : qMin(pos, len);
     } else if (len < 0) {
-        len = text.length();
+        len = text.size();
     }
     if (len == 0)
         return 0;
@@ -612,12 +612,12 @@ int QFontMetrics::horizontalAdvance(QChar ch) const
 */
 QRect QFontMetrics::boundingRect(const QString &text) const
 {
-    if (text.length() == 0)
+    if (text.size() == 0)
         return QRect();
 
     QStackTextEngine layout(text, QFont(d.data()));
     layout.itemize();
-    glyph_metrics_t gm = layout.boundingBox(0, text.length());
+    glyph_metrics_t gm = layout.boundingBox(0, text.size());
     return QRect(qRound(gm.x), qRound(gm.y), qRound(gm.width), qRound(gm.height));
 }
 
@@ -647,13 +647,13 @@ QRect QFontMetrics::boundingRect(const QString &text) const
 */
 QRect QFontMetrics::boundingRect(const QString &text, const QTextOption &option) const
 {
-    if (text.length() == 0)
+    if (text.size() == 0)
         return QRect();
 
     QStackTextEngine layout(text, QFont(d.data()));
     layout.option = option;
     layout.itemize();
-    glyph_metrics_t gm = layout.boundingBox(0, text.length());
+    glyph_metrics_t gm = layout.boundingBox(0, text.size());
     return QRect(qRound(gm.x), qRound(gm.y), qRound(gm.width), qRound(gm.height));
 }
 
@@ -815,12 +815,12 @@ QSize QFontMetrics::size(int flags, const QString &text, int tabStops, int *tabA
 */
 QRect QFontMetrics::tightBoundingRect(const QString &text) const
 {
-    if (text.length() == 0)
+    if (text.size() == 0)
         return QRect();
 
     QStackTextEngine layout(text, QFont(d.data()));
     layout.itemize();
-    glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
+    glyph_metrics_t gm = layout.tightBoundingBox(0, text.size());
     return QRect(qRound(gm.x), qRound(gm.y), qRound(gm.width), qRound(gm.height));
 }
 
@@ -847,13 +847,13 @@ QRect QFontMetrics::tightBoundingRect(const QString &text) const
 */
 QRect QFontMetrics::tightBoundingRect(const QString &text, const QTextOption &option) const
 {
-    if (text.length() == 0)
+    if (text.size() == 0)
         return QRect();
 
     QStackTextEngine layout(text, QFont(d.data()));
     layout.option = option;
     layout.itemize();
-    glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
+    glyph_metrics_t gm = layout.tightBoundingBox(0, text.size());
     return QRect(qRound(gm.x), qRound(gm.y), qRound(gm.width), qRound(gm.height));
 }
 
@@ -1410,7 +1410,7 @@ qreal QFontMetricsF::horizontalAdvance(const QString &text, int length) const
     if (pos != -1)
         length = (length < 0) ? pos : qMin(pos, length);
     else if (length < 0)
-        length = text.length();
+        length = text.size();
 
     if (length == 0)
         return 0;
@@ -1437,7 +1437,7 @@ qreal QFontMetricsF::horizontalAdvance(const QString &text, const QTextOption &o
     if (pos != -1)
         length = (length < 0) ? pos : qMin(pos, length);
     else if (length < 0)
-        length = text.length();
+        length = text.size();
 
     if (length == 0)
         return 0;
@@ -1524,7 +1524,7 @@ qreal QFontMetricsF::horizontalAdvance(QChar ch) const
 */
 QRectF QFontMetricsF::boundingRect(const QString &text) const
 {
-    int len = text.length();
+    int len = text.size();
     if (len == 0)
         return QRectF();
 
@@ -1559,13 +1559,13 @@ QRectF QFontMetricsF::boundingRect(const QString &text) const
 */
 QRectF QFontMetricsF::boundingRect(const QString &text, const QTextOption &option) const
 {
-    if (text.length() == 0)
+    if (text.size() == 0)
         return QRectF();
 
     QStackTextEngine layout(text, QFont(d.data()));
     layout.option = option;
     layout.itemize();
-    glyph_metrics_t gm = layout.boundingBox(0, text.length());
+    glyph_metrics_t gm = layout.boundingBox(0, text.size());
     return QRectF(gm.x.toReal(), gm.y.toReal(),
                   gm.width.toReal(), gm.height.toReal());
 }
@@ -1733,12 +1733,12 @@ QSizeF QFontMetricsF::size(int flags, const QString &text, int tabStops, int *ta
 */
 QRectF QFontMetricsF::tightBoundingRect(const QString &text) const
 {
-    if (text.length() == 0)
+    if (text.size() == 0)
         return QRectF();
 
     QStackTextEngine layout(text, QFont(d.data()));
     layout.itemize();
-    glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
+    glyph_metrics_t gm = layout.tightBoundingBox(0, text.size());
     return QRectF(gm.x.toReal(), gm.y.toReal(), gm.width.toReal(), gm.height.toReal());
 }
 
@@ -1765,13 +1765,13 @@ QRectF QFontMetricsF::tightBoundingRect(const QString &text) const
 */
 QRectF QFontMetricsF::tightBoundingRect(const QString &text, const QTextOption &option) const
 {
-    if (text.length() == 0)
+    if (text.size() == 0)
         return QRectF();
 
     QStackTextEngine layout(text, QFont(d.data()));
     layout.option = option;
     layout.itemize();
-    glyph_metrics_t gm = layout.tightBoundingBox(0, text.length());
+    glyph_metrics_t gm = layout.tightBoundingBox(0, text.size());
     return QRectF(gm.x.toReal(), gm.y.toReal(), gm.width.toReal(), gm.height.toReal());
 }
 
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
index 7b97570781..1f5ffac8d4 100644
--- a/src/gui/text/qfontsubset.cpp
+++ b/src/gui/text/qfontsubset.cpp
@@ -608,7 +608,7 @@ static QTtfTable generateName(const QList<QTtfNameRecord> &name)
     const int name_size = 6 + 12*name.size();
     int string_size = 0;
     for (int i = 0; i < name.size(); ++i) {
-        string_size += name.at(i).value.length()*char_size;
+        string_size += name.at(i).value.size()*char_size;
     }
     t.data.resize(name_size + string_size);
 
@@ -624,7 +624,7 @@ static QTtfTable generateName(const QList<QTtfNameRecord> &name)
 
     int off = 0;
     for (int i = 0; i < name.size(); ++i) {
-        int len = name.at(i).value.length()*char_size;
+        int len = name.at(i).value.size()*char_size;
 // quint16  platformID  Platform ID.
 // quint16  encodingID  Platform-specific encoding ID.
 // quint16  languageID  Language ID.
diff --git a/src/gui/text/qinputcontrol.cpp b/src/gui/text/qinputcontrol.cpp
index 87d8c59128..4edd46ff0e 100644
--- a/src/gui/text/qinputcontrol.cpp
+++ b/src/gui/text/qinputcontrol.cpp
@@ -43,7 +43,7 @@ bool QInputControl::isAcceptableInput(const QKeyEvent *event) const
     if (c.category() == QChar::Other_PrivateUse)
         return true;
 
-    if (c.isHighSurrogate() && text.length() > 1 && text.at(1).isLowSurrogate())
+    if (c.isHighSurrogate() && text.size() > 1 && text.at(1).isLowSurrogate())
         return true;
 
     if (m_type == TextEdit && c == u'\t')
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index c377472439..b974a1d34d 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -66,7 +66,7 @@ void QSyntaxHighlighterPrivate::applyFormatChanges()
     QList<QTextLayout::FormatRange> ranges = layout->formats();
 
     const int preeditAreaStart = layout->preeditAreaPosition();
-    const int preeditAreaLength = layout->preeditAreaText().length();
+    const int preeditAreaLength = layout->preeditAreaText().size();
 
     if (preeditAreaLength != 0) {
         auto isOutsidePreeditArea = [=](const QTextLayout::FormatRange &range) {
@@ -81,22 +81,22 @@ void QSyntaxHighlighterPrivate::applyFormatChanges()
     }
 
     int i = 0;
-    while (i < formatChanges.count()) {
+    while (i < formatChanges.size()) {
         QTextLayout::FormatRange r;
 
-        while (i < formatChanges.count() && formatChanges.at(i) == r.format)
+        while (i < formatChanges.size() && formatChanges.at(i) == r.format)
             ++i;
 
-        if (i == formatChanges.count())
+        if (i == formatChanges.size())
             break;
 
         r.start = i;
         r.format = formatChanges.at(i);
 
-        while (i < formatChanges.count() && formatChanges.at(i) == r.format)
+        while (i < formatChanges.size() && formatChanges.at(i) == r.format)
             ++i;
 
-        Q_ASSERT(i <= formatChanges.count());
+        Q_ASSERT(i <= formatChanges.size());
         r.length = i - r.start;
 
         if (preeditAreaLength != 0) {
@@ -403,10 +403,10 @@ void QSyntaxHighlighter::rehighlightBlock(const QTextBlock &block)
 void QSyntaxHighlighter::setFormat(int start, int count, const QTextCharFormat &format)
 {
     Q_D(QSyntaxHighlighter);
-    if (start < 0 || start >= d->formatChanges.count())
+    if (start < 0 || start >= d->formatChanges.size())
         return;
 
-    const int end = qMin(start + count, d->formatChanges.count());
+    const int end = qMin(start + count, d->formatChanges.size());
     for (int i = start; i < end; ++i)
         d->formatChanges[i] = format;
 }
@@ -456,7 +456,7 @@ void QSyntaxHighlighter::setFormat(int start, int count, const QFont &font)
 QTextCharFormat QSyntaxHighlighter::format(int pos) const
 {
     Q_D(const QSyntaxHighlighter);
-    if (pos < 0 || pos >= d->formatChanges.count())
+    if (pos < 0 || pos >= d->formatChanges.size())
         return QTextCharFormat();
     return d->formatChanges.at(pos);
 }
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 884a16ca78..c23bcf0317 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -1423,18 +1423,18 @@ void QTextCursor::insertText(const QString &text, const QTextCharFormat &_format
         QTextBlockFormat blockFmt = blockFormat();
 
 
-        int textStart = d->priv->text.length();
+        int textStart = d->priv->text.size();
         int blockStart = 0;
         d->priv->text += text;
-        int textEnd = d->priv->text.length();
+        int textEnd = d->priv->text.size();
 
-        for (int i = 0; i < text.length(); ++i) {
+        for (int i = 0; i < text.size(); ++i) {
             QChar ch = text.at(i);
 
             const int blockEnd = i;
 
             if (ch == u'\r'
-                && (i + 1) < text.length()
+                && (i + 1) < text.size()
                 && text.at(i + 1) == u'\n') {
                 ++i;
                 ch = text.at(i);
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 463026ed23..cdef0abd63 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -67,14 +67,14 @@ bool Qt::mightBeRichText(const QString& text)
         return false;
     int start = 0;
 
-    while (start < text.length() && text.at(start).isSpace())
+    while (start < text.size() && text.at(start).isSpace())
         ++start;
 
     // skip a leading <?xml ... ?> as for example with xhtml
     if (QStringView{text}.mid(start, 5).compare("<?xml"_L1) == 0) {
-        while (start < text.length()) {
+        while (start < text.size()) {
             if (text.at(start) == u'?'
-                && start + 2 < text.length()
+                && start + 2 < text.size()
                 && text.at(start + 1) == u'>') {
                 start += 2;
                 break;
@@ -82,20 +82,20 @@ bool Qt::mightBeRichText(const QString& text)
             ++start;
         }
 
-        while (start < text.length() && text.at(start).isSpace())
+        while (start < text.size() && text.at(start).isSpace())
             ++start;
     }
 
     if (QStringView{text}.mid(start, 5).compare("<!doc"_L1, Qt::CaseInsensitive) == 0)
         return true;
     int open = start;
-    while (open < text.length() && text.at(open) != u'<'
+    while (open < text.size() && text.at(open) != u'<'
             && text.at(open) != u'\n') {
         if (text.at(open) == u'&' &&  QStringView{text}.mid(open + 1, 3) == "lt;"_L1)
             return true; // support desperate attempt of user to see <...>
         ++open;
     }
-    if (open < text.length() && text.at(open) == u'<') {
+    if (open < text.size() && text.at(open) == u'<') {
         const int close = text.indexOf(u'>', open);
         if (close > -1) {
             QString tag;
@@ -134,10 +134,10 @@ QString Qt::convertFromPlainText(const QString &plain, Qt::WhiteSpaceMode mode)
     int col = 0;
     QString rich;
     rich += "<p>"_L1;
-    for (int i = 0; i < plain.length(); ++i) {
+    for (int i = 0; i < plain.size(); ++i) {
         if (plain[i] == u'\n'){
             int c = 1;
-            while (i+1 < plain.length() && plain[i+1] == u'\n') {
+            while (i+1 < plain.size() && plain[i+1] == u'\n') {
                 i++;
                 c++;
             }
@@ -1310,7 +1310,7 @@ static bool findInBlock(const QTextBlock &block, const QString &expression, int
     Qt::CaseSensitivity sensitivity = options & QTextDocument::FindCaseSensitively ? Qt::CaseSensitive : Qt::CaseInsensitive;
     int idx = -1;
 
-    while (offset >= 0 && offset <= text.length()) {
+    while (offset >= 0 && offset <= text.size()) {
         idx = (options & QTextDocument::FindBackward) ?
                text.lastIndexOf(expression, offset, sensitivity) : text.indexOf(expression, offset, sensitivity);
         if (idx == -1)
@@ -1318,9 +1318,9 @@ static bool findInBlock(const QTextBlock &block, const QString &expression, int
 
         if (options & QTextDocument::FindWholeWords) {
             const int start = idx;
-            const int end = start + expression.length();
+            const int end = start + expression.size();
             if ((start != 0 && text.at(start - 1).isLetterOrNumber())
-                || (end != text.length() && text.at(end).isLetterOrNumber())) {
+                || (end != text.size() && text.at(end).isLetterOrNumber())) {
                 //if this is not a whole word, continue the search in the string
                 offset = (options & QTextDocument::FindBackward) ? idx-1 : end+1;
                 idx = -1;
@@ -1330,7 +1330,7 @@ static bool findInBlock(const QTextBlock &block, const QString &expression, int
         //we have a hit, return the cursor for that.
         *cursor = QTextCursorPrivate::fromPosition(const_cast<QTextDocumentPrivate *>(QTextDocumentPrivate::get(block)),
                                                    block.position() + idx);
-        cursor->setPosition(cursor->position() + expression.length(), QTextCursor::KeepAnchor);
+        cursor->setPosition(cursor->position() + expression.size(), QTextCursor::KeepAnchor);
         return true;
     }
     return false;
@@ -1430,7 +1430,7 @@ static bool findInBlock(const QTextBlock &block, const QRegularExpression &expr,
     QRegularExpressionMatch match;
     int idx = -1;
 
-    while (offset >= 0 && offset <= text.length()) {
+    while (offset >= 0 && offset <= text.size()) {
         idx = (options & QTextDocument::FindBackward) ?
                text.lastIndexOf(expr, offset, &match) : text.indexOf(expr, offset, &match);
         if (idx == -1)
@@ -1440,7 +1440,7 @@ static bool findInBlock(const QTextBlock &block, const QRegularExpression &expr,
             const int start = idx;
             const int end = start + match.capturedLength();
             if ((start != 0 && text.at(start - 1).isLetterOrNumber())
-                || (end != text.length() && text.at(end).isLetterOrNumber())) {
+                || (end != text.size() && text.at(end).isLetterOrNumber())) {
                 //if this is not a whole word, continue the search in the string
                 offset = (options & QTextDocument::FindBackward) ? idx-1 : end+1;
                 idx = -1;
@@ -2323,7 +2323,7 @@ static QString colorValue(QColor color)
         result = color.name();
     } else if (color.alpha()) {
         QString alphaValue = QString::number(color.alphaF(), 'f', 6);
-        while (alphaValue.length() > 1 && alphaValue.at(alphaValue.size() - 1) == u'0')
+        while (alphaValue.size() > 1 && alphaValue.at(alphaValue.size() - 1) == u'0')
             alphaValue.chop(1);
         if (alphaValue.at(alphaValue.size() - 1) == u'.')
             alphaValue.chop(1);
@@ -2829,7 +2829,7 @@ void QTextHtmlExporter::emitFragment(const QTextFragment &fragment)
         html.chop(styleTag.size());
 
     if (isObject) {
-        for (int i = 0; isImage && i < txt.length(); ++i) {
+        for (int i = 0; isImage && i < txt.size(); ++i) {
             QTextImageFormat imgFmt = format.toImageFormat();
 
             html += "<img"_L1;
@@ -3259,7 +3259,7 @@ void QTextHtmlExporter::emitTable(const QTextTable *table)
         columnWidths.resize(columns);
         columnWidths.fill(QTextLength());
     }
-    Q_ASSERT(columnWidths.count() == columns);
+    Q_ASSERT(columnWidths.size() == columns);
 
     QVarLengthArray<bool> widthEmittedForColumn(columns);
     for (int i = 0; i < columns; ++i)
@@ -3436,7 +3436,7 @@ void QTextHtmlExporter::emitFrameStyle(const QTextFrameFormat &format, FrameType
 {
     const auto styleAttribute = " style=\""_L1;
     html += styleAttribute;
-    const int originalHtmlLength = html.length();
+    const int originalHtmlLength = html.size();
 
     if (frameType == TextFrame)
         html += "-qt-table-type: frame;"_L1;
@@ -3470,7 +3470,7 @@ void QTextHtmlExporter::emitFrameStyle(const QTextFrameFormat &format, FrameType
     if (format.property(QTextFormat::TableBorderCollapse).toBool())
         html += " border-collapse:collapse;"_L1;
 
-    if (html.length() == originalHtmlLength) // nothing emitted?
+    if (html.size() == originalHtmlLength) // nothing emitted?
         html.chop(styleAttribute.size());
     else
         html += u'\"';
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index e61194ab1e..0b9be23271 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -373,7 +373,7 @@ int QTextDocumentPrivate::insertBlock(QChar blockSeparator,
 
     beginEditBlock();
 
-    int strPos = text.length();
+    int strPos = text.size();
     text.append(blockSeparator);
 
     int ob = blocks.findNode(pos);
@@ -450,9 +450,9 @@ void QTextDocumentPrivate::insert(int pos, const QString &str, int format)
 
     Q_ASSERT(noBlockInString(str));
 
-    int strPos = text.length();
+    int strPos = text.size();
     text.append(str);
-    insert(pos, strPos, str.length(), format);
+    insert(pos, strPos, str.size(), format);
 }
 
 int QTextDocumentPrivate::remove_string(int pos, uint length, QTextUndoCommand::Operation op)
@@ -1433,7 +1433,7 @@ QTextFrame *QTextDocumentPrivate::frameAt(int pos) const
 
 void QTextDocumentPrivate::clearFrame(QTextFrame *f)
 {
-    for (int i = 0; i < f->d_func()->childFrames.count(); ++i)
+    for (int i = 0; i < f->d_func()->childFrames.size(); ++i)
         clearFrame(f->d_func()->childFrames.at(i));
     f->d_func()->childFrames.clear();
     f->d_func()->parentFrame = nullptr;
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index 0118c34c97..e96f7cf995 100644
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -84,7 +84,7 @@ int QTextCopyHelper::appendFragment(int pos, int endPos, int objectIndex)
     }
 
     QString txtToInsert(originalText.constData() + frag->stringPosition + inFragmentOffset, charsToCopy);
-    if (txtToInsert.length() == 1
+    if (txtToInsert.size() == 1
         && (txtToInsert.at(0) == QChar::ParagraphSeparator
             || txtToInsert.at(0) == QTextBeginningOfFrame
             || txtToInsert.at(0) == QTextEndOfFrame
@@ -109,7 +109,7 @@ int QTextCopyHelper::appendFragment(int pos, int endPos, int objectIndex)
         const int userState = nextBlock.userState();
         if (userState != -1)
             dst->blocksFind(insertPos).setUserState(userState);
-        insertPos += txtToInsert.length();
+        insertPos += txtToInsert.size();
     }
 
     return charsToCopy;
@@ -580,7 +580,7 @@ bool QTextHtmlImporter::appendNodeText()
     QString textToInsert;
     textToInsert.reserve(text.size());
 
-    for (int i = 0; i < text.length(); ++i) {
+    for (int i = 0; i < text.size(); ++i) {
         QChar ch = text.at(i);
 
         if (ch.isSpace()
@@ -621,7 +621,7 @@ bool QTextHtmlImporter::appendNodeText()
             || ch == QChar::ParagraphSeparator) {
 
             if (!textToInsert.isEmpty()) {
-                if (wsm == QTextHtmlParserNode::WhiteSpacePreLine && textToInsert.at(textToInsert.length() - 1) == u' ')
+                if (wsm == QTextHtmlParserNode::WhiteSpacePreLine && textToInsert.at(textToInsert.size() - 1) == u' ')
                     textToInsert = textToInsert.chopped(1);
                 cursor.insertText(textToInsert, format);
                 textToInsert.clear();
@@ -906,7 +906,7 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
 
     int tableHeaderRowCount = 0;
     QList<int> rowNodes;
-    rowNodes.reserve(at(tableNodeIdx).children.count());
+    rowNodes.reserve(at(tableNodeIdx).children.size());
     for (int row : at(tableNodeIdx).children) {
         switch (at(row).id) {
             case Html_tr:
@@ -959,7 +959,7 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
                 if (spanInfo.colSpan > 1 || spanInfo.rowSpan > 1)
                     rowColSpans.append(spanInfo);
 
-                columnWidths.resize(qMax(columnWidths.count(), colsInRow));
+                columnWidths.resize(qMax(columnWidths.size(), colsInRow));
                 rowColSpanForColumn.resize(columnWidths.size());
                 for (int i = currentColumn; i < currentColumn + c.tableCellColSpan; ++i) {
                     if (columnWidths.at(i).type() == QTextLength::VariableLength) {
@@ -1041,7 +1041,7 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
         QTextTable *textTable = cursor.insertTable(table.rows, table.columns, fmt.toTableFormat());
         table.frame = textTable;
 
-        for (int i = 0; i < rowColSpans.count(); ++i) {
+        for (int i = 0; i < rowColSpans.size(); ++i) {
             const RowColSpanInfo &nfo = rowColSpans.at(i);
             textTable->mergeCells(nfo.row, nfo.col, nfo.rowSpan, nfo.colSpan);
         }
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index 714632ba58..c95ec4c686 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -1175,7 +1175,7 @@ void QTextDocumentLayoutPrivate::drawFrame(const QPointF &offset, QPainter *pain
             it = frameIteratorForYPosition(QFixed::fromReal(context.clip.top()));
 
         QList<QTextFrame *> floats;
-        const int numFloats = fd->floats.count();
+        const int numFloats = fd->floats.size();
         floats.reserve(numFloats);
         for (int i = 0; i < numFloats; ++i)
             floats.append(fd->floats.at(i));
@@ -1967,7 +1967,7 @@ void QTextDocumentLayoutPrivate::drawFlow(const QPointF &offset, QPainter *paint
         previousFrame = c;
     }
 
-    for (int i = 0; i < floats.count(); ++i) {
+    for (int i = 0; i < floats.size(); ++i) {
         QTextFrame *frame = floats.at(i);
         if (!isFrameFromInlineObject(frame)
             || frame->frameFormat().position() == QTextFrameFormat::InFlow)
@@ -2368,7 +2368,7 @@ QRectF QTextDocumentLayoutPrivate::layoutTable(QTextTable *table, int layoutFrom
     td->childFrameMap.clear();
     {
         const QList<QTextFrame *> children = table->childFrames();
-        for (int i = 0; i < children.count(); ++i) {
+        for (int i = 0; i < children.size(); ++i) {
             QTextFrame *frame = children.at(i);
             QTextTableCell cell = table->cellAt(frame->firstPosition());
             td->childFrameMap.insert(cell.row() + cell.column() * rows, frame);
@@ -2378,7 +2378,7 @@ QRectF QTextDocumentLayoutPrivate::layoutTable(QTextTable *table, int layoutFrom
     QList<QTextLength> columnWidthConstraints = fmt.columnWidthConstraints();
     if (columnWidthConstraints.size() != columns)
         columnWidthConstraints.resize(columns);
-    Q_ASSERT(columnWidthConstraints.count() == columns);
+    Q_ASSERT(columnWidthConstraints.size() == columns);
 
     // borderCollapse will disable drawing the html4 style table cell borders
     // and draw a 1px grid instead. This also sets a fixed cellspacing
@@ -2575,9 +2575,9 @@ recalc_minmax_widths:
 
         QFixed lastRemainingWidth = remainingWidth;
         while (remainingWidth > 0) {
-            for (int k = 0; k < columnsWithProperMaxSize.count(); ++k) {
+            for (int k = 0; k < columnsWithProperMaxSize.size(); ++k) {
                 const int col = columnsWithProperMaxSize[k];
-                const int colsLeft = columnsWithProperMaxSize.count() - k;
+                const int colsLeft = columnsWithProperMaxSize.size() - k;
                 const QFixed w = qMin(td->maxWidths.at(col) - td->widths.at(col), remainingWidth / colsLeft);
                 td->widths[col] += w;
                 remainingWidth -= w;
@@ -3349,7 +3349,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout
     // and not per cell and layoutCell already takes care of doing the same as we do here
     if (!qobject_cast<QTextTable *>(layoutStruct->frame)) {
         QList<QTextFrame *> children = layoutStruct->frame->childFrames();
-        for (int i = 0; i < children.count(); ++i) {
+        for (int i = 0; i < children.size(); ++i) {
             QTextFrameData *fd = data(children.at(i));
             if (!fd->layoutDirty && children.at(i)->frameFormat().position() != QTextFrameFormat::InFlow)
                 layoutStruct->y = qMax(layoutStruct->y, fd->position.y + fd->size.height);
@@ -3850,7 +3850,7 @@ int QTextDocumentLayout::hitTest(const QPointF &point, Qt::HitTestAccuracy accur
     // ensure we stay within document bounds
     int lastPos = f->lastPosition();
     if (l && !l->preeditAreaText().isEmpty())
-        lastPos += l->preeditAreaText().length();
+        lastPos += l->preeditAreaText().size();
     if (position > lastPos)
         position = lastPos;
     else if (position < 0)
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index c6da4b8f4a..e1392008c7 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -101,7 +101,7 @@ private:
 
         if (!m_splitter)
             m_splitter = new QTextBoundaryFinder(QTextBoundaryFinder::Word,
-                                                 m_string.constData(), m_string.length(),
+                                                 m_string.constData(), m_string.size(),
                                                  /*buffer*/nullptr, /*buffer size*/0);
 
         m_splitter->setPosition(start);
@@ -1781,7 +1781,7 @@ const QCharAttributes *QTextEngine::attributes() const
         return (QCharAttributes *) layoutData->memory;
 
     itemize();
-    if (! ensureSpace(layoutData->string.length()))
+    if (! ensureSpace(layoutData->string.size()))
         return nullptr;
 
     QVarLengthArray<QUnicodeTools::ScriptItem> scriptItems(layoutData->items.size());
@@ -1888,7 +1888,7 @@ void QTextEngine::itemize() const
     if (layoutData->items.size())
         return;
 
-    int length = layoutData->string.length();
+    int length = layoutData->string.size();
     if (!length)
         return;
 
@@ -1970,7 +1970,7 @@ void QTextEngine::itemize() const
             const QTextFragmentData * const frag = it.value();
             if (it == end || format != frag->format) {
                 if (s && position >= preeditPosition) {
-                    position += s->preeditText.length();
+                    position += s->preeditText.size();
                     preeditPosition = INT_MAX;
                 }
                 Q_ASSERT(position <= length);
@@ -2399,7 +2399,7 @@ void QTextEngine::justify(const QScriptLine &line)
 
     if (!forceJustification) {
         int end = line.from + (int)line.length + line.trailingSpaces;
-        if (end == layoutData->string.length())
+        if (end == layoutData->string.size())
             return; // no justification at end of paragraph
         if (end && layoutData->items.at(findItem(end - 1)).analysis.flags == QScriptAnalysis::LineOrParagraphSeparator)
             return; // no justification at the end of an explicitly separated line
@@ -2612,11 +2612,11 @@ QTextEngine::LayoutData::LayoutData(const QString &str, void **stack_memory, int
 {
     allocated = _allocated;
 
-    int space_charAttributes = int(sizeof(QCharAttributes) * string.length() / sizeof(void*) + 1);
-    int space_logClusters = int(sizeof(unsigned short) * string.length() / sizeof(void*) + 1);
+    int space_charAttributes = int(sizeof(QCharAttributes) * string.size() / sizeof(void*) + 1);
+    int space_logClusters = int(sizeof(unsigned short) * string.size() / sizeof(void*) + 1);
     available_glyphs = ((int)allocated - space_charAttributes - space_logClusters)*(int)sizeof(void*)/(int)QGlyphLayout::SpaceNeeded;
 
-    if (available_glyphs < str.length()) {
+    if (available_glyphs < str.size()) {
         // need to allocate on the heap
         allocated = 0;
 
@@ -2629,7 +2629,7 @@ QTextEngine::LayoutData::LayoutData(const QString &str, void **stack_memory, int
         logClustersPtr = (unsigned short *)(memory + space_charAttributes);
 
         void *m = memory + space_charAttributes + space_logClusters;
-        glyphLayout = QGlyphLayout(reinterpret_cast<char *>(m), str.length());
+        glyphLayout = QGlyphLayout(reinterpret_cast<char *>(m), str.size());
         glyphLayout.clear();
         memset(memory, 0, space_charAttributes*sizeof(void *));
     }
@@ -2654,8 +2654,8 @@ bool QTextEngine::LayoutData::reallocate(int totalGlyphs)
         return true;
     }
 
-    int space_charAttributes = int(sizeof(QCharAttributes) * string.length() / sizeof(void*) + 1);
-    int space_logClusters = int(sizeof(unsigned short) * string.length() / sizeof(void*) + 1);
+    int space_charAttributes = int(sizeof(QCharAttributes) * string.size() / sizeof(void*) + 1);
+    int space_logClusters = int(sizeof(unsigned short) * string.size() / sizeof(void*) + 1);
     int space_glyphs = (totalGlyphs * QGlyphLayout::SpaceNeeded) / sizeof(void *) + 2;
 
     int newAllocated = space_charAttributes + space_glyphs + space_logClusters;
@@ -2745,10 +2745,10 @@ int QTextEngine::formatIndex(const QScriptItem *si) const
         return -1;
     int pos = si->position;
     if (specialData && si->position >= specialData->preeditPosition) {
-        if (si->position < specialData->preeditPosition + specialData->preeditText.length())
+        if (si->position < specialData->preeditPosition + specialData->preeditText.size())
             pos = qMax(qMin(block.length(), specialData->preeditPosition) - 1, 0);
         else
-            pos -= specialData->preeditText.length();
+            pos -= specialData->preeditText.size();
     }
     QTextDocumentPrivate::FragmentIterator it = p->find(block.position() + pos);
     return it.value()->format;
@@ -2883,9 +2883,9 @@ void QTextEngine::indexFormats()
 */
 static inline bool nextCharJoins(const QString &string, int pos)
 {
-    while (pos < string.length() && string.at(pos).category() == QChar::Mark_NonSpacing)
+    while (pos < string.size() && string.at(pos).category() == QChar::Mark_NonSpacing)
         ++pos;
-    if (pos == string.length())
+    if (pos == string.size())
         return false;
     QChar::JoiningType joining = string.at(pos).joiningType();
     return joining != QChar::Joining_None && joining != QChar::Joining_Transparent;
@@ -2968,12 +2968,12 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, QFixed width, int flags,
 
     validate();
 
-    const int to = count >= 0 && count <= layoutData->string.length() - from
+    const int to = count >= 0 && count <= layoutData->string.size() - from
             ? from + count
-            : layoutData->string.length();
+            : layoutData->string.size();
 
     if (mode == Qt::ElideNone
-        || this->width(from, layoutData->string.length()) <= width
+        || this->width(from, layoutData->string.size()) <= width
         || to - from <= 1)
         return layoutData->string.mid(from, from - to);
 
@@ -3040,7 +3040,7 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, QFixed width, int flags,
             pos = nextBreak;
 
             ++nextBreak;
-            while (nextBreak < layoutData->string.length() && !attributes[nextBreak].graphemeBoundary)
+            while (nextBreak < layoutData->string.size() && !attributes[nextBreak].graphemeBoundary)
                 ++nextBreak;
 
             currentWidth += this->width(pos, nextBreak - pos);
@@ -3092,7 +3092,7 @@ QString QTextEngine::elidedText(Qt::TextElideMode mode, QFixed width, int flags,
             rightPos = nextRightBreak;
 
             ++nextLeftBreak;
-            while (nextLeftBreak < layoutData->string.length() && !attributes[nextLeftBreak].graphemeBoundary)
+            while (nextLeftBreak < layoutData->string.size() && !attributes[nextLeftBreak].graphemeBoundary)
                 ++nextLeftBreak;
 
             --nextRightBreak;
@@ -3168,7 +3168,7 @@ QFixed QTextEngine::calculateTabWidth(int item, QFixed x) const
         for (const QTextOption::Tab &tabSpec : qAsConst(tabArray)) {
             QFixed tab = QFixed::fromReal(tabSpec.position) * dpiScale;
             if (tab > x) {  // this is the tab we need.
-                int tabSectionEnd = layoutData->string.length();
+                int tabSectionEnd = layoutData->string.size();
                 if (tabSpec.type == QTextOption::RightTab || tabSpec.type == QTextOption::CenterTab) {
                     // find next tab to calculate the width required.
                     tab = QFixed::fromReal(tabSpec.position);
@@ -3453,8 +3453,8 @@ int QTextEngine::previousLogicalPosition(int oldPos) const
 {
     const QCharAttributes *attrs = attributes();
     int len = block.isValid() ? block.length() - 1
-                              : layoutData->string.length();
-    Q_ASSERT(len <= layoutData->string.length());
+                              : layoutData->string.size();
+    Q_ASSERT(len <= layoutData->string.size());
     if (!attrs || oldPos <= 0 || oldPos > len)
         return oldPos;
 
@@ -3468,8 +3468,8 @@ int QTextEngine::nextLogicalPosition(int oldPos) const
 {
     const QCharAttributes *attrs = attributes();
     int len = block.isValid() ? block.length() - 1
-                              : layoutData->string.length();
-    Q_ASSERT(len <= layoutData->string.length());
+                              : layoutData->string.size();
+    Q_ASSERT(len <= layoutData->string.size());
     if (!attrs || oldPos < 0 || oldPos >= len)
         return oldPos;
 
@@ -3483,7 +3483,7 @@ int QTextEngine::lineNumberForTextPosition(int pos)
 {
     if (!layoutData)
         itemize();
-    if (pos == layoutData->string.length() && lines.size())
+    if (pos == layoutData->string.size() && lines.size())
         return lines.size() - 1;
     for (int i = 0; i < lines.size(); ++i) {
         const QScriptLine& line = lines[i];
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index c653bfc92f..925dafe04e 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -434,14 +434,14 @@ public:
         const QScriptItem &si = layoutData->items[item];
         int from = si.position;
         item++;
-        return (item < layoutData->items.size() ? layoutData->items[item].position : layoutData->string.length()) - from;
+        return (item < layoutData->items.size() ? layoutData->items[item].position : layoutData->string.size()) - from;
     }
     int length(const QScriptItem *si) const {
         int end;
         if (si + 1 < layoutData->items.constData()+ layoutData->items.size())
             end = (si+1)->position;
         else
-            end = layoutData->string.length();
+            end = layoutData->string.size();
         return end - si->position;
     }
 
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index be38aba368..56b9e82be0 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -168,7 +168,7 @@ public:
         if (key >= QTextFormat::FirstFontProperty && key <= QTextFormat::LastFontProperty)
             fontDirty = true;
 
-        for (int i = 0; i < props.count(); ++i)
+        for (int i = 0; i < props.size(); ++i)
             if (props.at(i).key == key) {
                 props[i].value = value;
                 return;
@@ -178,7 +178,7 @@ public:
 
     inline void clearProperty(qint32 key)
     {
-        for (int i = 0; i < props.count(); ++i)
+        for (int i = 0; i < props.size(); ++i)
             if (props.at(i).key == key) {
                 hashDirty = true;
                 if (key >= QTextFormat::FirstFontProperty && key <= QTextFormat::LastFontProperty)
@@ -190,7 +190,7 @@ public:
 
     inline int propertyIndex(qint32 key) const
     {
-        for (int i = 0; i < props.count(); ++i)
+        for (int i = 0; i < props.size(); ++i)
             if (props.at(i).key == key)
                 return i;
         return -1;
@@ -257,7 +257,7 @@ static inline size_t variantHash(const QVariant &variant)
     case QMetaType::Bool: return 0x371818 + variant.toBool();
     case QMetaType::QPen: return 0x02020202 + hash(qvariant_cast<QPen>(variant));
     case QMetaType::QVariantList:
-        return 0x8377U + qvariant_cast<QVariantList>(variant).count();
+        return 0x8377U + qvariant_cast<QVariantList>(variant).size();
     case QMetaType::QColor: return hash(qvariant_cast<QColor>(variant));
       case QMetaType::QTextLength:
         return 0x377 + hash(qvariant_cast<QTextLength>(variant).rawValue());
@@ -318,7 +318,7 @@ void QTextFormatPrivate::recalcFont() const
     QFont::SpacingType spacingType = QFont::PercentageSpacing;
     qreal letterSpacing = 0.0;
 
-    for (int i = 0; i < props.count(); ++i) {
+    for (int i = 0; i < props.size(); ++i) {
         switch (props.at(i).key) {
             case QTextFormat::FontFamilies:
                 f.setFamilies(props.at(i).value.toStringList());
@@ -951,7 +951,7 @@ void QTextFormat::merge(const QTextFormat &other)
 
     const QList<QT_PREPEND_NAMESPACE(Property)> &otherProps = other.d.constData()->props;
     p->props.reserve(p->props.size() + otherProps.size());
-    for (int i = 0; i < otherProps.count(); ++i) {
+    for (int i = 0; i < otherProps.size(); ++i) {
         const QT_PREPEND_NAMESPACE(Property) &prop = otherProps.at(i);
         p->insertProperty(prop.key, prop.value);
     }
@@ -1323,7 +1323,7 @@ QMap<int, QVariant> QTextFormat::properties() const
 {
     QMap<int, QVariant> map;
     if (d) {
-        for (int i = 0; i < d->props.count(); ++i)
+        for (int i = 0; i < d->props.size(); ++i)
             map.insert(d->props.at(i).key, d->props.at(i).value);
     }
     return map;
@@ -1335,7 +1335,7 @@ QMap<int, QVariant> QTextFormat::properties() const
 */
 int QTextFormat::propertyCount() const
 {
-    return d ? d->props.count() : 0;
+    return d ? d->props.size() : 0;
 }
 
 /*!
@@ -2237,7 +2237,7 @@ QTextBlockFormat::QTextBlockFormat(const QTextFormat &fmt)
 void QTextBlockFormat::setTabPositions(const QList<QTextOption::Tab> &tabs)
 {
     QList<QVariant> list;
-    list.reserve(tabs.count());
+    list.reserve(tabs.size());
     QList<QTextOption::Tab>::ConstIterator iter = tabs.constBegin();
     while (iter != tabs.constEnd()) {
         QVariant v;
@@ -2262,7 +2262,7 @@ QList<QTextOption::Tab> QTextBlockFormat::tabPositions() const
     QList<QTextOption::Tab> answer;
     QList<QVariant> variantsList = qvariant_cast<QList<QVariant> >(variant);
     QList<QVariant>::Iterator iter = variantsList.begin();
-    answer.reserve(variantsList.count());
+    answer.reserve(variantsList.size());
     while(iter != variantsList.end()) {
         answer.append( qvariant_cast<QTextOption::Tab>(*iter));
         ++iter;
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index ded2dd185a..995f5d3502 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -488,7 +488,7 @@ QTextHtmlParserNode *QTextHtmlParser::newNode(int parent)
 
     bool reuseLastNode = true;
 
-    if (nodes.count() == 1) {
+    if (nodes.size() == 1) {
         reuseLastNode = false;
     } else if (lastNode->tag.isEmpty()) {
 
@@ -496,7 +496,7 @@ QTextHtmlParserNode *QTextHtmlParser::newNode(int parent)
             reuseLastNode = true;
         } else { // last node is a text node (empty tag) with some text
 
-            if (lastNode->text.length() == 1 && lastNode->text.at(0).isSpace()) {
+            if (lastNode->text.size() == 1 && lastNode->text.at(0).isSpace()) {
 
                 int lastSibling = count() - 2;
                 while (lastSibling
@@ -543,7 +543,7 @@ void QTextHtmlParser::parse(const QString &text, const QTextDocument *_resourceP
     nodes.append(new QTextHtmlParserNode);
     txt = text;
     pos = 0;
-    len = txt.length();
+    len = txt.size();
     textEditMode = false;
     resourceProvider = _resourceProvider;
     parse();
@@ -672,7 +672,7 @@ void QTextHtmlParser::parseTag()
     resolveNode();
 
 #ifndef QT_NO_CSSPARSER
-    const int nodeIndex = nodes.count() - 1; // this new node is always the last
+    const int nodeIndex = nodes.size() - 1; // this new node is always the last
     node->applyCssDeclarations(declarationsForNode(nodeIndex), resourceProvider);
 #endif
     applyAttributes(node->attributes);
@@ -838,7 +838,7 @@ QString QTextHtmlParser::parseWord()
         while (pos < len) {
             QChar c = txt.at(pos++);
             // Allow for escaped single quotes as they may be part of the string
-            if (c == u'\'' && (txt.length() > 1 && txt.at(pos - 2) != u'\\'))
+            if (c == u'\'' && (txt.size() > 1 && txt.at(pos - 2) != u'\\'))
                 break;
             else
                 word += c;
@@ -876,21 +876,21 @@ QTextHtmlParserNode *QTextHtmlParser::resolveParent()
             n = at(n).parent;
 
         if (!n) {
-            nodes.insert(nodes.count() - 1, new QTextHtmlParserNode);
-            nodes.insert(nodes.count() - 1, new QTextHtmlParserNode);
+            nodes.insert(nodes.size() - 1, new QTextHtmlParserNode);
+            nodes.insert(nodes.size() - 1, new QTextHtmlParserNode);
 
-            QTextHtmlParserNode *table = nodes[nodes.count() - 3];
+            QTextHtmlParserNode *table = nodes[nodes.size() - 3];
             table->parent = p;
             table->id = Html_table;
             table->tag = "table"_L1;
-            table->children.append(nodes.count() - 2); // add row as child
+            table->children.append(nodes.size() - 2); // add row as child
 
-            QTextHtmlParserNode *row = nodes[nodes.count() - 2];
-            row->parent = nodes.count() - 3; // table as parent
+            QTextHtmlParserNode *row = nodes[nodes.size() - 2];
+            row->parent = nodes.size() - 3; // table as parent
             row->id = Html_tr;
             row->tag = "tr"_L1;
 
-            p = nodes.count() - 2;
+            p = nodes.size() - 2;
             node = nodes.last(); // re-initialize pointer
         }
     }
@@ -901,12 +901,12 @@ QTextHtmlParserNode *QTextHtmlParser::resolveParent()
             n = at(n).parent;
 
         if (!n) {
-            nodes.insert(nodes.count() - 1, new QTextHtmlParserNode);
-            QTextHtmlParserNode *table = nodes[nodes.count() - 2];
+            nodes.insert(nodes.size() - 1, new QTextHtmlParserNode);
+            QTextHtmlParserNode *table = nodes[nodes.size() - 2];
             table->parent = p;
             table->id = Html_table;
             table->tag = "table"_L1;
-            p = nodes.count() - 2;
+            p = nodes.size() - 2;
             node = nodes.last(); // re-initialize pointer
         }
     }
@@ -954,7 +954,7 @@ QTextHtmlParserNode *QTextHtmlParser::resolveParent()
     node->parent = p;
 
     // makes it easier to traverse the tree, later
-    nodes[p]->children.append(nodes.count() - 1);
+    nodes[p]->children.append(nodes.size() - 1);
     return node;
 }
 
@@ -1117,7 +1117,7 @@ void QTextHtmlParserNode::initializeProperties(const QTextHtmlParserNode *parent
 #ifndef QT_NO_CSSPARSER
 void QTextHtmlParserNode::setListStyle(const QList<QCss::Value> &cssValues)
 {
-    for (int i = 0; i < cssValues.count(); ++i) {
+    for (int i = 0; i < cssValues.size(); ++i) {
         if (cssValues.at(i).type == QCss::Value::KnownIdentifier) {
             switch (static_cast<QCss::KnownValue>(cssValues.at(i).variant.toInt())) {
                 case QCss::Value_None: hasOwnListStyle = true; listStyle = QTextListFormat::ListStyleUndefined; break;
@@ -1200,7 +1200,7 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
         }
     }
 
-    for (int i = 0; i < declarations.count(); ++i) {
+    for (int i = 0; i < declarations.size(); ++i) {
         const QCss::Declaration &decl = declarations.at(i);
         if (decl.d->values.isEmpty()) continue;
 
@@ -1487,7 +1487,7 @@ void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDo
 
 bool QTextHtmlParserNode::hasOnlyWhitespace() const
 {
-    for (int i = 0; i < text.length(); ++i)
+    for (int i = 0; i < text.size(); ++i)
         if (!text.at(i).isSpace() || text.at(i) == QChar::LineSeparator)
             return false;
     return true;
@@ -1537,7 +1537,7 @@ void QTextHtmlParserNode::parseStyleAttribute(const QString &value, const QTextD
     QCss::Parser parser(css);
     QCss::StyleSheet sheet;
     parser.parse(&sheet, Qt::CaseInsensitive);
-    if (sheet.styleRules.count() != 1) return;
+    if (sheet.styleRules.size() != 1) return;
     applyCssDeclarations(sheet.styleRules.at(0).declarations, resourceProvider);
 }
 #endif
@@ -1900,7 +1900,7 @@ void QTextHtmlStyleSelector::freeNode(NodePtr) const
 
 void QTextHtmlParser::resolveStyleSheetImports(const QCss::StyleSheet &sheet)
 {
-    for (int i = 0; i < sheet.importRules.count(); ++i) {
+    for (int i = 0; i < sheet.importRules.size(); ++i) {
         const QCss::ImportRule &rule = sheet.importRules.at(i);
         if (rule.media.isEmpty() || rule.media.contains("screen"_L1, Qt::CaseInsensitive))
             importStyleSheet(rule.href);
@@ -1911,7 +1911,7 @@ void QTextHtmlParser::importStyleSheet(const QString &href)
 {
     if (!resourceProvider)
         return;
-    for (int i = 0; i < externalStyleSheets.count(); ++i)
+    for (int i = 0; i < externalStyleSheets.size(); ++i)
         if (externalStyleSheets.at(i).url == href)
             return;
 
@@ -2117,15 +2117,15 @@ QList<QCss::Declaration> QTextHtmlParser::declarationsForNode(int node) const
 
     int idx = 0;
     selector.styleSheets.resize((resourceProvider ? 1 : 0)
-                                + externalStyleSheets.count()
-                                + inlineStyleSheets.count());
+                                + externalStyleSheets.size()
+                                + inlineStyleSheets.size());
     if (resourceProvider)
         selector.styleSheets[idx++] = QTextDocumentPrivate::get(resourceProvider)->parsedDefaultStyleSheet;
 
-    for (int i = 0; i < externalStyleSheets.count(); ++i, ++idx)
+    for (int i = 0; i < externalStyleSheets.size(); ++i, ++idx)
         selector.styleSheets[idx] = externalStyleSheets.at(i).sheet;
 
-    for (int i = 0; i < inlineStyleSheets.count(); ++i, ++idx)
+    for (int i = 0; i < inlineStyleSheets.size(); ++i, ++idx)
         selector.styleSheets[idx] = inlineStyleSheets.at(i);
 
     selector.medium = resourceProvider ? resourceProvider->metaInformation(QTextDocument::CssMedia) : "screen"_L1;
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index 5eb2e0683a..b26862da7f 100644
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -252,8 +252,8 @@ public:
 
     inline const QTextHtmlParserNode &at(int i) const { return *nodes.at(i); }
     inline QTextHtmlParserNode &operator[](int i) { return *nodes[i]; }
-    inline int count() const { return nodes.count(); }
-    inline int last() const { return nodes.count()-1; }
+    inline int count() const { return nodes.size(); }
+    inline int last() const { return nodes.size()-1; }
     int depth(int i) const;
     int topMargin(int i) const;
     int bottomMargin(int i) const;
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 43236eec91..32fac09f33 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -646,8 +646,8 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
 {
     const QCharAttributes *attributes = d->attributes();
     int len = d->block.isValid() ? d->block.length() - 1
-                                 : d->layoutData->string.length();
-    Q_ASSERT(len <= d->layoutData->string.length());
+                                 : d->layoutData->string.size();
+    Q_ASSERT(len <= d->layoutData->string.size());
     if (!attributes || oldPos < 0 || oldPos >= len)
         return oldPos;
 
@@ -682,8 +682,8 @@ int QTextLayout::previousCursorPosition(int oldPos, CursorMode mode) const
 {
     const QCharAttributes *attributes = d->attributes();
     int len = d->block.isValid() ? d->block.length() - 1
-                                 : d->layoutData->string.length();
-    Q_ASSERT(len <= d->layoutData->string.length());
+                                 : d->layoutData->string.size();
+    Q_ASSERT(len <= d->layoutData->string.size());
     if (!attributes || oldPos <= 0 || oldPos > len)
         return oldPos;
 
@@ -754,7 +754,7 @@ int QTextLayout::leftCursorPosition(int oldPos) const
 bool QTextLayout::isValidCursorPosition(int pos) const
 {
     const QCharAttributes *attributes = d->attributes();
-    if (!attributes || pos < 0 || pos > (int)d->layoutData->string.length())
+    if (!attributes || pos < 0 || pos > (int)d->layoutData->string.size())
         return false;
     return attributes[pos].graphemeBoundary;
 }
@@ -795,7 +795,7 @@ QTextLine QTextLayout::createLine()
         }
     }
     int from = l > 0 ? d->lines.at(l-1).from + d->lines.at(l-1).length + d->lines.at(l-1).trailingSpaces : 0;
-    int strlen = d->layoutData->string.length();
+    int strlen = d->layoutData->string.size();
     if (l && from >= strlen) {
         if (!d->lines.at(l-1).length || d->layoutData->string.at(strlen - 1) != QChar::LineSeparator)
             return QTextLine();
@@ -1032,7 +1032,7 @@ QList<QGlyphRun> QTextLayout::glyphRuns(int from,
     if (from < 0)
         from = 0;
     if (length < 0)
-        length = text().length();
+        length = text().size();
 
     QHash<QPair<QFontEngine *, int>, QGlyphRun> glyphRunHash;
     for (int i=0; i<d->lines.size(); ++i) {
@@ -1289,7 +1289,7 @@ void QTextLayout::drawCursor(QPainter *p, const QPointF &pos, int cursorPosition
 
     QPointF position = pos + d->position;
 
-    cursorPosition = qBound(0, cursorPosition, d->layoutData->string.length());
+    cursorPosition = qBound(0, cursorPosition, d->layoutData->string.size());
     int line = d->lineNumberForTextPosition(cursorPosition);
     if (line < 0)
         line = 0;
@@ -1617,7 +1617,7 @@ void QTextLine::setLineWidth(qreal width)
     line.width = QFixed::fromReal(width);
     if (line.length
         && line.textWidth <= line.width
-        && line.from + line.length == eng->layoutData->string.length())
+        && line.from + line.length == eng->layoutData->string.size())
         // no need to do anything if the line is already layouted and the last one. This optimization helps
         // when using things in a single line layout.
         return;
@@ -1833,12 +1833,12 @@ void QTextLine::layout_helper(int maxGlyphs)
     line.textWidth = 0;
     line.hasTrailingSpaces = false;
 
-    if (!eng->layoutData->items.size() || line.from >= eng->layoutData->string.length()) {
+    if (!eng->layoutData->items.size() || line.from >= eng->layoutData->string.size()) {
         line.setDefaultHeight(eng);
         return;
     }
 
-    Q_ASSERT(line.from < eng->layoutData->string.length());
+    Q_ASSERT(line.from < eng->layoutData->string.size());
 
     LineBreakHelper lbh;
 
@@ -1993,11 +1993,11 @@ void QTextLine::layout_helper(int maxGlyphs)
                 // spaces to behave as in previous Qt versions in the line breaking algorithm.
                 // The line breaks do not currently follow the Unicode specs, but fixing this would
                 // require refactoring the code and would cause behavioral regressions.
-                const bool isBreakableSpace = lbh.currentPosition < eng->layoutData->string.length()
+                const bool isBreakableSpace = lbh.currentPosition < eng->layoutData->string.size()
                                         && attributes[lbh.currentPosition].whiteSpace
                                         && eng->layoutData->string.at(lbh.currentPosition).decompositionTag() != QChar::NoBreak;
 
-                if (lbh.currentPosition >= eng->layoutData->string.length()
+                if (lbh.currentPosition >= eng->layoutData->string.size()
                     || isBreakableSpace
                     || attributes[lbh.currentPosition].lineBreak
                     || lbh.tmpData.textWidth >= QFIXED_MAX) {
diff --git a/src/gui/text/qtextmarkdownimporter.cpp b/src/gui/text/qtextmarkdownimporter.cpp
index a839ca9623..14f1d9054f 100644
--- a/src/gui/text/qtextmarkdownimporter.cpp
+++ b/src/gui/text/qtextmarkdownimporter.cpp
@@ -148,7 +148,7 @@ int QTextMarkdownImporter::cbEnterBlock(int blockType, void *det)
     switch (blockType) {
     case MD_BLOCK_P:
         if (!m_listStack.isEmpty())
-            qCDebug(lcMD, m_listItem ? "P of LI at level %d"  : "P continuation inside LI at level %d", int(m_listStack.count()));
+            qCDebug(lcMD, m_listItem ? "P of LI at level %d"  : "P continuation inside LI at level %d", int(m_listStack.size()));
         else
             qCDebug(lcMD, "P");
         m_needsInsertBlock = true;
@@ -202,7 +202,7 @@ int QTextMarkdownImporter::cbEnterBlock(int blockType, void *det)
             m_needsInsertList = true;
         MD_BLOCK_UL_DETAIL *detail = static_cast<MD_BLOCK_UL_DETAIL *>(det);
         m_listFormat = QTextListFormat();
-        m_listFormat.setIndent(m_listStack.count() + 1);
+        m_listFormat.setIndent(m_listStack.size() + 1);
         switch (detail->mark) {
         case '*':
             m_listFormat.setStyle(QTextListFormat::ListCircle);
@@ -214,7 +214,7 @@ int QTextMarkdownImporter::cbEnterBlock(int blockType, void *det)
             m_listFormat.setStyle(QTextListFormat::ListDisc);
             break;
         }
-        qCDebug(lcMD, "UL %c level %d", detail->mark, int(m_listStack.count()) + 1);
+        qCDebug(lcMD, "UL %c level %d", detail->mark, int(m_listStack.size()) + 1);
     } break;
     case MD_BLOCK_OL: {
         if (m_needsInsertList) // list nested in an empty list
@@ -223,10 +223,10 @@ int QTextMarkdownImporter::cbEnterBlock(int blockType, void *det)
             m_needsInsertList = true;
         MD_BLOCK_OL_DETAIL *detail = static_cast<MD_BLOCK_OL_DETAIL *>(det);
         m_listFormat = QTextListFormat();
-        m_listFormat.setIndent(m_listStack.count() + 1);
+        m_listFormat.setIndent(m_listStack.size() + 1);
         m_listFormat.setNumberSuffix(QChar::fromLatin1(detail->mark_delimiter));
         m_listFormat.setStyle(QTextListFormat::ListDecimal);
-        qCDebug(lcMD, "OL xx%d level %d", detail->mark_delimiter, int(m_listStack.count()) + 1);
+        qCDebug(lcMD, "OL xx%d level %d", detail->mark_delimiter, int(m_listStack.size()) + 1);
     } break;
     case MD_BLOCK_TD: {
         MD_BLOCK_TD_DETAIL *detail = static_cast<MD_BLOCK_TD_DETAIL *>(det);
@@ -297,7 +297,7 @@ int QTextMarkdownImporter::cbLeaveBlock(int blockType, void *detail)
         if (Q_UNLIKELY(m_listStack.isEmpty())) {
             qCWarning(lcMD, "list ended unexpectedly");
         } else {
-            qCDebug(lcMD, "list at level %d ended", int(m_listStack.count()));
+            qCDebug(lcMD, "list at level %d ended", int(m_listStack.size()));
             m_listStack.pop();
         }
         break;
@@ -334,7 +334,7 @@ int QTextMarkdownImporter::cbLeaveBlock(int blockType, void *detail)
         m_cursor->movePosition(QTextCursor::End);
         break;
     case MD_BLOCK_LI:
-        qCDebug(lcMD, "LI at level %d ended", int(m_listStack.count()));
+        qCDebug(lcMD, "LI at level %d ended", int(m_listStack.size()));
         m_listItem = false;
         break;
     case MD_BLOCK_CODE: {
@@ -591,7 +591,7 @@ void QTextMarkdownImporter::insertBlock()
     else
         blockFormat.setMarker(m_markerType);
     if (!m_listStack.isEmpty())
-        blockFormat.setIndent(m_listStack.count());
+        blockFormat.setIndent(m_listStack.size());
     if (m_doc->isEmpty()) {
         m_cursor->setBlockFormat(blockFormat);
         m_cursor->setCharFormat(charFormat);
diff --git a/src/gui/text/qtextmarkdownwriter.cpp b/src/gui/text/qtextmarkdownwriter.cpp
index a5d8f4cc97..036d590e01 100644
--- a/src/gui/text/qtextmarkdownwriter.cpp
+++ b/src/gui/text/qtextmarkdownwriter.cpp
@@ -47,20 +47,20 @@ void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table)
 {
     QList<int> tableColumnWidths(table->columnCount());
     for (int col = 0; col < table->columnCount(); ++col) {
-        tableColumnWidths[col] = table->headerData(col, Qt::Horizontal).toString().length();
+        tableColumnWidths[col] = table->headerData(col, Qt::Horizontal).toString().size();
         for (int row = 0; row < table->rowCount(); ++row) {
             tableColumnWidths[col] = qMax(tableColumnWidths[col],
-                table->data(table->index(row, col)).toString().length());
+                table->data(table->index(row, col)).toString().size());
         }
     }
 
     // write the header and separator
     for (int col = 0; col < table->columnCount(); ++col) {
         QString s = table->headerData(col, Qt::Horizontal).toString();
-        m_stream << "|" << s << QString(tableColumnWidths[col] - s.length(), Space);
+        m_stream << "|" << s << QString(tableColumnWidths[col] - s.size(), Space);
     }
     m_stream << "|" << Qt::endl;
-    for (int col = 0; col < tableColumnWidths.length(); ++col)
+    for (int col = 0; col < tableColumnWidths.size(); ++col)
         m_stream << '|' << QString(tableColumnWidths[col], u'-');
     m_stream << '|'<< Qt::endl;
 
@@ -68,7 +68,7 @@ void QTextMarkdownWriter::writeTable(const QAbstractItemModel *table)
     for (int row = 0; row < table->rowCount(); ++row) {
         for (int col = 0; col < table->columnCount(); ++col) {
             QString s = table->data(table->index(row, col)).toString();
-            m_stream << "|" << s << QString(tableColumnWidths[col] - s.length(), Space);
+            m_stream << "|" << s << QString(tableColumnWidths[col] - s.size(), Space);
         }
         m_stream << '|'<< Qt::endl;
     }
@@ -95,7 +95,7 @@ void QTextMarkdownWriter::writeFrame(const QTextFrame *frame)
                 while (it != cell.end()) {
                     QTextBlock block = it.currentBlock();
                     if (block.isValid())
-                        cellTextLen += block.text().length();
+                        cellTextLen += block.text().size();
                     ++it;
                 }
                 if (cell.columnSpan() == 1 && tableColumnWidths[col] < cellTextLen)
@@ -131,7 +131,7 @@ void QTextMarkdownWriter::writeFrame(const QTextFrame *frame)
                 if (tableRow < cell.row()) {
                     if (tableRow == 0) {
                         m_stream << Newline;
-                        for (int col = 0; col < tableColumnWidths.length(); ++col)
+                        for (int col = 0; col < tableColumnWidths.size(); ++col)
                             m_stream << '|' << QString(tableColumnWidths[col], u'-');
                         m_stream << '|';
                     }
@@ -213,7 +213,7 @@ QTextMarkdownWriter::ListInfo QTextMarkdownWriter::listInfo(QTextList *list)
 
 static int nearestWordWrapIndex(const QString &s, int before)
 {
-    before = qMin(before, s.length());
+    before = qMin(before, s.size());
     int fragBegin = qMax(before - 15, 0);
     if (lcMDW().isDebugEnabled()) {
         QString frag = s.mid(fragBegin, 30);
@@ -232,7 +232,7 @@ static int nearestWordWrapIndex(const QString &s, int before)
 
 static int adjacentBackticksCount(const QString &s)
 {
-    int start = -1, len = s.length();
+    int start = -1, len = s.size();
     int ret = 0;
     for (int i = 0; i < len; ++i) {
         if (s.at(i) == Backtick) {
@@ -334,7 +334,7 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
     QTextBlockFormat blockFmt = block.blockFormat();
     bool missedBlankCodeBlockLine = false;
     const bool codeBlock = blockFmt.hasProperty(QTextFormat::BlockCodeFence) ||
-            blockFmt.stringProperty(QTextFormat::BlockCodeLanguage).length() > 0 ||
+            blockFmt.stringProperty(QTextFormat::BlockCodeLanguage).size() > 0 ||
             blockFmt.nonBreakableLines();
     if (m_fencedCodeBlock && !codeBlock) {
         m_stream << m_linePrefix << m_codeBlockFence << Newline;
@@ -391,7 +391,7 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
             if (suffix.isEmpty())
                 suffix = QString(Period);
             QString numberStr = QString::number(number) + suffix + Space;
-            if (numberStr.length() == 3)
+            if (numberStr.size() == 3)
                 numberStr += Space;
             prefix += numberStr;
         } else {
@@ -444,7 +444,7 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
     // It would be convenient if QTextStream had a lineCharPos() accessor,
     // to keep track of how many characters (not bytes) have been written on the current line,
     // but it doesn't.  So we have to keep track with this col variable.
-    int col = wrapIndentString.length();
+    int col = wrapIndentString.size();
     bool mono = false;
     bool startsOrEndsWithBacktick = false;
     bool bold = false;
@@ -477,12 +477,12 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
             if (!title.isEmpty())
                 s += Space + DoubleQuote + title + DoubleQuote;
             s += u')';
-            if (wrap && col + s.length() > ColumnLimit) {
+            if (wrap && col + s.size() > ColumnLimit) {
                 m_stream << Newline << wrapIndentString;
                 col = m_wrappedLineIndent;
             }
             m_stream << s;
-            col += s.length();
+            col += s.size();
         } else if (fmt.hasProperty(QTextFormat::AnchorHref)) {
             const auto href = fmt.property(QTextFormat::AnchorHref).toString();
             const bool hasToolTip = fmt.hasProperty(QTextFormat::TextToolTip);
@@ -497,12 +497,12 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
                 }
                 s += u')';
             }
-            if (wrap && col + s.length() > ColumnLimit) {
+            if (wrap && col + s.size() > ColumnLimit) {
                 m_stream << Newline << wrapIndentString;
                 col = m_wrappedLineIndent;
             }
             m_stream << s;
-            col += s.length();
+            col += s.size();
         } else {
             QFontInfo fontInfo(fmt.font());
             bool monoFrag = fontInfo.fixedPitch() || fmt.fontFixedPitch();
@@ -538,9 +538,9 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
                     }
                 }
             }
-            if (wrap && col + markers.length() * 2 + fragmentText.length() > ColumnLimit) {
+            if (wrap && col + markers.size() * 2 + fragmentText.size() > ColumnLimit) {
                 int i = 0;
-                const int fragLen = fragmentText.length();
+                const int fragLen = fragmentText.size();
                 bool breakingLine = false;
                 while (i < fragLen) {
                     if (col >= ColumnLimit) {
@@ -565,7 +565,7 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
                     QString subfrag = fragmentText.mid(i, j - i);
                     if (!i) {
                         m_stream << markers;
-                        col += markers.length();
+                        col += markers.size();
                     }
                     if (col == m_wrappedLineIndent)
                         maybeEscapeFirstChar(subfrag);
@@ -574,13 +574,13 @@ int QTextMarkdownWriter::writeBlock(const QTextBlock &block, bool wrap, bool ign
                         m_stream << Newline << wrapIndentString;
                         col = m_wrappedLineIndent;
                     } else {
-                        col += subfrag.length();
+                        col += subfrag.size();
                     }
                     i = j + 1;
                 }
             } else {
                 m_stream << markers << fragmentText;
-                col += markers.length() + fragmentText.length();
+                col += markers.size() + fragmentText.size();
             }
         }
     }
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index af1015883a..546859037c 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -262,17 +262,17 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
         const int listLevel = block.textList()->format().indent();
         if (m_listStack.isEmpty() || m_listStack.top() != block.textList()) {
             // not the same list we were in.
-            while (m_listStack.count() >= listLevel && !m_listStack.isEmpty() && m_listStack.top() != block.textList() ) { // we need to close tags
+            while (m_listStack.size() >= listLevel && !m_listStack.isEmpty() && m_listStack.top() != block.textList() ) { // we need to close tags
                 m_listStack.pop();
                 writer.writeEndElement(); // list
-                if (m_listStack.count())
+                if (m_listStack.size())
                     writer.writeEndElement(); // list-item
             }
-            while (m_listStack.count() < listLevel) {
-                if (m_listStack.count())
+            while (m_listStack.size() < listLevel) {
+                if (m_listStack.size())
                     writer.writeStartElement(textNS, QString::fromLatin1("list-item"));
                 writer.writeStartElement(textNS, QString::fromLatin1("list"));
-                if (m_listStack.count() == listLevel - 1) {
+                if (m_listStack.size() == listLevel - 1) {
                     m_listStack.push(block.textList());
                     writer.writeAttribute(textNS, QString::fromLatin1("style-name"), QString::fromLatin1("L%1")
                             .arg(block.textList()->formatIndex()));
@@ -288,7 +288,7 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
         while (! m_listStack.isEmpty()) {
             m_listStack.pop();
             writer.writeEndElement(); // list
-            if (m_listStack.count())
+            if (m_listStack.size())
                 writer.writeEndElement(); // list-item
         }
     }
@@ -315,7 +315,7 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
         writer.writeStartElement(textNS, QString::fromLatin1("span"));
 
         QString fragmentText = frag.fragment().text();
-        if (fragmentText.length() == 1 && fragmentText[0] == u'\xFFFC') { // its an inline character.
+        if (fragmentText.size() == 1 && fragmentText[0] == u'\xFFFC') { // its an inline character.
             writeInlineCharacter(writer, frag.fragment());
             writer.writeEndElement(); // span
             continue;
@@ -326,8 +326,8 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
         bool escapeNextSpace = true;
         int precedingSpaces = 0;
         int exportedIndex = 0;
-        for (int i=0; i <= fragmentText.length(); ++i) {
-            QChar character = (i == fragmentText.length() ? QChar() : fragmentText.at(i));
+        for (int i=0; i <= fragmentText.size(); ++i) {
+            QChar character = (i == fragmentText.size() ? QChar() : fragmentText.at(i));
             bool isSpace = character.unicode() == ' ';
 
             // find more than one space. -> <text:s text:c="2" />
@@ -343,7 +343,7 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
                 exportedIndex = i;
             }
 
-            if (i < fragmentText.length()) {
+            if (i < fragmentText.size()) {
                 if (character.unicode() == 0x2028) { // soft-return
                     //if (exportedIndex < i)
                     writer.writeCharacters(fragmentText.mid(exportedIndex, i - exportedIndex));
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index c5d4874132..3e5b5bc000 100644
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -109,7 +109,7 @@ void QTextOption::setTabArray(const QList<qreal> &tabStops)
         d = new QTextOptionPrivate;
     QList<QTextOption::Tab> tabs;
     QTextOption::Tab tab;
-    tabs.reserve(tabStops.count());
+    tabs.reserve(tabStops.size());
     for (qreal pos : tabStops) {
         tab.position = pos;
         tabs.append(tab);
@@ -142,7 +142,7 @@ QList<qreal> QTextOption::tabArray() const
     if (!d)
         return answer;
 
-    answer.reserve(d->tabStops.count());
+    answer.reserve(d->tabStops.size());
     QList<QTextOption::Tab>::ConstIterator iter = d->tabStops.constBegin();
     while(iter != d->tabStops.constEnd()) {
         answer.append( (*iter).position);
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 7728abccb7..64b7aa6765 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -939,7 +939,7 @@ void QTextTable::removeColumns(int pos, int num)
     QTextTableFormat tfmt = format();
     tfmt.setColumns(tfmt.columns()-num);
     QList<QTextLength> columnWidths = tfmt.columnWidthConstraints();
-    if (columnWidths.count() > pos) {
+    if (columnWidths.size() > pos) {
         columnWidths.remove(pos, num);
         tfmt.setColumnWidthConstraints (columnWidths);
     }
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
index a3ef172902..7fd96363df 100644
--- a/src/gui/text/qzip.cpp
+++ b/src/gui/text/qzip.cpp
@@ -589,19 +589,19 @@ void QZipReaderPrivate::scanFiles()
 
         int l = readUShort(header.h.file_name_length);
         header.file_name = device->read(l);
-        if (header.file_name.length() != l) {
+        if (header.file_name.size() != l) {
             qWarning("QZip: Failed to read filename from zip index, index may be incomplete");
             break;
         }
         l = readUShort(header.h.extra_field_length);
         header.extra_field = device->read(l);
-        if (header.extra_field.length() != l) {
+        if (header.extra_field.size() != l) {
             qWarning("QZip: Failed to read extra field in zip file, skipping file, index may be incomplete");
             break;
         }
         l = readUShort(header.h.file_comment_length);
         header.file_comment = device->read(l);
-        if (header.file_comment.length() != l) {
+        if (header.file_comment.size() != l) {
             qWarning("QZip: Failed to read read file comment, index may be incomplete");
             break;
         }
@@ -630,7 +630,7 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const
     // don't compress small files
     QZipWriter::CompressionPolicy compression = compressionPolicy;
     if (compressionPolicy == QZipWriter::AutoCompress) {
-        if (contents.length() < 64)
+        if (contents.size() < 64)
             compression = QZipWriter::NeverCompress;
         else
             compression = QZipWriter::AlwaysCompress;
@@ -641,19 +641,19 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const
     writeUInt(header.h.signature, 0x02014b50);
 
     writeUShort(header.h.version_needed, ZIP_VERSION);
-    writeUInt(header.h.uncompressed_size, contents.length());
+    writeUInt(header.h.uncompressed_size, contents.size());
     writeMSDosDate(header.h.last_mod_file, QDateTime::currentDateTime());
     QByteArray data = contents;
     if (compression == QZipWriter::AlwaysCompress) {
         writeUShort(header.h.compression_method, CompressionMethodDeflated);
 
-       ulong len = contents.length();
+       ulong len = contents.size();
         // shamelessly copied form zlib
         len += (len >> 12) + (len >> 14) + 11;
         int res;
         do {
             data.resize(len);
-            res = deflate((uchar*)data.data(), &len, (const uchar*)contents.constData(), contents.length());
+            res = deflate((uchar*)data.data(), &len, (const uchar*)contents.constData(), contents.size());
 
             switch (res) {
             case Z_OK:
@@ -670,9 +670,9 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const
         } while (res == Z_BUF_ERROR);
     }
 // TODO add a check if data.length() > contents.length().  Then try to store the original and revert the compression method to be uncompressed
-    writeUInt(header.h.compressed_size, data.length());
+    writeUInt(header.h.compressed_size, data.size());
     uint crc_32 = ::crc32(0, nullptr, 0);
-    crc_32 = ::crc32(crc_32, (const uchar *)contents.constData(), contents.length());
+    crc_32 = ::crc32(crc_32, (const uchar *)contents.constData(), contents.size());
     writeUInt(header.h.crc_32, crc_32);
 
     // if bit 11 is set, the filename and comment fields must be encoded using UTF-8
@@ -689,7 +689,7 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const
         qWarning("QZip: File comment is too long, chopping it to 65535 bytes");
         header.file_comment.truncate(0xffff - header.file_name.size()); // ### don't break the utf-8 sequence, if any
     }
-    writeUShort(header.h.file_name_length, header.file_name.length());
+    writeUShort(header.h.file_name_length, header.file_name.size());
     //h.extra_field_length[2];
 
     writeUShort(header.h.version_made, HostUnix << 8);
@@ -878,7 +878,7 @@ QList<QZipReader::FileInfo> QZipReader::fileInfoList() const
 int QZipReader::count() const
 {
     d->scanFiles();
-    return d->fileHeaders.count();
+    return d->fileHeaders.size();
 }
 
 /*!
@@ -891,7 +891,7 @@ int QZipReader::count() const
 QZipReader::FileInfo QZipReader::entryInfoAt(int index) const
 {
     d->scanFiles();
-    if (index >= 0 && index < d->fileHeaders.count())
+    if (index >= 0 && index < d->fileHeaders.size())
         return d->fillFileInfo(index);
     return QZipReader::FileInfo();
 }
@@ -1340,7 +1340,7 @@ void QZipWriter::close()
     writeUShort(eod.num_dir_entries, d->fileHeaders.size());
     writeUInt(eod.directory_size, dir_size);
     writeUInt(eod.dir_start_offset, d->start_of_directory);
-    writeUShort(eod.comment_length, d->comment.length());
+    writeUShort(eod.comment_length, d->comment.size());
 
     d->device->write((const char *)&eod, sizeof(EndOfDirectory));
     d->device->write(d->comment);