Browse Source

FirmwarePlugin: Change NULL or 0 to nullptr

QGC4.4
murata 6 years ago
parent
commit
5b743555df
  1. 2
      src/FirmwarePlugin/APM/APMFirmwarePlugin.h
  2. 10
      src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
  3. 6
      src/FirmwarePlugin/APM/APMParameterMetaData.cc
  4. 2
      src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
  5. 2
      src/FirmwarePlugin/CameraMetaData.h
  6. 2
      src/FirmwarePlugin/FirmwarePluginManager.cc

2
src/FirmwarePlugin/APM/APMFirmwarePlugin.h

@ -148,7 +148,7 @@ class APMFirmwarePluginInstanceData : public QObject @@ -148,7 +148,7 @@ class APMFirmwarePluginInstanceData : public QObject
Q_OBJECT
public:
APMFirmwarePluginInstanceData(QObject* parent = NULL);
APMFirmwarePluginInstanceData(QObject* parent = nullptr);
bool textSeverityAdjustmentNeeded;
};

10
src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc

@ -16,10 +16,10 @@ @@ -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 @@ -74,5 +74,5 @@ FirmwarePlugin* APMFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPIL
}
}
return NULL;
return nullptr;
}

6
src/FirmwarePlugin/APM/APMParameterMetaData.cc

@ -157,7 +157,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData @@ -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 @@ -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 @@ -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())) {

2
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h

@ -33,7 +33,7 @@ class APMSubmarineFactGroup : public FactGroup @@ -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)

2
src/FirmwarePlugin/CameraMetaData.h

@ -26,7 +26,7 @@ public: @@ -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

2
src/FirmwarePlugin/FirmwarePluginManager.cc

@ -89,5 +89,5 @@ FirmwarePluginFactory* FirmwarePluginManager::_findPluginFactory(MAV_AUTOPILOT f @@ -89,5 +89,5 @@ FirmwarePluginFactory* FirmwarePluginManager::_findPluginFactory(MAV_AUTOPILOT f
}
}
return NULL;
return nullptr;
}

Loading…
Cancel
Save