Use stl algorithms for filtering in mergeExportItems

It makes the intention clearer than a loop that does 2 actions
simultaneously and is also a bit faster since we do not shift the tail
of the list after removing an item.

Change-Id: Ia39e972a6a9f83d5c352b2021246c5839b676f7f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 4 insertions, 9 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index c00fae6a0..d099c72a9 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -1975,15 +1975,10 @@ bool ModuleLoader::mergeExportItems(const ProductContext &productContext)
 {
     std::vector<Item *> exportItems;
     QList<Item *> children = productContext.item->children();
-    for (int i = 0; i < children.size();) {
-        Item * const child = children.at(i);
-        if (child->type() == ItemType::Export) {
-            exportItems.push_back(child);
-            children.removeAt(i);
-        } else {
-            ++i;
-        }
-    }
+
+    auto isExport = [](Item *item) { return item->type() == ItemType::Export; };
+    std::copy_if(children.cbegin(), children.cend(), std::back_inserter(exportItems), isExport);
+    qbs::Internal::removeIf(children, isExport);
 
     // Note that we do not return if there are no Export items: The "merged" item becomes the
     // "product module", which always needs to exist, regardless of whether the product sources