From 3ae126f589e4a8ee9fb16f0dca7732e51c4d3cb8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Feb 2018 11:14:45 +0100
Subject: [PATCH] [modules] Use cError() as well

 - Switch KPMHelpers to using Calamares logging instead of qDebug()
---
 src/libcalamaresui/Branding.cpp           | 2 +-
 src/modules/partition/core/KPMHelpers.cpp | 6 ++++--
 src/modules/partition/core/PartUtils.cpp  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index 5c4296491..5677f212e 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -291,7 +291,7 @@ Branding::setGlobals( GlobalStorage* globalStorage ) const
 void
 Branding::bail( const QString& message )
 {
-    cLog() << "FATAL ERROR in"
+    cError() << "FATAL in"
            << m_descriptorPath
            << "\n" + message;
     ::exit( EXIT_FAILURE );
diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp
index cf97b4fc2..3f3134c5b 100644
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -29,6 +29,8 @@
 #include <kpmcore/backend/corebackendmanager.h>
 #include <kpmcore/fs/luks.h>
 
+#include "utils/Logger.h"
+
 #include <QDebug>
 
 
@@ -46,7 +48,7 @@ initKPMcore()
     QByteArray backendName = qgetenv( "KPMCORE_BACKEND" );
     if ( !CoreBackendManager::self()->load( backendName.isEmpty() ? CoreBackendManager::defaultBackendName() : backendName ) )
     {
-        qWarning() << "Failed to load backend plugin" << backendName;
+        cWarning() << "Failed to load backend plugin" << backendName;
         return false;
     }
     s_KPMcoreInited = true;
@@ -155,7 +157,7 @@ createNewEncryptedPartition( PartitionNode* parent,
                                                       ) );
     if ( !fs )
     {
-        qDebug() << "ERROR: cannot create LUKS filesystem. Giving up.";
+        cError() << "cannot create LUKS filesystem. Giving up.";
         return nullptr;
     }
 
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index a8e004979..775fcee66 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -281,11 +281,11 @@ runOsprober( PartitionCoreModule* core )
     osprober.start();
     if ( !osprober.waitForStarted() )
     {
-        cDebug() << "ERROR: os-prober cannot start.";
+        cError() << "os-prober cannot start.";
     }
     else if ( !osprober.waitForFinished( 60000 ) )
     {
-        cDebug() << "ERROR: os-prober timed out.";
+        cError() << "os-prober timed out.";
     }
     else
     {