From 8092e354949370be204071258661aefad6f2b58e Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Mon, 18 Feb 2013 16:43:09 +0100
Subject: Remove RunMode enum, it's useless and clutters the API.

Change-Id: I4323a0d66bda362ccee71a19352c37c9ac1b51e1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 src/libs/installer/packagemanagercore_p.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index d93eba0b6..65642a4d6 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -408,14 +408,14 @@ void PackageManagerCorePrivate::clearUpdaterComponentLists()
     m_componentsToInstallCalculated = false;
 }
 
-QList<Component *> &PackageManagerCorePrivate::replacementDependencyComponents(RunMode mode)
+QList<Component *> &PackageManagerCorePrivate::replacementDependencyComponents()
 {
-    return mode == AllMode ? m_rootDependencyReplacements : m_updaterDependencyReplacements;
+    return (!isUpdater()) ? m_rootDependencyReplacements : m_updaterDependencyReplacements;
 }
 
-QHash<QString, QPair<Component*, Component*> > &PackageManagerCorePrivate::componentsToReplace(RunMode mode)
+QHash<QString, QPair<Component*, Component*> > &PackageManagerCorePrivate::componentsToReplace()
 {
-    return mode == AllMode ? m_componentsToReplaceAllMode : m_componentsToReplaceUpdaterMode;
+    return (!isUpdater()) ? m_componentsToReplaceAllMode : m_componentsToReplaceUpdaterMode;
 }
 
 void PackageManagerCorePrivate::clearComponentsToInstall()
@@ -439,7 +439,7 @@ bool PackageManagerCorePrivate::appendComponentsToInstall(const QList<Component
         relevantComponentForAutoDependOn = m_updaterComponents + m_updaterComponentsDeps;
     else {
         foreach (QInstaller::Component *component, m_rootComponents)
-            relevantComponentForAutoDependOn += component->childComponents(true, AllMode);
+            relevantComponentForAutoDependOn += component->childComponents(true);
     }
 
     QList<Component*> notAppendedComponents; // for example components with unresolved dependencies
@@ -1982,7 +1982,7 @@ void PackageManagerCorePrivate::runUndoOperations(const OperationList &undoOpera
             if (!componentName.isEmpty()) {
                 Component *component = m_core->componentByName(componentName);
                 if (!component)
-                    component = componentsToReplace(m_core->runMode()).value(componentName).second;
+                    component = componentsToReplace().value(componentName).second;
                 if (component) {
                     component->setUninstalled();
                     packages.removePackage(component->name());
-- 
cgit v1.2.3