STL compatibility: use size() instead of count()

This is a simple find and replace with manual sanity check.

Change-Id: Ia733befe7885dc3c643d5c84e151312bfd86a3c6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 21 insertions, 21 deletions

diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 4101f705d..90e3a1a81 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -130,7 +130,7 @@ ProjectData ProjectPrivate::projectData()
 
 static void addDependencies(QList<ResolvedProductPtr> &products)
 {
-    for (int i = 0; i < products.count(); ++i) {
+    for (int i = 0; i < products.size(); ++i) {
         const ResolvedProductPtr &product = products.at(i);
         for (const ResolvedProductPtr &dependency : qAsConst(product->dependencies)) {
             if (!products.contains(dependency))
@@ -317,7 +317,7 @@ void ProjectPrivate::setupInstallData(ArtifactData &artifact,
                 product->sourceDirectory, artifact.filePath(), artifact.properties().d->m_map,
                 options);
         if (!installRoot.isEmpty())
-            installFilePath.remove(0, installRoot.count());
+            installFilePath.remove(0, installRoot.size());
         artifact.d->installData.d->installFilePath = installFilePath;
     } catch (const ErrorInfo &e) {
         logger.printWarning(e);
@@ -335,7 +335,7 @@ void ProjectPrivate::addGroup(const ProductData &product, const QString &groupNa
     if (products.isEmpty())
         throw ErrorInfo(Tr::tr("Product '%1' does not exist.").arg(product.name()));
     const QList<ResolvedProductPtr> resolvedProducts = internalProducts(products);
-    QBS_CHECK(products.count() == resolvedProducts.count());
+    QBS_CHECK(products.size() == resolvedProducts.size());
 
     for (const GroupPtr &resolvedGroup : qAsConst(resolvedProducts.front()->groups)) {
         if (resolvedGroup->name == groupName) {
@@ -355,8 +355,8 @@ void ProjectPrivate::addGroup(const ProductData &product, const QString &groupNa
                                 groupInserter.lineOffset());
 
     products = findProductsByName(products.front().name()); // These are new objects.
-    QBS_CHECK(products.count() == resolvedProducts.count());
-    for (int i = 0; i < products.count(); ++i) {
+    QBS_CHECK(products.size() == resolvedProducts.size());
+    for (int i = 0; i < products.size(); ++i) {
         const GroupPtr resolvedGroup = ResolvedGroup::create();
         resolvedGroup->location = groupInserter.itemPosition();
         resolvedGroup->enabled = true;
@@ -396,9 +396,9 @@ ProjectPrivate::GroupUpdateContext ProjectPrivate::getGroupContext(const Product
         QBS_CHECK(p.isValid());
         context.groups << g;
     }
-    QBS_CHECK(context.resolvedProducts.count() == context.products.count());
-    QBS_CHECK(context.resolvedProducts.count() == context.resolvedGroups.count());
-    QBS_CHECK(context.products.count() == context.groups.count());
+    QBS_CHECK(context.resolvedProducts.size() == context.products.size());
+    QBS_CHECK(context.resolvedProducts.size() == context.resolvedGroups.size());
+    QBS_CHECK(context.products.size() == context.groups.size());
     return context;
 }
 
@@ -433,7 +433,7 @@ ProjectPrivate::FileListUpdateContext ProjectPrivate::getFileListContext(const P
         throw ErrorInfo(Tr::tr("No files supplied."));
 
     QString prefix;
-    for (int i = 0; i < groupContext.resolvedGroups.count(); ++i) {
+    for (int i = 0; i < groupContext.resolvedGroups.size(); ++i) {
         const GroupPtr &g = groupContext.resolvedGroups.at(i);
         if (!g->prefix.isEmpty() && !g->prefix.endsWith(QLatin1Char('/')))
             throw ErrorInfo(Tr::tr("Group has non-directory prefix."));
@@ -500,7 +500,7 @@ void ProjectPrivate::addFiles(const ProductData &product, const GroupData &group
     updateExternalCodeLocations(m_projectData, adder.itemPosition(), adder.lineOffset());
 
     QHash<QString, std::pair<SourceArtifactPtr, ResolvedProductPtr>> addedSourceArtifacts;
-    for (int i = 0; i < groupContext.resolvedGroups.count(); ++i) {
+    for (int i = 0; i < groupContext.resolvedGroups.size(); ++i) {
         const ResolvedProductPtr &resolvedProduct = groupContext.resolvedProducts.at(i);
         const GroupPtr &resolvedGroup = groupContext.resolvedGroups.at(i);
         for (const QString &file : qAsConst(filesContext.absoluteFilePaths)) {
@@ -573,7 +573,7 @@ void ProjectPrivate::removeFiles(const ProductData &product, const GroupData &gr
             filesContext.relativeFilePaths);
     remover.apply();
 
-    for (int i = 0; i < groupContext.resolvedProducts.count(); ++i) {
+    for (int i = 0; i < groupContext.resolvedProducts.size(); ++i) {
         removeFilesFromBuildGraph(groupContext.resolvedProducts.at(i), sourceArtifacts);
         for (const SourceArtifactPtr &sa : qAsConst(sourceArtifacts))
             groupContext.resolvedGroups.at(i)->files.removeOne(sa);
@@ -584,7 +584,7 @@ void ProjectPrivate::removeFiles(const ProductData &product, const GroupData &gr
     updateInternalCodeLocations(internalProject, remover.itemPosition(), remover.lineOffset());
     updateExternalCodeLocations(m_projectData, remover.itemPosition(), remover.lineOffset());
     for (const GroupData &g : qAsConst(groupContext.groups)) {
-        for (int i = g.d->sourceArtifacts.count() - 1; i >= 0; --i) {
+        for (int i = g.d->sourceArtifacts.size() - 1; i >= 0; --i) {
             if (filesContext.absoluteFilePaths.contains(g.d->sourceArtifacts.at(i).filePath()))
                 g.d->sourceArtifacts.removeAt(i);
         }
@@ -598,7 +598,7 @@ void ProjectPrivate::removeGroup(const ProductData &product, const GroupData &gr
     ProjectFileGroupRemover remover(context.products.front(), context.groups.front());
     remover.apply();
 
-    for (int i = 0; i < context.resolvedProducts.count(); ++i) {
+    for (int i = 0; i < context.resolvedProducts.size(); ++i) {
         const ResolvedProductPtr &product = context.resolvedProducts.at(i);
         const GroupPtr &group = context.resolvedGroups.at(i);
         removeFilesFromBuildGraph(product, group->allFiles());
@@ -610,7 +610,7 @@ void ProjectPrivate::removeGroup(const ProductData &product, const GroupData &gr
     m_projectData.d.detach();
     updateInternalCodeLocations(internalProject, remover.itemPosition(), remover.lineOffset());
     updateExternalCodeLocations(m_projectData, remover.itemPosition(), remover.lineOffset());
-    for (int i = 0; i < context.products.count(); ++i) {
+    for (int i = 0; i < context.products.size(); ++i) {
         const bool removed = context.products.at(i).d->groups.removeOne(context.groups.at(i));
         QBS_CHECK(removed);
     }
diff --git a/src/lib/corelib/api/projectdata.cpp b/src/lib/corelib/api/projectdata.cpp
index 03aa95f60..56d1cae49 100644
--- a/src/lib/corelib/api/projectdata.cpp
+++ b/src/lib/corelib/api/projectdata.cpp
@@ -170,7 +170,7 @@ QStringList GroupData::allFilePaths() const
 {
     const QList<ArtifactData> &artifacts = allSourceArtifacts();
     QStringList paths;
-    paths.reserve(artifacts.count());
+    paths.reserve(artifacts.size());
     std::transform(artifacts.constBegin(), artifacts.constEnd(), std::back_inserter(paths),
                           [](const ArtifactData &sa) { return sa.filePath(); });
     return paths;
diff --git a/src/lib/corelib/api/projectfileupdater.cpp b/src/lib/corelib/api/projectfileupdater.cpp
index ced85e123..b665e5520 100644
--- a/src/lib/corelib/api/projectfileupdater.cpp
+++ b/src/lib/corelib/api/projectfileupdater.cpp
@@ -232,12 +232,12 @@ void ProjectFileGroupInserter::doApply(QString &fileContent, UiProgram *ast)
 
     int lineOffset = 3 + 1; // Our text + a leading newline that is always added by the rewriter.
     const QList<ChangeSet::EditOp> &editOps = changeSet.operationList();
-    QBS_CHECK(editOps.count() == 1);
+    QBS_CHECK(editOps.size() == 1);
     const ChangeSet::EditOp &insertOp = editOps.front();
     setLineOffset(lineOffset);
 
     int insertionLine = fileContent.left(insertOp.pos1).count(QLatin1Char('\n'));
-    for (int i = 0; i < insertOp.text.count() && insertOp.text.at(i) == QLatin1Char('\n'); ++i)
+    for (int i = 0; i < insertOp.text.size() && insertOp.text.at(i) == QLatin1Char('\n'); ++i)
         ++insertionLine; // To account for newlines prepended by the rewriter.
     ++insertionLine; // To account for zero-based indexing.
     setItemPosition(CodeLocation(projectFile(), insertionLine,
@@ -255,7 +255,7 @@ static QString getNodeRepresentation(const QString &fileContent, const QbsQmlJS:
 static const ChangeSet::EditOp &getEditOp(const ChangeSet &changeSet)
 {
     const QList<ChangeSet::EditOp> &editOps = changeSet.operationList();
-    QBS_CHECK(editOps.count() == 1);
+    QBS_CHECK(editOps.size() == 1);
     return editOps.front();
 }
 
@@ -480,9 +480,9 @@ void ProjectFileFilesRemover::doApply(QString &fileContent, UiProgram *ast)
         break;
     }
     case QbsQmlJS::AST::Node::Kind_StringLiteral: {
-        if (m_files.count() != 1) {
+        if (m_files.size() != 1) {
             throw ErrorInfo(Tr::tr("Was requested to remove %1 files, but there is only "
-                                   "one in the list.").arg(m_files.count()), bindingLocation);
+                                   "one in the list.").arg(m_files.size()), bindingLocation);
         }
         const QString existingFile
                 = static_cast<StringLiteral *>(exprStatement->expression)->value.toString();
@@ -538,7 +538,7 @@ void ProjectFileGroupRemover::doApply(QString &fileContent, UiProgram *ast)
 
     setItemPosition(m_group.location());
     const QList<ChangeSet::EditOp> &editOps = changeSet.operationList();
-    QBS_CHECK(editOps.count() == 1);
+    QBS_CHECK(editOps.size() == 1);
     const ChangeSet::EditOp &op = editOps.front();
     const QString removedText = fileContent.mid(op.pos1, op.length1);
     setLineOffset(-removedText.count(QLatin1Char('\n')));