Add verbose levels and cleanup log categories

Setting several verbose switches enables more logging and performs component
checking. Also cleanup some logging categories and unify the rules.

Task-number: QTIFW-1914
Change-Id: I9195f4bb02affaa87e66cf9023a3512e65e0645b
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

5 files changed, 14 insertions, 14 deletions

diff --git a/src/libs/kdtools/filedownloader.cpp b/src/libs/kdtools/filedownloader.cpp
index 276d5bbef..91865fb5f 100644
--- a/src/libs/kdtools/filedownloader.cpp
+++ b/src/libs/kdtools/filedownloader.cpp
@@ -1398,7 +1398,7 @@ void KDUpdater::HttpDownloader::httpReqFinished()
         if (d->http == 0)
             return;
         const QUrl url = d->http->url();
-        if (url.isValid() && QInstaller::lcNetwork().isDebugEnabled()){
+        if (url.isValid() && QInstaller::lcServer().isDebugEnabled()){
             const QFileInfo fi(d->http->url().toString());
             if (fi.suffix() != QLatin1String("sha1")){
                 const QString hostName = url.host();
@@ -1406,7 +1406,7 @@ void KDUpdater::HttpDownloader::httpReqFinished()
                 QStringList hostAddresses;
                 foreach (const QHostAddress &address, info.addresses())
                     hostAddresses << address.toString();
-                qCDebug(QInstaller::lcNetwork) << "Using host:" << hostName
+                qCDebug(QInstaller::lcServer) << "Using host:" << hostName
                         << "for" << url.fileName() << "\nIP:" << hostAddresses;
             }
         }
diff --git a/src/libs/kdtools/job.cpp b/src/libs/kdtools/job.cpp
index c655f8202..8dc72da87 100644
--- a/src/libs/kdtools/job.cpp
+++ b/src/libs/kdtools/job.cpp
@@ -184,7 +184,7 @@ void Job::cancel()
         }
         emitFinished();
     } else {
-        qCDebug(QInstaller::lcGeneral) << "The current job cannot be canceled, "
+        qCDebug(QInstaller::lcInstallerInstallLog) << "The current job cannot be canceled, "
             "missing \"Cancelable\" capability.";
     }
 }
diff --git a/src/libs/kdtools/runoncechecker.cpp b/src/libs/kdtools/runoncechecker.cpp
index dda0ef730..35ec924ce 100644
--- a/src/libs/kdtools/runoncechecker.cpp
+++ b/src/libs/kdtools/runoncechecker.cpp
@@ -50,7 +50,7 @@ RunOnceChecker::RunOnceChecker(const QString &filename)
 RunOnceChecker::~RunOnceChecker()
 {
     if (!m_lockfile.unlock())
-        qCWarning(QInstaller::lcGeneral).noquote() << m_lockfile.errorString();
+        qCWarning(QInstaller::lcInstallerInstallLog).noquote() << m_lockfile.errorString();
 }
 
 class ProcessnameEquals
@@ -98,7 +98,7 @@ bool RunOnceChecker::isRunning(RunOnceChecker::ConditionFlags flags)
     if (flags.testFlag(ConditionFlag::Lockfile)) {
         const bool locked = m_lockfile.lock();
         if (!locked)
-            qCWarning(QInstaller::lcGeneral).noquote() << m_lockfile.errorString();
+            qCWarning(QInstaller::lcInstallerInstallLog).noquote() << m_lockfile.errorString();
         return !locked;
     }
     return false;
diff --git a/src/libs/kdtools/task.cpp b/src/libs/kdtools/task.cpp
index 01ddfb0d7..fbc3ed669 100644
--- a/src/libs/kdtools/task.cpp
+++ b/src/libs/kdtools/task.cpp
@@ -176,12 +176,12 @@ QString Task::progressText() const
 void Task::run()
 {
     if (m_started) {
-        qCDebug(QInstaller::lcGeneral) << "Trying to start an already started task";
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Trying to start an already started task";
         return;
     }
 
     if (m_stopped) {
-        qCDebug(QInstaller::lcGeneral) << "Trying to start a finished or canceled task";
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Trying to start a finished or canceled task";
         return;
     }
 
@@ -208,13 +208,13 @@ void Task::stop()
     }
 
     if (!m_started) {
-        qCDebug(QInstaller::lcGeneral) << "Trying to stop an unstarted task";
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Trying to stop an unstarted task";
         return;
     }
 
     if(m_finished || m_stopped)
     {
-        qCDebug(QInstaller::lcGeneral) << "Trying to stop a finished or canceled task";
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Trying to stop a finished or canceled task";
         return;
     }
 
@@ -245,12 +245,12 @@ void Task::pause()
     }
 
     if (!m_started) {
-        qCDebug(QInstaller::lcGeneral) << "Trying to pause an unstarted task";
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Trying to pause an unstarted task";
         return;
     }
 
     if (m_finished || m_stopped) {
-        qCDebug(QInstaller::lcGeneral) << "Trying to pause a finished or canceled task";
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Trying to pause a finished or canceled task";
         return;
     }
 
@@ -278,7 +278,7 @@ void Task::pause()
 void Task::resume()
 {
     if (!m_paused) {
-        qCDebug(QInstaller::lcGeneral) << "Trying to resume an unpaused task";
+        qCDebug(QInstaller::lcInstallerInstallLog) << "Trying to resume an unpaused task";
         return;
     }
 
diff --git a/src/libs/kdtools/updatefinder.cpp b/src/libs/kdtools/updatefinder.cpp
index 616159d23..674ae578f 100644
--- a/src/libs/kdtools/updatefinder.cpp
+++ b/src/libs/kdtools/updatefinder.cpp
@@ -418,7 +418,7 @@ UpdateFinder::Private::Resolution UpdateFinder::Private::checkPriorityAndVersion
 
         if (match > 0) {
             // new package has higher version, use
-            qCDebug(QInstaller::lcGeneral).nospace() << "Remove Package 'Name: " << name
+            qCDebug(QInstaller::lcDeveloperBuild).nospace() << "Remove Package 'Name: " << name
                 << ", Version: "<< existingPackage->data(QLatin1String("Version")).toString()
                 << ", Source: " << QFileInfo(existingPackage->packageSource().url.toLocalFile()).fileName()
                 << "' found a package with higher version 'Name: "
@@ -429,7 +429,7 @@ UpdateFinder::Private::Resolution UpdateFinder::Private::checkPriorityAndVersion
 
         if ((match == 0) && (source.priority > existingPackage->packageSource().priority)) {
             // new package version equals but priority is higher, use
-            qCDebug(QInstaller::lcGeneral).nospace() << "Remove Package 'Name: " << name
+            qCDebug(QInstaller::lcDeveloperBuild).nospace() << "Remove Package 'Name: " << name
                 << ", Priority: " << existingPackage->packageSource().priority
                 << ", Source: " << QFileInfo(existingPackage->packageSource().url.toLocalFile()).fileName()
                 << "' found a package with higher priority 'Name: "