Move filter blacklisted function into common header.

Change-Id: Ic2b77c140e5a6900ecd12d5c23d94b17985adbe0
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>

2 files changed, 18 insertions, 3 deletions

diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp
index 35996042d..7e9b5e1f7 100644
--- a/installerbuilder/common/repositorygen.cpp
+++ b/installerbuilder/common/repositorygen.cpp
@@ -849,3 +849,12 @@ void QInstaller::copyComponentData(const QString &packageDir, const QString &con
         }
     }
 }
+
+PackageInfoVector QInstaller::filterBlacklisted(PackageInfoVector packages, const QStringList &blacklist)
+{
+    for (int i = packages.size() - 1; i >= 0; --i) {
+        if (blacklist.contains(packages[i].name))
+            packages.remove(i);
+    }
+    return packages;
+}
diff --git a/installerbuilder/common/repositorygen.h b/installerbuilder/common/repositorygen.h
index 23706ba39..9eb95660e 100644
--- a/installerbuilder/common/repositorygen.h
+++ b/installerbuilder/common/repositorygen.h
@@ -49,18 +49,24 @@ struct PackageInfo
 typedef QVector<PackageInfo> PackageInfoVector;
 
 QMap<QString, QString> buildPathToVersionMap(const PackageInfoVector &info);
-void compressMetaDirectories(const QString &configDir, const QString &repoDir, const QString &baseDir,
-    const QMap<QString, QString> &versionMapping);
-void compressMetaDirectories(const QString &configDir, const QString &repoDir);
+
 void compressDirectory(const QStringList &paths, const QString &archivePath);
+void compressMetaDirectories(const QString &configDir, const QString &repoDir);
+void compressMetaDirectories(const QString &configDir, const QString &repoDir,
+    const QString &baseDir, const QMap<QString, QString> &versionMapping);
+
 void copyComponentData(const QString &packageDir, const QString &configDir, const QString &repoDir,
     const PackageInfoVector &infos);
+
 void generateMetaDataDirectory(const QString &outDir, const QString &dataDir,
     const PackageInfoVector &packages, const QString &appName,
     const QString& appVersion, const QString &redirectUpdateUrl = QString());
+
 PackageInfoVector createListOfPackages(const QStringList &components, const QString &packagesDirectory,
     bool addDependencies = true);
 
+PackageInfoVector filterBlacklisted(PackageInfoVector packages, const QStringList &blacklist);
+
 } // namespace QInstaller
 
 #endif // QINSTALLER_REPOSITORYGEN_H