From 5b743555dff4eab4bdf0674e77b1f768415ed802 Mon Sep 17 00:00:00 2001
From: murata <ma2maru@gmail.com>
Date: Sun, 11 Aug 2019 17:16:21 +0900
Subject: [PATCH] FirmwarePlugin: Change NULL or 0 to nullptr

---
 src/FirmwarePlugin/APM/APMFirmwarePlugin.h         |  2 +-
 src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc | 10 +++++-----
 src/FirmwarePlugin/APM/APMParameterMetaData.cc     |  6 +++---
 src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h     |  2 +-
 src/FirmwarePlugin/CameraMetaData.h                |  2 +-
 src/FirmwarePlugin/FirmwarePluginManager.cc        |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h
index c5867d0a3..fef3418d7 100644
--- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h
+++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h
@@ -148,7 +148,7 @@ class APMFirmwarePluginInstanceData : public QObject
     Q_OBJECT
 
 public:
-    APMFirmwarePluginInstanceData(QObject* parent = NULL);
+    APMFirmwarePluginInstanceData(QObject* parent = nullptr);
 
     bool                    textSeverityAdjustmentNeeded;
 };
diff --git a/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc b/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
index 7acfc92ab..c791b5971 100644
--- a/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
+++ b/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
@@ -16,10 +16,10 @@
 APMFirmwarePluginFactory APMFirmwarePluginFactory;
 
 APMFirmwarePluginFactory::APMFirmwarePluginFactory(void)
-    : _arduCopterPluginInstance(NULL)
-    , _arduPlanePluginInstance(NULL)
-    , _arduRoverPluginInstance(NULL)
-    , _arduSubPluginInstance(NULL)
+    : _arduCopterPluginInstance(nullptr)
+    , _arduPlanePluginInstance(nullptr)
+    , _arduRoverPluginInstance(nullptr)
+    , _arduSubPluginInstance(nullptr)
 {
 
 }
@@ -74,5 +74,5 @@ FirmwarePlugin* APMFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPIL
         }
     }
 
-    return NULL;
+    return nullptr;
 }
diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
index 47cd0f304..1fd7f18c2 100644
--- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc
+++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc
@@ -157,7 +157,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
 
     bool                badMetaData = true;
     QStack<int>         xmlState;
-    APMFactMetaDataRaw* rawMetaData = NULL;
+    APMFactMetaDataRaw* rawMetaData = nullptr;
 
     xmlState.push(XmlStateNone);
 
@@ -285,7 +285,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
                 // Done loading this parameter
                 // Reset for next parameter
                 qCDebug(APMParameterMetaDataVerboseLog) << "done loading parameter";
-                rawMetaData = NULL;
+                rawMetaData = nullptr;
                 badMetaData = false;
                 xmlState.pop();
             } else if (elementName == "parameters") {
@@ -422,7 +422,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa
 void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType)
 {
     const QString mavTypeString = mavTypeToString(vehicleType);
-    APMFactMetaDataRaw* rawMetaData = NULL;
+    APMFactMetaDataRaw* rawMetaData = nullptr;
 
     // check if we have metadata for fact, use generic otherwise
     if (_vehicleTypeToParametersMap[mavTypeString].contains(fact->name())) {
diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
index b826c1e0c..3e3767ede 100644
--- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
+++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
@@ -33,7 +33,7 @@ class APMSubmarineFactGroup : public FactGroup
     Q_OBJECT
 
 public:
-    APMSubmarineFactGroup(QObject* parent = NULL);
+    APMSubmarineFactGroup(QObject* parent = nullptr);
 
     Q_PROPERTY(Fact* camTilt             READ camTilt             CONSTANT)
     Q_PROPERTY(Fact* tetherTurns         READ tetherTurns         CONSTANT)
diff --git a/src/FirmwarePlugin/CameraMetaData.h b/src/FirmwarePlugin/CameraMetaData.h
index 2c146f1a3..1e6de08cb 100644
--- a/src/FirmwarePlugin/CameraMetaData.h
+++ b/src/FirmwarePlugin/CameraMetaData.h
@@ -26,7 +26,7 @@ public:
                    bool             landscape,
                    bool             fixedOrientation,
                    double           minTriggerInterval,
-                   QObject*         parent = NULL);
+                   QObject*         parent = nullptr);
 
     Q_PROPERTY(QString  name                READ name               CONSTANT)   ///< Camera name
     Q_PROPERTY(double   sensorWidth         READ sensorWidth        CONSTANT)   ///< Sensor size in millimeters
diff --git a/src/FirmwarePlugin/FirmwarePluginManager.cc b/src/FirmwarePlugin/FirmwarePluginManager.cc
index 68d7e7ae1..4627848ba 100644
--- a/src/FirmwarePlugin/FirmwarePluginManager.cc
+++ b/src/FirmwarePlugin/FirmwarePluginManager.cc
@@ -89,5 +89,5 @@ FirmwarePluginFactory* FirmwarePluginManager::_findPluginFactory(MAV_AUTOPILOT f
         }
     }
 
-    return NULL;
+    return nullptr;
 }
-- 
2.22.0