diff options
36 files changed, 99 insertions, 101 deletions
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index 1687f311c..ef9df1b53 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -90,7 +90,7 @@ static QStringList collectQmakePaths() if (pathFileInfo.exists()) { QString qmakePath = pathFileInfo.absoluteFilePath(); if (!qmakePaths.contains(qmakePath)) - qmakePaths.append(qmakePath); + qmakePaths.push_back(qmakePath); } } } @@ -114,7 +114,7 @@ QList<QtEnvironment> SetupQt::fetchEnvironments() [&env](const QtEnvironment &otherEnv) { return env.includePath == otherEnv.includePath; }) == qtEnvironments.constEnd()) { - qtEnvironments.append(env); + qtEnvironments.push_back(env); } } diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp index ce82dd5cf..c9f8f49fd 100644 --- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp +++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp @@ -91,7 +91,7 @@ bool XcodeProbe::addDeveloperPath(const QString &path) return false; if (developerPaths.contains(path)) return false; - developerPaths.append(path); + developerPaths.push_back(path); qbsInfo() << Tr::tr("Added developer path %1").arg(path); return true; } diff --git a/src/app/qbs/status.cpp b/src/app/qbs/status.cpp index aa018429d..f88196094 100644 --- a/src/app/qbs/status.cpp +++ b/src/app/qbs/status.cpp @@ -53,18 +53,14 @@ namespace qbs { static QList<QRegExp> createIgnoreList(const QString &projectRootPath) { - QList<QRegExp> ignoreRegularExpressionList; - ignoreRegularExpressionList.append(QRegExp(projectRootPath + QLatin1String("/build.*"))); - ignoreRegularExpressionList.append(QRegExp(QLatin1String("*.qbs"), - Qt::CaseSensitive, QRegExp::Wildcard)); - ignoreRegularExpressionList.append(QRegExp(QLatin1String("*.pro"), - Qt::CaseSensitive, QRegExp::Wildcard)); - ignoreRegularExpressionList.append(QRegExp(QLatin1String("*Makefile"), - Qt::CaseSensitive, QRegExp::Wildcard)); - ignoreRegularExpressionList.append(QRegExp(QLatin1String("*.so*"), - Qt::CaseSensitive, QRegExp::Wildcard)); - ignoreRegularExpressionList.append(QRegExp(QLatin1String("*.o"), - Qt::CaseSensitive, QRegExp::Wildcard)); + QList<QRegExp> ignoreRegularExpressionList { + QRegExp(projectRootPath + QLatin1String("/build.*")), + QRegExp(QLatin1String("*.qbs"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QLatin1String("*.pro"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QLatin1String("*Makefile"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QLatin1String("*.so*"), Qt::CaseSensitive, QRegExp::Wildcard), + QRegExp(QLatin1String("*.o"), Qt::CaseSensitive, QRegExp::Wildcard) + }; QString ignoreFilePath = projectRootPath + QLatin1String("/.qbsignore"); QFile ignoreFile(ignoreFilePath); @@ -74,11 +70,11 @@ static QList<QRegExp> createIgnoreList(const QString &projectRootPath) foreach (const QByteArray &btoken, ignoreTokenList) { const QString token = QString::fromLatin1(btoken); if (token.left(1) == QLatin1String("/")) - ignoreRegularExpressionList.append(QRegExp(projectRootPath + ignoreRegularExpressionList.push_back(QRegExp(projectRootPath + token + QLatin1String(".*"), Qt::CaseSensitive, QRegExp::RegExp2)); else if (!token.isEmpty()) - ignoreRegularExpressionList.append(QRegExp(token, Qt::CaseSensitive, QRegExp::RegExp2)); + ignoreRegularExpressionList.push_back(QRegExp(token, Qt::CaseSensitive, QRegExp::RegExp2)); } } @@ -102,9 +98,9 @@ static QStringList allFilesInDirectoryRecursive(const QDir &rootDirecory, const if (!inIgnoreList) { if (fileInfo.isFile()) - fileList.append(absoluteFilePath); + fileList.push_back(absoluteFilePath); else if (fileInfo.isDir()) - fileList.append(allFilesInDirectoryRecursive(QDir(absoluteFilePath), ignoreRegularExpressionList)); + fileList << allFilesInDirectoryRecursive(QDir(absoluteFilePath), ignoreRegularExpressionList); } } @@ -147,7 +143,7 @@ int printStatus(const ProjectData &project) qSort(sourceFiles); foreach (const QString &sourceFile, sourceFiles) { if (!QFileInfo(sourceFile).exists()) - missingFiles.append(sourceFile); + missingFiles.push_back(sourceFile); qbsInfo() << " " << sourceFile.mid(projectDirectoryPathLength + 1); untrackedFilesInProject.removeOne(sourceFile); } diff --git a/src/lib/corelib/api/changeset.cpp b/src/lib/corelib/api/changeset.cpp index 699270b39..0f69ca047 100644 --- a/src/lib/corelib/api/changeset.cpp +++ b/src/lib/corelib/api/changeset.cpp @@ -288,47 +288,47 @@ void ChangeSet::convertToReplace(const EditOp &op, QList<EditOp> *replaceList) switch (op.type) { case EditOp::Replace: - replaceList->append(op); + replaceList->push_back(op); break; case EditOp::Move: replace1.pos1 = op.pos1; replace1.length1 = op.length1; - replaceList->append(replace1); + replaceList->push_back(replace1); replace2.pos1 = op.pos2; replace2.text = textAt(op.pos1, op.length1); - replaceList->append(replace2); + replaceList->push_back(replace2); break; case EditOp::Insert: replace1.pos1 = op.pos1; replace1.text = op.text; - replaceList->append(replace1); + replaceList->push_back(replace1); break; case EditOp::Remove: replace1.pos1 = op.pos1; replace1.length1 = op.length1; - replaceList->append(replace1); + replaceList->push_back(replace1); break; case EditOp::Flip: replace1.pos1 = op.pos1; replace1.length1 = op.length1; replace1.text = textAt(op.pos2, op.length2); - replaceList->append(replace1); + replaceList->push_back(replace1); replace2.pos1 = op.pos2; replace2.length1 = op.length2; replace2.text = textAt(op.pos1, op.length1); - replaceList->append(replace2); + replaceList->push_back(replace2); break; case EditOp::Copy: replace1.pos1 = op.pos2; replace1.text = textAt(op.pos1, op.length1); - replaceList->append(replace1); + replaceList->push_back(replace1); break; case EditOp::Unset: diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp index 0baacc27d..00b025698 100644 --- a/src/lib/corelib/buildgraph/buildgraph.cpp +++ b/src/lib/corelib/buildgraph/buildgraph.cpp @@ -353,7 +353,7 @@ void setupScriptEngineForProduct(ScriptEngine *engine, ResolvedProduct *product, bool findPath(BuildGraphNode *u, BuildGraphNode *v, QList<BuildGraphNode *> &path) { if (u == v) { - path.append(v); + path.push_back(v); return true; } diff --git a/src/lib/corelib/buildgraph/depscanner.cpp b/src/lib/corelib/buildgraph/depscanner.cpp index e0fae57c9..8b5a0a0fe 100644 --- a/src/lib/corelib/buildgraph/depscanner.cpp +++ b/src/lib/corelib/buildgraph/depscanner.cpp @@ -232,9 +232,9 @@ QStringList UserDependencyScanner::evaluate(Artifact *artifact, const ScriptFunc QScriptValueList args; args.reserve(3); - args.append(m_global.property(QString::fromLatin1("project"))); - args.append(m_global.property(QString::fromLatin1("product"))); - args.append(Transformer::translateFileConfig(m_engine, artifact, m_scanner->module->name)); + args.push_back(m_global.property(QString::fromLatin1("project"))); + args.push_back(m_global.property(QString::fromLatin1("product"))); + args.push_back(Transformer::translateFileConfig(m_engine, artifact, m_scanner->module->name)); m_engine->setGlobalObject(m_global); QScriptValue &function = script->scriptFunction; @@ -259,7 +259,7 @@ QStringList UserDependencyScanner::evaluate(Artifact *artifact, const ScriptFunc for (qint32 i = 0; i < count; ++i) { QScriptValue item = result.property(i); if (item.isValid() && !item.isUndefined()) - list.append(item.toString()); + list.push_back(item.toString()); } } return list; diff --git a/src/lib/corelib/buildgraph/environmentscriptrunner.cpp b/src/lib/corelib/buildgraph/environmentscriptrunner.cpp index 34c80fd0a..6a143c16f 100644 --- a/src/lib/corelib/buildgraph/environmentscriptrunner.cpp +++ b/src/lib/corelib/buildgraph/environmentscriptrunner.cpp @@ -90,9 +90,9 @@ static QList<const ResolvedModule*> topSortModules(const QHash<const ResolvedMod for (const ResolvedModule * const m : modules) { if (m->name.isNull()) continue; - result.append(topSortModules(moduleChildren, moduleChildren.value(m), seenModuleNames)); + result << topSortModules(moduleChildren, moduleChildren.value(m), seenModuleNames); if (seenModuleNames.insert(m->name).second) - result.append(m); + result.push_back(m); } return result; } @@ -141,8 +141,8 @@ void EnvironmentScriptRunner::setupEnvironment() for (const QString &moduleName : qAsConst(module->moduleDependencies)) { const ResolvedModule * const depmod = moduleMap.value(moduleName); QBS_ASSERT(depmod, return); - moduleParents[depmod].append(module.get()); - moduleChildren[module.get()].append(depmod); + moduleParents[depmod].push_back(module.get()); + moduleChildren[module.get()].push_back(depmod); } } @@ -150,7 +150,7 @@ void EnvironmentScriptRunner::setupEnvironment() for (const ResolvedModuleConstPtr &module : m_product->modules) { if (moduleParents.value(module.get()).isEmpty()) { QBS_ASSERT(module, return); - rootModules.append(module.get()); + rootModules.push_back(module.get()); } } diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 6d5cc9f90..819ed7d99 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -531,7 +531,7 @@ void Executor::finishJob(ExecutorJob *job, bool success) QBS_CHECK(it != m_processingJobs.end()); const TransformerPtr transformer = it.value(); m_processingJobs.erase(it); - m_availableJobs.append(job); + m_availableJobs.push_back(job); if (success) { m_project->buildData->isDirty = true; for (Artifact * const artifact : qAsConst(transformer->outputs)) { @@ -710,7 +710,7 @@ void Executor::addExecutorJobs() job->setObjectName(QString::fromLatin1("J%1").arg(i)); job->setDryRun(m_buildOptions.dryRun()); job->setEchoMode(m_buildOptions.echoMode()); - m_availableJobs.append(job); + m_availableJobs.push_back(job); connect(job, &ExecutorJob::reportCommandDescription, this, &Executor::reportCommandDescription); connect(job, &ExecutorJob::reportProcessResult, this, &Executor::reportProcessResult); @@ -1122,7 +1122,7 @@ void Executor::prepareArtifact(Artifact *artifact) const FileTime oldTimestamp = artifact->timestamp(); retrieveSourceFileTimestamp(artifact); if (oldTimestamp != artifact->timestamp()) - m_changedSourceArtifacts.append(artifact); + m_changedSourceArtifacts.push_back(artifact); possiblyInstallArtifact(artifact); } diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp index 31e54486e..13314eb52 100644 --- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp +++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp @@ -149,7 +149,7 @@ void InputArtifactScanner::scanForFileDependencies(Artifact *inputArtifact) InputArtifactScannerContext::CacheItem &cacheItem = m_context->cache[inputArtifact->properties]; Set<QString> visitedFilePaths; QList<FileResourceBase *> filesToScan; - filesToScan.append(inputArtifact); + filesToScan.push_back(inputArtifact); const Set<DependencyScanner *> scanners = scannersForArtifact(inputArtifact); if (scanners.empty()) return; @@ -270,11 +270,11 @@ resolved: // Do not scan an artifact that is not built yet: Its contents might still change. if (artifactDependency->artifactType == Artifact::SourceFile || artifactDependency->buildState == BuildGraphNode::Built) { - artifactsToScan->append(artifactDependency); + artifactsToScan->push_back(artifactDependency); } } else { // Add file dependency to the next round of scanning. - artifactsToScan->append(resolvedDependency.file); + artifactsToScan->push_back(resolvedDependency.file); } } } diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp index 258943051..7b7e30cc3 100644 --- a/src/lib/corelib/buildgraph/projectbuilddata.cpp +++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp @@ -118,7 +118,7 @@ void ProjectBuildData::insertIntoLookupTable(FileResourceBase *fileres) } } QBS_CHECK(!lst.contains(fileres)); - lst.append(fileres); + lst.push_back(fileres); } void ProjectBuildData::removeFromLookupTable(FileResourceBase *fileres) @@ -344,7 +344,7 @@ private: } throw ErrorInfo(Tr::tr("Cycle detected in rule dependencies: %1").arg(pathstr)); } - m_rulePath.append(rule.get()); + m_rulePath.push_back(rule.get()); RuleNode *node = m_nodePerRule.value(rule); if (!node) { node = new RuleNode; diff --git a/src/lib/corelib/buildgraph/rulegraph.cpp b/src/lib/corelib/buildgraph/rulegraph.cpp index e782b3f32..24749767e 100644 --- a/src/lib/corelib/buildgraph/rulegraph.cpp +++ b/src/lib/corelib/buildgraph/rulegraph.cpp @@ -56,7 +56,7 @@ void RuleGraph::build(const QList<RulePtr> &rules, const FileTags &productFileTa m_rules.reserve(rules.size()); for (const RulePtr &rule : rules) { for (const FileTag &fileTag : rule->collectedOutputFileTags()) - m_outputFileTagToRule[fileTag].append(rule.get()); + m_outputFileTagToRule[fileTag].push_back(rule.get()); insert(rule); } @@ -68,7 +68,7 @@ void RuleGraph::build(const QList<RulePtr> &rules, const FileTags &productFileTa inFileTags += rule->auxiliaryInputs; inFileTags += rule->explicitlyDependsOn; for (const FileTag &fileTag : qAsConst(inFileTags)) { - inputFileTagToRule[fileTag].append(rule.get()); + inputFileTagToRule[fileTag].push_back(rule.get()); for (const Rule * const producingRule : m_outputFileTagToRule.value(fileTag)) { if (!producingRule->collectedOutputFileTags().intersects( rule->excludedAuxiliaryInputs)) { diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp index 4e2bfd350..1e474e1e2 100644 --- a/src/lib/corelib/buildgraph/transformer.cpp +++ b/src/lib/corelib/buildgraph/transformer.cpp @@ -136,7 +136,7 @@ QScriptValue Transformer::translateInOutputs(ScriptEngine *scriptEngine, TagArtifactsMap tagArtifactsMap; for (Artifact *artifact : artifacts) for (const FileTag &fileTag : artifact->fileTags()) - tagArtifactsMap[fileTag.toString()].append(artifact); + tagArtifactsMap[fileTag.toString()].push_back(artifact); for (TagArtifactsMap::Iterator it = tagArtifactsMap.begin(); it != tagArtifactsMap.end(); ++it) std::sort(it.value().begin(), it.value().end(), compareByFilePath); diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp index 87cd701d9..b81e65fe4 100644 --- a/src/lib/corelib/generators/generator.cpp +++ b/src/lib/corelib/generators/generator.cpp @@ -183,7 +183,7 @@ static GeneratableProjectData _reduceProjectConfigurations( prod.data.insert(it.key(), it.value().products().at(i)); } - gproject.products.append(prod); + gproject.products.push_back(prod); } // Add the project's subprojects... @@ -197,7 +197,7 @@ static GeneratableProjectData _reduceProjectConfigurations( subprojectMap.insert(it.key(), it.value().subProjects().at(i)); } - gproject.subProjects.append(_reduceProjectConfigurations(subprojectMap)); + gproject.subProjects.push_back(_reduceProjectConfigurations(subprojectMap)); } return gproject; diff --git a/src/lib/corelib/jsextensions/fileinfoextension.cpp b/src/lib/corelib/jsextensions/fileinfoextension.cpp index 8b951ddbf..681df5a35 100644 --- a/src/lib/corelib/jsextensions/fileinfoextension.cpp +++ b/src/lib/corelib/jsextensions/fileinfoextension.cpp @@ -269,7 +269,7 @@ QScriptValue FileInfoExtension::js_joinPaths(QScriptContext *context, QScriptEng if (!value.isUndefined() && !value.isNull()) { const QString arg = value.toString(); if (!arg.isEmpty()) - paths.append(arg); + paths.push_back(arg); } } return engine->toScriptValue(QString::fromStdString( diff --git a/src/lib/corelib/jsextensions/propertylistutils.mm b/src/lib/corelib/jsextensions/propertylistutils.mm index 4ab5831a1..33445e03a 100644 --- a/src/lib/corelib/jsextensions/propertylistutils.mm +++ b/src/lib/corelib/jsextensions/propertylistutils.mm @@ -112,7 +112,7 @@ static QVariantList fromArray(NSArray *array) { QVariantList list; for (id obj in array) - list.append(fromObject(obj)); + list.push_back(fromObject(obj)); return list; } diff --git a/src/lib/corelib/language/astimportshandler.cpp b/src/lib/corelib/language/astimportshandler.cpp index 75c2cb0ca..af9fd8ffd 100644 --- a/src/lib/corelib/language/astimportshandler.cpp +++ b/src/lib/corelib/language/astimportshandler.cpp @@ -165,7 +165,7 @@ void ASTImportsHandler::handleImport(const QbsQmlJS::AST::UiImport *import) if (filePath.endsWith(QLatin1String(".js"), Qt::CaseInsensitive)) { JsImport &jsImport = m_jsImports[as]; jsImport.scopeName = as; - jsImport.filePaths.append(filePath); + jsImport.filePaths.push_back(filePath); jsImport.location = toCodeLocation(m_file->filePath(), import->firstSourceLocation()); } else if (filePath.endsWith(QLatin1String(".qbs"), Qt::CaseInsensitive)) { @@ -230,8 +230,8 @@ bool ASTImportsHandler::addPrototype(const QString &fileName, const QString &fil QStringList prototypeName; if (!as.isEmpty()) - prototypeName.append(as); - prototypeName.append(componentName); + prototypeName.push_back(as); + prototypeName.push_back(componentName); if (!m_typeNameToFile.contains(prototypeName)) m_typeNameToFile.insert(prototypeName, filePath); return true; @@ -285,7 +285,7 @@ void ASTImportsHandler::collectPrototypesAndJsCollections(const QString &path, c jsImport.scopeName = as; jsImport.location = location; } - jsImport.filePaths.append(dirIter.filePath()); + jsImport.filePaths.push_back(dirIter.filePath()); } } diff --git a/src/lib/corelib/language/asttools.cpp b/src/lib/corelib/language/asttools.cpp index 93c9689e3..a46e2c554 100644 --- a/src/lib/corelib/language/asttools.cpp +++ b/src/lib/corelib/language/asttools.cpp @@ -47,7 +47,7 @@ QStringList toStringList(QbsQmlJS::AST::UiQualifiedId *qid) { QStringList result; for (; qid; qid = qid->next) - result.append(qid->name.toString()); + result.push_back(qid->name.toString()); return result; } diff --git a/src/lib/corelib/language/evaluator.cpp b/src/lib/corelib/language/evaluator.cpp index a65cc4d6f..39157171f 100644 --- a/src/lib/corelib/language/evaluator.cpp +++ b/src/lib/corelib/language/evaluator.cpp @@ -128,7 +128,7 @@ static QStringList toStringList(const QScriptValue &scriptValue) QScriptValue elem = scriptValue.property(i++); if (!elem.isValid()) break; - lst.append(elem.toString()); + lst.push_back(elem.toString()); } return lst; } diff --git a/src/lib/corelib/language/item.cpp b/src/lib/corelib/language/item.cpp index 646d90ff7..f7b32d6be 100644 --- a/src/lib/corelib/language/item.cpp +++ b/src/lib/corelib/language/item.cpp @@ -90,7 +90,7 @@ Item *Item::clone() const for (const Item * const child : qAsConst(m_children)) { Item *clonedChild = child->clone(); clonedChild->m_parent = dup; - dup->m_children.append(clonedChild); + dup->m_children.push_back(clonedChild); } for (PropertyMap::const_iterator it = m_properties.constBegin(); it != m_properties.constEnd(); @@ -359,7 +359,7 @@ Item *Item::child(ItemType type, bool checkForMultiple) const void Item::addChild(Item *parent, Item *child) { - parent->m_children.append(child); + parent->m_children.push_back(child); child->setParent(parent); } diff --git a/src/lib/corelib/language/itemdeclaration.cpp b/src/lib/corelib/language/itemdeclaration.cpp index 956b6b061..d7230e9d6 100644 --- a/src/lib/corelib/language/itemdeclaration.cpp +++ b/src/lib/corelib/language/itemdeclaration.cpp @@ -49,7 +49,7 @@ ItemDeclaration::ItemDeclaration(ItemType type) ItemDeclaration &ItemDeclaration::operator<<(const PropertyDeclaration &decl) { - m_properties.append(decl); + m_properties.push_back(decl); return *this; } diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp index 5f6a5ff58..b6c48fdbe 100644 --- a/src/lib/corelib/language/language.cpp +++ b/src/lib/corelib/language/language.cpp @@ -214,7 +214,7 @@ QList<SourceArtifactPtr> ResolvedGroup::allFiles() const { QList<SourceArtifactPtr> lst = files; if (wildcards) - lst.append(wildcards->files); + lst << wildcards->files; return lst; } diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 138a07f53..ea78c4703 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -489,7 +489,7 @@ private: const QualifiedId oldModuleName = m_currentModuleName; if (m_parentItem->type() != ItemType::ModulePrefix) m_currentModuleName.clear(); - m_currentModuleName.append(m_currentName); + m_currentModuleName.push_back(m_currentName); it.value()->apply(this); m_currentModuleName = oldModuleName; } @@ -620,7 +620,7 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult, Item::addChild(projectItem, additionalProductItem); resolveProbes(&dummyProductContext, projectItem); - projectContext.topLevelProject->probes.append(dummyProductContext.info.probes); + projectContext.topLevelProject->probes << dummyProductContext.info.probes; const QList<Item *> originalChildren = projectItem->children(); for (Item * const child : originalChildren) { @@ -820,7 +820,7 @@ QList<Item *> ModuleLoader::multiplexProductItem(ProductContext *dummyContext, I QBS_CHECK(mprow.size() == multiplexInfo.properties.size()); if (row > 0) { item = productItem->clone(); - additionalProductItems.append(item); + additionalProductItems.push_back(item); } if (multiplexInfo.table.size() > 1 || aggregator) { const QString multiplexConfigurationId = multiplexInfo.toIdString(row); @@ -1973,7 +1973,7 @@ void ModuleLoader::resolveDependencies(DependsContext *dependsContext, Item *ite int lastModulesCount = loadedModules.size(); resolveDependsItem(dependsContext, item, child, &loadedModules, &productDependencies); for (int i = lastModulesCount; i < loadedModules.size(); ++i) - dependsItemPerLoadedModule.append(child); + dependsItemPerLoadedModule.push_back(child); } QBS_CHECK(loadedModules.size() == dependsItemPerLoadedModule.size()); @@ -2132,7 +2132,7 @@ void ModuleLoader::resolveDependsItem(DependsContext *dependsContext, Item *pare result.required = isRequired; result.parameters = defaultParameters; result.versionRange = versionRange; - moduleResults->append(result); + moduleResults->push_back(result); if (result.isProduct) { qCDebug(lcModuleLoader) << "product dependency loaded:" << moduleName.toString(); const QString profilesKey = QLatin1String("profiles"); @@ -2141,9 +2141,9 @@ void ModuleLoader::resolveDependsItem(DependsContext *dependsContext, Item *pare &profilesPropertyWasSet); if (profiles.empty()) { if (profilesPropertyWasSet) - profiles.append(QLatin1String("*")); + profiles.push_back(QLatin1String("*")); else - profiles.append(QString()); + profiles.push_back(QString()); } QStringList multiplexConfigurationIds = m_evaluator->stringListValue(dependsItem, @@ -2651,7 +2651,7 @@ Item *ModuleLoader::loadModuleFile(ProductContext *productContext, const QString if (Q_UNLIKELY(!module->hasProperty(vmit.key()))) { const ErrorInfo error(Tr::tr("Unknown property: %1.%2").arg(fullModuleName, vmit.key())); - unknownProfilePropertyErrors.append(error); + unknownProfilePropertyErrors.push_back(error); continue; } const PropertyDeclaration decl = module->propertyDeclaration(vmit.key()); @@ -2730,7 +2730,7 @@ void ModuleLoader::setupBaseModulePrototype(Item *prototype) static void collectItemsWithId_impl(Item *item, QList<Item *> *result) { if (!item->id().isEmpty()) - result->append(item); + result->push_back(item); for (Item * const child : item->children()) collectItemsWithId_impl(child, result); } @@ -2753,7 +2753,7 @@ static std::vector<std::pair<QualifiedId, ItemValuePtr>> instanceItemProperties( ItemValuePtr itemValue = std::static_pointer_cast<ItemValue>(it.value()); if (!itemValue->item()) continue; - name.append(it.key()); + name.push_back(it.key()); if (itemValue->item()->type() == ItemType::ModulePrefix) f(itemValue->item()); else diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index ee95cacf1..424560a24 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -728,7 +728,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont QStringList patterns; for (int i = files.size(); --i >= 0;) { if (FileInfo::isPattern(files[i])) - patterns.append(files.takeAt(i)); + patterns.push_back(files.takeAt(i)); } GroupPtr group = ResolvedGroup::create(); bool prefixWasSet = false; diff --git a/src/lib/corelib/tools/error.cpp b/src/lib/corelib/tools/error.cpp index 60394ca6e..8530d993f 100644 --- a/src/lib/corelib/tools/error.cpp +++ b/src/lib/corelib/tools/error.cpp @@ -207,17 +207,17 @@ ErrorInfo::~ErrorInfo() void ErrorInfo::appendBacktrace(const QString &description, const CodeLocation &location) { - d->items.append(ErrorItem(description, location, true)); + d->items.push_back(ErrorItem(description, location, true)); } void ErrorInfo::append(const ErrorItem &item) { - d->items.append(item); + d->items.push_back(item); } void ErrorInfo::append(const QString &description, const CodeLocation &location) { - d->items.append(ErrorItem(description, location)); + d->items.push_back(ErrorItem(description, location)); } void ErrorInfo::prepend(const QString &description, const CodeLocation &location) @@ -256,9 +256,9 @@ QString ErrorInfo::toString() const if (e.codeLocation().isValid()) line.append(QStringLiteral(" in %1").arg(e.codeLocation().toString())); if (!line.isEmpty()) - lines.append(QStringLiteral("\t") + line); + lines.push_back(QStringLiteral("\t") + line); } else { - lines.append(e.toString()); + lines.push_back(e.toString()); } } return lines.join(QLatin1Char('\n')); diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index 23db77e01..fbe53e3b8 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -130,7 +130,7 @@ static QStringList parseCommandLine(const QString &commandLine) if (!args) throw ErrorInfo(mkStr("Could not parse command line arguments: ") + commandLine); for (int i = 0; i < argCount; ++i) - list.append(QString::fromWCharArray(args[i])); + list.push_back(QString::fromWCharArray(args[i])); delete[] buf; return list; } diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index e780085bd..f7a501b90 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -272,7 +272,7 @@ static void copyTemplateFile(const QString &fileName, const QString &targetDirec replaceSpecialValues(&newContent, profile, *module, qtEnv); sourceFile.close(); const QString targetPath = targetDirectory + QLatin1Char('/') + fileName; - allFiles->append(QFileInfo(targetPath).absoluteFilePath()); + allFiles->push_back(QFileInfo(targetPath).absoluteFilePath()); QFile targetFile(targetPath); if (targetFile.open(QIODevice::ReadOnly)) { if (newContent == targetFile.readAll()) // No need to overwrite anything in this case. @@ -430,7 +430,7 @@ void doSetupQtProfile(const QString &profileName, Settings *settings, // determine whether user apps require C++11 if (qtEnvironment.qtConfigItems.contains(QLatin1String("c++11")) && qtEnvironment.staticBuild) - qtEnvironment.configItems.append(QLatin1String("c++11")); + qtEnvironment.configItems.push_back(QLatin1String("c++11")); // Set the minimum operating system versions appropriate for this Qt version qtEnvironment.windowsVersion = guessMinimumWindowsVersion(qtEnvironment); diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp index a3407cb09..0f94f2b2b 100644 --- a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp +++ b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp @@ -92,7 +92,7 @@ void ClangCompilationDatabaseGenerator::generate() for (const RuleCommand &rule : rules) { if (rule.type() != RuleCommand::ProcessCommandType) continue; - database.append(createEntry(filePath, buildDir, rule)); + database.push_back(createEntry(filePath, buildDir, rule)); } } } diff --git a/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp b/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp index a6d572425..fbd6a3848 100644 --- a/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp +++ b/src/plugins/generator/visualstudio/solution/visualstudiosolution.cpp @@ -76,7 +76,7 @@ QList<VisualStudioSolutionFileProject *> VisualStudioSolution::fileProjects() co QList<VisualStudioSolutionFileProject *> list; for (const auto &project : d->projects) if (auto fileProject = qobject_cast<VisualStudioSolutionFileProject *>(project)) - list.append(fileProject); + list.push_back(fileProject); return list; } @@ -85,13 +85,13 @@ QList<VisualStudioSolutionFolderProject *> VisualStudioSolution::folderProjects( QList<VisualStudioSolutionFolderProject *> list; for (const auto &project : d->projects) if (auto folderProject = qobject_cast<VisualStudioSolutionFolderProject *>(project)) - list.append(folderProject); + list.push_back(folderProject); return list; } void VisualStudioSolution::appendProject(IVisualStudioSolutionProject *project) { - d->projects.append(project); + d->projects.push_back(project); } QList<VisualStudioSolutionFileProject *> VisualStudioSolution::dependencies( @@ -103,7 +103,7 @@ QList<VisualStudioSolutionFileProject *> VisualStudioSolution::dependencies( void VisualStudioSolution::addDependency(VisualStudioSolutionFileProject *project, VisualStudioSolutionFileProject *dependency) { - d->dependencies[project].append(dependency); + d->dependencies[project].push_back(dependency); } QList<VisualStudioSolutionGlobalSection *> VisualStudioSolution::globalSections() const @@ -113,7 +113,7 @@ QList<VisualStudioSolutionGlobalSection *> VisualStudioSolution::globalSections( void VisualStudioSolution::appendGlobalSection(VisualStudioSolutionGlobalSection *globalSection) { - d->globalSections.append(globalSection); + d->globalSections.push_back(globalSection); } } // namespace qbs diff --git a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp index e5cf62003..02c5d710d 100644 --- a/src/plugins/generator/visualstudio/visualstudiogenerator.cpp +++ b/src/plugins/generator/visualstudio/visualstudiogenerator.cpp @@ -169,7 +169,7 @@ void VisualStudioGenerator::addPropertySheets(const GeneratableProject &project) { { const auto fileName = QStringLiteral("qbs.props"); - d->propertySheetNames.append({ fileName, true }); + d->propertySheetNames.push_back({ fileName, true }); d->msbuildProjects.insert(project.baseBuildDirectory().absoluteFilePath(fileName), std::make_shared<MSBuildSolutionPropertiesProject>( d->versionInfo, project, @@ -178,7 +178,7 @@ void VisualStudioGenerator::addPropertySheets(const GeneratableProject &project) { const auto fileName = QStringLiteral("qbs-shared.props"); - d->propertySheetNames.append({ fileName, false }); + d->propertySheetNames.push_back({ fileName, false }); d->msbuildProjects.insert(project.baseBuildDirectory().absoluteFilePath(fileName), std::make_shared<MSBuildSharedSolutionPropertiesProject>( d->versionInfo, project, diff --git a/src/plugins/scanner/cpp/cppscanner.cpp b/src/plugins/scanner/cpp/cppscanner.cpp index 84bda61b6..739b863de 100644 --- a/src/plugins/scanner/cpp/cppscanner.cpp +++ b/src/plugins/scanner/cpp/cppscanner.cpp @@ -169,7 +169,7 @@ static void scanCppFile(void *opaq, CPlusPlus::Lexer &yylex, bool scanForFileTag else scanResult.flags = SC_GLOBAL_INCLUDE_FLAG; scanResult.fileName = opaque->fileContent + tk.begin() + 1; - opaque->includedFiles.append(scanResult); + opaque->includedFiles.push_back(scanResult); } } } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index ab88d8560..80e4c730b 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -5299,7 +5299,7 @@ void TestBlackbox::qbsVersion() << "project.qbsVersionPatch:" + QString::number(v.patchLevel()); QCOMPARE(runQbs(params), 0); - params.arguments.append("project.qbsVersionPatch:" + QString::number(v.patchLevel() + 1)); + params.arguments.push_back("project.qbsVersionPatch:" + QString::number(v.patchLevel() + 1)); params.expectFailure = true; QVERIFY(runQbs(params) != 0); } diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 9fe189ed7..90f6494d9 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -185,7 +185,7 @@ void TestBlackboxApple::assetCatalog() } rmDirR(relativeBuildDir()); - params.arguments.append("modules.cpp.minimumMacosVersion:'10.10'"); // force CAR generation + params.arguments.push_back("modules.cpp.minimumMacosVersion:'10.10'"); // force CAR generation QCOMPARE(runQbs(params), 0); // empty asset catalogs must still produce output @@ -211,7 +211,7 @@ void TestBlackboxApple::assetCatalog() // now we'll add the iconset rmDirR(relativeBuildDir()); - params.arguments.append("project.includeIconset:true"); + params.arguments.push_back("project.includeIconset:true"); QCOMPARE(runQbs(params), 0); QVERIFY(!(bool)m_qbsStdout.contains("compiling empty.xcassets")); QVERIFY((bool)m_qbsStdout.contains("compiling empty.iconset")); diff --git a/tests/auto/blackbox/tst_blackboxbase.cpp b/tests/auto/blackbox/tst_blackboxbase.cpp index 97aef869b..6993c7958 100644 --- a/tests/auto/blackbox/tst_blackboxbase.cpp +++ b/tests/auto/blackbox/tst_blackboxbase.cpp @@ -78,14 +78,16 @@ int TestBlackboxBase::runQbs(const QbsRunParameters ¶ms) if (!params.settingsDir.isEmpty() && supportsSettingsDirOption(params.command)) args << "--settings-dir" << params.settingsDir; if (supportsBuildDirectoryOption(params.command)) { - args.append(QLatin1String("-d")); - args.append(params.buildDirectory.isEmpty() ? QLatin1String(".") : params.buildDirectory); + args.push_back(QLatin1String("-d")); + args.push_back(params.buildDirectory.isEmpty() + ? QLatin1String(".") + : params.buildDirectory); } args << params.arguments; const bool commandImpliesResolve = params.command.isEmpty() || params.command == "resolve" || params.command == "build" || params.command == "install" || params.command == "run"; if (!params.profile.isEmpty() && commandImpliesResolve) { - args.append(QLatin1String("profile:") + params.profile); + args.push_back(QLatin1String("profile:") + params.profile); } QProcess process; process.setProcessEnvironment(params.environment); diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 20f3f0050..964bbe036 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -145,7 +145,7 @@ void TestBlackboxJava::javaDependencyTracking() QDir::setCurrent(testDataDir + "/java"); QbsRunParameters rp; - rp.arguments.append("--check-outputs"); + rp.arguments.push_back("--check-outputs"); if (!jdkPath.isEmpty()) rp.arguments << ("modules.java.jdkPath:" + jdkPath); if (!javaVersion.isEmpty()) diff --git a/tests/auto/blackbox/tst_clangdb.cpp b/tests/auto/blackbox/tst_clangdb.cpp index 1433dda3b..b1b03dbc3 100644 --- a/tests/auto/blackbox/tst_clangdb.cpp +++ b/tests/auto/blackbox/tst_clangdb.cpp @@ -172,7 +172,7 @@ void TestClangDb::checkDbIsConsistentWithProject() const QJsonArray jsonArguments = entry.value("arguments").toArray(); QString executable = jsonArguments.at(0).toString(); for (int i=1; i<jsonArguments.size(); i++) - arguments.append(jsonArguments.at(i).toString()); + arguments.push_back(jsonArguments.at(i).toString()); QVERIFY(runProcess(executable, arguments, stdErr, stdOut) == 0); } diff --git a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp index 59f4adbc3..88a458d53 100644 --- a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp +++ b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp @@ -59,8 +59,8 @@ private slots: void testValidCommandLine() { QStringList args; - args.append("-vvk"); - args.append("-v"); + args.push_back("-vvk"); + args.push_back("-v"); args << "--products" << "blubb"; args << "--changed-files" << "foo,bar" << m_fileArgs; args << "--check-timestamps"; |