1 files changed, 20 insertions, 21 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index f9e809565..78d4eb68b 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -43,9 +43,9 @@
 #include "errors.h"
 #include "fileutils.h"
 #include "fsengineclient.h"
+#include "globals.h"
 #include "lib7z_facade.h"
 #include "packagemanagercore.h"
-#include "qinstallerglobal.h"
 #include "messageboxhandler.h"
 
 #include <kdupdaterupdatesourcesinfo.h>
@@ -182,13 +182,13 @@ void Component::loadDataFromPackage(const Package &package)
     }
 
     setLocalTempPath(QInstaller::pathFromUrl(package.sourceInfo().url));
-    const QStringList uis = package.data(QLatin1String("UserInterfaces")).toString().split(scCommaRegExp,
-        QString::SkipEmptyParts);
+    const QStringList uis = package.data(QLatin1String("UserInterfaces")).toString()
+        .split(QInstaller::commaRegExp(), QString::SkipEmptyParts);
     if (!uis.isEmpty())
         loadUserInterfaces(QDir(QString::fromLatin1("%1/%2").arg(localTempPath(), name())), uis);
 
-    const QStringList qms = package.data(QLatin1String("Translations")).toString().split(scCommaRegExp,
-        QString::SkipEmptyParts);
+    const QStringList qms = package.data(QLatin1String("Translations")).toString()
+        .split(QInstaller::commaRegExp(), QString::SkipEmptyParts);
     if (!qms.isEmpty())
         loadTranslations(QDir(QString::fromLatin1("%1/%2").arg(localTempPath(), name())), qms);
 
@@ -308,23 +308,22 @@ void Component::removeComponent(Component *component)
 }
 
 /*!
-    Returns a list of child components. If \a recursive is set to true, the returned list
-    contains not only the direct children, but all ancestors. Note: The returned list does include ALL
-    children, non virtual components as well as virtual components.
+    Returns a list of child components. If \a kind is set to DirectChildrenOnly, the returned list contains
+    only the direct children, if set to Descendants it will also include all descendants of the components
+    children. Note: The returned list does include ALL children, non virtual components as well as virtual
+    components.
 */
-QList<Component*> Component::childComponents(bool recursive, RunMode runMode) const
+QList<Component *> Component::childComponents(Kind kind) const
 {
-    QList<Component*> result;
-    if (runMode == UpdaterMode)
-        return result;
+    if (d->m_core->isUpdater())
+        return QList<Component*>();
 
-    if (!recursive)
-        return d->m_allChildComponents;
+    QList<Component *> result = d->m_allChildComponents;
+    if (kind == DirectChildrenOnly)
+        return result;
 
-    foreach (Component *component, d->m_allChildComponents) {
-        result.append(component);
-        result += component->childComponents(true, runMode);
-    }
+    foreach (Component *component, d->m_allChildComponents)
+        result += component->childComponents(kind);
     return result;
 }
 
@@ -977,7 +976,7 @@ bool Component::validatePage()
 void Component::setSelected(bool selected)
 {
     Q_UNUSED(selected)
-    qDebug() << Q_FUNC_INFO << QString::fromLatin1("on \"%1\" is deprecated!!!").arg(d->m_componentName);
+    qDebug() << Q_FUNC_INFO << QString::fromLatin1("on '%1' is deprecated.").arg(d->m_componentName);
 }
 
 void Component::addDependency(const QString &newDependency)
@@ -996,13 +995,13 @@ void Component::addDependency(const QString &newDependency)
 */
 QStringList Component::dependencies() const
 {
-    return d->m_vars.value(scDependencies).split(scCommaRegExp, QString::SkipEmptyParts);
+    return d->m_vars.value(scDependencies).split(QInstaller::commaRegExp(), QString::SkipEmptyParts);
 }
 
 QStringList Component::autoDependencies() const
 {
     QStringList autoDependencyStringList =
-        d->m_vars.value(scAutoDependOn).split(scCommaRegExp, QString::SkipEmptyParts);
+        d->m_vars.value(scAutoDependOn).split(QInstaller::commaRegExp(), QString::SkipEmptyParts);
     autoDependencyStringList.removeAll(QLatin1String("script"));
     return autoDependencyStringList;
 }