Replace std::erase && std::remove_if chains with Internal::remove_if

Change-Id: Ia267b9419227db5f4382a33aa99eb7dbe0ada45f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp b/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp
index 2adb77d47..3f3fce59b 100644
--- a/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp
+++ b/src/lib/corelib/buildgraph/artifactsscriptvalue.cpp
@@ -45,6 +45,8 @@
 #include <language/language.h>
 #include <language/scriptengine.h>
 
+#include <tools/stlutils.h>
+
 #include <QtScript/qscriptclass.h>
 #include <QtScript/qscriptcontext.h>
 
@@ -162,7 +164,7 @@ template<class ProductOrModule> static QScriptValue js_artifactsForFileTag(
     const auto filter = [productOrModule](const Artifact *a) {
         return !isRelevantArtifact(productOrModule, a);
     };
-    artifacts.erase(std::remove_if(artifacts.begin(), artifacts.end(), filter), artifacts.end());
+    Internal::removeIf(artifacts, filter);
     result = engine->newArray(uint(artifacts.size()));
     ctx->callee().setProperty(CachedValueKey, result);
     int k = 0;
diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp
index 8d82ac562..2dc87e980 100644
--- a/src/lib/corelib/jsextensions/utilitiesextension.cpp
+++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp
@@ -43,6 +43,7 @@
 #include <logging/translator.h>
 #include <tools/architectures.h>
 #include <tools/hostosinfo.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 #include <tools/toolchains.h>
 #include <tools/version.h>
@@ -604,7 +605,7 @@ QScriptValue UtilitiesExtension::js_installedMSVCs(QScriptContext *context, QScr
         auto archPair = MSVC::getHostTargetArchPair(msvc.architecture);
         return archPair.first != hostArch || preferredArch != archPair.second;
     };
-    msvcs.erase(std::remove_if(msvcs.begin(), msvcs.end(), predicate), msvcs.end());
+    Internal::removeIf(msvcs, predicate);
     QVariantList result;
     for (const auto &msvc: msvcs)
         result.append(msvc.toVariantMap());
diff --git a/src/lib/corelib/language/itemreader.cpp b/src/lib/corelib/language/itemreader.cpp
index afa768a06..1abc5caf9 100644
--- a/src/lib/corelib/language/itemreader.cpp
+++ b/src/lib/corelib/language/itemreader.cpp
@@ -42,6 +42,7 @@
 #include "itemreadervisitorstate.h"
 
 #include <tools/profiling.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qfileinfo.h>
 
@@ -52,13 +53,10 @@ namespace Internal {
 
 static void makePathsCanonical(QStringList &paths)
 {
-    auto it = std::remove_if(paths.begin(), paths.end(), [](QString &p) {
+    Internal::removeIf(paths, [](QString &p) {
         p = QFileInfo(p).canonicalFilePath();
         return p.isEmpty();
     });
-    auto e = paths.end();
-    if (it != e)
-        paths.erase(it, e);
 }
 
 ItemReader::ItemReader(Logger &logger)
diff --git a/src/lib/corelib/tools/clangclinfo.cpp b/src/lib/corelib/tools/clangclinfo.cpp
index 36845da6d..3aaee0786 100644
--- a/src/lib/corelib/tools/clangclinfo.cpp
+++ b/src/lib/corelib/tools/clangclinfo.cpp
@@ -49,8 +49,7 @@ static std::vector<MSVCInstallInfo> compatibleMsvcs(Logger &logger)
         const int major = versions.at(0).toInt(&ok);
         return !(ok && major >= 15); // support MSVC2017 and above
     };
-    const auto it = std::remove_if(msvcs.begin(), msvcs.end(), filter);
-    msvcs.erase(it, msvcs.end());
+    Internal::removeIf(msvcs, filter);
     for (const auto &msvc: msvcs) {
         auto vcvarsallPath = msvc.findVcvarsallBat();
         if (vcvarsallPath.isEmpty())