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, 3 insertions, 8 deletions

diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h
index 6f6c80a5e..6ae1632ae 100644
--- a/src/libs/installer/packagemanagercore_p.h
+++ b/src/libs/installer/packagemanagercore_p.h
@@ -95,8 +95,7 @@ public:
 class InstallerCalculator
 {
 public:
-    InstallerCalculator(const QList<Component *> &allComponents,
-                        PackageManagerCorePrivate *privateManager);
+    InstallerCalculator(const QList<Component *> &allComponents);
 
     enum InstallReasonType
     {
@@ -123,8 +122,6 @@ private:
     QString recursionError(Component *component);
 
     QList<Component*> m_allComponents;
-    PackageManagerCorePrivate *m_privateManager;
-
     QHash<Component*, QSet<Component*> > m_visitedComponents;
     QSet<QString> m_toInstallComponentIds; //for faster lookups
     QString m_componentsToInstallError;
@@ -326,12 +323,10 @@ private:
     QObject *m_guiObject;
     QScopedPointer<RemoteFileEngineHandler> m_remoteFileEngineHandler;
 
-public:
-    void setCheckedState(Component *component, Qt::CheckState state);
-
 private:
     // remove once we deprecate isSelected, setSelected etc...
-    void resetComponentsToUserCheckedState();
+    void restoreCheckState();
+    void storeCheckState();
     QHash<Component*, Qt::CheckState> m_coreCheckedHash;
 };