aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/language')
-rw-r--r--src/lib/corelib/language/astimportshandler.cpp2
-rw-r--r--src/lib/corelib/language/evaluatorscriptclass.cpp2
-rw-r--r--src/lib/corelib/language/identifiersearch.cpp4
-rw-r--r--src/lib/corelib/language/item.cpp2
-rw-r--r--src/lib/corelib/language/itemreaderastvisitor.cpp6
-rw-r--r--src/lib/corelib/language/language.cpp6
-rw-r--r--src/lib/corelib/language/loader.cpp2
-rw-r--r--src/lib/corelib/language/moduleloader.cpp28
-rw-r--r--src/lib/corelib/language/projectresolver.cpp16
-rw-r--r--src/lib/corelib/language/qualifiedid.cpp4
-rw-r--r--src/lib/corelib/language/scriptengine.cpp2
11 files changed, 37 insertions, 37 deletions
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 &parameters)
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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 06:26:22 +0000