1 files changed, 9 insertions, 16 deletions
diff --git a/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp b/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
index 9ca402822d..3a2fee0afb 100644
--- a/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
+++ b/src/plugins/platforms/qnx/qqnxnavigatorpps.cpp
@@ -8,17 +8,11 @@
 #include <QByteArray>
 #include <private/qcore_unix_p.h>
 
-#if defined(QQNXNAVIGATOR_DEBUG)
-#define qNavigatorDebug qDebug
-#else
-#define qNavigatorDebug QT_NO_QDEBUG_MACRO
-#endif
-
-static const char *navigatorControlPath = "/pps/services/navigator/control";
-static const int ppsBufferSize = 4096;
-
 QT_BEGIN_NAMESPACE
 
+const char *QQnxNavigatorPps::navigatorControlPath = "/pps/services/navigator/control";
+const size_t QQnxNavigatorPps::ppsBufferSize = 4096;
+
 QQnxNavigatorPps::QQnxNavigatorPps(QObject *parent)
     : QQnxAbstractNavigator(parent)
     , m_fd(-1)
@@ -45,7 +39,7 @@ bool QQnxNavigatorPps::openPpsConnection()
         return false;
     }
 
-    qNavigatorDebug("successfully connected to Navigator. fd=%d", m_fd);
+    qCDebug(lcQpaQnxNavigator) << "successfully connected to Navigator. fd=" << m_fd;
 
     return true;
 }
@@ -67,7 +61,7 @@ bool QQnxNavigatorPps::sendPpsMessage(const QByteArray &message, const QByteArra
 
     ppsMessage += "\n";
 
-    qNavigatorDebug() << "sending PPS message:\n" << ppsMessage;
+    qCDebug(lcQpaQnxNavigator) << "sending PPS message:\n" << ppsMessage;
 
     // send pps message to navigator
     errno = 0;
@@ -89,7 +83,7 @@ bool QQnxNavigatorPps::sendPpsMessage(const QByteArray &message, const QByteArra
     // ensure data is null terminated
     buffer[bytes] = '\0';
 
-    qNavigatorDebug() << "received PPS message:\n" << buffer;
+    qCDebug(lcQpaQnxNavigator) << "received PPS message:\n" << buffer;
 
     // process received message
     QByteArray ppsData(buffer);
@@ -108,7 +102,7 @@ bool QQnxNavigatorPps::sendPpsMessage(const QByteArray &message, const QByteArra
 
 void QQnxNavigatorPps::parsePPS(const QByteArray &ppsData, QHash<QByteArray, QByteArray> &messageFields)
 {
-    qNavigatorDebug() << "data=" << ppsData;
+    qCDebug(lcQpaQnxNavigator) << "data=" << ppsData;
 
     // tokenize pps data into lines
     QList<QByteArray> lines = ppsData.split('\n');
@@ -123,7 +117,7 @@ void QQnxNavigatorPps::parsePPS(const QByteArray &ppsData, QHash<QByteArray, QBy
         // tokenize current attribute
         const QByteArray &attr = lines.at(i);
 
-        qNavigatorDebug() << "attr=" << attr;
+        qCDebug(lcQpaQnxNavigator) << "attr=" << attr;
 
         int firstColon = attr.indexOf(':');
         if (firstColon == -1) {
@@ -140,8 +134,7 @@ void QQnxNavigatorPps::parsePPS(const QByteArray &ppsData, QHash<QByteArray, QBy
         QByteArray key = attr.left(firstColon);
         QByteArray value = attr.mid(secondColon + 1);
 
-        qNavigatorDebug() << "key=" << key;
-        qNavigatorDebug() << "val=" << value;
+        qCDebug(lcQpaQnxNavigator) << "key=" << key << "value=" << value;
         messageFields[key] = value;
     }
 }