Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I687907747e05cedbd3f9f1c20df95e5de2d5cd48

3 files changed, 15 insertions, 15 deletions

diff --git a/src/plugins/canbus/socketcan/main.cpp b/src/plugins/canbus/socketcan/main.cpp
index 4f414fd..e83b569 100644
--- a/src/plugins/canbus/socketcan/main.cpp
+++ b/src/plugins/canbus/socketcan/main.cpp
@@ -55,7 +55,7 @@ class SocketCanBusPlugin : public QObject, public QCanBusFactory
 public:
     QCanBusDevice *createDevice(const QString &interfaceName) const
     {
-        QCanBusDevice *device = new SocketCanBackend(interfaceName);
+        auto device = new SocketCanBackend(interfaceName);
         return device;
     }
 };
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index 48a2aaf..87c466e 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -43,13 +43,14 @@
 
 #include <linux/can/error.h>
 #include <linux/can/raw.h>
+#include <errno.h>
 #include <unistd.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 
 #ifndef CANFD_MTU
-// CANFD support was added by Linux kernel 3.6
+// CAN FD support was added by Linux kernel 3.6
 // For prior kernels we redefine the missing defines here
 // they are taken from linux/can/raw.h & linux/can.h
 
@@ -76,7 +77,7 @@ QT_BEGIN_NAMESPACE
 
 SocketCanBackend::SocketCanBackend(const QString &name) :
     canSocket(-1),
-    notifier(0),
+    notifier(nullptr),
     canSocketName(name),
     canFdOptionEnabled(false)
 {
@@ -284,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
@@ -335,7 +336,7 @@ void SocketCanBackend::setConfigurationParameter(int key, const QVariant &value)
 
     QCanBusDevice::setConfigurationParameter(key, value);
 
-    // we need to check canfd option a lot -> cache it and avoid QVector lookup
+    // we need to check CAN FD option a lot -> cache it and avoid QVector lookup
     if (key == QCanBusDevice::CanFdKey)
         canFdOptionEnabled = value.toBool();
 }
@@ -369,7 +370,7 @@ bool SocketCanBackend::writeFrame(const QCanBusFrame &newData)
                               "maximal %2 bytes. Frame is discarded.").
                         arg(payloadSize).arg(canFdOptionEnabled ? CANFD_MAX_DLEN : CAN_MAX_DLEN);
         if (!canFdOptionEnabled && payloadSize <= CANFD_MAX_DLEN)
-            setError(tr("Sending CanFd frame although CanFd option not enabled."),
+            setError(tr("Sending CAN FD frame although CAN FD option not enabled."),
                      QCanBusDevice::WriteError);
         else
             setError(tr("Frame payload exceeds maximum CAN frame payload length."),
@@ -581,11 +582,11 @@ void SocketCanBackend::readSocket()
         if (bytesReceived <= 0) {
             break;
         } else if (bytesReceived != CANFD_MTU && bytesReceived != CAN_MTU) {
-            setError(tr("ERROR SocketCanBackend: incomplete can frame"),
+            setError(tr("ERROR SocketCanBackend: incomplete CAN frame"),
                      QCanBusDevice::CanBusError::ReadError);
             continue;
         } else if (frame.len > bytesReceived - offsetof(canfd_frame, data)) {
-            setError(tr("ERROR SocketCanBackend: invalid can frame length"),
+            setError(tr("ERROR SocketCanBackend: invalid CAN frame length"),
                      QCanBusDevice::CanBusError::ReadError);
             continue;
         }
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h
index ac6c0d5..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>
@@ -54,14 +53,14 @@ public:
     explicit SocketCanBackend(const QString &name);
     ~SocketCanBackend();
 
-    bool open() Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
+    bool open() override;
+    void close() override;
 
-    void setConfigurationParameter(int key, const QVariant &value) Q_DECL_OVERRIDE;
+    void setConfigurationParameter(int key, const QVariant &value) override;
 
-    bool writeFrame(const QCanBusFrame &newData) Q_DECL_OVERRIDE;
+    bool writeFrame(const QCanBusFrame &newData) override;
 
-    QString interpretErrorFrame(const QCanBusFrame &errorFrame) Q_DECL_OVERRIDE;
+    QString interpretErrorFrame(const QCanBusFrame &errorFrame) override;
 
 private Q_SLOTS:
     void readSocket();
@@ -72,7 +71,7 @@ private:
     bool applyConfigurationParameter(int key, const QVariant &value);
 
     qint64 canSocket;
-    QPointer<QSocketNotifier> notifier;
+    QSocketNotifier *notifier;
     QString canSocketName;
     bool canFdOptionEnabled;
 };