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

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

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

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

Change-Id: I95f6410e57a6a92b1cf91bbedfbe3d517cab6b44
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

24 files changed, 65 insertions, 65 deletions

diff --git a/src/assistant/assistant/bookmarkitem.cpp b/src/assistant/assistant/bookmarkitem.cpp
index 96f0fc3b4..57c5fbeb8 100644
--- a/src/assistant/assistant/bookmarkitem.cpp
+++ b/src/assistant/assistant/bookmarkitem.cpp
@@ -41,14 +41,14 @@ BookmarkItem::addChild(BookmarkItem *child)
 BookmarkItem*
 BookmarkItem::child(int number) const
 {
-    if (number >= 0 && number < m_children.count())
+    if (number >= 0 && number < m_children.size())
         return m_children[number];
     return nullptr;
 }
 
 int BookmarkItem::childCount() const
 {
-    return m_children.count();
+    return m_children.size();
 }
 
 int BookmarkItem::childNumber() const
diff --git a/src/assistant/assistant/bookmarkmanagerwidget.cpp b/src/assistant/assistant/bookmarkmanagerwidget.cpp
index f5ed6cdf7..a869bb1b6 100644
--- a/src/assistant/assistant/bookmarkmanagerwidget.cpp
+++ b/src/assistant/assistant/bookmarkmanagerwidget.cpp
@@ -104,7 +104,7 @@ void BookmarkManagerWidget::selectNextIndex(bool direction) const
 {
     QModelIndex current = ui.treeView->currentIndex();
     if (current.isValid() && !cache.isEmpty()) {
-        current = cache.at(nextIndex(cache.indexOf(current), cache.count(),
+        current = cache.at(nextIndex(cache.indexOf(current), cache.size(),
             direction));
     }
     ui.treeView->setCurrentIndex(current);
diff --git a/src/assistant/assistant/bookmarkmodel.cpp b/src/assistant/assistant/bookmarkmodel.cpp
index 7f0ae5f3d..5dcc08fbf 100644
--- a/src/assistant/assistant/bookmarkmodel.cpp
+++ b/src/assistant/assistant/bookmarkmodel.cpp
@@ -77,7 +77,7 @@ BookmarkModel::setBookmarks(const QByteArray &bookmarks)
     QString name, url;
     while (!stream.atEnd()) {
         stream >> depth >> name >> url >> expanded;
-        while ((parents.count() - 1) != depth)
+        while ((parents.size() - 1) != depth)
             parents.pop();
 
         BookmarkItem *item = new BookmarkItem(DataVector() << name << url << expanded);
diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index f9c166eca..9f55515ed 100644
--- a/src/assistant/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -519,7 +519,7 @@ void CentralWidget::highlightSearchTerms()
     const QString searchInput = searchEngine->searchInput();
     const bool wholePhrase = searchInput.startsWith(QLatin1Char('"')) &&
                              searchInput.endsWith(QLatin1Char('"'));
-    const QStringList &words = wholePhrase ? QStringList(searchInput.mid(1, searchInput.length() - 2)) :
+    const QStringList &words = wholePhrase ? QStringList(searchInput.mid(1, searchInput.size() - 2)) :
                                 searchInput.split(QRegularExpression("\\W+"), Qt::SkipEmptyParts);
     HelpViewer *viewer = currentHelpViewer();
     for (const QString &word : words)
diff --git a/src/assistant/assistant/cmdlineparser.cpp b/src/assistant/assistant/cmdlineparser.cpp
index 44e5fd9c1..e0be70fe9 100644
--- a/src/assistant/assistant/cmdlineparser.cpp
+++ b/src/assistant/assistant/cmdlineparser.cpp
@@ -56,7 +56,7 @@ CmdLineParser::CmdLineParser(const QStringList &arguments)
     m_quiet(false)
 {
     TRACE_OBJ
-    for (int i = 1; i < arguments.count(); ++i) {
+    for (int i = 1; i < arguments.size(); ++i) {
         const QString &arg = arguments.at(i);
         if (arg.toLower() == "-quiet")
             m_quiet = true;
@@ -113,7 +113,7 @@ CmdLineParser::Result CmdLineParser::parse()
 bool CmdLineParser::hasMoreArgs() const
 {
     TRACE_OBJ
-    return m_pos < m_arguments.count();
+    return m_pos < m_arguments.size();
 }
 
 const QString &CmdLineParser::nextArg()
diff --git a/src/assistant/assistant/helpbrowsersupport.cpp b/src/assistant/assistant/helpbrowsersupport.cpp
index 1c3b661c8..2109f906c 100644
--- a/src/assistant/assistant/helpbrowsersupport.cpp
+++ b/src/assistant/assistant/helpbrowsersupport.cpp
@@ -71,7 +71,7 @@ public:
     void abort() override;
 
     qint64 bytesAvailable() const override
-        { return data.length() + QNetworkReply::bytesAvailable(); }
+        { return data.size() + QNetworkReply::bytesAvailable(); }
 
 protected:
     qint64 readData(char *data, qint64 maxlen) override;
@@ -83,7 +83,7 @@ private:
 
 HelpNetworkReply::HelpNetworkReply(const QNetworkRequest &request,
         const QByteArray &fileData, const QString& mimeType)
-    : data(fileData), origLen(fileData.length())
+    : data(fileData), origLen(fileData.size())
 {
     TRACE_OBJ
     setRequest(request);
@@ -105,12 +105,12 @@ void HelpNetworkReply::abort()
 qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
 {
     TRACE_OBJ
-    qint64 len = qMin(qint64(data.length()), maxlen);
+    qint64 len = qMin(qint64(data.size()), maxlen);
     if (len) {
         memcpy(buffer, data.constData(), len);
         data.remove(0, len);
     }
-    if (!data.length())
+    if (!data.size())
         QTimer::singleShot(0, this, &QNetworkReply::finished);
     return len;
 }
diff --git a/src/assistant/assistant/helpenginewrapper.cpp b/src/assistant/assistant/helpenginewrapper.cpp
index 64ff6d7a9..5c9e5044e 100644
--- a/src/assistant/assistant/helpenginewrapper.cpp
+++ b/src/assistant/assistant/helpenginewrapper.cpp
@@ -697,8 +697,8 @@ void HelpEngineWrapperPrivate::qchFileChanged(const QString &fileName)
 void HelpEngineWrapperPrivate::checkDocFilesWatched()
 {
     TRACE_OBJ
-    const int watchedFilesCount = m_qchWatcher->files().count();
-    const int docFilesCount = m_helpEngine->registeredDocumentations().count();
+    const int watchedFilesCount = m_qchWatcher->files().size();
+    const int docFilesCount = m_helpEngine->registeredDocumentations().size();
     if (watchedFilesCount != docFilesCount) {
         qWarning("Strange: Have %d docs, but %d are being watched",
                  watchedFilesCount, docFilesCount);
diff --git a/src/assistant/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp
index b889c0508..db2b3b922 100644
--- a/src/assistant/assistant/indexwindow.cpp
+++ b/src/assistant/assistant/indexwindow.cpp
@@ -178,7 +178,7 @@ void IndexWindow::open(QHelpIndexWidget* indexWidget, const QModelIndex &index)
         const QList<QHelpLink> docs = model->helpEngine()->documentsForKeyword(keyword);
 
         QUrl url;
-        if (docs.count() > 1) {
+        if (docs.size() > 1) {
             TopicChooser tc(this, keyword, docs);
             if (tc.exec() == QDialog::Accepted)
                 url = tc.link();
diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index 5f253c15f..b104d759a 100644
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -43,10 +43,10 @@ updateLastPagesOnUnregister(QHelpEngineCore& helpEngine, const QString& nsName)
     QStringList currentPages = CollectionConfiguration::lastShownPages(helpEngine);
     if (!currentPages.isEmpty()) {
         QStringList zoomList = CollectionConfiguration::lastZoomFactors(helpEngine);
-        while (zoomList.count() < currentPages.count())
+        while (zoomList.size() < currentPages.size())
             zoomList.append(CollectionConfiguration::DefaultZoomFactor);
 
-        for (int i = currentPages.count(); --i >= 0;) {
+        for (int i = currentPages.size(); --i >= 0;) {
             if (QUrl(currentPages.at(i)).host() == nsName) {
                 zoomList.removeAt(i);
                 currentPages.removeAt(i);
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index c73edec06..a6fbe8136 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -398,7 +398,7 @@ void MainWindow::lookForNewQtDocumentation()
             this, &MainWindow::resetQtDocInfo);
     connect(m_qtDocInstaller, &QtDocInstaller::registerDocumentation,
             this, &MainWindow::registerDocumentation);
-    if (helpEngine.qtDocInfo(QLatin1String("qt")).count() != 2)
+    if (helpEngine.qtDocInfo(QLatin1String("qt")).size() != 2)
         statusBar()->showMessage(tr("Looking for Qt Documentation..."));
     m_qtDocInstaller->installDocs();
 }
diff --git a/src/assistant/assistant/openpagesmanager.cpp b/src/assistant/assistant/openpagesmanager.cpp
index 3e42f4bb0..65f37b19c 100644
--- a/src/assistant/assistant/openpagesmanager.cpp
+++ b/src/assistant/assistant/openpagesmanager.cpp
@@ -92,7 +92,7 @@ void OpenPagesManager::setupInitialPages(bool defaultCollection,
         break;
     case ShowLastPages: {
         const QStringList &lastShownPageList = helpEngine.lastShownPages();
-        const int pageCount = lastShownPageList.count();
+        const int pageCount = lastShownPageList.size();
         if (pageCount == 0) {
             if (defaultCollection)
                 m_helpPageViewer = m_model->addPage(QUrl(QLatin1String("help")));
@@ -100,7 +100,7 @@ void OpenPagesManager::setupInitialPages(bool defaultCollection,
                 m_model->addPage(QUrl(QLatin1String("about:blank")));
         } else {
             QStringList zoomFactors = helpEngine.lastZoomFactors();
-            while (zoomFactors.count() < pageCount)
+            while (zoomFactors.size() < pageCount)
                 zoomFactors.append(CollectionConfiguration::DefaultZoomFactor);
             initialPage = helpEngine.lastTabPage();
             if (initialPage >= pageCount) {
diff --git a/src/assistant/assistant/openpagesmodel.cpp b/src/assistant/assistant/openpagesmodel.cpp
index cb1779ab6..edc03d736 100644
--- a/src/assistant/assistant/openpagesmodel.cpp
+++ b/src/assistant/assistant/openpagesmodel.cpp
@@ -19,7 +19,7 @@ OpenPagesModel::OpenPagesModel(QObject *parent) : QAbstractTableModel(parent)
 int OpenPagesModel::rowCount(const QModelIndex &parent) const
 {
     TRACE_OBJ
-    return  parent.isValid() ? 0 : m_pages.count();
+    return  parent.isValid() ? 0 : m_pages.size();
 }
 
 int OpenPagesModel::columnCount(const QModelIndex &/*parent*/) const
diff --git a/src/assistant/assistant/qtdocinstaller.cpp b/src/assistant/assistant/qtdocinstaller.cpp
index d64d849e5..6b49a44db 100644
--- a/src/assistant/assistant/qtdocinstaller.cpp
+++ b/src/assistant/assistant/qtdocinstaller.cpp
@@ -64,7 +64,7 @@ bool QtDocInstaller::installDoc(const DocInfo &docInfo)
         dt = QDateTime::fromString(info.first(), Qt::ISODate);
 
     QString qchFile;
-    if (info.count() == 2)
+    if (info.size() == 2)
         qchFile = info.last();
 
     if (m_qchFiles.isEmpty()) {
diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp
index 5c8fedea6..3c6f52b29 100644
--- a/src/assistant/help/qhelpcollectionhandler.cpp
+++ b/src/assistant/help/qhelpcollectionhandler.cpp
@@ -168,7 +168,7 @@ bool QHelpCollectionHandler::openCollectionFile()
 
     m_query->exec(queryString);
     m_query->next();
-    if (m_query->value(0).toInt() != newTables.count()) {
+    if (m_query->value(0).toInt() != newTables.size()) {
         if (!recreateIndexAndNamespaceFilterTables(m_query)) {
             emit error(tr("Cannot create index tables in file %1.").arg(collectionFile()));
             return false;
@@ -958,7 +958,7 @@ static QHelpCollectionHandler::FileInfo extractFileInfo(const QUrl &url)
     if (fileInfo.fileName.startsWith(QLatin1Char('/')))
         fileInfo.fileName = fileInfo.fileName.mid(1);
     fileInfo.folderName = fileInfo.fileName.mid(0, fileInfo.fileName.indexOf(QLatin1Char('/'), 1));
-    fileInfo.fileName.remove(0, fileInfo.folderName.length() + 1);
+    fileInfo.fileName.remove(0, fileInfo.folderName.size() + 1);
 
     return fileInfo;
 }
@@ -1101,8 +1101,8 @@ static QString prepareFilterQuery(int attributesCount,
 void bindFilterQuery(QSqlQuery *query, int startingBindPos, const QStringList &filterAttributes)
 {
     for (int i = 0; i < 2; ++i) {
-        for (int j = 0; j < filterAttributes.count(); j++) {
-            query->bindValue(i * filterAttributes.count() + j + startingBindPos,
+        for (int j = 0; j < filterAttributes.size(); j++) {
+            query->bindValue(i * filterAttributes.size() + j + startingBindPos,
                              filterAttributes.at(j));
         }
     }
@@ -1131,7 +1131,7 @@ QString QHelpCollectionHandler::namespaceForFile(const QUrl &url,
                 "AND FolderTable.NamespaceId = NamespaceTable.Id");
 
     const QString filterQuery = filterlessQuery
-            + prepareFilterQuery(filterAttributes.count(),
+            + prepareFilterQuery(filterAttributes.size(),
                                  QLatin1String("FileNameTable"),
                                  QLatin1String("FileId"),
                                  QLatin1String("FileFilterTable"),
@@ -1244,7 +1244,7 @@ QStringList QHelpCollectionHandler::files(const QString &namespaceName,
                 "AND NamespaceTable.Name = ?") + extensionQuery;
 
     const QString filterQuery = filterlessQuery
-            + prepareFilterQuery(filterAttributes.count(),
+            + prepareFilterQuery(filterAttributes.size(),
                                  QLatin1String("FileNameTable"),
                                  QLatin1String("FileId"),
                                  QLatin1String("FileFilterTable"),
@@ -1389,7 +1389,7 @@ QStringList QHelpCollectionHandler::indicesForFilter(const QStringList &filterAt
                 "AND IndexTable.NamespaceId = NamespaceTable.Id");
 
     const QString filterQuery = filterlessQuery
-            + prepareFilterQuery(filterAttributes.count(),
+            + prepareFilterQuery(filterAttributes.size(),
                                  QLatin1String("IndexTable"),
                                  QLatin1String("Id"),
                                  QLatin1String("IndexFilterTable"),
@@ -1483,7 +1483,7 @@ QList<QHelpCollectionHandler::ContentsData> QHelpCollectionHandler::contentsForF
                 "AND VersionTable.NamespaceId = NamespaceTable.Id");
 
     const QString filterQuery = filterlessQuery
-            + prepareFilterQuery(filterAttributes.count(),
+            + prepareFilterQuery(filterAttributes.size(),
                                  QLatin1String("ContentsTable"),
                                  QLatin1String("Id"),
                                  QLatin1String("ContentsFilterTable"),
@@ -2010,7 +2010,7 @@ bool QHelpCollectionHandler::registerIndexTable(const QHelpDBReader::IndexTable
         const int attributeId = m_query->value(0).toInt();
 
         QVariantList attributeIds;
-        for (int i = 0; i < it.value().count(); i++)
+        for (int i = 0; i < it.value().size(); i++)
             attributeIds.append(attributeId);
 
         m_query->prepare(QLatin1String("INSERT INTO FileFilterTable VALUES(?, ?)"));
@@ -2072,7 +2072,7 @@ bool QHelpCollectionHandler::registerIndexTable(const QHelpDBReader::IndexTable
         const int attributeId = m_query->value(0).toInt();
 
         QVariantList attributeIds;
-        for (int i = 0; i < it.value().count(); i++)
+        for (int i = 0; i < it.value().size(); i++)
             attributeIds.append(attributeId);
 
         m_query->prepare(QLatin1String("INSERT INTO IndexFilterTable VALUES(?, ?)"));
@@ -2124,7 +2124,7 @@ bool QHelpCollectionHandler::registerIndexTable(const QHelpDBReader::IndexTable
         const int attributeId = m_query->value(0).toInt();
 
         QVariantList attributeIds;
-        for (int i = 0; i < it.value().count(); i++)
+        for (int i = 0; i < it.value().size(); i++)
             attributeIds.append(attributeId);
 
         m_query->prepare(QLatin1String("INSERT INTO ContentsFilterTable VALUES(?, ?)"));
@@ -2343,7 +2343,7 @@ QList<QHelpLink> QHelpCollectionHandler::documentsForField(
                 "AND IndexTable.%1 = ?").arg(fieldName);
 
     const QString filterQuery = filterlessQuery
-            + prepareFilterQuery(filterAttributes.count(),
+            + prepareFilterQuery(filterAttributes.size(),
                                  QLatin1String("IndexTable"),
                                  QLatin1String("Id"),
                                  QLatin1String("IndexFilterTable"),
diff --git a/src/assistant/help/qhelpcontentwidget.cpp b/src/assistant/help/qhelpcontentwidget.cpp
index bb1bdd2bd..18be2778b 100644
--- a/src/assistant/help/qhelpcontentwidget.cpp
+++ b/src/assistant/help/qhelpcontentwidget.cpp
@@ -100,7 +100,7 @@ QHelpContentItem *QHelpContentItem::child(int row) const
 */
 int QHelpContentItem::childCount() const
 {
-    return d->childItems.count();
+    return d->childItems.size();
 }
 
 /*!
diff --git a/src/assistant/help/qhelpdbreader.cpp b/src/assistant/help/qhelpdbreader.cpp
index da77fe799..bf42bbae7 100644
--- a/src/assistant/help/qhelpdbreader.cpp
+++ b/src/assistant/help/qhelpdbreader.cpp
@@ -207,7 +207,7 @@ QHelpDBReader::IndexTable QHelpDBReader::indexTable() const
             ? QLatin1String("ContextName")
             : QLatin1String("Identifier");
 
-    const int usedAttributeCount = usedAttributeIds.count();
+    const int usedAttributeCount = usedAttributeIds.size();
 
     QMap<int, IndexItem> idToIndexItem;
 
@@ -273,13 +273,13 @@ QHelpDBReader::IndexTable QHelpDBReader::indexTable() const
 
         const bool mayOptimizeIndexTable
                 = filterDataCount(m_query, QLatin1String("IndexFilterTable"))
-                == idToIndexItem.count() * usedAttributeCount;
+                == idToIndexItem.size() * usedAttributeCount;
         const bool mayOptimizeFileTable
                 = filterDataCount(m_query, QLatin1String("FileFilterTable"))
-                == idToFileItem.count() * usedAttributeCount;
+                == idToFileItem.size() * usedAttributeCount;
         const bool mayOptimizeContentsTable
                 = filterDataCount(m_query, QLatin1String("ContentsFilterTable"))
-                == idToContentsItem.count() * usedAttributeCount;
+                == idToContentsItem.size() * usedAttributeCount;
         optimized = mayOptimizeIndexTable && mayOptimizeFileTable && mayOptimizeContentsTable;
 
         if (!optimized) {
@@ -471,7 +471,7 @@ QMultiMap<QString, QByteArray> QHelpDBReader::filesData(const QStringList &filte
                                       "AND FileNameTable.FolderId = FolderTable.Id %1"))
             .arg(extension);
     } else {
-        for (int i = 0; i < filterAttributes.count(); ++i) {
+        for (int i = 0; i < filterAttributes.size(); ++i) {
             if (i > 0)
                 query.append(QLatin1String(" INTERSECT "));
             query.append(QString(QLatin1String(
diff --git a/src/assistant/help/qhelpindexwidget.cpp b/src/assistant/help/qhelpindexwidget.cpp
index abce833e8..3023298af 100644
--- a/src/assistant/help/qhelpindexwidget.cpp
+++ b/src/assistant/help/qhelpindexwidget.cpp
@@ -226,12 +226,12 @@ QModelIndex QHelpIndexModel::filter(const QString &filter, const QString &wildca
                 lst.append(index);
                 if (perfectMatch == -1 && index.startsWith(filter, Qt::CaseInsensitive)) {
                     if (goodMatch == -1)
-                        goodMatch = lst.count() - 1;
-                    if (filter.length() == index.length()){
-                        perfectMatch = lst.count() - 1;
+                        goodMatch = lst.size() - 1;
+                    if (filter.size() == index.size()){
+                        perfectMatch = lst.size() - 1;
                     }
                 } else if (perfectMatch > -1 && index == filter) {
-                    perfectMatch = lst.count() - 1;
+                    perfectMatch = lst.size() - 1;
                 }
             }
         }
@@ -241,12 +241,12 @@ QModelIndex QHelpIndexModel::filter(const QString &filter, const QString &wildca
                 lst.append(index);
                 if (perfectMatch == -1 && index.startsWith(filter, Qt::CaseInsensitive)) {
                     if (goodMatch == -1)
-                        goodMatch = lst.count() - 1;
-                    if (filter.length() == index.length()){
-                        perfectMatch = lst.count() - 1;
+                        goodMatch = lst.size() - 1;
+                    if (filter.size() == index.size()){
+                        perfectMatch = lst.size() - 1;
                     }
                 } else if (perfectMatch > -1 && index == filter) {
-                    perfectMatch = lst.count() - 1;
+                    perfectMatch = lst.size() - 1;
                 }
             }
         }
@@ -327,7 +327,7 @@ void QHelpIndexWidget::showLink(const QModelIndex &index)
     const QString name = v.isValid() ? v.toString() : QString();
 
     const QList<QHelpLink> &docs = indexModel->helpEngine()->documentsForKeyword(name);
-    if (docs.count() > 1) {
+    if (docs.size() > 1) {
         emit documentsActivated(docs, name);
 #if QT_DEPRECATED_SINCE(5, 15)
         QT_WARNING_PUSH
diff --git a/src/assistant/help/qhelpsearchindexreader.cpp b/src/assistant/help/qhelpsearchindexreader.cpp
index 0c991934a..6a67f7569 100644
--- a/src/assistant/help/qhelpsearchindexreader.cpp
+++ b/src/assistant/help/qhelpsearchindexreader.cpp
@@ -37,7 +37,7 @@ void QHelpSearchIndexReader::search(const QString &collectionFile, const QString
 int QHelpSearchIndexReader::searchResultCount() const
 {
     QMutexLocker lock(&m_mutex);
-    return m_searchResults.count();
+    return m_searchResults.size();
 }
 
 QList<QHelpSearchResult> QHelpSearchIndexReader::searchResults(int start,
diff --git a/src/assistant/help/qhelpsearchindexreader_default.cpp b/src/assistant/help/qhelpsearchindexreader_default.cpp
index 22ef9589c..67fd3693a 100644
--- a/src/assistant/help/qhelpsearchindexreader_default.cpp
+++ b/src/assistant/help/qhelpsearchindexreader_default.cpp
@@ -83,7 +83,7 @@ static QString namespacePlaceholders(const QStringList &namespaceList)
 {
     QString placeholders;
     bool firstNS = true;
-    for (int i = namespaceList.count(); i; --i) {
+    for (int i = namespaceList.size(); i; --i) {
         if (firstNS)
             firstNS = false;
         else
@@ -242,7 +242,7 @@ void QHelpSearchIndexReaderDefault::run()
     m_searchResults = m_reader.searchResults();
     lock.unlock();
 
-    emit searchingFinished(m_searchResults.count());
+    emit searchingFinished(m_searchResults.size());
 }
 
 }   // namespace std
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index 1d3ba857f..4602d47bc 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -42,7 +42,7 @@ private:
 
         QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
         {
-            if (!index.isValid() || index.row() >= termList.count()||
+            if (!index.isValid() || index.row() >= termList.size()||
                 (role != Qt::EditRole && role != Qt::DisplayRole))
                 return QVariant();
             return termList.at(index.row());
@@ -100,7 +100,7 @@ private:
         // Otherwise, the respective button would be disabled.
         Q_ASSERT(m_queries.curQuery != maxOrMinIndex);
 
-        m_queries.curQuery = qBound(0, m_queries.curQuery + addend, m_queries.queries.count() - 1);
+        m_queries.curQuery = qBound(0, m_queries.curQuery + addend, m_queries.queries.size() - 1);
         const QString &query = m_queries.queries.at(m_queries.curQuery);
         m_lineEdit->setText(query);
 
diff --git a/src/assistant/help/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp
index 78456a844..246f8fee3 100644
--- a/src/assistant/help/qhelpsearchresultwidget.cpp
+++ b/src/assistant/help/qhelpsearchresultwidget.cpp
@@ -50,7 +50,7 @@ public:
         QTextStream str(&htmlFile);
         str << "<html><head><title>" << tr("Search Results") << "</title></head><body>";
 
-        const int count = results.count();
+        const int count = results.size();
         if (count != 0) {
             if (isIndexing) {
                 str << "<div style=\"text-align:left;"
diff --git a/src/assistant/help/qoptionswidget.cpp b/src/assistant/help/qoptionswidget.cpp
index 71e8cd435..01abbfdef 100644
--- a/src/assistant/help/qoptionswidget.cpp
+++ b/src/assistant/help/qoptionswidget.cpp
@@ -103,14 +103,14 @@ void QOptionsWidget::setOptions(const QStringList &validOptions,
     for (const QString &option : m_invalidOptions)
         appendItem(option, false, true);
 
-    if ((validSelectedOptions.count() + m_invalidOptions.count())
-            && validUnselectedOptions.count()) {
+    if ((validSelectedOptions.size() + m_invalidOptions.size())
+            && validUnselectedOptions.size()) {
         appendSeparator();
     }
 
     for (const QString &option : validUnselectedOptions) {
         appendItem(option, true, false);
-        if (option.isEmpty() && validUnselectedOptions.count() > 1) // special No Option item
+        if (option.isEmpty() && validUnselectedOptions.size() > 1) // special No Option item
             appendSeparator();
     }
 }
diff --git a/src/assistant/qhelpgenerator/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp
index 1a2ea6df0..7dd2ed2fe 100644
--- a/src/assistant/qhelpgenerator/helpgenerator.cpp
+++ b/src/assistant/qhelpgenerator/helpgenerator.cpp
@@ -157,7 +157,7 @@ bool HelpGeneratorPrivate::generate(QHelpProjectData *helpData,
     int i = 1;
     for (const QHelpDataFilterSection &fs : helpData->filterSections()) {
         emit statusChanged(tr("Insert help data for filter section (%1 of %2)...")
-            .arg(i++).arg(helpData->filterSections().count()));
+            .arg(i++).arg(helpData->filterSections().size()));
         insertFilterAttributes(fs.filterAttributes());
         QByteArray ba;
         QDataStream s(&ba, QIODevice::WriteOnly);
@@ -185,15 +185,15 @@ void HelpGeneratorPrivate::setupProgress(QHelpProjectData *helpData)
     int numberOfFiles = 0;
     int numberOfIndices = 0;
     for (const QHelpDataFilterSection &fs : helpData->filterSections()) {
-        numberOfFiles += fs.files().count();
-        numberOfIndices += fs.indices().count();
+        numberOfFiles += fs.files().size();
+        numberOfIndices += fs.indices().size();
     }
     // init      2%
     // filters   1%
     // contents 10%
     // files    60%
     // indices  27%
-    m_contentStep = 10.0 / qMax(helpData->customFilters().count(), 1);
+    m_contentStep = 10.0 / qMax(helpData->customFilters().size(), 1);
     m_fileStep = 60.0 / qMax(numberOfFiles, 1);
     m_indexStep = 27.0 / qMax(numberOfIndices, 1);
 }
@@ -668,7 +668,7 @@ bool HelpGeneratorPrivate::insertKeywords(const QList<QHelpDataIndexItem> &keywo
     m_query->exec(QLatin1String("COMMIT"));
 
     m_query->exec(QLatin1String("SELECT COUNT(Id) FROM IndexTable"));
-    if (m_query->next() && m_query->value(0).toInt() >= indices.count())
+    if (m_query->next() && m_query->value(0).toInt() >= indices.size())
         return true;
     return false;
 }
diff --git a/src/assistant/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp
index 0128d2898..cad0095c4 100644
--- a/src/assistant/qhelpgenerator/main.cpp
+++ b/src/assistant/qhelpgenerator/main.cpp
@@ -147,7 +147,7 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
         CollectionConfiguration::setApplicationIcon(helpEngine, icon.readAll());
     }
 
-    if (config.aboutMenuTexts().count()) {
+    if (config.aboutMenuTexts().size()) {
         QByteArray ba;
         QDataStream s(&ba, QIODevice::WriteOnly);
         const QMap<QString, QString> &aboutMenuTexts = config.aboutMenuTexts();
@@ -165,7 +165,7 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
         CollectionConfiguration::setAboutIcon(helpEngine, icon.readAll());
     }
 
-    if (config.aboutTextFiles().count()) {
+    if (config.aboutTextFiles().size()) {
         QByteArray ba;
         QDataStream s(&ba, QIODevice::WriteOnly);
         QMap<QString, QByteArray> imgData;
@@ -209,7 +209,7 @@ int generateCollectionFile(const QByteArray &data, const QString &basePath, cons
             }
         }
         CollectionConfiguration::setAboutTexts(helpEngine, ba);
-        if (imgData.count()) {
+        if (imgData.size()) {
             QByteArray imageData;
             QBuffer buffer(&imageData);
             buffer.open(QIODevice::WriteOnly);