diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-26 11:02:21 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-27 08:43:42 +0000 |
commit | de2fea77343b8b72de2e5a276316752a364639de (patch) | |
tree | 9ca2bc461aad4bdfd6fb4fb34ed9ca4626a20f25 /src/lib/corelib/language/projectresolver.cpp | |
parent | 235dfa540fb694ba6f9ccc5472bb38b97c0925d8 (diff) |
Make ResolvedProject::products a vector
The value_type is not suitable for QList.
Change-Id: If72af8998e9e1da37c8451bc6dc5925079be43dd
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 592a2a41c..174c9d5bd 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -134,11 +134,11 @@ void ProjectResolver::setProgressObserver(ProgressObserver *observer) static void checkForDuplicateProductNames(const TopLevelProjectConstPtr &project) { - const QList<ResolvedProductPtr> allProducts = project->allProducts(); - for (int i = 0; i < allProducts.size(); ++i) { + const std::vector<ResolvedProductPtr> allProducts = project->allProducts(); + for (size_t i = 0; i < allProducts.size(); ++i) { const ResolvedProductConstPtr product1 = allProducts.at(i); const QString productName = product1->uniqueName(); - for (int j = i + 1; j < allProducts.size(); ++j) { + for (size_t j = i + 1; j < allProducts.size(); ++j) { const ResolvedProductConstPtr product2 = allProducts.at(j); if (product2->uniqueName() == productName) { ErrorInfo error; @@ -345,7 +345,7 @@ void ProjectResolver::resolveProjectFully(Item *item, ProjectResolver::ProjectCo } } - for (const ResolvedProductPtr &product : qAsConst(projectContext->project->products)) + for (const ResolvedProductPtr &product : projectContext->project->products) postProcess(product, projectContext); } @@ -1518,7 +1518,7 @@ void gatherDependencies(ResolvedProduct *product, DependencyMap &dependencies) -static DependencyMap allDependencies(const QList<ResolvedProductPtr> &products) +static DependencyMap allDependencies(const std::vector<ResolvedProductPtr> &products) { DependencyMap dependencies; for (const ResolvedProductPtr &product : products) @@ -1529,7 +1529,7 @@ static DependencyMap allDependencies(const QList<ResolvedProductPtr> &products) void ProjectResolver::resolveProductDependencies(const ProjectContext &projectContext) { // Resolve all inter-product dependencies. - const QList<ResolvedProductPtr> allProducts = projectContext.project->allProducts(); + const std::vector<ResolvedProductPtr> allProducts = projectContext.project->allProducts(); bool disabledDependency = false; for (const ResolvedProductPtr &rproduct : allProducts) { if (!rproduct->enabled) |