Make InstallerCalculator independent on PackageManagerCorePrivate

Inside PackageManagerCorePrivate:
- rename resetComponentsToUserCheckedState() into restoreCheckState()
- replace setCheckedState() with storeCheckState(),
complementary to restoreCheckState()
- call storeCheckState() before calculation of components to
install / uninstall

Change-Id: I8dde3be75a60ebac2fae5fcde1da1b609dd23256
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index e52053ba9..efaa05ab5 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -1258,6 +1258,7 @@ bool PackageManagerCore::calculateComponentsToInstall() const
             }
         }
 
+        d->storeCheckState();
         d->m_componentsToInstallCalculated =
             d->installerCalculator()->appendComponentsToInstall(componentsToInstall);
     }
@@ -1296,6 +1297,7 @@ bool PackageManagerCore::calculateComponentsToUninstall() const
         }
 
         d->m_componentsToUninstall.clear();
+        d->storeCheckState();
         result = d->appendComponentsToUninstall(componentsToUninstall);
     }
     emit finishedCalculateComponentsToUninstall();
@@ -2357,9 +2359,9 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
     return true;
 }
 
-void PackageManagerCore::resetComponentsToUserCheckedState()
+void PackageManagerCore::restoreCheckState()
 {
-    d->resetComponentsToUserCheckedState();
+    d->restoreCheckState();
 }
 
 void PackageManagerCore::updateDisplayVersions(const QString &displayKey)