Introduce isMaintainer() method

Prepare for unification of updater and packageManager.

Change-Id: Iac9ac109ac5e6cf1309d5739ecee03bdfb1e2934
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>

6 files changed, 26 insertions, 17 deletions

diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 2b5b798b4..a7359ace8 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -78,7 +78,7 @@ void MetadataJob::doStart()
 
     emit infoMessage(this, tr("Preparing meta information download..."));
     const bool onlineInstaller = m_core->isInstaller() && !m_core->isOfflineOnly();
-    if (onlineInstaller || (m_core->isUpdater() || m_core->isPackageManager())) {
+    if (onlineInstaller || m_core->isMaintainer()) {
         QList<FileTaskItem> items;
         const ProductKeyCheck *const productKeyCheck = ProductKeyCheck::instance();
         foreach (const Repository &repo, m_core->settings().repositories()) {
@@ -158,7 +158,7 @@ void MetadataJob::xmlTaskFinished()
 
                     if (s.updateDefaultRepositories(update) == Settings::UpdatesApplied
                         || s.updateUserRepositories(update) == Settings::UpdatesApplied) {
-                            if (m_core->isUpdater() || m_core->isPackageManager())
+                            if (m_core->isMaintainer())
                                 m_core->writeMaintenanceConfigFiles();
                     }
                 }
@@ -438,7 +438,7 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                     return XmlDownloadRetry;
                 }
             } else if (s.updateDefaultRepositories(repositoryUpdates) == Settings::UpdatesApplied) {
-                if (m_core->isUpdater() || m_core->isPackageManager())
+                if (m_core->isMaintainer())
                     m_core->writeMaintenanceConfigFiles();
                 QFile::remove(result.target());
                 return XmlDownloadRetry;
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 8600dc114..99b4970e5 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -892,7 +892,7 @@ void PackageManagerCore::networkSettingsChanged()
     d->m_repoFetched = false;
     d->m_updateSourcesAdded = false;
 
-    if (d->isUpdater() || d->isPackageManager())
+    if (isMaintainer())
         d->writeMaintenanceConfigFiles();
     KDUpdater::FileDownloaderFactory::instance().setProxyFactory(proxyFactory());
 
@@ -2060,6 +2060,14 @@ bool PackageManagerCore::isPackageManager() const
 }
 
 /*!
+    Returns \c true if it is a package manager or an updater.
+*/
+bool PackageManagerCore::isMaintainer() const
+{
+    return isPackageManager() || isUpdater();
+}
+
+/*!
     \qmlmethod boolean installer::runInstaller()
 
     Runs the installer. Returns \c true on success, \c false otherwise.
@@ -2109,7 +2117,7 @@ bool PackageManagerCore::run()
         return d->runInstaller();
     else if (isUninstaller())
         return d->runUninstaller();
-    else if (isPackageManager() || isUpdater())
+    else if (isMaintainer())
         return d->runPackageUpdater();
     return false;
 }
diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h
index fb16cc29c..8c11288f1 100644
--- a/src/libs/installer/packagemanagercore.h
+++ b/src/libs/installer/packagemanagercore.h
@@ -228,6 +228,8 @@ public:
     Q_INVOKABLE void setPackageManager();
     Q_INVOKABLE bool isPackageManager() const;
 
+    bool isMaintainer() const;
+
     bool isVerbose() const;
     void setVerbose(bool on);
 
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 7735f280c..8003bc393 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -411,7 +411,7 @@ bool PackageManagerCorePrivate::buildComponentTree(QHash<QString, Component*> &c
 void PackageManagerCorePrivate::cleanUpComponentEnvironment()
 {
     // clean up registered (downloaded) data
-    if (m_core->isUpdater() || m_core->isPackageManager())
+    if (m_core->isMaintainer())
         BinaryFormatEngineHandler::instance()->clear();
 
     // there could be still some references to already deleted components,
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 46ba310ba..ebbf3e201 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -605,7 +605,7 @@ void PackageManagerGui::cancelButtonClicked()
         question = tr("Do you want to quit the installer application?");
         if (m_core->isUninstaller())
             question = tr("Do you want to quit the uninstaller application?");
-        if (m_core->isUpdater() || m_core->isPackageManager())
+        if (m_core->isMaintainer())
             question = tr("Do you want to quit the maintenance application?");
     }
 
@@ -851,7 +851,7 @@ int PackageManagerPage::nextId() const
 
         core->calculateComponentsToInstall();
         foreach (Component* component, core->orderedComponentsToInstall()) {
-            if ((core->isPackageManager() || core->isUpdater()) && component->isInstalled())
+            if (core->isMaintainer() && component->isInstalled())
                 continue; // package manager or updater, hide as long as the component is installed
 
             // The component is about to be installed and provides a license, so the page needs to
@@ -954,7 +954,7 @@ int IntroductionPage::nextId() const
     if (packageManagerCore()->isUninstaller())
         return PackageManagerCore::ReadyForInstallation;
 
-    if (packageManagerCore()->isUpdater() || packageManagerCore()->isPackageManager())
+    if (packageManagerCore()->isMaintainer())
         return PackageManagerCore::ComponentSelection;
 
     return PackageManagerPage::nextId();
@@ -974,8 +974,7 @@ bool IntroductionPage::validatePage()
     }
 
     gui()->setSettingsButtonEnabled(false);
-    const bool maintenance = core->isUpdater() || core->isPackageManager();
-    if (maintenance) {
+    if (core->isMaintainer()) {
         showAll();
         setMaintenanceToolsEnabled(false);
     } else {
@@ -1034,7 +1033,7 @@ bool IntroductionPage::validatePage()
             setComplete(true);
     }
 
-    if (maintenance) {
+    if (core->isMaintainer()) {
         showMaintenanceTools();
         setMaintenanceToolsEnabled(true);
     } else {
@@ -1178,7 +1177,7 @@ void IntroductionPage::entering()
     m_progressBar->setValue(0);
     m_progressBar->setRange(0, 0);
     PackageManagerCore *core = packageManagerCore();
-    if (core->isUninstaller() || core->isUpdater() || core->isPackageManager()) {
+    if (core->isUninstaller() || core->isMaintainer()) {
         showMaintenanceTools();
         setMaintenanceToolsEnabled(true);
     }
@@ -2035,7 +2034,7 @@ void ReadyForInstallationPage::entering()
             .absolutePath())));
         setComplete(true);
         return;
-    } else if (packageManagerCore()->isPackageManager() || packageManagerCore()->isUpdater()) {
+    } else if (packageManagerCore()->isMaintainer()) {
         setButtonText(QWizard::CommitButton, tr("U&pdate"));
         setColoredTitle(tr("Ready to Update Packages"));
         m_msgLabel->setText(tr("Setup is now ready to begin updating your installation."));
@@ -2254,7 +2253,7 @@ void PerformInstallationPage::entering()
         setColoredTitle(tr("Uninstalling %1").arg(productName()));
 
         QTimer::singleShot(30, packageManagerCore(), SLOT(runUninstaller()));
-    } else if (packageManagerCore()->isPackageManager() || packageManagerCore()->isUpdater()) {
+    } else if (packageManagerCore()->isMaintainer()) {
         setButtonText(QWizard::CommitButton, tr("&Update"));
         setColoredTitle(tr("Updating components of %1").arg(productName()));
 
@@ -2362,7 +2361,7 @@ void FinishedPage::entering()
         m_commitButton = 0;
     }
 
-    if (packageManagerCore()->isUpdater() || packageManagerCore()->isPackageManager()) {
+    if (packageManagerCore()->isMaintainer()) {
 #ifdef Q_OS_OSX
         gui()->setOption(QWizard::NoCancelButton, false);
 #endif
diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp
index 192e7ef67..dd14d5e64 100644
--- a/src/libs/installer/selfrestartoperation.cpp
+++ b/src/libs/installer/selfrestartoperation.cpp
@@ -58,7 +58,7 @@ bool SelfRestartOperation::performOperation()
         return false;
     }
 
-    if (!core->isUpdater() && !core->isPackageManager()) {
+    if (!core->isMaintainer()) {
         setError(UserDefinedError);
         setErrorString(tr("Self Restart: Only valid within updater or packagemanager mode."));
         return false;