Commit aaf8e379 authored by murata's avatar murata

Vehicle: Change NULL or 0 to nullptr

parent 44d97f51
...@@ -20,9 +20,9 @@ class ADSBVehicle : public QObject ...@@ -20,9 +20,9 @@ class ADSBVehicle : public QObject
Q_OBJECT Q_OBJECT
public: public:
ADSBVehicle(mavlink_adsb_vehicle_t& adsbVehicle, QObject* parent = NULL); ADSBVehicle(mavlink_adsb_vehicle_t& adsbVehicle, QObject* parent = nullptr);
ADSBVehicle(const QGeoCoordinate& location, float heading, bool alert = false, QObject* parent = NULL); ADSBVehicle(const QGeoCoordinate& location, float heading, bool alert = false, QObject* parent = nullptr);
Q_PROPERTY(int icaoAddress READ icaoAddress CONSTANT) Q_PROPERTY(int icaoAddress READ icaoAddress CONSTANT)
Q_PROPERTY(QString callsign READ callsign NOTIFY callsignChanged) Q_PROPERTY(QString callsign READ callsign NOTIFY callsignChanged)
......
...@@ -17,7 +17,7 @@ class GPSRTKFactGroup : public FactGroup ...@@ -17,7 +17,7 @@ class GPSRTKFactGroup : public FactGroup
Q_OBJECT Q_OBJECT
public: public:
GPSRTKFactGroup(QObject* parent = NULL); GPSRTKFactGroup(QObject* parent = nullptr);
Q_PROPERTY(Fact* connected READ connected CONSTANT) Q_PROPERTY(Fact* connected READ connected CONSTANT)
Q_PROPERTY(Fact* currentDuration READ currentDuration CONSTANT) Q_PROPERTY(Fact* currentDuration READ currentDuration CONSTANT)
......
...@@ -140,7 +140,7 @@ public: ...@@ -140,7 +140,7 @@ public:
bool enableAutoStart () { return _enableAutoStart; } bool enableAutoStart () { return _enableAutoStart; }
bool uploading (); bool uploading ();
bool logRunning () { return _logRunning; } bool logRunning () { return _logRunning; }
bool canStartLog () { return _vehicle != NULL && !_logginDenied; } bool canStartLog () { return _vehicle != nullptr && !_logginDenied; }
bool deleteAfterUpload () { return _deleteAfterUpload; } bool deleteAfterUpload () { return _deleteAfterUpload; }
bool publicLog () { return _publicLog; } bool publicLog () { return _publicLog; }
int windSpeed () { return _windSpeed; } int windSpeed () { return _windSpeed; }
......
...@@ -33,11 +33,11 @@ MultiVehicleManager::MultiVehicleManager(QGCApplication* app, QGCToolbox* toolbo ...@@ -33,11 +33,11 @@ MultiVehicleManager::MultiVehicleManager(QGCApplication* app, QGCToolbox* toolbo
: QGCTool(app, toolbox) : QGCTool(app, toolbox)
, _activeVehicleAvailable(false) , _activeVehicleAvailable(false)
, _parameterReadyVehicleAvailable(false) , _parameterReadyVehicleAvailable(false)
, _activeVehicle(NULL) , _activeVehicle(nullptr)
, _offlineEditingVehicle(NULL) , _offlineEditingVehicle(nullptr)
, _firmwarePluginManager(NULL) , _firmwarePluginManager(nullptr)
, _joystickManager(NULL) , _joystickManager(nullptr)
, _mavlinkProtocol(NULL) , _mavlinkProtocol(nullptr)
, _gcsHeartbeatEnabled(true) , _gcsHeartbeatEnabled(true)
{ {
QSettings settings; QSettings settings;
...@@ -236,7 +236,7 @@ void MultiVehicleManager::_deleteVehiclePhase2(void) ...@@ -236,7 +236,7 @@ void MultiVehicleManager::_deleteVehiclePhase2(void)
/// Qml has been notified of vehicle about to go away and should be disconnected from it by now. /// Qml has been notified of vehicle about to go away and should be disconnected from it by now.
/// This means we can now clear the active vehicle property and delete the Vehicle for real. /// This means we can now clear the active vehicle property and delete the Vehicle for real.
Vehicle* newActiveVehicle = NULL; Vehicle* newActiveVehicle = nullptr;
if (_vehicles.count()) { if (_vehicles.count()) {
newActiveVehicle = qobject_cast<Vehicle*>(_vehicles[0]); newActiveVehicle = qobject_cast<Vehicle*>(_vehicles[0]);
} }
...@@ -338,7 +338,7 @@ Vehicle* MultiVehicleManager::getVehicleById(int vehicleId) ...@@ -338,7 +338,7 @@ Vehicle* MultiVehicleManager::getVehicleById(int vehicleId)
} }
} }
return NULL; return nullptr;
} }
void MultiVehicleManager::setGcsHeartbeatEnabled(bool gcsHeartBeatEnabled) void MultiVehicleManager::setGcsHeartbeatEnabled(bool gcsHeartBeatEnabled)
......
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
Q_INVOKABLE Vehicle* getVehicleById(int vehicleId); Q_INVOKABLE Vehicle* getVehicleById(int vehicleId);
UAS* activeUas(void) { return _activeVehicle ? _activeVehicle->uas() : NULL; } UAS* activeUas(void) { return _activeVehicle ? _activeVehicle->uas() : nullptr; }
// Property accessors // Property accessors
......
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