diff options
-rw-r--r-- | src/libs/installer/component.cpp | 12 | ||||
-rw-r--r-- | src/libs/installer/component.h | 2 | ||||
-rw-r--r-- | src/libs/installer/component_p.cpp | 2 | ||||
-rw-r--r-- | src/libs/installer/componentmodel.cpp | 4 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 41 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore.h | 2 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 12 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 4 | ||||
-rw-r--r-- | src/libs/installer/qinstallerglobal.h | 6 |
9 files changed, 36 insertions, 49 deletions
diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index a2ce4bc26..ddc74328d 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -303,14 +303,14 @@ void Component::removeComponent(Component *component) } /*! - Returns a list of child components. If \a recursive is set to true, the returned list - contains not only the direct children, but all ancestors. Note: The returned list does include ALL - children, non virtual components as well as virtual components. + Returns a list of child components. If \a recursive is set to true, the returned list contains not only + the direct children, but all ancestors. Note: The returned list does include ALL children, non virtual + components as well as virtual components. */ -QList<Component*> Component::childComponents(bool recursive, RunMode runMode) const +QList<Component*> Component::childComponents(bool recursive) const { QList<Component*> result; - if (runMode == UpdaterMode) + if (d->m_core->isUpdater()) return result; if (!recursive) @@ -318,7 +318,7 @@ QList<Component*> Component::childComponents(bool recursive, RunMode runMode) co foreach (Component *component, d->m_allChildComponents) { result.append(component); - result += component->childComponents(true, runMode); + result += component->childComponents(true); } return result; } diff --git a/src/libs/installer/component.h b/src/libs/installer/component.h index 1c8712145..7e5541970 100644 --- a/src/libs/installer/component.h +++ b/src/libs/installer/component.h @@ -117,7 +117,7 @@ public: Component *parentComponent() const; void appendComponent(Component *component); void removeComponent(Component *component); - QList<Component*> childComponents(bool recursive, RunMode runMode) const; + QList<Component*> childComponents(bool recursive) const; void loadComponentScript(); diff --git a/src/libs/installer/component_p.cpp b/src/libs/installer/component_p.cpp index 162b62c54..93f79e025 100644 --- a/src/libs/installer/component_p.cpp +++ b/src/libs/installer/component_p.cpp @@ -219,7 +219,7 @@ int ComponentModelHelper::indexInParent() const { int index = 0; if (Component *parent = m_componentPrivate->m_parentComponent->parentComponent()) - index = parent->childComponents(false, AllMode).indexOf(m_componentPrivate->m_parentComponent); + index = parent->childComponents(false).indexOf(m_componentPrivate->m_parentComponent); return (index >= 0 ? index : 0); } diff --git a/src/libs/installer/componentmodel.cpp b/src/libs/installer/componentmodel.cpp index a87f59c00..264f69650 100644 --- a/src/libs/installer/componentmodel.cpp +++ b/src/libs/installer/componentmodel.cpp @@ -373,7 +373,7 @@ void ComponentModel::appendRootComponents(QList<QInstaller::Component*> rootComp void ComponentModel::slotModelReset() { QList<QInstaller::Component*> components = m_rootComponentList; - if (m_core->runMode() == QInstaller::AllMode) { + if (!m_core->isUpdater()) { for (int i = m_rootIndex; i < m_rootComponentList.count(); ++i) components.append(m_rootComponentList.at(i)->childs()); } @@ -384,7 +384,7 @@ void ComponentModel::slotModelReset() } m_currentCheckedSet += m_initialCheckedSet; - if (m_core->runMode() == QInstaller::AllMode) + if (!m_core->isUpdater()) select(Qt::Unchecked); foreach (const QString &name, m_currentCheckedSet) diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index a87b56177..ebce458e2 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -129,12 +129,12 @@ Component *PackageManagerCore::subComponentByName(const QInstaller::PackageManag if (check != 0 && componentMatches(check, name, version)) return check; - if (installer->runMode() == AllMode) { + if (!installer->isUpdater()) { QList<Component*> rootComponents; if (check == 0) rootComponents = installer->rootComponents(); else - rootComponents = check->childComponents(false, AllMode); + rootComponents = check->childComponents(false); foreach (QInstaller::Component *component, rootComponents) { Component *const result = subComponentByName(installer, name, version, component); @@ -485,7 +485,7 @@ void PackageManagerCore::rollBackInstallation() if (!componentName.isEmpty()) { Component *component = componentByName(componentName); if (!component) - component = d->componentsToReplace(runMode()).value(componentName).second; + component = d->componentsToReplace().value(componentName).second; if (component) { component->setUninstalled(); packages.removePackage(component->name()); @@ -604,11 +604,6 @@ void PackageManagerCore::setCreateLocalRepositoryFromBinary(bool create) sCreateLocalRepositoryFromBinary = create; } -RunMode PackageManagerCore::runMode() const -{ - return isUpdater() ? UpdaterMode : AllMode; -} - bool PackageManagerCore::fetchLocalPackagesTree() { d->setStatus(Running); @@ -718,7 +713,7 @@ bool PackageManagerCore::fetchRemotePackagesTree() return false; bool success = false; - if (runMode() == AllMode) + if (!isUpdater()) success = fetchAllPackages(packages, installedPackages); else { success = fetchUpdaterPackages(packages, installedPackages); @@ -927,7 +922,7 @@ QList<Component*> PackageManagerCore::availableComponents() const QList<Component*> result = d->m_rootComponents; foreach (QInstaller::Component *component, d->m_rootComponents) - result += component->childComponents(true, AllMode); + result += component->childComponents(true); return result + d->m_rootDependencyReplacements; } @@ -961,21 +956,23 @@ bool PackageManagerCore::calculateComponentsToInstall() const if (!d->m_componentsToInstallCalculated) { d->clearComponentsToInstall(); QList<Component*> components; - if (runMode() == UpdaterMode) { + if (isUpdater()) { foreach (Component *component, updaterComponents()) { if (component->updateRequested()) components.append(component); } - } else if (runMode() == AllMode) { + } else if (!isUpdater()) { // relevant means all components which are not replaced QList<Component*> relevantComponents = rootComponents(); foreach (QInstaller::Component *component, rootComponents()) - relevantComponents += component->childComponents(true, AllMode); + relevantComponents += component->childComponents(true); foreach (Component *component, relevantComponents) { // ask for all components which will be installed to get all dependencies - // even dependencies wich are changed without an increased version - if (component->installationRequested() || (component->isInstalled() && !component->uninstallationRequested())) - components.append(component); + // even dependencies which are changed without an increased version + if (component->installationRequested() || (component->isInstalled() + && !component->uninstallationRequested())) { + components.append(component); + } } } @@ -998,10 +995,10 @@ QList<Component*> PackageManagerCore::orderedComponentsToInstall() const */ bool PackageManagerCore::calculateComponentsToUninstall() const { - if (runMode() == UpdaterMode) + if (isUpdater()) return true; - // hack to avoid removeing needed dependencies + // hack to avoid removing needed dependencies QSet<Component*> componentsToInstall = d->m_orderedComponentsToInstall.toSet(); QList<Component*> components; @@ -1704,14 +1701,14 @@ void PackageManagerCore::storeReplacedComponents(QHash<QString, Component *> &co qWarning() << componentName << "- Does not exist in the repositories anymore."; continue; } - if (!component && !d->componentsToReplace(data.runMode).contains(componentName)) { + if (!component && !d->componentsToReplace().contains(componentName)) { component = new Component(this); component->setValue(scName, componentName); } else { component->loadComponentScript(); - d->replacementDependencyComponents(data.runMode).append(component); + d->replacementDependencyComponents().append(component); } - d->componentsToReplace(data.runMode).insert(componentName, qMakePair(it.key(), component)); + d->componentsToReplace().insert(componentName, qMakePair(it.key(), component)); } } } @@ -1724,7 +1721,6 @@ bool PackageManagerCore::fetchAllPackages(const PackagesList &remotes, const Loc QHash<QString, QInstaller::Component*> components; Data data; - data.runMode = AllMode; data.components = &components; data.installedPackages = &locals; @@ -1768,7 +1764,6 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const QHash<QString, QInstaller::Component *> components; Data data; - data.runMode = UpdaterMode; data.components = &components; data.installedPackages = &locals; diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h index 50eb63184..df77cd115 100644 --- a/src/libs/installer/packagemanagercore.h +++ b/src/libs/installer/packagemanagercore.h @@ -121,7 +121,6 @@ public: bool fetchRemotePackagesTree(); bool run(); - RunMode runMode() const; void reset(const QHash<QString, QString> ¶ms); Q_INVOKABLE void setDependsOnLocalInstallerBinary(); @@ -297,7 +296,6 @@ Q_SIGNALS: private: struct Data { - RunMode runMode; Package *package; QHash<QString, Component*> *components; const LocalPackagesHash *installedPackages; 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()); diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index 9d4a6abab..72c7096d6 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -117,8 +117,8 @@ public: void clearAllComponentLists(); void clearUpdaterComponentLists(); - QList<Component*> &replacementDependencyComponents(RunMode mode); - QHash<QString, QPair<Component*, Component*> > &componentsToReplace(RunMode mode); + QList<Component*> &replacementDependencyComponents(); + QHash<QString, QPair<Component*, Component*> > &componentsToReplace(); void clearComponentsToInstall(); bool appendComponentsToInstall(const QList<Component*> &components); diff --git a/src/libs/installer/qinstallerglobal.h b/src/libs/installer/qinstallerglobal.h index b7d5d3f3d..81635830b 100644 --- a/src/libs/installer/qinstallerglobal.h +++ b/src/libs/installer/qinstallerglobal.h @@ -59,12 +59,6 @@ namespace QInstaller { static QRegExp scCommaRegExp(QLatin1String("\\b(,|, )\\b")); -enum INSTALLER_EXPORT RunMode -{ - AllMode, - UpdaterMode -}; - enum INSTALLER_EXPORT JobError { InvalidUrl = 0x24B04, |