diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2017-11-05 19:15:19 +0100 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-11-13 19:29:48 +0000 |
| commit | 328db7b395a1df970ccc641b2077c5c6ecbcf7de (patch) | |
| tree | dd3911db9dc995797e2d8cfbba08f56c645308fd /src/plugins/canbus/vectorcan | |
| parent | 9de99ca2d395037a092a9003cad3dbb7bb5fde98 (diff) | |
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>
Diffstat (limited to 'src/plugins/canbus/vectorcan')
| -rw-r--r-- | src/plugins/canbus/vectorcan/main.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/plugins/canbus/vectorcan/main.cpp b/src/plugins/canbus/vectorcan/main.cpp index 07c30bc..bbfb851 100644 --- a/src/plugins/canbus/vectorcan/main.cpp +++ b/src/plugins/canbus/vectorcan/main.cpp @@ -40,8 +40,12 @@ #include <QtSerialBus/qcanbusdevice.h> #include <QtSerialBus/qcanbusfactory.h> +#include <QtCore/qloggingcategory.h> + QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(QT_CANBUS_PLUGINS_VECTORCAN, "qt.canbus.plugins.vectorcan") + class VectorCanBusPlugin : public QObject, public QCanBusFactoryV2 { Q_OBJECT @@ -61,7 +65,7 @@ public: { QString errorReason; if (Q_UNLIKELY(!VectorCanBackend::canCreate(&errorReason))) { - qWarning("%ls", qUtf16Printable(errorReason)); + qCWarning(QT_CANBUS_PLUGINS_VECTORCAN, "%ls", qUtf16Printable(errorReason)); if (errorMessage) *errorMessage = errorReason; return nullptr; diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index d58a7e9..0dbe4c4 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -42,6 +42,7 @@ #include <QtCore/qtimer.h> #include <QtCore/qcoreevent.h> +#include <QtCore/qloggingcategory.h> #include <QtCore/qwineventnotifier.h> #include <QtCore/qcoreapplication.h> @@ -49,6 +50,8 @@ QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(QT_CANBUS_PLUGINS_VECTORCAN) + #ifndef LINK_LIBVECTORCAN Q_GLOBAL_STATIC(QLibrary, vectorcanLibrary) #endif @@ -459,8 +462,8 @@ bool VectorCanBackend::open() const QVariant param = configurationParameter(key); const bool success = d->setConfigurationParameter(key, param); if (!success) { - qWarning("Cannot apply parameter: %d with value: %ls", - key, qUtf16Printable(param.toString())); + qCWarning(QT_CANBUS_PLUGINS_VECTORCAN, "Cannot apply parameter: %d with value: %ls.", + key, qUtf16Printable(param.toString())); } } |