CAN: Use C++11 class initialization where possible

Change-Id: I2aeeb762297707337273b0a1ecba8b3d13ed923f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

10 files changed, 25 insertions, 42 deletions

diff --git a/src/plugins/canbus/peakcan/peakcanbackend.cpp b/src/plugins/canbus/peakcan/peakcanbackend.cpp
index 83d36c6..f256d82 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend.cpp
+++ b/src/plugins/canbus/peakcan/peakcanbackend.cpp
@@ -208,15 +208,6 @@ private:
 
 PeakCanBackendPrivate::PeakCanBackendPrivate(PeakCanBackend *q)
     : q_ptr(q)
-    , isOpen(false)
-    , channelIndex(PCAN_NONEBUS)
-    , writeNotifier(nullptr)
-    , readNotifier(nullptr)
-#if defined(Q_OS_WIN32)
-    , readHandle(INVALID_HANDLE_VALUE)
-#else
-    , readHandle(-1)
-#endif
 {
 }
 
diff --git a/src/plugins/canbus/peakcan/peakcanbackend_p.h b/src/plugins/canbus/peakcan/peakcanbackend_p.h
index 032495b..8ecbe57 100644
--- a/src/plugins/canbus/peakcan/peakcanbackend_p.h
+++ b/src/plugins/canbus/peakcan/peakcanbackend_p.h
@@ -39,6 +39,7 @@
 #define PEAKCANBACKEND_P_H
 
 #include "peakcanbackend.h"
+#include "peakcan_symbols_p.h"
 
 #if defined(Q_OS_WIN32)
 #  include <qt_windows.h>
@@ -81,16 +82,16 @@ public:
 
     PeakCanBackend * const q_ptr;
 
-    bool isOpen;
-    int channelIndex;
-    QTimer *writeNotifier;
+    bool isOpen = false;
+    int channelIndex = PCAN_NONEBUS;
+    QTimer *writeNotifier = nullptr;
 
 #if defined(Q_OS_WIN32)
-    QWinEventNotifier *readNotifier;
-    HANDLE readHandle;
+    QWinEventNotifier *readNotifier = nullptr;
+    HANDLE readHandle  = INVALID_HANDLE_VALUE;
 #else
-    QSocketNotifier *readNotifier;
-    int readHandle;
+    QSocketNotifier *readNotifier = nullptr;
+    int readHandle = -1;
 #endif
 };
 
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
index a41c8d1..0790b9d 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
@@ -142,10 +142,7 @@ QList<QCanBusDeviceInfo> SocketCanBackend::interfaces()
 }
 
 SocketCanBackend::SocketCanBackend(const QString &name) :
-    canSocket(-1),
-    notifier(nullptr),
-    canSocketName(name),
-    canFdOptionEnabled(false)
+    canSocketName(name)
 {
     resetConfigurations();
 }
diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h
index 940588a..3caddd8 100644
--- a/src/plugins/canbus/socketcan/socketcanbackend.h
+++ b/src/plugins/canbus/socketcan/socketcanbackend.h
@@ -73,10 +73,10 @@ private:
     bool connectSocket();
     bool applyConfigurationParameter(int key, const QVariant &value);
 
-    qint64 canSocket;
-    QSocketNotifier *notifier;
+    qint64 canSocket = -1;
+    QSocketNotifier *notifier = nullptr;
     QString canSocketName;
-    bool canFdOptionEnabled;
+    bool canFdOptionEnabled = false;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/canbus/tinycan/tinycanbackend.cpp b/src/plugins/canbus/tinycan/tinycanbackend.cpp
index ea33177..af9e3be 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend.cpp
+++ b/src/plugins/canbus/tinycan/tinycanbackend.cpp
@@ -119,9 +119,6 @@ static void DRV_CALLBACK_TYPE canRxEventCallback(quint32 index, TCanMsg *frame,
 
 TinyCanBackendPrivate::TinyCanBackendPrivate(TinyCanBackend *q)
     : q_ptr(q)
-    , isOpen(false)
-    , channelIndex(INDEX_INVALID)
-    , writeNotifier(nullptr)
 {
     startupDriver();
 
diff --git a/src/plugins/canbus/tinycan/tinycanbackend_p.h b/src/plugins/canbus/tinycan/tinycanbackend_p.h
index 18c82ef..680a559 100644
--- a/src/plugins/canbus/tinycan/tinycanbackend_p.h
+++ b/src/plugins/canbus/tinycan/tinycanbackend_p.h
@@ -39,6 +39,7 @@
 #define TINYCANBACKEND_P_H
 
 #include "tinycanbackend.h"
+#include "tinycan_symbols_p.h"
 
 //
 //  W A R N I N G
@@ -78,9 +79,10 @@ public:
     bool setBitRate(int bitrate);
 
     TinyCanBackend * const q_ptr;
-    bool isOpen;
-    int channelIndex;
-    QTimer *writeNotifier;
+
+    bool isOpen = false;
+    int channelIndex = INDEX_INVALID;
+    QTimer *writeNotifier = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
index 50ede55..e8b3b91 100644
--- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
+++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp
@@ -148,7 +148,6 @@ private:
 
 VectorCanBackendPrivate::VectorCanBackendPrivate(VectorCanBackend *q)
     : q_ptr(q)
-    , portHandle(XL_INVALID_PORTHANDLE)
 {
     startupDriver();
 }
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend_p.h b/src/plugins/canbus/vectorcan/vectorcanbackend_p.h
index dff90d8..141aca8 100644
--- a/src/plugins/canbus/vectorcan/vectorcanbackend_p.h
+++ b/src/plugins/canbus/vectorcan/vectorcanbackend_p.h
@@ -84,7 +84,7 @@ public:
 
     VectorCanBackend * const q_ptr;
 
-    long portHandle;
+    long portHandle = XL_INVALID_PORTHANDLE;
     quint64 channelMask = 0;
     HANDLE readHandle = INVALID_HANDLE_VALUE;
     QTimer *writeNotifier = nullptr;
diff --git a/src/serialbus/qcanbus.cpp b/src/serialbus/qcanbus.cpp
index a16b230..3189c09 100644
--- a/src/serialbus/qcanbus.cpp
+++ b/src/serialbus/qcanbus.cpp
@@ -51,14 +51,14 @@
 
 QT_BEGIN_NAMESPACE
 
-struct QCanBusPrivate
+class QCanBusPrivate
 {
 public:
-    QCanBusPrivate() : factory(nullptr), index(-1) { }
+    QCanBusPrivate() { }
 
     QJsonObject meta;
-    QCanBusFactory *factory;
-    int index;
+    QCanBusFactory *factory = nullptr;
+    int index = -1;
 };
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, qFactoryLoader,
diff --git a/src/serialbus/qcanbusdevice_p.h b/src/serialbus/qcanbusdevice_p.h
index db067c5..666cb29 100644
--- a/src/serialbus/qcanbusdevice_p.h
+++ b/src/serialbus/qcanbusdevice_p.h
@@ -61,14 +61,10 @@ class QCanBusDevicePrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QCanBusDevice)
 public:
-    QCanBusDevicePrivate()
-        : lastError(QCanBusDevice::CanBusError::NoError),
-          state(QCanBusDevice::UnconnectedState)
-    {
-    }
+    QCanBusDevicePrivate() {}
 
-    QCanBusDevice::CanBusError lastError;
-    QCanBusDevice::CanBusDeviceState state;
+    QCanBusDevice::CanBusError lastError = QCanBusDevice::CanBusError::NoError;
+    QCanBusDevice::CanBusDeviceState state = QCanBusDevice::UnconnectedState;
     QString errorText;
 
     QVector<QCanBusFrame> incomingFrames;