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/peakcan | |
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/peakcan')
-rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp index 16232f8..5a17b22 100644 --- a/src/plugins/canbus/peakcan/peakcanbackend.cpp +++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2017 Denis Shienkov <denis.shienkov@gmail.com> ** Copyright (C) 2017 The Qt Company Ltd. @@ -153,11 +153,11 @@ QList<QCanBusDeviceInfo> PeakCanBackend::interfaces() } #if defined(Q_OS_WIN32) -class ReadNotifier : public QWinEventNotifier +class PeakCanReadNotifier : public QWinEventNotifier { // no Q_OBJECT macro! public: - explicit ReadNotifier(PeakCanBackendPrivate *d, QObject *parent) + explicit PeakCanReadNotifier(PeakCanBackendPrivate *d, QObject *parent) : QWinEventNotifier(parent) , dptr(d) { @@ -178,11 +178,11 @@ private: PeakCanBackendPrivate * const dptr; }; #else -class ReadNotifier : public QSocketNotifier +class PeakCanReadNotifier : public QSocketNotifier { // no Q_OBJECT macro! public: - explicit ReadNotifier(PeakCanBackendPrivate *d, QObject *parent) + explicit PeakCanReadNotifier(PeakCanBackendPrivate *d, QObject *parent) : QSocketNotifier(d->readHandle, QSocketNotifier::Read, parent) , dptr(d) { @@ -203,11 +203,11 @@ private: }; #endif -class WriteNotifier : public QTimer +class PeakCanWriteNotifier : public QTimer { // no Q_OBJECT macro! public: - WriteNotifier(PeakCanBackendPrivate *d, QObject *parent) + PeakCanWriteNotifier(PeakCanBackendPrivate *d, QObject *parent) : QTimer(parent) , dptr(d) { @@ -369,10 +369,10 @@ bool PeakCanBackendPrivate::open() } #endif - writeNotifier = new WriteNotifier(this, q); + writeNotifier = new PeakCanWriteNotifier(this, q); writeNotifier->setInterval(0); - readNotifier = new ReadNotifier(this, q); + readNotifier = new PeakCanReadNotifier(this, q); readNotifier->setEnabled(true); isOpen = true; |