Move calculation of components into InstallerCalculator

Move all methods and data involved in process of
calculation of components to be installed into
the separate class InstallerCalculator.

Change-Id: I47ffc94e562b1eec826c9955b62545409a1c7969
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 4d6358803..e9acdc580 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1283,7 +1283,7 @@ bool PackageManagerCore::calculateComponentsToInstall() const
 {
     emit aboutCalculateComponentsToInstall();
     if (!d->m_componentsToInstallCalculated) {
-        d->clearComponentsToInstall();
+        d->clearInstallerCalculator();
         QList<Component*> components;
         if (isUpdater()) {
             foreach (Component *component, updaterComponents()) {
@@ -1303,7 +1303,7 @@ bool PackageManagerCore::calculateComponentsToInstall() const
             }
         }
 
-        d->m_componentsToInstallCalculated = d->appendComponentsToInstall(components);
+        d->m_componentsToInstallCalculated = d->installerCalculator()->appendComponentsToInstall(components);
     }
     emit finishedCalculateComponentsToInstall();
     return d->m_componentsToInstallCalculated;
@@ -1314,7 +1314,7 @@ bool PackageManagerCore::calculateComponentsToInstall() const
 */
 QList<Component*> PackageManagerCore::orderedComponentsToInstall() const
 {
-    return d->m_orderedComponentsToInstall;
+    return d->installerCalculator()->orderedComponentsToInstall();
 }
 
 /*!
@@ -1331,7 +1331,7 @@ bool PackageManagerCore::calculateComponentsToUninstall() const
     emit aboutCalculateComponentsToUninstall();
     if (!isUpdater()) {
         // hack to avoid removing needed dependencies
-        QSet<Component*>  componentsToInstall = d->m_orderedComponentsToInstall.toSet();
+        QSet<Component*>  componentsToInstall = d->installerCalculator()->orderedComponentsToInstall().toSet();
 
         QList<Component*> components;
         foreach (Component *component, availableComponents()) {
@@ -1356,7 +1356,7 @@ QList<Component *> PackageManagerCore::componentsToUninstall() const
 
 QString PackageManagerCore::componentsToInstallError() const
 {
-    return d->m_componentsToInstallError;
+    return d->installerCalculator()->componentsToInstallError();
 }
 
 /*!
@@ -1366,7 +1366,7 @@ QString PackageManagerCore::componentsToInstallError() const
 */
 QString PackageManagerCore::installReason(Component *component) const
 {
-    return d->installReason(component);
+    return d->installerCalculator()->installReason(component);
 }
 
 /*!