diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-04-30 17:06:39 +0300 |
---|---|---|
committer | André Hartmann <aha_1980@gmx.de> | 2017-01-18 20:29:54 +0000 |
commit | fa979925d9afa58aab29a57f4289c0b679ac03e9 (patch) | |
tree | 70274866370b7141748fd0c67a724cfaba81aae6 /src/plugins/canbus/peakcan | |
parent | 19d4d81e8dd7ccb9831bea725989d2a08d258207 (diff) |
CAN: Use C++11 class initialization where possible
Change-Id: I2aeeb762297707337273b0a1ecba8b3d13ed923f
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/canbus/peakcan')
-rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend.cpp | 9 | ||||
-rw-r--r-- | src/plugins/canbus/peakcan/peakcanbackend_p.h | 15 |
2 files changed, 8 insertions, 16 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 }; |