From d69947bf2ffc55f17cbb459a2962bbc4bb7ff249 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Sat, 25 Nov 2017 16:55:46 +0100 Subject: [PATCH] SerialBusConnection: Use member initialization And as we have full C++11 support, so its also preferred to use nullptr. --- connections/serialbusconnection.cpp | 3 +-- connections/serialbusconnection.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/connections/serialbusconnection.cpp b/connections/serialbusconnection.cpp index 50ebe87..f2f4cd2 100644 --- a/connections/serialbusconnection.cpp +++ b/connections/serialbusconnection.cpp @@ -13,7 +13,6 @@ SerialBusConnection::SerialBusConnection(QString portName) : CANConnection(portName, CANCon::SOCKETCAN, 1, 4000, true), - mDev_p(NULL), mTimer(this) /*NB: set connection as parent of timer to manage it from working thread */ { } @@ -135,7 +134,7 @@ void SerialBusConnection::disconnectDevice() { if(mDev_p) { mDev_p->disconnectDevice(); delete mDev_p; - mDev_p = Q_NULLPTR; + mDev_p = nullptr; } } diff --git a/connections/serialbusconnection.h b/connections/serialbusconnection.h index 3090bfc..2c9d357 100644 --- a/connections/serialbusconnection.h +++ b/connections/serialbusconnection.h @@ -33,7 +33,7 @@ private slots: void testConnection(); protected: - QCanBusDevice* mDev_p; + QCanBusDevice *mDev_p = nullptr; QTimer mTimer; };