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/system.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

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

diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp
index fd3b04e338..117e5dc9b4 100644
--- a/rbutil/rbutilqt/base/system.cpp
+++ b/rbutil/rbutilqt/base/system.cpp
@@ -69,6 +69,7 @@
 
 #include "utils.h"
 #include "rbsettings.h"
+#include "Logger.h"
 
 /** @brief detect permission of user (only Windows at moment).
  *  @return enum userlevel.
@@ -242,17 +243,17 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
 {
     QMap<uint32_t, QString> usbids;
     // usb pid detection
-    qDebug() << "[System] Searching for USB devices";
+    LOG_INFO() << "Searching for USB devices";
 #if defined(Q_OS_LINUX)
 #if defined(LIBUSB1)
     libusb_device **devs;
     if(libusb_init(NULL) != 0) {
-        qDebug() << "[System] Initializing libusb-1 failed.";
+        LOG_ERROR() << "Initializing libusb-1 failed.";
         return usbids;
     }
 
     if(libusb_get_device_list(NULL, &devs) < 1) {
-        qDebug() << "[System] Error getting device list.";
+        LOG_ERROR() << "Error getting device list.";
         return usbids;
     }
     libusb_device *dev;
@@ -277,7 +278,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
                 name = tr("(no description available)");
             if(id) {
                 usbids.insertMulti(id, name);
-                qDebug("[System] USB: 0x%08x, %s", id, name.toLocal8Bit().data());
+                LOG_INFO("USB: 0x%08x, %s", id, name.toLocal8Bit().data());
             }
         }
     }
@@ -323,7 +324,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
 
                 if(id) {
                     usbids.insertMulti(id, name);
-                    qDebug() << "[System] USB:" << QString("0x%1").arg(id, 8, 16) << name;
+                    LOG_INFO() << "USB:" << QString("0x%1").arg(id, 8, 16) << name;
                 }
                 u = u->next;
             }
@@ -341,7 +342,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
     result = IOServiceGetMatchingServices(kIOMasterPortDefault, usb_matching_dictionary,
                                           &usb_iterator);
     if(result) {
-        qDebug() << "[System] USB: IOKit: Could not get matching services.";
+        LOG_ERROR() << "USB: IOKit: Could not get matching services.";
         return usbids;
     }
 
@@ -404,7 +405,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
 
         if(id) {
             usbids.insertMulti(id, name);
-            qDebug() << "[System] USB:" << QString("0x%1").arg(id, 8, 16) << name;
+            LOG_INFO() << "USB:" << QString("0x%1").arg(id, 8, 16) << name;
         }
 
     }
@@ -468,7 +469,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
             uint32_t id;
             id = vid << 16 | pid;
             usbids.insert(id, description);
-            qDebug("[System] USB VID: %04x, PID: %04x", vid, pid);
+            LOG_INFO("USB VID: %04x, PID: %04x", vid, pid);
         }
         if(buffer) free(buffer);
     }
@@ -507,7 +508,7 @@ QUrl System::systemProxy(void)
 
     RegCloseKey(hk);
 
-    //qDebug() << QString::fromWCharArray(proxyval) << QString("%1").arg(enable);
+    //LOG_INFO() << QString::fromWCharArray(proxyval) << QString("%1").arg(enable);
     if(enable != 0)
         return QUrl("http://" + QString::fromWCharArray(proxyval));
     else
@@ -537,7 +538,7 @@ QUrl System::systemProxy(void)
             bufsize = CFStringGetLength(stringref) * 2 + 1;
             buf = (char*)malloc(sizeof(char) * bufsize);
             if(buf == NULL) {
-                qDebug() << "[System] can't allocate memory for proxy string!";
+                LOG_ERROR() << "can't allocate memory for proxy string!";
                 CFRelease(dictref);
                 return QUrl("");
             }
-- 
cgit v1.2.3