From 7f97957097ab38ae6e00c1325b840cc22cae33fc Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Tue, 7 Oct 2014 16:01:45 +0200
Subject: Move the uninstallation calculations into UninstallerCalculator

Change-Id: I1b398815414430c2fab9a5c611b44e3a92c2fb39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
---
 src/libs/installer/packagemanagercore.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/libs/installer/packagemanagercore.cpp')

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index a9e7f7216..93a97ccc6 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -57,6 +57,7 @@
 #include "settings.h"
 #include "utils.h"
 #include "installercalculator.h"
+#include "uninstallercalculator.h"
 
 #include <productkeycheck.h>
 
@@ -1269,9 +1270,9 @@ bool PackageManagerCore::calculateComponentsToUninstall() const
                 componentsToUninstall.append(component);
         }
 
-        d->m_componentsToUninstall.clear();
+        d->clearUninstallerCalculator();
         d->storeCheckState();
-        result = d->appendComponentsToUninstall(componentsToUninstall);
+        result = d->uninstallerCalculator()->appendComponentsToUninstall(componentsToUninstall);
     }
     emit finishedCalculateComponentsToUninstall();
     return result;
@@ -1282,7 +1283,7 @@ bool PackageManagerCore::calculateComponentsToUninstall() const
 */
 QList<Component *> PackageManagerCore::componentsToUninstall() const
 {
-    return d->m_componentsToUninstall.toList();
+    return d->uninstallerCalculator()->componentsToUninstall().toList();
 }
 
 QString PackageManagerCore::componentsToInstallError() const
-- 
cgit v1.2.3