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/tinycan | |
| 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/tinycan')
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 606927c..fdd5aaa 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2017 Denis Shienkov <denis.shienkov@gmail.com> ** Copyright (C) 2017 The Qt Company Ltd. @@ -89,11 +89,11 @@ struct TinyCanGlobal { Q_GLOBAL_STATIC(TinyCanGlobal, gTinyCan) -class WriteNotifier : public QTimer +class TinyCanWriteNotifier : public QTimer { // no Q_OBJECT macro! public: - WriteNotifier(TinyCanBackendPrivate *d, QObject *parent) + TinyCanWriteNotifier(TinyCanBackendPrivate *d, QObject *parent) : QTimer(parent) , dptr(d) { @@ -211,7 +211,7 @@ bool TinyCanBackendPrivate::open() } } - writeNotifier = new WriteNotifier(this, q); + writeNotifier = new TinyCanWriteNotifier(this, q); writeNotifier->setInterval(0); isOpen = true; |