1 files changed, 22 insertions, 14 deletions

diff --git a/src/fbgui/sysinfo.cpp b/src/fbgui/sysinfo.cpp
index 7d6ac92..59fe577 100644
--- a/src/fbgui/sysinfo.cpp
+++ b/src/fbgui/sysinfo.cpp
@@ -1,5 +1,14 @@
 #include "sysinfo.h"
 
+
+#include <log4cxx/logger.h>
+#include "qlog4cxx.h"
+
+using namespace log4cxx;
+using namespace log4cxx::helpers;
+LoggerPtr siLogger(Logger::getLogger("fbgui.sysinfo"));
+
+
 // ------------------------------------------------------------------------------------------------
 /**
  * A empty constructor.
@@ -32,13 +41,13 @@ SysInfo::~SysInfo() {
  * @see JavascriptInterface::getSysInfo(const QString& info)
  */
 const QString SysInfo::getInfo(const QString& infoName) {
-   qxtLog->debug() << "[sysinfo] requested " << infoName;
+   LOG4CXX_DEBUG(siLogger, "[sysinfo] requested " << infoName);
    if (infoName == QString("mbserial"))
       return getMainboardSerial();
    else if (infoName == QString("usb"))
       return getUsbVendorIdProductIdSerialNumber();
    /* unknown code */
-   qxtLog->debug() << "[sysinfo] unknown requested";
+   LOG4CXX_DEBUG(siLogger, "[sysinfo] unknown requested");
    return "info_error";
 }
 // -----------------------------------------------------------------------------------------------
@@ -74,11 +83,10 @@ const QString SysInfo::getMainboardSerial() {
             out = QString(attr->value);
          }
       }
-      qxtLog->debug() << "[sysinfo] Mainboard Serial: " + out;
+      LOG4CXX_DEBUG(siLogger, "[sysinfo] Mainboard Serial: " + out);
       return out;
    }
-   qxtLog->debug()
-         << "[sysinfo] Mainboard Serial: attrlist is null! return: mainboard_serial_error";
+   LOG4CXX_DEBUG(siLogger, "[sysinfo] Mainboard Serial: attrlist is null! return: mainboard_serial_error");
    sysfs_close_class_device(class_device);
    return "mainboard_serial_error";
 }
@@ -116,14 +124,14 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
    int r = 1;
    r = libusb_init(&ctx);
    if (r < 0) {
-      qxtLog->debug() << tag + "failed to initialise libusb";
+      LOG4CXX_DEBUG(siLogger, tag + "failed to initialise libusb");
       return "error";
    }
    cnt = libusb_get_device_list(ctx, &devs); //get the list of devices
    if (cnt < 0) {
-      qxtLog->debug() << tag + "Get Device Error"; //there was an error
+      LOG4CXX_DEBUG(siLogger, tag + "Get Device Error"); //there was an error
    }
-   qxtLog->debug() << tag + cnt + " Devices in list."; //print total number of usb devices
+   LOG4CXX_DEBUG(siLogger, tag + cnt + " Devices in list."); //print total number of usb devices
    ssize_t i; //for iterating through the list#
    for (i = 0; i < cnt; i++) {
       //printdev(devs[i]); //print specs of this device
@@ -132,7 +140,7 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
       libusb_device_descriptor desc;
       int re = libusb_get_device_descriptor(dev, &desc);
       if (re < 0) {
-         qxtLog->debug() << tag + "failed to get device descriptor";
+         LOG4CXX_DEBUG(siLogger, tag + "failed to get device descriptor");
          return "error";
       }
       infos.insert("vendorId", desc.idVendor);
@@ -141,27 +149,27 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
       libusb_device_handle *handle;
       re = libusb_open(dev, &handle);
       if (re != 0) {
-         qxtLog->debug() << tag + "failed to get handler / fail to open device";
+         LOG4CXX_DEBUG(siLogger, tag + "failed to get handler / fail to open device");
          return "error";
       }
       re = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber,
             string, sizeof(string));
       if (re < 0) {
-         qxtLog->debug() << tag + "failed to get SerialNumber";
+         LOG4CXX_DEBUG(siLogger, tag + "failed to get SerialNumber");
          return "error";
       }
       infos.insert("serialnumber", QString((const char *) string));
       re = libusb_get_string_descriptor_ascii(handle, desc.iProduct, string,
             sizeof(string));
       if (re < 0) {
-         qxtLog->debug() << tag + "failed to get Product";
+         LOG4CXX_DEBUG(siLogger, tag + "failed to get Product");
          return "error";
       }
       infos.insert("product", QString((const char *) string));
       re = libusb_get_string_descriptor_ascii(handle, desc.iManufacturer,
             string, sizeof(string));
       if (re < 0) {
-         qxtLog->debug() << tag + "failed to get Product";
+         LOG4CXX_DEBUG(siLogger, tag + "failed to get Product");
          return "error";
       }
       infos.insert("manuacturer", QString((const char *) string));
@@ -174,7 +182,7 @@ const QString SysInfo::getUsbVendorIdProductIdSerialNumber() {
 
    /*
    QByteArray json = serializer.serialize(list);
-   qxtLog->debug() << tag + "json object: " + json;
+   LOG4CXX_DEBUG(siLogger, tag + "json object: " + json);
    return json;
    */
 }