diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:03:25 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:03:25 +0200 |
commit | b0009399980d51e157e46c745a710bc1cd6706c1 (patch) | |
tree | a224515f33b1a5238b4a81cb692d5d4886c984cd /src/plugins/canbus/vectorcan | |
parent | 77ccec69263567b2b41244e483dfb083b883c6d8 (diff) | |
parent | f129107e472c179e47b37d8fdaff120d1eccc7f8 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I49240ebad0b08b728783a4e5137f12799cb5080c
Diffstat (limited to 'src/plugins/canbus/vectorcan')
-rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index e071122..0382d66 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2017 Denis Shienkov <denis.shienkov@gmail.com> ** Contact: http://www.qt.io/licensing/ @@ -103,11 +103,11 @@ QList<QCanBusDeviceInfo> VectorCanBackend::interfaces() static int driverRefCount = 0; -class ReadNotifier : public QWinEventNotifier +class VectorCanReadNotifier : public QWinEventNotifier { // no Q_OBJECT macro! public: - explicit ReadNotifier(VectorCanBackendPrivate *d, QObject *parent) + explicit VectorCanReadNotifier(VectorCanBackendPrivate *d, QObject *parent) : QWinEventNotifier(parent) , dptr(d) { @@ -128,11 +128,11 @@ private: VectorCanBackendPrivate * const dptr; }; -class WriteNotifier : public QTimer +class VectorCanWriteNotifier : public QTimer { // no Q_OBJECT macro! public: - WriteNotifier(VectorCanBackendPrivate *d, QObject *parent) + VectorCanWriteNotifier(VectorCanBackendPrivate *d, QObject *parent) : QTimer(parent) , dptr(d) { @@ -202,10 +202,10 @@ bool VectorCanBackendPrivate::open() } } - readNotifier = new ReadNotifier(this, q); + readNotifier = new VectorCanReadNotifier(this, q); readNotifier->setEnabled(true); - writeNotifier = new WriteNotifier(this, q); + writeNotifier = new VectorCanWriteNotifier(this, q); return true; } |