From 328db7b395a1df970ccc641b2077c5c6ecbcf7de Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Sun, 5 Nov 2017 19:15:19 +0100
Subject: CAN: Introduce categorized logging

[ChangeLog][CAN bus] Introduced categorized logging to the
CAN bus module which can be enabled by the "qt.canbus" and
"qt.canbus.plugins.<pluginname>" filters.

Change-Id: Ib39c0b2ebcd967cd7812602190807ad3488ccb18
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
---
 src/plugins/canbus/peakcan/main.cpp           | 6 +++++-
 src/plugins/canbus/peakcan/peakcanbackend.cpp | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/plugins/canbus/peakcan')

diff --git a/src/plugins/canbus/peakcan/main.cpp b/src/plugins/canbus/peakcan/main.cpp
index 7444f6d..8ab1b99 100644
--- a/src/plugins/canbus/peakcan/main.cpp
+++ b/src/plugins/canbus/peakcan/main.cpp
@@ -41,8 +41,12 @@
 #include <QtSerialBus/qcanbusdevice.h>
 #include <QtSerialBus/qcanbusfactory.h>
 
+#include <QtCore/qloggingcategory.h>
+
 QT_BEGIN_NAMESPACE
 
+Q_LOGGING_CATEGORY(QT_CANBUS_PLUGINS_PEAKCAN, "qt.canbus.plugins.peakcan")
+
 class PeakCanBusPlugin : public QObject, public QCanBusFactoryV2
 {
     Q_OBJECT
@@ -62,7 +66,7 @@ public:
     {
         QString errorReason;
         if (!PeakCanBackend::canCreate(&errorReason)) {
-            qWarning("%ls", qUtf16Printable(errorReason));
+            qCWarning(QT_CANBUS_PLUGINS_PEAKCAN, "%ls", qUtf16Printable(errorReason));
             if (errorMessage)
                 *errorMessage = errorReason;
             return nullptr;
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 40b63df..6dd87da 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -43,6 +43,7 @@
 
 #include <QtCore/qtimer.h>
 #include <QtCore/qcoreevent.h>
+#include <QtCore/qloggingcategory.h>
 
 #include <algorithm>
 
@@ -54,6 +55,8 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_DECLARE_LOGGING_CATEGORY(QT_CANBUS_PLUGINS_PEAKCAN)
+
 #ifndef LINK_LIBPCANBASIC
 Q_GLOBAL_STATIC(QLibrary, pcanLibrary)
 #endif
@@ -482,8 +485,8 @@ bool PeakCanBackend::open()
             const QVariant param = configurationParameter(key);
             const bool success = d->setConfigurationParameter(key, param);
             if (Q_UNLIKELY(!success)) {
-                qWarning("Cannot apply parameter: %d with value: %ls.",
-                         key, qUtf16Printable(param.toString()));
+                qCWarning(QT_CANBUS_PLUGINS_PEAKCAN, "Cannot apply parameter: %d with value: %ls.",
+                          key, qUtf16Printable(param.toString()));
             }
         }
     }
-- 
cgit v1.2.3