Remove unneeded member holding virtual children

Virtual children always lie after the
non-virtual ones inside allChildren list anyway.

Change-Id: Iefccabfc1d15f41a7e211b8fe4f518d1948013b1
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 7e57e239d..ec2b65a19 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -428,13 +428,14 @@ void Component::appendComponent(Component *component)
         throw Error(tr("Components cannot have children in updater mode."));
 
     if (!component->isVirtual()) {
+        const QList<Component *> virtualChildComponents = d->m_allChildComponents.mid(d->m_childComponents.count());
         d->m_childComponents.append(component);
         std::sort(d->m_childComponents.begin(), d->m_childComponents.end(), SortingPriorityGreaterThan());
+        d->m_allChildComponents = d->m_childComponents + virtualChildComponents;
     } else {
-        d->m_virtualChildComponents.append(component);
+        d->m_allChildComponents.append(component);
     }
 
-    d->m_allChildComponents = d->m_childComponents + d->m_virtualChildComponents;
     if (Component *parent = component->parentComponent())
         parent->removeComponent(component);
     component->d->m_parentComponent = this;
@@ -450,8 +451,7 @@ void Component::removeComponent(Component *component)
     if (component->parentComponent() == this) {
         component->d->m_parentComponent = 0;
         d->m_childComponents.removeAll(component);
-        d->m_virtualChildComponents.removeAll(component);
-        d->m_allChildComponents = d->m_childComponents + d->m_virtualChildComponents;
+        d->m_allChildComponents.removeAll(component);
     }
 }
 
diff --git a/src/libs/installer/component_p.h b/src/libs/installer/component_p.h
index 65617a7be..15834d1f2 100644
--- a/src/libs/installer/component_p.h
+++ b/src/libs/installer/component_p.h
@@ -77,7 +77,6 @@ public:
     QHash<QString, QString> m_vars;
     QList<Component*> m_childComponents;
     QList<Component*> m_allChildComponents;
-    QList<Component*> m_virtualChildComponents;
     QStringList m_downloadableArchives;
     QStringList m_stopProcessForUpdateRequests;
     QHash<QString, QPointer<QWidget> > m_userInterfaces;