Since Log4Qt uses QDebug underneath now, it autoinserts spaces while logging

4 files changed, 11 insertions, 11 deletions

diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
index 252e715..584710a 100644
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -64,7 +64,7 @@ void initLogging()
     // console.log() exactly in Sailfish OS device release builds doesn't go through the same qDebug() channel
     Log4Qt::LogManager::setHandleQtMessages(true);
 
-    qDebug() << "Using following log config file: " << usedConfigFile;
+    qDebug() << "Using following log config file:" << usedConfigFile;
 }
 
 int main(int argc, char *argv[])
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index b47c170..57ef57e 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -191,13 +191,13 @@ QString Manager::findPersonByNumber(QString number)
 
 void Manager::onVoiceError(const QString &message)
 {
-    logger()->error() << "Error: " << message;
+    logger()->error() << "Error:" << message;
 }
 
 
 void Manager::onNotifyError(const QString &message)
 {
-    qWarning() << "Error: " << message;
+    qWarning() << "Error:" << message;
 }
 
 void Manager::onSmsNotify(const QString &sender, const QString &data)
diff --git a/daemon/notificationmanager.cpp b/daemon/notificationmanager.cpp
index 9050605..104c614 100644
--- a/daemon/notificationmanager.cpp
+++ b/daemon/notificationmanager.cpp
@@ -208,7 +208,7 @@ void NotificationManager::Notify(const QString &app_name, uint replaces_id, cons
 
         //Never send empty data and subject
         if (data.isEmpty() && subject.isEmpty()) {
-            logger()->warn() << Q_FUNC_INFO << "Empty subject and data in dbus app " << app_name;
+            logger()->warn() << Q_FUNC_INFO << "Empty subject and data in dbus app:" << app_name;
             return;
         }
 
diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp
index e9066ce..93b59ab 100644
--- a/daemon/watchconnector.cpp
+++ b/daemon/watchconnector.cpp
@@ -22,10 +22,10 @@ void WatchConnector::deviceDiscovered(const QBluetoothDeviceInfo &device)
 {
     //FIXME TODO: Configurable
     if (device.name().startsWith("Pebble")) {
-        logger()->debug() << "Found Pebble: " << device.name() << " (" << device.address().toString() << ')';
+        logger()->debug() << "Found Pebble:" << device.name() << '(' << device.address().toString() << ')';
         handleWatch(device.name(), device.address().toString());
     } else {
-        logger()->debug() << "Found other device: " << device.name() << " (" << device.address().toString() << ')';
+        logger()->debug() << "Found other device:" << device.name() << '(' << device.address().toString() << ')';
     }
 }
 
@@ -36,7 +36,7 @@ void WatchConnector::deviceConnect(const QString &name, const QString &address)
 
 void WatchConnector::reconnect()
 {
-    logger()->debug() << "reconnect " << _last_name;
+    logger()->debug() << "reconnect" << _last_name;
     if (!_last_name.isEmpty() && !_last_address.isEmpty()) {
         deviceConnect(_last_name, _last_address);
     }
@@ -53,7 +53,7 @@ void WatchConnector::disconnect()
 
 void WatchConnector::handleWatch(const QString &name, const QString &address)
 {
-    logger()->debug() << "handleWatch " << name << " " << address;
+    logger()->debug() << "handleWatch" << name << address;
     reconnectTimer.stop();
     if (socket != nullptr && socket->isOpen()) {
         socket->close();
@@ -95,7 +95,7 @@ void WatchConnector::decodeMsg(QByteArray data)
     endpoint = (data.at(index) << 8) + data.at(index+1);
     index += 2;
 
-    logger()->debug() << "Length:" << datalen << " Endpoint:" << decodeEndpoint(endpoint);
+    logger()->debug() << "Length:" << datalen << "Endpoint:" << decodeEndpoint(endpoint);
     logger()->debug() << "Data:" << data.mid(index).toHex();
 
     emit messageDecoded(endpoint, data.mid(index, datalen));
@@ -141,11 +141,11 @@ void WatchConnector::onDisconnected()
 
     reconnectTimer.setInterval(reconnectTimer.interval() + __reconnect_timeout);
     reconnectTimer.start();
-    logger()->debug() << "Will reconnect in " << reconnectTimer.interval() << " ms";
+    logger()->debug() << "Will reconnect in" << reconnectTimer.interval() << "ms";
 }
 
 void WatchConnector::onError(QBluetoothSocket::SocketError error) {
-    logger()->error() << "Error connecting Pebble: " << error << socket->errorString();
+    logger()->error() << "Error connecting Pebble:" << error << socket->errorString();
 }
 
 void WatchConnector::sendData(const QByteArray &data)