Commit 5b743555 authored by murata's avatar murata

FirmwarePlugin: Change NULL or 0 to nullptr

parent f6658d4a
...@@ -148,7 +148,7 @@ class APMFirmwarePluginInstanceData : public QObject ...@@ -148,7 +148,7 @@ class APMFirmwarePluginInstanceData : public QObject
Q_OBJECT Q_OBJECT
public: public:
APMFirmwarePluginInstanceData(QObject* parent = NULL); APMFirmwarePluginInstanceData(QObject* parent = nullptr);
bool textSeverityAdjustmentNeeded; bool textSeverityAdjustmentNeeded;
}; };
......
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
APMFirmwarePluginFactory APMFirmwarePluginFactory; APMFirmwarePluginFactory APMFirmwarePluginFactory;
APMFirmwarePluginFactory::APMFirmwarePluginFactory(void) APMFirmwarePluginFactory::APMFirmwarePluginFactory(void)
: _arduCopterPluginInstance(NULL) : _arduCopterPluginInstance(nullptr)
, _arduPlanePluginInstance(NULL) , _arduPlanePluginInstance(nullptr)
, _arduRoverPluginInstance(NULL) , _arduRoverPluginInstance(nullptr)
, _arduSubPluginInstance(NULL) , _arduSubPluginInstance(nullptr)
{ {
} }
...@@ -74,5 +74,5 @@ FirmwarePlugin* APMFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPIL ...@@ -74,5 +74,5 @@ FirmwarePlugin* APMFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPIL
} }
} }
return NULL; return nullptr;
} }
...@@ -157,7 +157,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData ...@@ -157,7 +157,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
bool badMetaData = true; bool badMetaData = true;
QStack<int> xmlState; QStack<int> xmlState;
APMFactMetaDataRaw* rawMetaData = NULL; APMFactMetaDataRaw* rawMetaData = nullptr;
xmlState.push(XmlStateNone); xmlState.push(XmlStateNone);
...@@ -285,7 +285,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData ...@@ -285,7 +285,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
// Done loading this parameter // Done loading this parameter
// Reset for next parameter // Reset for next parameter
qCDebug(APMParameterMetaDataVerboseLog) << "done loading parameter"; qCDebug(APMParameterMetaDataVerboseLog) << "done loading parameter";
rawMetaData = NULL; rawMetaData = nullptr;
badMetaData = false; badMetaData = false;
xmlState.pop(); xmlState.pop();
} else if (elementName == "parameters") { } else if (elementName == "parameters") {
...@@ -422,7 +422,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa ...@@ -422,7 +422,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa
void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType) void APMParameterMetaData::addMetaDataToFact(Fact* fact, MAV_TYPE vehicleType)
{ {
const QString mavTypeString = mavTypeToString(vehicleType); const QString mavTypeString = mavTypeToString(vehicleType);
APMFactMetaDataRaw* rawMetaData = NULL; APMFactMetaDataRaw* rawMetaData = nullptr;
// check if we have metadata for fact, use generic otherwise // check if we have metadata for fact, use generic otherwise
if (_vehicleTypeToParametersMap[mavTypeString].contains(fact->name())) { if (_vehicleTypeToParametersMap[mavTypeString].contains(fact->name())) {
......
...@@ -33,7 +33,7 @@ class APMSubmarineFactGroup : public FactGroup ...@@ -33,7 +33,7 @@ class APMSubmarineFactGroup : public FactGroup
Q_OBJECT Q_OBJECT
public: public:
APMSubmarineFactGroup(QObject* parent = NULL); APMSubmarineFactGroup(QObject* parent = nullptr);
Q_PROPERTY(Fact* camTilt READ camTilt CONSTANT) Q_PROPERTY(Fact* camTilt READ camTilt CONSTANT)
Q_PROPERTY(Fact* tetherTurns READ tetherTurns CONSTANT) Q_PROPERTY(Fact* tetherTurns READ tetherTurns CONSTANT)
......
...@@ -26,7 +26,7 @@ public: ...@@ -26,7 +26,7 @@ public:
bool landscape, bool landscape,
bool fixedOrientation, bool fixedOrientation,
double minTriggerInterval, double minTriggerInterval,
QObject* parent = NULL); QObject* parent = nullptr);
Q_PROPERTY(QString name READ name CONSTANT) ///< Camera name Q_PROPERTY(QString name READ name CONSTANT) ///< Camera name
Q_PROPERTY(double sensorWidth READ sensorWidth CONSTANT) ///< Sensor size in millimeters Q_PROPERTY(double sensorWidth READ sensorWidth CONSTANT) ///< Sensor size in millimeters
......
...@@ -89,5 +89,5 @@ FirmwarePluginFactory* FirmwarePluginManager::_findPluginFactory(MAV_AUTOPILOT f ...@@ -89,5 +89,5 @@ FirmwarePluginFactory* FirmwarePluginManager::_findPluginFactory(MAV_AUTOPILOT f
} }
} }
return NULL; return nullptr;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment