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

Change-Id: I687907747e05cedbd3f9f1c20df95e5de2d5cd48

11 files changed, 69 insertions, 53 deletions

diff --git a/src/plugins/canbus/peakcan/main.cpp b/src/plugins/canbus/peakcan/main.cpp
index 4544690..94213f1 100644
--- a/src/plugins/canbus/peakcan/main.cpp
+++ b/src/plugins/canbus/peakcan/main.cpp
@@ -56,10 +56,10 @@ public:
         QString errorReason;
         if (!PeakCanBackend::canCreate(&errorReason)) {
             qWarning("%s", qPrintable(errorReason));
-            return Q_NULLPTR;
+            return nullptr;
         }
 
-        QCanBusDevice *device = new PeakCanBackend(interfaceName);
+        auto device = new PeakCanBackend(interfaceName);
         return device;
     }
 };
diff --git a/src/plugins/canbus/peakcan/peakcan_symbols_p.h b/src/plugins/canbus/peakcan/peakcan_symbols_p.h
index 79522c8..cb90599 100644
--- a/src/plugins/canbus/peakcan/peakcan_symbols_p.h
+++ b/src/plugins/canbus/peakcan/peakcan_symbols_p.h
@@ -35,8 +35,8 @@
 **
 ****************************************************************************/
 
-#ifndef REAKCAN_SYMBOLS_P_H
-#define REAKCAN_SYMBOLS_P_H
+#ifndef PEAKCAN_SYMBOLS_P_H
+#define PEAKCAN_SYMBOLS_P_H
 
 //
 //  W A R N I N G
@@ -266,8 +266,8 @@ GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Initialize, TPCANHandle, TPCANBaudrate
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Uninitialize, TPCANHandle)
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Reset, TPCANHandle)
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetStatus, TPCANHandle)
-GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Read, TPCANHandle, TPCANMsg*, TPCANTimestamp*)
-GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Write, TPCANHandle, TPCANMsg*)
+GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Read, TPCANHandle, TPCANMsg *, TPCANTimestamp *)
+GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_Write, TPCANHandle, TPCANMsg *)
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_FilterMessages, TPCANHandle, quint32, quint32, TPCANMode)
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_GetValue, TPCANHandle, TPCANParameter, void *, quint32)
 GENERATE_SYMBOL_VARIABLE(TPCANStatus, CAN_SetValue, TPCANHandle, TPCANParameter, void *, quint32)
@@ -308,4 +308,4 @@ inline bool resolveSymbols(QLibrary *pcanLibrary)
 
 #endif
 
-#endif // REAKCAN_SYMBOLS_P_H
+#endif // PEAKCAN_SYMBOLS_P_H
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 3bea3f0..98c8117 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -84,7 +84,7 @@ public:
     }
 
 protected:
-    bool event(QEvent *e) Q_DECL_OVERRIDE
+    bool event(QEvent *e) override
     {
         if (e->type() == QEvent::WinEventAct) {
             dptr->canReadNotification();
@@ -107,7 +107,7 @@ public:
     }
 
 protected:
-    bool event(QEvent *e) Q_DECL_OVERRIDE
+    bool event(QEvent *e) override
     {
         if (e->type() == QEvent::SockAct) {
             dptr->canReadNotification();
@@ -131,7 +131,7 @@ public:
     }
 
 protected:
-    void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE
+    void timerEvent(QTimerEvent *e) override
     {
         if (e->timerId() == timerId()) {
             dptr->canWriteNotification();
@@ -148,8 +148,8 @@ PeakCanBackendPrivate::PeakCanBackendPrivate(PeakCanBackend *q)
     : q_ptr(q)
     , isOpen(false)
     , channelIndex(PCAN_NONEBUS)
-    , outgoingEventNotifier(Q_NULLPTR)
-    , incomingEventNotifier(Q_NULLPTR)
+    , outgoingEventNotifier(nullptr)
+    , incomingEventNotifier(nullptr)
 #if defined(Q_OS_WIN32)
     , incomingEventHandle(INVALID_HANDLE_VALUE)
 #else
@@ -229,7 +229,7 @@ void PeakCanBackendPrivate::close()
 
     if (outgoingEventNotifier) {
         delete outgoingEventNotifier;
-        outgoingEventNotifier = Q_NULLPTR;
+        outgoingEventNotifier = nullptr;
     }
 
     if (TPCANStatus st = ::CAN_Uninitialize(channelIndex) != PCAN_ERROR_OK)
@@ -269,6 +269,22 @@ static int channelIndexFromName(const QString &interfaceName)
         return PCAN_USBBUS7;
     else if (interfaceName == QStringLiteral("usbbus8"))
         return PCAN_USBBUS8;
+    else if (interfaceName == QStringLiteral("pcibus1"))
+        return PCAN_PCIBUS1;
+    else if (interfaceName == QStringLiteral("pcibus2"))
+        return PCAN_PCIBUS2;
+    else if (interfaceName == QStringLiteral("pcibus3"))
+        return PCAN_PCIBUS3;
+    else if (interfaceName == QStringLiteral("pcibus4"))
+        return PCAN_PCIBUS4;
+    else if (interfaceName == QStringLiteral("pcibus5"))
+        return PCAN_PCIBUS5;
+    else if (interfaceName == QStringLiteral("pcibus6"))
+        return PCAN_PCIBUS6;
+    else if (interfaceName == QStringLiteral("pcibus7"))
+        return PCAN_PCIBUS7;
+    else if (interfaceName == QStringLiteral("pcibus8"))
+        return PCAN_PCIBUS8;
     else // TODO: Add other indexes here
         return PCAN_NONEBUS;
 }
@@ -351,7 +367,7 @@ bool PeakCanBackendPrivate::acquireReadNotification()
 
 #if defined(Q_OS_WIN32)
     if (incomingEventHandle == INVALID_HANDLE_VALUE) {
-        incomingEventHandle = ::CreateEvent(Q_NULLPTR, FALSE, FALSE, Q_NULLPTR);
+        incomingEventHandle = ::CreateEvent(nullptr, FALSE, FALSE, nullptr);
         if (!incomingEventHandle) {
             q->setError(qt_error_string(::GetLastError()), QCanBusDevice::ReadError);
             return false;
@@ -383,7 +399,7 @@ void PeakCanBackendPrivate::releaseReadNotification()
 
     if (incomingEventNotifier) {
         delete incomingEventNotifier;
-        incomingEventNotifier = Q_NULLPTR;
+        incomingEventNotifier = nullptr;
     }
 
 #if defined(Q_OS_WIN32)
@@ -529,9 +545,9 @@ bool PeakCanBackend::writeFrame(const QCanBusFrame &newData)
         return false;
     }
 
-    // canFD frame format not implemented at this stage
+    // CAN FD frame format not implemented at this stage
     if (newData.payload().size() > 8) {
-        setError(tr("CanFD frame format not supported."), QCanBusDevice::WriteError);
+        setError(tr("CAN FD frame format not supported."), QCanBusDevice::WriteError);
         return false;
     }
 
diff --git a/src/plugins/canbus/peakcan/peakcanbackend.h b/src/plugins/canbus/peakcan/peakcanbackend.h
index d5d531c..d44ba58 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.h
+++ b/src/plugins/canbus/peakcan/peakcanbackend.h
@@ -55,17 +55,17 @@ class PeakCanBackend : public QCanBusDevice
     Q_DECLARE_PRIVATE(PeakCanBackend)
     Q_DISABLE_COPY(PeakCanBackend)
 public:
-    explicit PeakCanBackend(const QString &name, QObject *parent = 0);
+    explicit PeakCanBackend(const QString &name, QObject *parent = nullptr);
     ~PeakCanBackend();
 
-    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;
 
     static bool canCreate(QString *errorReason);
 
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;
 };
diff --git a/src/plugins/canbus/tinycan/main.cpp b/src/plugins/canbus/tinycan/main.cpp
index 6e1f959..d020425 100644
--- a/src/plugins/canbus/tinycan/main.cpp
+++ b/src/plugins/canbus/tinycan/main.cpp
@@ -56,10 +56,10 @@ public:
         QString errorReason;
         if (!TinyCanBackend::canCreate(&errorReason)) {
             qWarning("%s", qPrintable(errorReason));
-            return Q_NULLPTR;
+            return nullptr;
         }
 
-        QCanBusDevice *device = new TinyCanBackend(interfaceName);
+        auto device = new TinyCanBackend(interfaceName);
         return device;
     }
 };
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index 669c153..530959a 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -82,7 +82,7 @@ public:
     }
 
 protected:
-    void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE
+    void timerEvent(QTimerEvent *e) override
     {
         if (e->timerId() == timerId()) {
             dptr->canWriteNotification();
@@ -115,6 +115,7 @@ TinyCanBackendPrivate::TinyCanBackendPrivate(TinyCanBackend *q)
     : q_ptr(q)
     , isOpen(false)
     , channelIndex(INDEX_INVALID)
+    , outgoingEventNotifier(nullptr)
 {
     startupDriver();
 
@@ -175,7 +176,7 @@ bool TinyCanBackendPrivate::open()
         return false;
     }
 
-    if (int ret = ::CanDeviceOpen(channelIndex, Q_NULLPTR) < 0) {
+    if (int ret = ::CanDeviceOpen(channelIndex, nullptr) < 0) {
         q->setError(systemErrorString(ret), QCanBusDevice::CanBusError::ConnectionError);
         return false;
     }
@@ -427,7 +428,7 @@ void TinyCanBackendPrivate::startupDriver()
     Q_Q(TinyCanBackend);
 
     if (driverRefCount == 0) {
-        if (int ret = ::CanInitDriver(Q_NULLPTR) < 0) {
+        if (int ret = ::CanInitDriver(nullptr) < 0) {
             q->setError(systemErrorString(ret), QCanBusDevice::CanBusError::ConnectionError);
             return;
         }
@@ -554,9 +555,9 @@ bool TinyCanBackend::writeFrame(const QCanBusFrame &newData)
         return false;
     }
 
-    // canFd frame format not supported at this stage
+    // CAN FD frame format not supported at this stage
     if (newData.payload().size() > 8) {
-        setError(tr("CanFD frame format not supported."), QCanBusDevice::WriteError);
+        setError(tr("CAN FD frame format not supported."), QCanBusDevice::WriteError);
         return false;
     }
 
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.h b/src/plugins/canbus/tinycan/tinycanbackend.h
index c5f23c6..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>
@@ -56,17 +55,17 @@ class TinyCanBackend : public QCanBusDevice
     Q_DECLARE_PRIVATE(TinyCanBackend)
     Q_DISABLE_COPY(TinyCanBackend)
 public:
-    explicit TinyCanBackend(const QString &name, QObject *parent = 0);
+    explicit TinyCanBackend(const QString &name, QObject *parent = nullptr);
     ~TinyCanBackend();
 
-    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;
 
     static bool canCreate(QString *errorReason);
 
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