diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-03 15:45:40 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-05-04 16:14:19 +0000 |
| commit | b8d5c1f1dff57da6927470543e5d004c237846ac (patch) | |
| tree | 5fdd8fafd036df90e8dd45b4767b26984ca5c828 /src/plugins/canbus/tinycan | |
| parent | aa4222f350a59ad2d90f14a1dfb88f83bf2d2c78 (diff) | |
CAN: Do not use QPointer class as it is overhead
... and use the QScopedPointer instead, where possible.
Change-Id: Ie503d5ff31af77cf6a495f324c1e93c34ff7d58b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/plugins/canbus/tinycan')
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend.h | 1 | ||||
| -rw-r--r-- | src/plugins/canbus/tinycan/tinycanbackend_p.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp index 727721f..530959a 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.cpp +++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp @@ -115,6 +115,7 @@ TinyCanBackendPrivate::TinyCanBackendPrivate(TinyCanBackend *q) : q_ptr(q) , isOpen(false) , channelIndex(INDEX_INVALID) + , outgoingEventNotifier(nullptr) { startupDriver(); diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h index 5b71f19..bd3aca0 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend.h +++ b/src/plugins/canbus/tinycan/tinycanbackend.h @@ -41,7 +41,6 @@ #include <QtSerialBus/qcanbusframe.h> #include <QtSerialBus/qcanbusdevice.h> -#include <QtCore/qpointer.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> #include <QtCore/qlist.h> diff --git a/src/plugins/canbus/tinycan/tinycanbackend_p.h b/src/plugins/canbus/tinycan/tinycanbackend_p.h index bd17c62..bc0f385 100644 --- a/src/plugins/canbus/tinycan/tinycanbackend_p.h +++ b/src/plugins/canbus/tinycan/tinycanbackend_p.h @@ -82,7 +82,7 @@ public: TinyCanBackend * const q_ptr; bool isOpen; int channelIndex; - QPointer<QTimer> outgoingEventNotifier; + QTimer *outgoingEventNotifier; }; QT_END_NAMESPACE |