diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-10-24 09:02:03 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-15 16:57:54 +0000 |
commit | a0c61e70eeefbf9d6c632a94d29bcc2a7e97b7d7 (patch) | |
tree | 10ae236ef25cc2284377ab7bf29a315ad6a7444c /src/lib/corelib/language/projectresolver.cpp | |
parent | 9d8ad8027a34de6871f753047a160b3b3ec65368 (diff) |
STL compatibility: use size() instead of count()
This is a simple find and replace with manual sanity check.
Change-Id: Ia733befe7885dc3c643d5c84e151312bfd86a3c6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
-rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 { |