1 files changed, 26 insertions, 26 deletions

diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 77a04104c..5186df409 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -45,13 +45,13 @@
 namespace QInstaller {
 
 MetadataJob::MetadataJob(QObject *parent)
-    : KDJob(parent)
+    : Job(parent)
     , m_core(0)
 {
     setCapabilities(Cancelable);
-    connect(&m_xmlTask, SIGNAL(finished()), this, SLOT(xmlTaskFinished()));
-    connect(&m_metadataTask, SIGNAL(finished()), this, SLOT(metadataTaskFinished()));
-    connect(&m_metadataTask, SIGNAL(progressValueChanged(int)), this, SLOT(progressChanged(int)));
+    connect(&m_xmlTask, &QFutureWatcherBase::finished, this, &MetadataJob::xmlTaskFinished);
+    connect(&m_metadataTask, &QFutureWatcherBase::finished, this, &MetadataJob::metadataTaskFinished);
+    connect(&m_metadataTask, &QFutureWatcherBase::progressValueChanged, this, &MetadataJob::progressChanged);
 }
 
 MetadataJob::~MetadataJob()
@@ -71,13 +71,13 @@ void MetadataJob::doStart()
 {
     reset();
     if (!m_core) {
-        emitFinishedWithError(KDJob::Canceled, tr("Missing package manager core engine."));
+        emitFinishedWithError(Job::Canceled, tr("Missing package manager core engine."));
         return; // We can't do anything here without core, so avoid tons of !m_core checks.
     }
 
     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()) {
@@ -87,8 +87,8 @@ void MetadataJob::doStart()
                 authenticator.setPassword(repo.password());
 
                 QString url = repo.url().toString() + QLatin1String("/Updates.xml?");
-                if (!m_core->value(QLatin1String("UrlQueryString")).isEmpty())
-                    url += m_core->value(QLatin1String("UrlQueryString")) + QLatin1Char('&');
+                if (!m_core->value(scUrlQueryString).isEmpty())
+                    url += m_core->value(scUrlQueryString) + QLatin1Char('&');
 
                 // also append a random string to avoid proxy caches
                 FileTaskItem item(url.append(QString::number(qrand() * qrand())));
@@ -108,7 +108,7 @@ void MetadataJob::doStart()
 void MetadataJob::doCancel()
 {
     reset();
-    emitFinishedWithError(KDJob::Canceled, tr("Meta data download canceled."));
+    emitFinishedWithError(Job::Canceled, tr("Meta data download canceled."));
 }
 
 void MetadataJob::xmlTaskFinished()
@@ -121,7 +121,7 @@ void MetadataJob::xmlTaskFinished()
         if (e.type() == AuthenticationRequiredException::Type::Proxy) {
             const QNetworkProxy proxy = e.proxy();
             ProxyCredentialsDialog proxyCredentials(proxy);
-            qDebug() << e.message();
+            qDebug().noquote() << e.message();
 
             if (proxyCredentials.exec() == QDialog::Accepted) {
                 qDebug() << "Retrying with new credentials ...";
@@ -136,7 +136,7 @@ void MetadataJob::xmlTaskFinished()
                 emitFinishedWithError(QInstaller::DownloadError, tr("Missing proxy credentials."));
             }
         } else if (e.type() == AuthenticationRequiredException::Type::Server) {
-            qDebug() << e.message();
+            qDebug().noquote() << e.message();
             ServerAuthenticationDialog dlg(e.message(), e.taskItem());
             if (dlg.exec() == QDialog::Accepted) {
                 Repository original = e.taskItem().value(TaskRole::UserRole)
@@ -157,7 +157,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();
                     }
                 }
@@ -178,7 +178,7 @@ void MetadataJob::xmlTaskFinished()
         emitFinishedWithError(QInstaller::DownloadError, tr("Unknown exception during download."));
     }
 
-    if (error() != KDJob::NoError)
+    if (error() != Job::NoError)
         return;
 
     if (status == XmlDownloadSuccess) {
@@ -211,7 +211,7 @@ void MetadataJob::unzipTaskFinished()
         emitFinishedWithError(QInstaller::DownloadError, tr("Unknown exception during extracting."));
     }
 
-    if (error() != KDJob::NoError)
+    if (error() != Job::NoError)
         return;
 
     delete m_unzipTasks.value(watcher);
@@ -243,7 +243,7 @@ void MetadataJob::metadataTaskFinished()
 
                 QFutureWatcher<void> *watcher = new QFutureWatcher<void>();
                 m_unzipTasks.insert(watcher, qobject_cast<QObject*> (task));
-                connect(watcher, SIGNAL(finished()), this, SLOT(unzipTaskFinished()));
+                connect(watcher, &QFutureWatcherBase::finished, this, &MetadataJob::unzipTaskFinished);
                 watcher->setFuture(QtConcurrent::run(&UnzipArchiveTask::doTask, task));
             }
         } else {
@@ -269,7 +269,7 @@ void MetadataJob::reset()
     m_packages.clear();
     m_metadata.clear();
 
-    setError(KDJob::NoError);
+    setError(Job::NoError);
     setErrorString(QString());
     setCapabilities(Cancelable);
 
@@ -290,13 +290,13 @@ void MetadataJob::reset()
 MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &results)
 {
     foreach (const FileTaskResult &result, results) {
-        if (error() != KDJob::NoError)
+        if (error() != Job::NoError)
             return XmlDownloadFailure;
 
         Metadata metadata;
         QTemporaryDir tmp(QDir::tempPath() + QLatin1String("/remoterepo-XXXXXX"));
         if (!tmp.isValid()) {
-            qDebug() << "Could not create unique temporary directory.";
+            qDebug() << "Cannot create unique temporary directory.";
             return XmlDownloadFailure;
         }
 
@@ -306,20 +306,20 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
 
         QFile file(result.target());
         if (!file.rename(metadata.directory + QLatin1String("/Updates.xml"))) {
-            qDebug() << "Could not rename target to Updates.xml. Error:" << file.errorString();
+            qDebug() << "Cannot rename target to Updates.xml:" << file.errorString();
             return XmlDownloadFailure;
         }
 
         if (!file.open(QIODevice::ReadOnly)) {
-            qDebug() << "Could not open Updates.xml for reading. Error:" << file.errorString();
+            qDebug() << "Cannot open Updates.xml for reading:" << file.errorString();
             return XmlDownloadFailure;
         }
 
         QString error;
         QDomDocument doc;
         if (!doc.setContent(&file, &error)) {
-            qDebug() << QString::fromLatin1("Could not fetch a valid version of Updates.xml from "
-                "repository: %1. Error: %2").arg(metadata.repository.displayname(), error);
+            qDebug().nospace() << "Cannot fetch a valid version of Updates.xml from repository "
+                               << metadata.repository.displayname() << ": " << error;
             return XmlDownloadFailure;
         }
         file.close();
@@ -343,7 +343,7 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                 for (int j = 0; j < c2.count(); ++j) {
                     if (c2.at(j).toElement().tagName() == scName)
                         packageName = c2.at(j).toElement().text();
-                    else if (c2.at(j).toElement().tagName() == scRemoteVersion)
+                    else if (c2.at(j).toElement().tagName() == scVersion)
                         packageVersion = (online ? c2.at(j).toElement().text() : QString());
                     else if ((c2.at(j).toElement().tagName() == QLatin1String("SHA1")) && testCheckSum)
                         packageHash = c2.at(j).toElement().text();
@@ -404,12 +404,12 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                     if (ProductKeyCheck::instance()->isValidRepository(newRepository)) {
                         // store the new repository and the one old it replaces
                         repositoryUpdates.insertMulti(action, qMakePair(newRepository, oldRepository));
-                        qDebug() << "Replace repository:" << oldRepository.displayname() << "with:"
+                        qDebug() << "Replace repository" << oldRepository.displayname() << "with"
                             << newRepository.displayname();
                     }
                 } else {
                     qDebug() << "Invalid additional repositories action set in Updates.xml fetched "
-                        "from:" << metadata.repository.displayname() << "Line:" << el.lineNumber();
+                        "from" << metadata.repository.displayname() << "line:" << el.lineNumber();
                 }
             }
         }
@@ -437,7 +437,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;