diff options
Diffstat (limited to 'src')
51 files changed, 164 insertions, 165 deletions
diff --git a/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp index 4de5c85d8..836f2539b 100644 --- a/src/app/config-ui/mainwindow.cpp +++ b/src/app/config-ui/mainwindow.cpp @@ -183,7 +183,7 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event); if (keyEvent->matches(QKeySequence::Delete)) { const QModelIndexList indexes = ui->treeView->selectionModel()->selectedRows(); - if (indexes.count() == 1) { + if (indexes.size() == 1) { const QModelIndex index = indexes.front(); if (index.isValid()) { m_model->removeKey(index); diff --git a/src/app/config/configcommandlineparser.cpp b/src/app/config/configcommandlineparser.cpp index 45fb79231..dd6262543 100644 --- a/src/app/config/configcommandlineparser.cpp +++ b/src/app/config/configcommandlineparser.cpp @@ -55,8 +55,8 @@ void ConfigCommandLineParser::parse(const QStringList &commandLine) m_commandLine = commandLine; if (m_commandLine.isEmpty()) throw ErrorInfo(Tr::tr("No parameters supplied.")); - if (m_commandLine.count() == 1 && (m_commandLine.front() == QLatin1String("--help") - || m_commandLine.front() == QLatin1String("-h"))) { + if (m_commandLine.size() == 1 && (m_commandLine.front() == QLatin1String("--help") + || m_commandLine.front() == QLatin1String("-h"))) { m_helpRequested = true; return; } @@ -81,10 +81,10 @@ void ConfigCommandLineParser::parse(const QStringList &commandLine) case ConfigCommand::CfgNone: if (m_commandLine.isEmpty()) throw ErrorInfo(Tr::tr("No parameters supplied.")); - if (m_commandLine.count() > 2) + if (m_commandLine.size() > 2) throw ErrorInfo(Tr::tr("Too many arguments.")); m_command.varNames << m_commandLine.front(); - if (m_commandLine.count() == 1) { + if (m_commandLine.size() == 1) { setCommand(ConfigCommand::CfgList); } else { m_command.varValue = m_commandLine.at(1); @@ -97,12 +97,12 @@ void ConfigCommandLineParser::parse(const QStringList &commandLine) m_command.varNames = m_commandLine; break; case ConfigCommand::CfgExport: - if (m_commandLine.count() != 1) + if (m_commandLine.size() != 1) throw ErrorInfo(Tr::tr("Need name of file to which to export.")); m_command.fileName = m_commandLine.front(); break; case ConfigCommand::CfgImport: - if (m_commandLine.count() != 1) + if (m_commandLine.size() != 1) throw ErrorInfo(Tr::tr("Need name of file from which to import.")); m_command.fileName = m_commandLine.front(); break; diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index 99866be9a..e5ad9e845 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -129,7 +129,7 @@ static QtAndroidInfo getInfoForQtDir(const QString &qtDir) if (!isArchLine && !isPlatformLine) continue; const QList<QByteArray> elems = line.split('='); - if (elems.count() != 2) + if (elems.size() != 2) continue; const QString rhs = QString::fromLatin1(elems.at(1).trimmed()); if (isArchLine) @@ -166,8 +166,8 @@ static QString maximumPlatform(const QString &platform1, const QString &platform if (platform2.isEmpty()) return platform1; static const QString prefix = qls("android-"); - const QString numberString1 = platform1.mid(prefix.count()); - const QString numberString2 = platform2.mid(prefix.count()); + const QString numberString1 = platform1.mid(prefix.size()); + const QString numberString2 = platform2.mid(prefix.size()); bool ok; const int value1 = numberString1.toInt(&ok); if (!ok) { diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp index d2465f395..174016480 100644 --- a/src/app/qbs-setup-android/commandlineparser.cpp +++ b/src/app/qbs-setup-android/commandlineparser.cpp @@ -94,7 +94,7 @@ void CommandLineParser::parse(const QStringList &commandLine) return; } - switch (m_commandLine.count()) { + switch (m_commandLine.size()) { case 0: throwError(Tr::tr("No profile name supplied.")); case 1: diff --git a/src/app/qbs-setup-qt/commandlineparser.cpp b/src/app/qbs-setup-qt/commandlineparser.cpp index c51af58a0..0f842e7b2 100644 --- a/src/app/qbs-setup-qt/commandlineparser.cpp +++ b/src/app/qbs-setup-qt/commandlineparser.cpp @@ -83,7 +83,7 @@ void CommandLineParser::parse(const QStringList &commandLine) return; } - switch (m_commandLine.count()) { + switch (m_commandLine.size()) { case 0: case 1: throwError(Tr::tr("Not enough command-line arguments provided.")); diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index 23a5b2736..5a938bc5e 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -565,9 +565,9 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironmen compressMsvcProfiles(fullMatches); QString bestMatch; - if (fullMatches.count() == 1) + if (fullMatches.size() == 1) bestMatch = fullMatches.front(); - else if (fullMatches.isEmpty() && partialMatches.count() == 1) + else if (fullMatches.isEmpty() && partialMatches.size() == 1) bestMatch = partialMatches.front(); if (bestMatch.isEmpty()) { QString message = Tr::tr("You need to set up toolchain information before you can " diff --git a/src/app/qbs-setup-toolchains/commandlineparser.cpp b/src/app/qbs-setup-toolchains/commandlineparser.cpp index f67a24ab3..b7466d6b9 100644 --- a/src/app/qbs-setup-toolchains/commandlineparser.cpp +++ b/src/app/qbs-setup-toolchains/commandlineparser.cpp @@ -87,7 +87,7 @@ void CommandLineParser::parse(const QStringList &commandLine) return; } - switch (m_commandLine.count()) { + switch (m_commandLine.size()) { case 0: case 1: throwError(Tr::tr("Not enough command-line arguments provided.")); diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp index c2bc06c7d..1dd1ad56c 100644 --- a/src/app/qbs-setup-toolchains/probe.cpp +++ b/src/app/qbs-setup-toolchains/probe.cpp @@ -289,7 +289,7 @@ void probe(Settings *settings) if (profiles.isEmpty()) { qStderr << Tr::tr("Could not detect any toolchains. No profile created.") << endl; - } else if (profiles.count() == 1 && settings->defaultProfile().isEmpty()) { + } else if (profiles.size() == 1 && settings->defaultProfile().isEmpty()) { const QString profileName = profiles.front().name(); qStdout << Tr::tr("Making profile '%1' the default.").arg(profileName) << endl; settings->setValue(QLatin1String("defaultProfile"), profileName); diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index 2c4290c46..00862e071 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -112,7 +112,7 @@ void CommandLineFrontend::start() switch (m_parser.command()) { case RunCommandType: case ShellCommandType: - if (m_parser.products().count() > 1) { + if (m_parser.products().size() > 1) { throw ErrorInfo(Tr::tr("Invalid use of command '%1': Cannot use more than one " "product.\nUsage: %2") .arg(m_parser.commandName(), m_parser.commandDescription())); @@ -122,7 +122,7 @@ void CommandLineFrontend::start() case InstallCommandType: case DumpNodesTreeCommandType: case ListProductsCommandType: - if (m_parser.buildConfigurations().count() > 1) { + if (m_parser.buildConfigurations().size() > 1) { QString error = Tr::tr("Invalid use of command '%1': There can be only one " "build configuration.\n").arg(m_parser.commandName()); error += Tr::tr("Usage: %1").arg(m_parser.commandDescription()); @@ -190,7 +190,7 @@ void CommandLineFrontend::start() * notification to arrive.) */ if (m_parser.showProgress() && resolvingMultipleProjects()) - m_observer->initialize(tr("Setting up projects"), m_resolveJobs.count()); + m_observer->initialize(tr("Setting up projects"), m_resolveJobs.size()); // Check every two seconds whether we received a cancel request. This value has been // experimentally found to be acceptable. @@ -322,7 +322,7 @@ void CommandLineFrontend::handleProcessResultReport(const qbs::ProcessResult &re bool CommandLineFrontend::resolvingMultipleProjects() const { - return isResolving() && m_resolveJobs.count() + m_projects.count() > 1; + return isResolving() && m_resolveJobs.size() + m_projects.size() > 1; } bool CommandLineFrontend::isResolving() const @@ -427,7 +427,7 @@ void CommandLineFrontend::makeClean() int CommandLineFrontend::runShell() { ProductData productToRun; - switch (m_parser.products().count()) { + switch (m_parser.products().size()) { case 0: // No specific product, use project-global environment. break; case 1: @@ -496,7 +496,7 @@ void CommandLineFrontend::build() * the respective total efforts as they come in. Once all jobs have reported their total * efforts, we can start the overall progress report. */ - m_buildEffortsNeeded = m_buildJobs.count(); + m_buildEffortsNeeded = m_buildJobs.size(); m_buildEffortsRetrieved = 0; m_totalBuildEffort = 0; m_currentBuildEffort = 0; @@ -612,16 +612,16 @@ void CommandLineFrontend::connectJob(AbstractJob *job) ProductData CommandLineFrontend::getTheOneRunnableProduct() { - QBS_CHECK(m_projects.count() == 1); // Has been checked earlier. + QBS_CHECK(m_projects.size() == 1); // Has been checked earlier. - if (m_parser.products().count() == 1) { + if (m_parser.products().size() == 1) { foreach (const ProductData &p, m_projects.front().projectData().allProducts()) { if (p.name() == m_parser.products().front()) return p; } QBS_CHECK(false); } - QBS_CHECK(m_parser.products().count() == 0); + QBS_CHECK(m_parser.products().size() == 0); QList<ProductData> runnableProducts; foreach (const ProductData &p, m_projects.front().projectData().allProducts()) { @@ -629,7 +629,7 @@ ProductData CommandLineFrontend::getTheOneRunnableProduct() runnableProducts << p; } - if (runnableProducts.count() == 1) + if (runnableProducts.size() == 1) return runnableProducts.front(); if (runnableProducts.isEmpty()) { @@ -653,7 +653,7 @@ ProductData CommandLineFrontend::getTheOneRunnableProduct() void CommandLineFrontend::install() { - Q_ASSERT(m_projects.count() == 1); + Q_ASSERT(m_projects.size() == 1); const Project project = m_projects.front(); InstallJob *installJob; if (m_parser.products().isEmpty()) { diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index c223ea735..1ff7a665a 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -403,7 +403,7 @@ QString CommandLineParser::CommandLineParserPrivate::generalHelp() const foreach (const Command * command, commandMap) { help.append(QLatin1String(" ")).append(command->representation()); const QString whitespace - = QString(rhsIndentation - 2 - command->representation().count(), QLatin1Char(' ')); + = QString(rhsIndentation - 2 - command->representation().size(), QLatin1Char(' ')); help.append(whitespace).append(command->shortDescription()).append(QLatin1Char('\n')); } @@ -413,7 +413,7 @@ QString CommandLineParser::CommandLineParserPrivate::generalHelp() const help.append(QLatin1Char('\n')).append(Tr::tr("Auxiliary commands:\n")); foreach (const QString &toolName, toolNames) { help.append(QLatin1String(" ")).append(toolName); - const QString whitespace = QString(rhsIndentation - 2 - toolName.count(), + const QString whitespace = QString(rhsIndentation - 2 - toolName.size(), QLatin1Char(' ')); QbsTool tool; tool.runTool(toolName, QStringList(QLatin1String("--help"))); @@ -442,7 +442,7 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildOptions() buildOptions.setDryRun(dryRun()); QStringList changedFiles = optionPool.changedFilesOption()->arguments(); QDir currentDir; - for (int i = 0; i < changedFiles.count(); ++i) { + for (int i = 0; i < changedFiles.size(); ++i) { QString &file = changedFiles[i]; file = QDir::fromNativeSeparators(currentDir.absoluteFilePath(file)); } @@ -484,7 +484,7 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildConfigurations() } propertiesPerConfiguration << std::make_pair(currentConfigurationName, currentProperties); - if (propertiesPerConfiguration.count() == 1) // No configuration name specified on command line. + if (propertiesPerConfiguration.size() == 1) // No configuration name specified on command line. propertiesPerConfiguration << PropertyListItem(QStringLiteral("default"), QVariantMap()); const QVariantMap globalProperties = propertiesPerConfiguration.takeFirst().second; diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp index 7bf147cea..564ecfcf2 100644 --- a/src/app/qbs/parser/parsercommand.cpp +++ b/src/app/qbs/parser/parsercommand.cpp @@ -104,13 +104,13 @@ void Command::parseOption(QStringList &input) const QString optionString = input.front(); QBS_CHECK(optionString.startsWith(QLatin1Char('-'))); input.removeFirst(); - if (optionString.count() == 1) + if (optionString.size() == 1) throwError(Tr::tr("Empty options are not allowed.")); // Split up grouped short options. - if (optionString.at(1) != QLatin1Char('-') && optionString.count() > 2) { + if (optionString.at(1) != QLatin1Char('-') && optionString.size() > 2) { QString parameter; - for (int i = optionString.count(); --i > 0;) { + for (int i = optionString.size(); --i > 0;) { const QChar c = optionString.at(i); if (c.isDigit()) { parameter.prepend(c); @@ -562,7 +562,7 @@ void HelpCommand::parseNext(QStringList &input) { if (input.isEmpty()) return; - if (input.count() > 1) + if (input.size() > 1) throwError(Tr::tr("Cannot describe more than one command.")); m_command = input.takeFirst(); QBS_CHECK(input.empty()); diff --git a/src/app/qbs/qbstool.cpp b/src/app/qbs/qbstool.cpp index d9afda270..d01c39591 100644 --- a/src/app/qbs/qbstool.cpp +++ b/src/app/qbs/qbstool.cpp @@ -95,10 +95,10 @@ QStringList QbsTool::allToolNames() QStringList toolFileNames = QDir(qbsBinDir()).entryList(QStringList(toolPrefix() + QString::fromLatin1("*%1").arg(suffix)), QDir::Files, QDir::Name); QStringList toolNames; - const int prefixLength = toolPrefix().count(); + const int prefixLength = toolPrefix().size(); foreach (const QString &toolFileName, toolFileNames) { toolNames << toolFileName.mid(prefixLength, - toolFileName.count() - prefixLength - suffix.count()); + toolFileName.size() - prefixLength - suffix.size()); } return toolNames; } 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'))); diff --git a/src/lib/corelib/buildgraph/artifactcleaner.cpp b/src/lib/corelib/buildgraph/artifactcleaner.cpp index 7a4b4dd82..df6e7f8c0 100644 --- a/src/lib/corelib/buildgraph/artifactcleaner.cpp +++ b/src/lib/corelib/buildgraph/artifactcleaner.cpp @@ -163,7 +163,7 @@ void ArtifactCleaner::cleanup(const TopLevelProjectPtr &project, m_hasError = false; const QString configString = Tr::tr(" for configuration %1").arg(project->id()); - m_observer->initialize(Tr::tr("Cleaning up%1").arg(configString), products.count() + 1); + m_observer->initialize(Tr::tr("Cleaning up%1").arg(configString), products.size() + 1); Set<QString> directories; for (const ResolvedProductPtr &product : products) { @@ -178,7 +178,7 @@ void ArtifactCleaner::cleanup(const TopLevelProjectPtr &project, // Directories created during the build are not artifacts (TODO: should they be?), // so we have to clean them up manually. QList<QString> dirList = directories.toList(); - for (int i = 0; i < dirList.count(); ++i) { + for (int i = 0; i < dirList.size(); ++i) { const QString &dir = dirList.at(i); if (!dir.startsWith(project->buildDirectory)) continue; diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp index 19b800f9f..4582bc870 100644 --- a/src/lib/corelib/buildgraph/buildgraph.cpp +++ b/src/lib/corelib/buildgraph/buildgraph.cpp @@ -123,7 +123,7 @@ template<class ProductOrModule> static QScriptValue js_artifactsForFileTag( return !isRelevantArtifact(productOrModule, a); }; artifacts.erase(std::remove_if(artifacts.begin(), artifacts.end(), filter), artifacts.end()); - result = engine->newArray(artifacts.count()); + result = engine->newArray(artifacts.size()); ctx->callee().setProperty(CachedValueKey, result); int k = 0; for (const Artifact * const artifact : artifacts) @@ -229,7 +229,7 @@ private: } } } - QBS_ASSERT(idx == quint32(module->moduleDependencies.count()),;); + QBS_ASSERT(idx == quint32(module->moduleDependencies.size()),;); return result; } @@ -470,7 +470,7 @@ QString relativeArtifactFileName(const Artifact *artifact) const QString &buildDir = artifact->product->topLevelProject()->buildDirectory; QString str = artifact->filePath(); if (str.startsWith(buildDir)) - str.remove(0, buildDir.count()); + str.remove(0, buildDir.size()); if (str.startsWith(QLatin1Char('/'))) str.remove(0, 1); return str; @@ -609,7 +609,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, QBS_CHECK(transformer->outputs.contains(artifact)); QBS_CHECK(product->rules.contains(std::const_pointer_cast<Rule>(transformer->rule))); qCDebug(lcBuildGraph) - << "The transformer has" << transformer->outputs.count() << "outputs."; + << "The transformer has" << transformer->outputs.size() << "outputs."; ArtifactSet transformerOutputChildren; for (const Artifact * const output : qAsConst(transformer->outputs)) { QBS_CHECK(output->transformer == transformer); @@ -631,7 +631,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product, for (const Artifact * const a : qAsConst(transformer->inputs)) qCDebug(lcBuildGraph) << "\t" << a->fileName(); } - QBS_CHECK(transformer->inputs.count() <= transformerOutputChildren.count()); + QBS_CHECK(transformer->inputs.size() <= transformerOutputChildren.size()); for (Artifact * const transformerInput : qAsConst(transformer->inputs)) QBS_CHECK(transformerOutputChildren.contains(transformerInput)); } diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index bb0837a91..e6051abcb 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -391,9 +391,9 @@ void BuildGraphLoader::trackProjectChanges() m_result.newlyResolvedProject->buildData.swap(restoredProject->buildData); QBS_CHECK(m_result.newlyResolvedProject->buildData); m_result.newlyResolvedProject->buildData->isDirty = true; - for (int i = allNewlyResolvedProducts.count() - 1; i >= 0; --i) { + for (int i = allNewlyResolvedProducts.size() - 1; i >= 0; --i) { const ResolvedProductPtr &newlyResolvedProduct = allNewlyResolvedProducts.at(i); - for (int j = allRestoredProducts.count() - 1; j >= 0; --j) { + for (int j = allRestoredProducts.size() - 1; j >= 0; --j) { const ResolvedProductPtr &restoredProduct = allRestoredProducts.at(j); if (newlyResolvedProduct->uniqueName() == restoredProduct->uniqueName()) { if (newlyResolvedProduct->enabled) @@ -654,7 +654,7 @@ void BuildGraphLoader::checkAllProductsForChanges(const QList<ResolvedProductPtr static bool dependenciesAreEqual(const ResolvedProductConstPtr &p1, const ResolvedProductConstPtr &p2) { - if (p1->dependencies.count() != p2->dependencies.count()) + if (p1->dependencies.size() != p2->dependencies.size()) return false; Set<QString> names1; Set<QString> names2; diff --git a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp index 13f5adaa5..5a6a1c137 100644 --- a/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp +++ b/src/lib/corelib/buildgraph/emptydirectoriesremover.cpp @@ -78,7 +78,7 @@ void EmptyDirectoriesRemover::removeEmptyParentDirectories(const ArtifactSet &ar void EmptyDirectoriesRemover::insertSorted(const QString &dirPath) { int i; - for (i = 0; i < m_dirsToRemove.count(); ++i) { + for (i = 0; i < m_dirsToRemove.size(); ++i) { const QString &cur = m_dirsToRemove.at(i); if (dirPath == cur) return; diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 0d86142ef..0d5a2660d 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -147,7 +147,7 @@ void Executor::retrieveSourceFileTimestamp(Artifact *artifact) const void Executor::build() { try { - m_partialBuild = m_productsToBuild.count() != m_project->allProducts().count(); + m_partialBuild = m_productsToBuild.size() != m_project->allProducts().size(); doBuild(); } catch (const ErrorInfo &e) { handleError(e); @@ -788,10 +788,10 @@ void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0) if (canRescue) { const TypeFilter<Artifact> childArtifacts(artifact->children); - const int newChildCount = childrenToConnect.count() + const int newChildCount = childrenToConnect.size() + std::distance(childArtifacts.begin(), childArtifacts.end()); - QBS_CHECK(newChildCount >= rad.children.count()); - if (newChildCount > rad.children.count()) { + QBS_CHECK(newChildCount >= rad.children.size()); + if (newChildCount > rad.children.size()) { canRescue = false; qCDebug(lcBuildGraph) << "Artifact has children not present in rescue data."; } diff --git a/src/lib/corelib/buildgraph/executorjob.cpp b/src/lib/corelib/buildgraph/executorjob.cpp index d93276b6b..c2f28dcf4 100644 --- a/src/lib/corelib/buildgraph/executorjob.cpp +++ b/src/lib/corelib/buildgraph/executorjob.cpp @@ -122,9 +122,9 @@ void ExecutorJob::cancel() void ExecutorJob::runNextCommand() { - QBS_ASSERT(m_currentCommandIdx <= m_transformer->commands.count(), return); + QBS_ASSERT(m_currentCommandIdx <= m_transformer->commands.size(), return); ++m_currentCommandIdx; - if (m_currentCommandIdx >= m_transformer->commands.count()) { + if (m_currentCommandIdx >= m_transformer->commands.size()) { setFinished(); return; } diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp index 7d4a41e2f..31022b768 100644 --- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp +++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp @@ -141,10 +141,10 @@ void ProcessCommandExecutor::doStart() .arg(responseFile.fileName()))); return; } - for (int i = cmd->responseFileArgumentIndex(); i < cmd->arguments().count(); ++i) { + for (int i = cmd->responseFileArgumentIndex(); i < cmd->arguments().size(); ++i) { const QString arg = cmd->arguments().at(i); if (arg.startsWith(cmd->responseFileUsagePrefix())) { - QFile f(arg.mid(cmd->responseFileUsagePrefix().count())); + QFile f(arg.mid(cmd->responseFileUsagePrefix().size())); if (!f.open(QIODevice::ReadOnly)) { emit finished(ErrorInfo(Tr::tr("Cannot open command file '%1'.") .arg(QDir::toNativeSeparators(f.fileName())))); diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp index 89e7c94a9..f95bc1600 100644 --- a/src/lib/corelib/buildgraph/productinstaller.cpp +++ b/src/lib/corelib/buildgraph/productinstaller.cpp @@ -102,7 +102,7 @@ void ProductInstaller::install() artifactsToInstall += artifact; } } - m_observer->initialize(Tr::tr("Installing"), artifactsToInstall.count()); + m_observer->initialize(Tr::tr("Installing"), artifactsToInstall.size()); for (const Artifact * const a : qAsConst(artifactsToInstall)) { copyFile(a); diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index 0c9d65cf9..b3c7d5ae1 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -283,7 +283,7 @@ void BuildDataResolver::resolveBuildData(const TopLevelProjectPtr &resolvedProje resolvedProject->buildData->evaluationContext = evalContext; const QList<ResolvedProductPtr> allProducts = resolvedProject->allProducts(); evalContext->initializeObserver(Tr::tr("Setting up build graph for configuration %1") - .arg(resolvedProject->id()), allProducts.count() + 1); + .arg(resolvedProject->id()), allProducts.size() + 1); for (ResolvedProductPtr rProduct : allProducts) { if (rProduct->enabled) resolveProductBuildData(rProduct); diff --git a/src/lib/corelib/buildgraph/qtmocscanner.cpp b/src/lib/corelib/buildgraph/qtmocscanner.cpp index 9f369bdd1..906a0e37d 100644 --- a/src/lib/corelib/buildgraph/qtmocscanner.cpp +++ b/src/lib/corelib/buildgraph/qtmocscanner.cpp @@ -214,16 +214,16 @@ QScriptValue QtMocScanner::apply(QScriptEngine *engine, const Artifact *artifact { if (!m_cppScanner) { QList<ScannerPlugin *> scanners = ScannerPluginManager::scannersForFileTag(m_tags.cpp); - if (scanners.count() != 1) - return scannerCountError(engine, scanners.count(), m_tags.cpp.toString()); + if (scanners.size() != 1) + return scannerCountError(engine, scanners.size(), m_tags.cpp.toString()); m_cppScanner = scanners.front(); scanners = ScannerPluginManager::scannersForFileTag(m_tags.objcpp); - if (scanners.count() != 1) - return scannerCountError(engine, scanners.count(), m_tags.objcpp.toString()); + if (scanners.size() != 1) + return scannerCountError(engine, scanners.size(), m_tags.objcpp.toString()); m_objcppScanner = scanners.front(); scanners = ScannerPluginManager::scannersForFileTag(m_tags.hpp); - if (scanners.count() != 1) - return scannerCountError(engine, scanners.count(), m_tags.hpp.toString()); + if (scanners.size() != 1) + return scannerCountError(engine, scanners.size(), m_tags.hpp.toString()); m_hppScanner = scanners.front(); } diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp index 0044bdd5c..dc6b9e551 100644 --- a/src/lib/corelib/buildgraph/rulecommands.cpp +++ b/src/lib/corelib/buildgraph/rulecommands.cpp @@ -220,7 +220,7 @@ void ProcessCommand::getEnvironmentFromList(const QStringList &envList) m_environment.clear(); for (const QString &env : envList) { const int equalsIndex = env.indexOf(QLatin1Char('=')); - if (equalsIndex <= 0 || equalsIndex == env.count() - 1) + if (equalsIndex <= 0 || equalsIndex == env.size() - 1) continue; const QString &var = env.left(equalsIndex); const QString &value = env.mid(equalsIndex + 1); @@ -452,7 +452,7 @@ QList<AbstractCommandPtr> loadCommandList(PersistentPool &pool) void storeCommandList(const QList<AbstractCommandPtr> &commands, PersistentPool &pool) { - pool.store(commands.count()); + pool.store(commands.size()); for (const AbstractCommandPtr &cmd : commands) { pool.store(static_cast<quint8>(cmd->type())); pool.store(cmd); @@ -461,9 +461,9 @@ void storeCommandList(const QList<AbstractCommandPtr> &commands, PersistentPool bool commandListsAreEqual(const QList<AbstractCommandPtr> &l1, const QList<AbstractCommandPtr> &l2) { - if (l1.count() != l2.count()) + if (l1.size() != l2.size()) return false; - for (int i = 0; i < l1.count(); ++i) + for (int i = 0; i < l1.size(); ++i) if (!l1.at(i)->equals(l2.at(i).get())) return false; return true; diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index ec7a4dac5..c550bfec9 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -216,7 +216,7 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p QScriptValue scriptValue; if (!ruleArtifactArtifactMap.isEmpty()) engine()->setGlobalObject(prepareScriptContext); - for (int i = ruleArtifactArtifactMap.count(); --i >= 0;) { + for (int i = ruleArtifactArtifactMap.size(); --i >= 0;) { const RuleArtifact *ra = ruleArtifactArtifactMap.at(i).first; if (ra->bindings.empty()) continue; @@ -366,7 +366,7 @@ Artifact *RulesApplicator::createOutputArtifact(const QString &filePath, const F FileTags outputArtifactFileTags = fileTags.isEmpty() ? m_product->fileTagsForFileName(outputArtifact->fileName()) : fileTags; - for (int i = 0; i < m_product->artifactProperties.count(); ++i) { + for (int i = 0; i < m_product->artifactProperties.size(); ++i) { const ArtifactPropertiesConstPtr &props = m_product->artifactProperties.at(i); if (outputArtifactFileTags.intersects(props->fileTagsFilter())) { outputArtifact->properties = props->propertyMap(); @@ -387,7 +387,7 @@ Artifact *RulesApplicator::createOutputArtifact(const QString &filePath, const F outputArtifact->transformer = m_transformer; m_transformer->outputs.insert(outputArtifact); - QBS_CHECK(m_rule->multiplex || m_transformer->inputs.count() == 1); + QBS_CHECK(m_rule->multiplex || m_transformer->inputs.size() == 1); return outputArtifact; } diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index bc2754363..29028e8d4 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -143,7 +143,7 @@ QScriptValue Transformer::translateInOutputs(ScriptEngine *scriptEngine, QScriptValue jsTagFiles = scriptEngine->newObject(); for (TagArtifactsMap::const_iterator tag = tagArtifactsMap.constBegin(); tag != tagArtifactsMap.constEnd(); ++tag) { const QList<Artifact*> &artifacts = tag.value(); - QScriptValue jsFileConfig = scriptEngine->newArray(artifacts.count()); + QScriptValue jsFileConfig = scriptEngine->newArray(artifacts.size()); int i = 0; for (Artifact * const artifact : artifacts) { jsFileConfig.setProperty(i++, translateFileConfig(scriptEngine, artifact, @@ -169,7 +169,7 @@ void Transformer::setupInputs(QScriptValue targetScriptValue, const ArtifactSet QScriptValue scriptValue = translateInOutputs(scriptEngine, inputs, defaultModuleName); targetScriptValue.setProperty(QLatin1String("inputs"), scriptValue); QScriptValue inputScriptValue; - if (inputs.count() == 1) { + if (inputs.size() == 1) { Artifact *input = *inputs.cbegin(); const FileTags &fileTags = input->fileTags(); QBS_ASSERT(!fileTags.isEmpty(), return); @@ -191,7 +191,7 @@ void Transformer::setupOutputs(QScriptValue targetScriptValue) QScriptValue scriptValue = translateInOutputs(scriptEngine, outputs, defaultModuleName); targetScriptValue.setProperty(QLatin1String("outputs"), scriptValue); QScriptValue outputScriptValue; - if (outputs.count() == 1) { + if (outputs.size() == 1) { Artifact *output = *outputs.cbegin(); const FileTags &fileTags = output->fileTags(); QBS_ASSERT(!fileTags.isEmpty(), return); diff --git a/src/lib/corelib/jsextensions/moduleproperties.cpp b/src/lib/corelib/jsextensions/moduleproperties.cpp index eadcc612c..47b226e50 100644 --- a/src/lib/corelib/jsextensions/moduleproperties.cpp +++ b/src/lib/corelib/jsextensions/moduleproperties.cpp @@ -186,7 +186,7 @@ void ModuleProperties::setupModules(QScriptValue &object, const ResolvedProduct moduleObject.setData(data); const QualifiedId moduleName = QualifiedId::fromString(module->name); QScriptValue obj = object; - for (int i = 0; i < moduleName.count() - 1; ++i) { + for (int i = 0; i < moduleName.size() - 1; ++i) { QScriptValue tmp = obj.property(moduleName.at(i)); if (!tmp.isObject()) tmp = engine->newObject(); @@ -194,7 +194,7 @@ void ModuleProperties::setupModules(QScriptValue &object, const ResolvedProduct obj = tmp; } obj.setProperty(moduleName.last(), moduleObject); - if (moduleName.count() > 1) + if (moduleName.size() > 1) object.setProperty(moduleName.toString(), moduleObject); } } diff --git a/src/lib/corelib/language/astimportshandler.cpp b/src/lib/corelib/language/astimportshandler.cpp index 1f3c10a0f..a5f86d964 100644 --- a/src/lib/corelib/language/astimportshandler.cpp +++ b/src/lib/corelib/language/astimportshandler.cpp @@ -105,7 +105,7 @@ void ASTImportsHandler::handleImport(const QbsQmlJS::AST::UiImport *import) toCodeLocation(m_file->filePath(), import->importIdToken)); } } else { - if (importUri.count() == 2 && importUri.front() == QLatin1String("qbs")) { + if (importUri.size() == 2 && importUri.front() == QLatin1String("qbs")) { const QString extensionName = importUri.last(); if (JsExtensions::hasExtension(extensionName)) { if (Q_UNLIKELY(!import->importId.isNull())) { diff --git a/src/lib/corelib/language/evaluatorscriptclass.cpp b/src/lib/corelib/language/evaluatorscriptclass.cpp index cb88788f6..f416be1b1 100644 --- a/src/lib/corelib/language/evaluatorscriptclass.cpp +++ b/src/lib/corelib/language/evaluatorscriptclass.cpp @@ -428,7 +428,7 @@ void EvaluatorScriptClass::collectValuesFromNextChain(const EvaluationData *data *result = engine()->newArray(); quint32 k = 0; - for (int i = 0; i < lst.count(); ++i) { + for (int i = 0; i < lst.size(); ++i) { const QScriptValue &v = lst.at(i); QBS_ASSERT(!v.isError(), continue); if (v.isArray()) { diff --git a/src/lib/corelib/language/identifiersearch.cpp b/src/lib/corelib/language/identifiersearch.cpp index 32412e2d1..973aae6a8 100644 --- a/src/lib/corelib/language/identifiersearch.cpp +++ b/src/lib/corelib/language/identifiersearch.cpp @@ -62,7 +62,7 @@ void IdentifierSearch::add(const QString &name, bool *found) bool IdentifierSearch::preVisit(QbsQmlJS::AST::Node *) { - return m_numberOfFoundIds < m_requests.count(); + return m_numberOfFoundIds < m_requests.size(); } bool IdentifierSearch::visit(QbsQmlJS::AST::IdentifierExpression *e) @@ -72,7 +72,7 @@ bool IdentifierSearch::visit(QbsQmlJS::AST::IdentifierExpression *e) *found = true; m_numberOfFoundIds++; } - return m_numberOfFoundIds < m_requests.count(); + return m_numberOfFoundIds < m_requests.size(); } } // namespace Internal diff --git a/src/lib/corelib/language/item.cpp b/src/lib/corelib/language/item.cpp index 143643316..f729858db 100644 --- a/src/lib/corelib/language/item.cpp +++ b/src/lib/corelib/language/item.cpp @@ -86,7 +86,7 @@ Item *Item::clone() const dup->m_propertyDeclarations = m_propertyDeclarations; dup->m_modules = m_modules; - dup->m_children.reserve(m_children.count()); + dup->m_children.reserve(m_children.size()); for (const Item * const child : qAsConst(m_children)) { Item *clonedChild = child->clone(); clonedChild->m_parent = dup; diff --git a/src/lib/corelib/language/itemreaderastvisitor.cpp b/src/lib/corelib/language/itemreaderastvisitor.cpp index 76bdc7ff0..d43e14927 100644 --- a/src/lib/corelib/language/itemreaderastvisitor.cpp +++ b/src/lib/corelib/language/itemreaderastvisitor.cpp @@ -96,7 +96,7 @@ bool ItemReaderASTVisitor::visit(AST::UiObjectDefinition *ast) QBS_CHECK(inheritorItem->type() <= ItemType::LastActualItem); itemType = inheritorItem->type(); } else { - if (fullTypeName.count() > 1) { + if (fullTypeName.size() > 1) { throw ErrorInfo(Tr::tr("Invalid item '%1'. Did you mean to set a module property?") .arg(fullTypeName.join(QLatin1Char('.'))), itemLocation); } @@ -262,7 +262,7 @@ Item *ItemReaderASTVisitor::targetItemForBinding(const QStringList &bindingName, const JSSourceValueConstPtr &value) { Item *targetItem = m_item; - const int c = bindingName.count() - 1; + const int c = bindingName.size() - 1; for (int i = 0; i < c; ++i) { ValuePtr v = targetItem->ownProperty(bindingName.at(i)); if (!v) { @@ -284,7 +284,7 @@ Item *ItemReaderASTVisitor::targetItemForBinding(const QStringList &bindingName, void ItemReaderASTVisitor::inheritItem(Item *dst, const Item *src) { int insertPos = 0; - for (int i = 0; i < src->m_children.count(); ++i) { + for (int i = 0; i < src->m_children.size(); ++i) { Item *child = src->m_children.at(i); dst->m_children.insert(insertPos++, child); child->m_parent = dst; diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 5d40c6562..4612fd2d9 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -1218,7 +1218,7 @@ template<typename T> QMap<QString, T> listToMap(const QList<T> &list) template<typename T> bool listsAreEqual(const QList<T> &l1, const QList<T> &l2) { - if (l1.count() != l2.count()) + if (l1.size() != l2.size()) return false; const QMap<QString, T> map1 = listToMap(l1); const QMap<QString, T> map2 = listToMap(l2); @@ -1267,9 +1267,9 @@ bool sourceArtifactSetsAreEqual(const QList<SourceArtifactPtr> &l1, bool operator==(const Rule &r1, const Rule &r2) { - if (r1.artifacts.count() != r2.artifacts.count()) + if (r1.artifacts.size() != r2.artifacts.size()) return false; - for (int i = 0; i < r1.artifacts.count(); ++i) { + for (int i = 0; i < r1.artifacts.size(); ++i) { if (!equals(r1.artifacts.at(i).get(), r2.artifacts.at(i).get())) return false; } diff --git a/src/lib/corelib/language/loader.cpp b/src/lib/corelib/language/loader.cpp index 6926ed61f..c6bf2cf41 100644 --- a/src/lib/corelib/language/loader.cpp +++ b/src/lib/corelib/language/loader.cpp @@ -200,7 +200,7 @@ void Loader::setupProjectFilePath(SetupProjectParameters ¶meters) error = Tr::tr("No project file found in directory '%1'.").arg(projectFilePath); throw ErrorInfo(error); } - if (actualFileNames.count() > 1) { + if (actualFileNames.size() > 1) { throw ErrorInfo(Tr::tr("More than one project file found in directory '%1'.") .arg(projectFilePath)); } diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 9b683c5dd..f01d20a53 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -178,13 +178,13 @@ public: = Set<ProductContext *>::fromList(allProducts) - allDependencies; for (ProductContext * const rootProduct : rootProducts) traverse(rootProduct); - if (m_sortedProducts.count() < allProducts.count()) { + if (m_sortedProducts.size() < allProducts.size()) { for (auto * const product : qAsConst(allProducts)) { QList<ModuleLoader::ProductContext *> path; findCycle(product, path); } } - QBS_CHECK(m_sortedProducts.count() == allProducts.count()); + QBS_CHECK(m_sortedProducts.size() == allProducts.size()); } // No product at position i has dependencies to a product at position j > i. @@ -1544,7 +1544,7 @@ void ModuleLoader::mergeExportItems(const ProductContext &productContext) { std::vector<Item *> exportItems; QList<Item *> children = productContext.item->children(); - for (int i = 0; i < children.count();) { + for (int i = 0; i < children.size();) { Item * const child = children.at(i); if (child->type() == ItemType::Export) { exportItems.push_back(child); @@ -1970,12 +1970,12 @@ void ModuleLoader::resolveDependencies(DependsContext *dependsContext, Item *ite if (child->type() != ItemType::Depends) continue; - int lastModulesCount = loadedModules.count(); + int lastModulesCount = loadedModules.size(); resolveDependsItem(dependsContext, item, child, &loadedModules, &productDependencies); - for (int i = lastModulesCount; i < loadedModules.count(); ++i) + for (int i = lastModulesCount; i < loadedModules.size(); ++i) dependsItemPerLoadedModule.append(child); } - QBS_CHECK(loadedModules.count() == dependsItemPerLoadedModule.count()); + QBS_CHECK(loadedModules.size() == dependsItemPerLoadedModule.size()); Item *lastDependsItem = nullptr; for (Item * const dependsItem : dependsItemPerLoadedModule) { @@ -2066,7 +2066,7 @@ void ModuleLoader::resolveDependsItem(DependsContext *dependsContext, Item *pare qCDebug(lcModuleLoader) << "Ignoring Depends item with empty submodules list."; return; } - if (Q_UNLIKELY(submodules.count() > 1 && !dependsItem->id().isEmpty())) { + if (Q_UNLIKELY(submodules.size() > 1 && !dependsItem->id().isEmpty())) { QString msg = Tr::tr("A Depends item with more than one module cannot have an id."); throw ErrorInfo(msg, dependsItem->location()); } @@ -2114,7 +2114,7 @@ void ModuleLoader::resolveDependsItem(DependsContext *dependsContext, Item *pare ErrorInfo e(Tr::tr("Dependency '%1' not found for product '%2'.") .arg(moduleName.toString(), dependsContext->product->name), dependsItem->location()); - if (moduleName.count() == 2 && moduleName.front() == QLatin1String("Qt")) { + if (moduleName.size() == 2 && moduleName.front() == QLatin1String("Qt")) { e.append(Tr::tr("Please create a Qt profile using the qbs-setup-qt tool " "if you haven't already done so.")); } @@ -2272,19 +2272,19 @@ Item *ModuleLoader::moduleInstanceItem(Item *containerItem, const QualifiedId &m { QBS_CHECK(!moduleName.isEmpty()); Item *instance = containerItem; - for (int i = 0; i < moduleName.count(); ++i) { + for (int i = 0; i < moduleName.size(); ++i) { const QString &moduleNameSegment = moduleName.at(i); const ValuePtr v = instance->ownProperty(moduleName.at(i)); if (v && v->type() == Value::ItemValueType) { instance = std::static_pointer_cast<ItemValue>(v)->item(); } else { - const ItemType itemType = i < moduleName.count() - 1 ? ItemType::ModulePrefix - : ItemType::ModuleInstance; + const ItemType itemType = i < moduleName.size() - 1 ? ItemType::ModulePrefix + : ItemType::ModuleInstance; Item *newItem = Item::create(m_pool, itemType); instance->setProperty(moduleNameSegment, ItemValue::create(newItem)); instance = newItem; } - if (i < moduleName.count() - 1) { + if (i < moduleName.size() - 1) { if (instance->type() == ItemType::ModuleInstance) { QualifiedId conflictingName = QStringList(moduleName.mid(0, i + 1)); throwModuleNamePrefixError(conflictingName, moduleName, CodeLocation()); @@ -2355,7 +2355,7 @@ private: static bool isBaseModule(const QualifiedId &moduleName) { - return moduleName.count() == 1 && moduleName.front() == QLatin1String("qbs"); + return moduleName.size() == 1 && moduleName.front() == QLatin1String("qbs"); } class DelayedPropertyChanger @@ -3308,7 +3308,7 @@ void ModuleLoader::copyGroupsFromModuleToProduct(const ProductContext &productCo const Item::Module &module, const Item *modulePrototype) { - for (int i = 0; i < modulePrototype->children().count(); ++i) { + for (int i = 0; i < modulePrototype->children().size(); ++i) { Item * const child = modulePrototype->children().at(i); if (child->type() == ItemType::Group) { Item * const clonedGroup = child->clone(); diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 44193ac0b..4da9e77a2 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -129,10 +129,10 @@ void ProjectResolver::setProgressObserver(ProgressObserver *observer) static void checkForDuplicateProductNames(const TopLevelProjectConstPtr &project) { const QList<ResolvedProductPtr> allProducts = project->allProducts(); - for (int i = 0; i < allProducts.count(); ++i) { + for (int i = 0; i < allProducts.size(); ++i) { const ResolvedProductConstPtr product1 = allProducts.at(i); const QString productName = product1->uniqueName(); - for (int j = i + 1; j < allProducts.count(); ++j) { + for (int j = i + 1; j < allProducts.size(); ++j) { const ResolvedProductConstPtr product2 = allProducts.at(j); if (product2->uniqueName() == productName) { ErrorInfo error; @@ -234,7 +234,7 @@ static void makeSubProjectNamesUniqe(const ResolvedProjectPtr &parentProject) TopLevelProjectPtr ProjectResolver::resolveTopLevelProject() { if (m_progressObserver) - m_progressObserver->setMaximum(m_loadResult.productInfos.count()); + m_progressObserver->setMaximum(m_loadResult.productInfos.size()); const TopLevelProjectPtr project = TopLevelProject::create(); project->buildDirectory = TopLevelProject::deriveBuildDirectory(m_setupParams.buildRoot(), TopLevelProject::deriveId(m_setupParams.finalBuildConfigurationTree())); @@ -437,7 +437,7 @@ void ProjectResolver::resolveProductFully(Item *item, ProjectContext *projectCon // First item is "main error", gets prepended again in the catch clause. const QList<ErrorItem> &items = pi.delayedError.items(); - for (int i = 1; i < items.count(); ++i) + for (int i = 1; i < items.size(); ++i) errorInfo.append(items.at(i)); pi.delayedError.clear(); @@ -632,7 +632,7 @@ QVariantMap ProjectResolver::resolveAdditionalModuleProperties(const Item *group QHash<QString, QStringList> propsPerModule; for (auto fullPropName : propsToEval) { const QString moduleName - = QualifiedId(fullPropName.mid(0, fullPropName.count() - 1)).toString(); + = QualifiedId(fullPropName.mid(0, fullPropName.size() - 1)).toString(); propsPerModule[moduleName] << fullPropName.last(); } EvalCacheEnabler cachingEnabler(m_evaluator); @@ -726,7 +726,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont return; } QStringList patterns; - for (int i = files.count(); --i >= 0;) { + for (int i = files.size(); --i >= 0;) { if (FileInfo::isPattern(files[i])) patterns.append(files.takeAt(i)); } @@ -737,7 +737,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont if (!prefixWasSet && m_productContext->currentGroup) group->prefix = m_productContext->currentGroup->prefix; if (!group->prefix.isEmpty()) { - for (int i = files.count(); --i >= 0;) + for (int i = files.size(); --i >= 0;) files[i].prepend(group->prefix); } group->location = item->location(); @@ -787,7 +787,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont } group->name = m_evaluator->stringValue(item, QLatin1String("name")); if (group->name.isEmpty()) - group->name = Tr::tr("Group %1").arg(m_productContext->product->groups.count()); + group->name = Tr::tr("Group %1").arg(m_productContext->product->groups.size()); m_productContext->product->groups += group; class GroupContextSwitcher { diff --git a/src/lib/corelib/language/qualifiedid.cpp b/src/lib/corelib/language/qualifiedid.cpp index e49b82b3c..6fb2964b0 100644 --- a/src/lib/corelib/language/qualifiedid.cpp +++ b/src/lib/corelib/language/qualifiedid.cpp @@ -70,7 +70,7 @@ QString QualifiedId::toString() const bool operator<(const QualifiedId &a, const QualifiedId &b) { - const int c = std::min(a.count(), b.count()); + const int c = std::min(a.size(), b.size()); for (int i = 0; i < c; ++i) { int n = a.at(i).compare(b.at(i)); if (n < 0) @@ -78,7 +78,7 @@ bool operator<(const QualifiedId &a, const QualifiedId &b) if (n > 0) return false; } - return a.count() < b.count(); + return a.size() < b.size(); } } // namespace Internal diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp index 0306f4e73..b43421d3e 100644 --- a/src/lib/corelib/language/scriptengine.cpp +++ b/src/lib/corelib/language/scriptengine.cpp @@ -601,7 +601,7 @@ QScriptValueList ScriptEngine::argumentList(const QStringList &argumentNames, const QScriptValue &context) { QScriptValueList result; - for (int i = 0; i < argumentNames.count(); ++i) + for (int i = 0; i < argumentNames.size(); ++i) result += context.property(argumentNames.at(i)); return result; } diff --git a/src/lib/corelib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp index db156e288..6556ba8a5 100644 --- a/src/lib/corelib/parser/qmlerror.cpp +++ b/src/lib/corelib/parser/qmlerror.cpp @@ -265,7 +265,7 @@ QDebug operator<<(QDebug debug, const QmlError &error) const QString code = stream.readAll(); const QStringList lines = code.split(QLatin1Char('\n')); - if (lines.count() >= error.line()) { + if (lines.size() >= error.line()) { const QString &line = lines.at(error.line() - 1); debug << "\n " << qPrintable(line); diff --git a/src/lib/corelib/tools/executablefinder.cpp b/src/lib/corelib/tools/executablefinder.cpp index 816c0e7d0..2a55fe99b 100644 --- a/src/lib/corelib/tools/executablefinder.cpp +++ b/src/lib/corelib/tools/executablefinder.cpp @@ -98,7 +98,7 @@ QString ExecutableFinder::findBySuffix(const QString &filePath) const bool ExecutableFinder::candidateCheck(const QString &directory, const QString &program, QString &fullProgramPath) const { - for (int i = 0; i < m_executableSuffixes.count(); ++i) { + for (int i = 0; i < m_executableSuffixes.size(); ++i) { QString candidate = directory + program + m_executableSuffixes.at(i); qCDebug(lcExec) << "candidate:" << candidate; QFileInfo fi(candidate); @@ -122,12 +122,12 @@ QString ExecutableFinder::findInPath(const QString &filePath, const QString &wor .split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); if (HostOsInfo::isWindowsHost()) pathEnv.prepend(QLatin1String(".")); - for (int i = 0; i < pathEnv.count(); ++i) { + for (int i = 0; i < pathEnv.size(); ++i) { QString directory = pathEnv.at(i); if (directory == QLatin1String(".")) directory = workingDirPath; if (!directory.isEmpty()) { - const QChar lastChar = directory.at(directory.count() - 1); + const QChar lastChar = directory.at(directory.size() - 1); if (lastChar != QLatin1Char('/') && lastChar != QLatin1Char('\\')) directory.append(QLatin1Char('/')); } diff --git a/src/lib/corelib/tools/jsliterals.cpp b/src/lib/corelib/tools/jsliterals.cpp index 61315a669..b731f067f 100644 --- a/src/lib/corelib/tools/jsliterals.cpp +++ b/src/lib/corelib/tools/jsliterals.cpp @@ -60,7 +60,7 @@ QString toJSLiteral(const QString &str) QString toJSLiteral(const QStringList &strs) { QString js = QLatin1String("["); - for (int i = 0; i < strs.count(); ++i) { + for (int i = 0; i < strs.size(); ++i) { if (i != 0) js.append(QLatin1String(", ")); js.append(toJSLiteral(strs.at(i))); diff --git a/src/lib/corelib/tools/persistence.h b/src/lib/corelib/tools/persistence.h index ff91eface..847ded5cb 100644 --- a/src/lib/corelib/tools/persistence.h +++ b/src/lib/corelib/tools/persistence.h @@ -257,7 +257,7 @@ template<> struct PersistentPool::Helper<QProcessEnvironment> static void store(const QProcessEnvironment &env, PersistentPool *pool) { const QStringList &keys = env.keys(); - pool->store(keys.count()); + pool->store(keys.size()); for (const QString &key : keys) { pool->store(key); pool->store(env.value(key)); @@ -339,7 +339,7 @@ struct PersistentPool::Helper<T, typename std::enable_if<IsKeyValueContainer<T>: { static void store(const T &container, PersistentPool *pool) { - pool->store(container.count()); + pool->store(container.size()); for (auto it = container.cbegin(); it != container.cend(); ++it) { pool->store(it.key()); pool->store(it.value()); diff --git a/src/lib/corelib/tools/scripttools.h b/src/lib/corelib/tools/scripttools.h index 8346aea66..2d8f54204 100644 --- a/src/lib/corelib/tools/scripttools.h +++ b/src/lib/corelib/tools/scripttools.h @@ -55,7 +55,7 @@ namespace Internal { template <typename C> QScriptValue toScriptValue(QScriptEngine *scriptEngine, const C &container) { - QScriptValue v = scriptEngine->newArray(container.count()); + QScriptValue v = scriptEngine->newArray(container.size()); int i = 0; for (const typename C::value_type &item : container) v.setProperty(i++, scriptEngine->toScriptValue(item)); diff --git a/src/lib/corelib/tools/set.h b/src/lib/corelib/tools/set.h index 393b8530c..3292b68f6 100644 --- a/src/lib/corelib/tools/set.h +++ b/src/lib/corelib/tools/set.h @@ -119,8 +119,7 @@ public: bool contains(const T &v) const { return std::binary_search(cbegin(), cend(), v); } bool contains(const Set<T> &other) const; bool isEmpty() const { return m_data.empty(); } - int count() const { return int(m_data.size()); } - int size() const { return count(); } + int size() const { return int(m_data.size()); } int capacity() const { return int(m_data.capacity()); } bool intersects(const Set<T> &other) const; @@ -274,7 +273,7 @@ template<typename T> void Set<T>::load(PersistentPool &pool) template<typename T> void Set<T>::store(PersistentPool &pool) const { - pool.store(count()); + pool.store(size()); std::for_each(m_data.cbegin(), m_data.cend(), std::bind(&Set<T>::storeElem, this, std::ref(pool), std::placeholders::_1)); } @@ -282,7 +281,7 @@ template<typename T> void Set<T>::store(PersistentPool &pool) const template<typename T> QStringList Set<T>::toStringList() const { QStringList sl; - sl.reserve(count()); + sl.reserve(size()); std::transform(cbegin(), cend(), std::back_inserter(sl), [this](const T &e) { return toString(e); }); return sl; diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp index 4544fa5d0..c24c58d2c 100644 --- a/src/lib/corelib/tools/settingsmodel.cpp +++ b/src/lib/corelib/tools/settingsmodel.cpp @@ -166,7 +166,7 @@ void SettingsModel::addNewKey(const QModelIndex &parent) Node * const newNode = new Node; newNode->parent = parentNode; newNode->name = parentNode->uniqueChildName(); - beginInsertRows(parent, parentNode->children.count(), parentNode->children.count()); + beginInsertRows(parent, parentNode->children.size(), parentNode->children.size()); parentNode->children << newNode; endInsertRows(); d->dirty = true; @@ -247,7 +247,7 @@ int SettingsModel::rowCount(const QModelIndex &parent) const return 0; const Node * const node = d->indexToNode(parent); Q_ASSERT(node); - return node->children.count(); + return node->children.size(); } QVariant SettingsModel::data(const QModelIndex &index, int role) const @@ -302,7 +302,7 @@ QModelIndex SettingsModel::index(int row, int column, const QModelIndex &parent) { const Node * const parentNode = d->indexToNode(parent); Q_ASSERT(parentNode); - if (parentNode->children.count() <= row) + if (parentNode->children.size() <= row) return QModelIndex(); return createIndex(row, column, parentNode->children.at(row)); } diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp index 28152ddd8..61f7483bf 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp @@ -55,7 +55,7 @@ namespace Internal { typedef QHash<QString, QString> NamePathHash; static void replaceQtLibNamesWithFilePath(const NamePathHash &namePathHash, QStringList *libList) { - for (int i = 0; i < libList->count(); ++i) { + for (int i = 0; i < libList->size(); ++i) { QString &lib = (*libList)[i]; const NamePathHash::ConstIterator it = namePathHash.find(lib); if (it != namePathHash.constEnd()) @@ -76,7 +76,7 @@ static void replaceQtLibNamesWithFilePath(QList<QtModuleInfo> *modules, const Qt linkerNamesToFilePathsRelease.insert(m.libNameForLinker(qtEnv, false), m.libFilePathRelease); } - for (int i = 0; i < modules->count(); ++i) { + for (int i = 0; i < modules->size(); ++i) { QtModuleInfo &module = (*modules)[i]; replaceQtLibNamesWithFilePath(linkerNamesToFilePathsDebug, &module.dynamicLibrariesDebug); replaceQtLibNamesWithFilePath(linkerNamesToFilePathsDebug, &module.staticLibrariesDebug); @@ -281,7 +281,7 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild, // Assuming lib names and directories without spaces here. QStringList parts = QString::fromLatin1(simplifiedLine.mid(equalsOffset + 1).trimmed()) .split(QLatin1Char(' '), QString::SkipEmptyParts); - for (int i = 0; i < parts.count(); ++i) { + for (int i = 0; i < parts.size(); ++i) { QString part = parts.at(i); part.replace(QLatin1String("$$[QT_INSTALL_LIBS]"), qtEnv.libraryPath); if (part.startsWith(QLatin1String("-l"))) { @@ -291,7 +291,7 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild, } else if (part.startsWith(QLatin1String("-F"))) { frameworkPaths << part.mid(2); } else if (part == QLatin1String("-framework")) { - if (++i < parts.count()) + if (++i < parts.size()) frameworks << parts.at(i); } else if (part == QLatin1String("-pthread")) { libs << QLatin1String("pthread"); @@ -486,7 +486,7 @@ QList<QtModuleInfo> allQt4Modules(const QtEnvironment &qtEnvironment) << QLatin1String("webkit") << QLatin1String("script") << QLatin1String("scripttools") << QLatin1String("declarative") << QLatin1String("gui") << QLatin1String("dbus") << QLatin1String("opengl") << QLatin1String("openvg"); - for (int i = 0; i < modules.count(); ++i) { + for (int i = 0; i < modules.size(); ++i) { QString name = modules[i].qbsName; name.remove(QLatin1String("-private")); if (modulesThatCanBeDisabled.contains(name)) @@ -494,7 +494,7 @@ QList<QtModuleInfo> allQt4Modules(const QtEnvironment &qtEnvironment) } Internal::Set<QString> nonExistingPrlFiles; - for (int i = 0; i < modules.count(); ++i) { + for (int i = 0; i < modules.size(); ++i) { QtModuleInfo &module = modules[i]; if (qtEnvironment.staticBuild) module.isStaticLibrary = true; @@ -514,12 +514,12 @@ static QList<QByteArray> getPriFileContentsRecursively(const Profile &profile, "file '%2' (%3).").arg(profile.name(), priFile.fileName(), priFile.errorString())); } QList<QByteArray> lines = priFile.readAll().split('\n'); - for (int i = 0; i < lines.count(); ++i) { + for (int i = 0; i < lines.size(); ++i) { const QByteArray includeString = "include("; const QByteArray &line = lines.at(i).trimmed(); if (!line.startsWith(includeString)) continue; - const int offset = includeString.count(); + const int offset = includeString.size(); const int closingParenPos = line.indexOf(')', offset); if (closingParenPos == -1) { qDebug("Warning: Invalid include statement in '%s'", qPrintable(priFilePath)); @@ -556,9 +556,9 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q moduleInfo.isPlugin = fileHasPluginPrefix; const QString fileNamePrefix = moduleInfo.isPlugin ? pluginFileNamePrefix : moduleFileNamePrefix; - moduleInfo.qbsName = dit.fileName().mid(fileNamePrefix.count(), - dit.fileName().count() - fileNamePrefix.count() - - moduleFileNameSuffix.count()); + moduleInfo.qbsName = dit.fileName().mid(fileNamePrefix.size(), + dit.fileName().size() - fileNamePrefix.size() + - moduleFileNameSuffix.size()); if (moduleInfo.isPlugin) { moduleInfo.name = moduleInfo.qbsName; moduleInfo.isStaticLibrary = true; @@ -583,7 +583,7 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q hasModuleEntry = true; } else if (key.endsWith(".depends")) { moduleInfo.dependencies = QString::fromLocal8Bit(value).split(QLatin1Char(' ')); - for (int i = 0; i < moduleInfo.dependencies.count(); ++i) { + for (int i = 0; i < moduleInfo.dependencies.size(); ++i) { moduleInfo.dependencies[i].replace(QLatin1String("_private"), QLatin1String("-private")); } @@ -600,7 +600,7 @@ QList<QtModuleInfo> allQt5Modules(const Profile &profile, const QtEnvironment &q } } else if (key.endsWith(".includes")) { moduleInfo.includePaths = QString::fromLocal8Bit(value).split(QLatin1Char(' ')); - for (int i = 0; i < moduleInfo.includePaths.count(); ++i) { + for (int i = 0; i < moduleInfo.includePaths.size(); ++i) { moduleInfo.includePaths[i] .replace(QLatin1String("$$QT_MODULE_INCLUDE_BASE"), qtEnvironment.includePath) diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 8e401f2bb..124029b42 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -93,7 +93,7 @@ static QString defaultQpaPlugin(const Profile &profile, const QtModuleInfo &modu foreach (const QByteArray &line, lines) { const QByteArray simplifiedLine = line.simplified(); if (simplifiedLine.startsWith(magicString)) - return QString::fromLatin1(simplifiedLine.mid(magicString.count()).trimmed()); + return QString::fromLatin1(simplifiedLine.mid(magicString.size()).trimmed()); } } else { const QString qtGuiConfigHeader = (qtEnv.frameworkBuild diff --git a/src/libexec/qbs_processlauncher/processlauncher-main.cpp b/src/libexec/qbs_processlauncher/processlauncher-main.cpp index 224e3bf9b..e4850cff9 100644 --- a/src/libexec/qbs_processlauncher/processlauncher-main.cpp +++ b/src/libexec/qbs_processlauncher/processlauncher-main.cpp @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) #endif QCoreApplication app(argc, argv); - if (app.arguments().count() != 2) { + if (app.arguments().size() != 2) { qbs::Internal::logError("Need exactly one argument (path to socket)"); return 1; } diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index a29b00e78..9e7b3c690 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -262,7 +262,7 @@ static void closeScanner(void *ptr) static const char *next(void *opaq, int *size, int *flags) { Opaq *opaque = static_cast<Opaq*>(opaq); - if (opaque->currentResultIndex < opaque->includedFiles.count()) { + if (opaque->currentResultIndex < opaque->includedFiles.size()) { const ScanResult &result = opaque->includedFiles.at(opaque->currentResultIndex); ++opaque->currentResultIndex; *size = result.size; |