From 6a8cdaf2f718fef8a826fd98241050a7d3cbfb3d Mon Sep 17 00:00:00 2001
From: Tomasz Sterna <tomek@xiaoka.com>
Date: Fri, 11 Jul 2014 23:31:28 +0200
Subject: Use Log4Qt in daemon

---
 daemon/watchconnector.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'daemon/watchconnector.cpp')

diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp
index dbcd831..d999229 100644
--- a/daemon/watchconnector.cpp
+++ b/daemon/watchconnector.cpp
@@ -18,10 +18,10 @@ void WatchConnector::deviceDiscovered(const QBluetoothDeviceInfo &device)
 {
     //FIXME TODO: Configurable
     if (device.name().startsWith("Pebble")) {
-        qDebug() << "Found Pebble:" << device.name() << '(' << device.address().toString() << ')';
+        logger()->debug() << "Found Pebble: " << device.name() << " (" << device.address().toString() << ')';
         handleWatch(device.name(), device.address().toString());
     } else {
-        qDebug() << "Found other device:" << device.name() << '(' << device.address().toString() << ')';
+        logger()->debug() << "Found other device: " << device.name() << " (" << device.address().toString() << ')';
     }
 }
 
@@ -32,7 +32,7 @@ void WatchConnector::deviceConnect(const QString &name, const QString &address)
 
 void WatchConnector::reconnect()
 {
-    qDebug() << "reconnect" << _last_name;
+    logger()->debug() << "reconnect " << _last_name;
     if (!_last_name.isEmpty() && !_last_address.isEmpty()) {
         deviceConnect(_last_name, _last_address);
     }
@@ -40,14 +40,14 @@ void WatchConnector::reconnect()
 
 void WatchConnector::disconnect()
 {
-    qDebug() << __FUNCTION__;
+    logger()->debug() << __FUNCTION__;
     socket->close();
     socket->deleteLater();
 }
 
 void WatchConnector::handleWatch(const QString &name, const QString &address)
 {
-    qDebug() << "handleWatch" << name << address;
+    logger()->debug() << "handleWatch " << name << " " << address;
     if (socket != nullptr && socket->isOpen()) {
         socket->close();
         socket->deleteLater();
@@ -58,7 +58,7 @@ void WatchConnector::handleWatch(const QString &name, const QString &address)
     _last_address = address;
     if (emit_name) emit nameChanged();
 
-    qDebug() << "Creating socket";
+    logger()->debug() << "Creating socket";
     socket = new QBluetoothSocket(QBluetoothSocket::RfcommSocket);
 
     connect(socket, SIGNAL(readyRead()), SLOT(onReadSocket()));
@@ -128,8 +128,8 @@ void WatchConnector::decodeMsg(QByteArray data)
     endpoint = (data.at(index) << 8) + data.at(index+1);
     index += 2;
 
-    qDebug() << "Length:" << datalen << " Endpoint:" << decodeEndpoint(endpoint);
-    qDebug() << "Data:" << data.mid(index).toHex();
+    logger()->debug() << "Length:" << datalen << " Endpoint:" << decodeEndpoint(endpoint);
+    logger()->debug() << "Data:" << data.mid(index).toHex();
     if (endpoint == watchPHONE_CONTROL) {
         if (data.length() >= 5) {
             if (data.at(4) == callHANGUP) {
@@ -141,7 +141,7 @@ void WatchConnector::decodeMsg(QByteArray data)
 
 void WatchConnector::onReadSocket()
 {
-    qDebug() << "read";
+    logger()->debug() << "read";
 
     QBluetoothSocket *socket = qobject_cast<QBluetoothSocket *>(sender());
     if (!socket) return;
@@ -155,7 +155,7 @@ void WatchConnector::onReadSocket()
 
 void WatchConnector::onConnected()
 {
-    qDebug() << "Connected!";
+    logger()->debug() << "Connected!";
     bool was_connected = is_connected;
     is_connected = true;
     if (not was_connected) emit connectedChanged();
@@ -163,7 +163,7 @@ void WatchConnector::onConnected()
 
 void WatchConnector::onDisconnected()
 {
-    qDebug() << "Disconnected!";
+    logger()->debug() << "Disconnected!";
 
     bool was_connected = is_connected;
     is_connected = false;
@@ -180,7 +180,7 @@ void WatchConnector::onDisconnected()
 }
 
 void WatchConnector::onError(QBluetoothSocket::SocketError error) {
-    qWarning() << "Error connecting Pebble" << error << socket->errorString();
+    logger()->error() << "Error connecting Pebble: " << error << socket->errorString();
 }
 
 void WatchConnector::sendData(const QByteArray &data)
@@ -192,7 +192,7 @@ void WatchConnector::sendData(const QByteArray &data)
 
 void WatchConnector::sendMessage(unsigned int endpoint, QByteArray data)
 {
-    qDebug() << "Sending message";
+    logger()->debug() << "Sending message";
     QByteArray msg;
 
     // First send the length
-- 
cgit v1.2.3