From 4d2ce949b3b41f8bf0af446fa20205ddd229e579 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 3 Nov 2013 11:08:18 +0100
Subject: Use cutelogger for Rockbox Utility internal trace.

Change tracing from qDebug() to use cutelogger, which is available under the
LGPL2.1. This allows to automatically add filename and line number to the log,
and also provides multiple log levels.

Change-Id: I5dbdaf902ba54ea99f07ae10a07467c52fdac910
---
 rbutil/rbutilqt/base/bootloaderinstallams.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'rbutil/rbutilqt/base/bootloaderinstallams.cpp')

diff --git a/rbutil/rbutilqt/base/bootloaderinstallams.cpp b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
index dbdac8e2ce..33ad51c200 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallams.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallams.cpp
@@ -19,6 +19,7 @@
 #include <QtCore>
 #include "bootloaderinstallbase.h"
 #include "bootloaderinstallams.h"
+#include "Logger.h"
 
 #include "../mkamsboot/mkamsboot.h"
 
@@ -51,7 +52,7 @@ bool BootloaderInstallAms::install(void)
     if(m_offile.isEmpty())
         return false;
 
-    qDebug() << "[BootloaderInstallAms] installing bootloader";
+    LOG_INFO() << "installing bootloader";
 
     // download firmware from server
     emit logItem(tr("Downloading bootloader file"), LOGINFO);
@@ -64,7 +65,7 @@ bool BootloaderInstallAms::install(void)
 
 void BootloaderInstallAms::installStage2(void)
 {
-    qDebug() << "[BootloaderInstallAms] installStage2";
+    LOG_INFO() << "installStage2";
 
     unsigned char* buf;
     unsigned char* of_packed;
@@ -94,7 +95,7 @@ void BootloaderInstallAms::installStage2(void)
                                     errstr,sizeof(errstr));
     if (rb_packed == NULL)
     {
-        qDebug() << "[BootloaderInstallAms] could not load bootloader: " << bootfile;
+        LOG_ERROR() << "could not load bootloader: " << bootfile;
         emit logItem(errstr, LOGERROR);
         emit logItem(tr("Could not load %1").arg(bootfile), LOGERROR);
         emit done(true);
@@ -107,7 +108,7 @@ void BootloaderInstallAms::installStage2(void)
                         errstr, sizeof(errstr));
     if (buf == NULL)
     {
-        qDebug() << "[BootloaderInstallAms] could not load OF: " << m_offile;
+        LOG_ERROR() << "could not load OF: " << m_offile;
         emit logItem(errstr, LOGERROR);
         emit logItem(tr("Could not load %1").arg(m_offile), LOGERROR);
         free(rb_packed);
@@ -121,7 +122,7 @@ void BootloaderInstallAms::installStage2(void)
 
     if (!patchable)
     {
-        qDebug() << "[BootloaderInstallAms] No room to insert bootloader";
+        LOG_ERROR() << "No room to insert bootloader";
         emit logItem(errstr, LOGERROR);
         emit logItem(tr("No room to insert bootloader, try another firmware version"),
                      LOGERROR);
@@ -143,7 +144,7 @@ void BootloaderInstallAms::installStage2(void)
 
     if(!out.open(QIODevice::WriteOnly | QIODevice::Truncate))
     {
-        qDebug() << "[BootloaderInstallAms] Could not open" <<  m_blfile << "for writing";
+        LOG_ERROR() << "Could not open" <<  m_blfile << "for writing";
         emit logItem(tr("Could not open %1 for writing").arg(m_blfile),LOGERROR);
         free(buf);
         free(of_packed);
@@ -156,7 +157,7 @@ void BootloaderInstallAms::installStage2(void)
 
     if (n != len)
     {
-        qDebug() << "[BootloaderInstallAms] Could not write firmware file";
+        LOG_ERROR() << "Could not write firmware file";
         emit logItem(tr("Could not write firmware file"),LOGERROR);
         free(buf);
         free(of_packed);
@@ -172,7 +173,7 @@ void BootloaderInstallAms::installStage2(void)
     free(rb_packed);
 
     //end of install
-    qDebug() << "[BootloaderInstallAms] install successfull";
+    LOG_INFO() << "install successfull";
     emit logItem(tr("Success: modified firmware file created"), LOGINFO);
     logInstall(LogAdd);
     emit done(false);
-- 
cgit v1.2.3