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>

5 files changed, 5 insertions, 6 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;
 };
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