diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-22 15:51:27 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-23 08:17:48 +0000 |
commit | 815f132be90c76ec857d725d39b1cf6c265b6865 (patch) | |
tree | 044f81f4bdc8d75129d3196c44652fd2196c035e /src/lib/corelib/language/projectresolver.cpp | |
parent | 37511dc3031c3dff8ad16414a57e9ddb32a75d59 (diff) |
Remove effect-free code
We're iterating backwards over the product dependencies. Adding/removing
elements at the current index has no effect for the next iteration.
Remove that code.
Change-Id: Ibd9168356772b92843dae9ad6ca7b287fb8fdf36
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 | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 7813b9bac..964dad6b0 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -969,16 +969,6 @@ void ProjectResolver::resolveScanner(Item *item, ProjectResolver::ProjectContext m_productContext->product->scanners += scanner; } -static ModuleLoaderResult::ProductInfo::Dependency extractDependency( - const ResolvedProductConstPtr &product) -{ - ModuleLoaderResult::ProductInfo::Dependency dependency; - dependency.name = product->name; - dependency.profile = product->profile; - dependency.multiplexConfigurationId = product->multiplexConfigurationId; - return dependency; -} - ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies( const ResolvedProductConstPtr &product, const ModuleLoaderResult::ProductInfo &productInfo) { @@ -997,10 +987,8 @@ ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies( continue; } result.dependencies.emplace_back(p, dependency.parameters); - dependencies << extractDependency(p); } } - dependencies.removeAt(i); } else if (dependency.profile == QLatin1String("*")) { for (const ResolvedProductPtr &p : qAsConst(m_productsByName)) { if (p->name != dependency.name || p == product || !p->enabled @@ -1008,9 +996,7 @@ ProjectResolver::ProductDependencyInfos ProjectResolver::getProductDependencies( continue; } result.dependencies.emplace_back(p, dependency.parameters); - dependencies << extractDependency(p); } - dependencies.removeAt(i); } else { ResolvedProductPtr usedProduct = m_productsByName.value(dependency.uniqueName()); const QString depDisplayName = ResolvedProduct::fullDisplayName(dependency.name, |