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/socketcan | |
| 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/socketcan')
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/canbus/socketcan/socketcanbackend.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp index 2579881..87c466e 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.cpp +++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE SocketCanBackend::SocketCanBackend(const QString &name) : canSocket(-1), - notifier(0), + notifier(nullptr), canSocketName(name), canFdOptionEnabled(false) { @@ -285,7 +285,7 @@ bool SocketCanBackend::connectSocket() delete notifier; notifier = new QSocketNotifier(canSocket, QSocketNotifier::Read, this); - connect(notifier.data(), &QSocketNotifier::activated, + connect(notifier, &QSocketNotifier::activated, this, &SocketCanBackend::readSocket); //apply all stored configurations diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h index b0c2362..06e7f84 100644 --- a/src/plugins/canbus/socketcan/socketcanbackend.h +++ b/src/plugins/canbus/socketcan/socketcanbackend.h @@ -40,7 +40,6 @@ #include <QtSerialBus/qcanbusframe.h> #include <QtSerialBus/qcanbusdevice.h> -#include <QtCore/qpointer.h> #include <QtCore/qsocketnotifier.h> #include <QtCore/qstring.h> #include <QtCore/qvariant.h> @@ -72,7 +71,7 @@ private: bool applyConfigurationParameter(int key, const QVariant &value); qint64 canSocket; - QPointer<QSocketNotifier> notifier; + QSocketNotifier *notifier; QString canSocketName; bool canFdOptionEnabled; }; |