From 1cb343fb6516ff071054c47a880e42e24f52252c Mon Sep 17 00:00:00 2001
From: murata <ma2maru@gmail.com>
Date: Sun, 11 Aug 2019 17:14:50 +0900
Subject: [PATCH] VehicleSetup: Change NULL or 0 to nullptr

---
 src/VehicleSetup/PX4FirmwareUpgradeThread.cc | 20 ++++++++++----------
 src/VehicleSetup/PX4FirmwareUpgradeThread.h  |  2 +-
 src/VehicleSetup/VehicleComponent.h          |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
index 5da788997b..3cf05ae8dd 100644
--- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc
@@ -23,9 +23,9 @@
 
 PX4FirmwareUpgradeThreadWorker::PX4FirmwareUpgradeThreadWorker(PX4FirmwareUpgradeThreadController* controller) :
     _controller(controller),
-    _bootloader(NULL),
-    _bootloaderPort(NULL),
-    _timerRetry(NULL),
+    _bootloader(nullptr),
+    _bootloaderPort(nullptr),
+    _timerRetry(nullptr),
     _foundBoard(false),
     _findBoardFirstAttempt(true)
 {
@@ -52,14 +52,14 @@ void PX4FirmwareUpgradeThreadWorker::_init(void)
 {
     // We create the timers here so that they are on the right thread
     
-    Q_ASSERT(_timerRetry == NULL);
+    Q_ASSERT(_timerRetry == nullptr);
     _timerRetry = new QTimer(this);
     Q_CHECK_PTR(_timerRetry);
     _timerRetry->setSingleShot(true);
     _timerRetry->setInterval(_retryTimeout);
     connect(_timerRetry, &QTimer::timeout, this, &PX4FirmwareUpgradeThreadWorker::_findBoardOnce);
     
-    Q_ASSERT(_bootloader == NULL);
+    Q_ASSERT(_bootloader == nullptr);
     _bootloader = new Bootloader(this);
     connect(_bootloader, &Bootloader::updateProgress, this, &PX4FirmwareUpgradeThreadWorker::_updateProgress);
 }
@@ -69,7 +69,7 @@ void PX4FirmwareUpgradeThreadWorker::_cancel(void)
     if (_bootloaderPort) {
         _bootloaderPort->close();
         _bootloaderPort->deleteLater();
-        _bootloaderPort = NULL;
+        _bootloaderPort = nullptr;
     }
 }
 
@@ -233,7 +233,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBootloader(const QGCSerialPortInfo& po
             emit error(_bootloader->errorString());
         }
         _bootloaderPort->deleteLater();
-        _bootloaderPort = NULL;
+        _bootloaderPort = nullptr;
         return false;
     }
 
@@ -254,7 +254,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBootloader(const QGCSerialPortInfo& po
     
     _bootloaderPort->close();
     _bootloaderPort->deleteLater();
-    _bootloaderPort = NULL;
+    _bootloaderPort = nullptr;
     qCDebug(FirmwareUpgradeLog) << "Bootloader error:" << _bootloader->errorString();
     if (errorOnNotFound) {
         emit error(_bootloader->errorString());
@@ -270,7 +270,7 @@ void PX4FirmwareUpgradeThreadWorker::_reboot(void)
             _bootloader->reboot(_bootloaderPort);
         }
         _bootloaderPort->deleteLater();
-        _bootloaderPort = NULL;
+        _bootloaderPort = nullptr;
     }
 }
 
@@ -286,7 +286,7 @@ void PX4FirmwareUpgradeThreadWorker::_flash(void)
             emit status("Program complete");
         } else {
             _bootloaderPort->deleteLater();
-            _bootloaderPort = NULL;
+            _bootloaderPort = nullptr;
             qCDebug(FirmwareUpgradeLog) << "Program failed:" << _bootloader->errorString();
             emit error(_bootloader->errorString());
             return;
diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.h b/src/VehicleSetup/PX4FirmwareUpgradeThread.h
index 2d398e710c..f419ad9b92 100644
--- a/src/VehicleSetup/PX4FirmwareUpgradeThread.h
+++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.h
@@ -88,7 +88,7 @@ class PX4FirmwareUpgradeThreadController : public QObject
     Q_OBJECT
     
 public:
-    PX4FirmwareUpgradeThreadController(QObject* parent = NULL);
+    PX4FirmwareUpgradeThreadController(QObject* parent = nullptr);
     ~PX4FirmwareUpgradeThreadController(void);
     
     /// @brief Begins the process of searching for a supported board connected to any serial port. This will
diff --git a/src/VehicleSetup/VehicleComponent.h b/src/VehicleSetup/VehicleComponent.h
index 9b6488ed0b..829ac31b1d 100644
--- a/src/VehicleSetup/VehicleComponent.h
+++ b/src/VehicleSetup/VehicleComponent.h
@@ -40,7 +40,7 @@ class VehicleComponent : public QObject
     Q_PROPERTY(bool     allowSetupWhileFlying   READ allowSetupWhileFlying  CONSTANT)
 
 public:
-    VehicleComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = NULL);
+    VehicleComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent = nullptr);
     ~VehicleComponent();
     
     virtual QString name(void) const = 0;
-- 
GitLab