Commit 7b70df8d authored by murata's avatar murata

uas: Change NULL or 0 to nullptr

parent 24d73dc7
......@@ -24,7 +24,7 @@ FileManager::FileManager(QObject* parent, Vehicle* vehicle)
: QObject(parent)
, _currentOperation(kCOIdle)
, _vehicle(vehicle)
, _dedicatedLink(NULL)
, _dedicatedLink(nullptr)
, _activeSession(0)
, _missingDownloadedBytes(0)
, _downloadingMissingParts(false)
......
......@@ -1547,5 +1547,5 @@ void UAS::shutdownVehicle(void)
simulation->deleteLater();
}
#endif
_vehicle = NULL;
_vehicle = nullptr;
}
......@@ -41,7 +41,7 @@ bool UASMessage::severityIsError()
UASMessageHandler::UASMessageHandler(QGCApplication* app, QGCToolbox* toolbox)
: QGCTool(app, toolbox)
, _activeVehicle(NULL)
, _activeVehicle(nullptr)
, _activeComponent(-1)
, _multiComp(false)
, _errorCount(0)
......@@ -49,7 +49,7 @@ UASMessageHandler::UASMessageHandler(QGCApplication* app, QGCToolbox* toolbox)
, _warningCount(0)
, _normalCount(0)
, _showErrorsInToolbar(false)
, _multiVehicleManager(NULL)
, _multiVehicleManager(nullptr)
{
}
......@@ -66,7 +66,7 @@ void UASMessageHandler::setToolbox(QGCToolbox *toolbox)
_multiVehicleManager = _toolbox->multiVehicleManager();
connect(_multiVehicleManager, &MultiVehicleManager::activeVehicleChanged, this, &UASMessageHandler::_activeVehicleChanged);
emit textMessageReceived(NULL);
emit textMessageReceived(nullptr);
emit textMessageCountChanged(0);
}
......@@ -89,9 +89,9 @@ void UASMessageHandler::_activeVehicleChanged(Vehicle* vehicle)
// If we were already attached to an autopilot, disconnect it.
if (_activeVehicle) {
disconnect(_activeVehicle, &Vehicle::textMessageReceived, this, &UASMessageHandler::handleTextMessage);
_activeVehicle = NULL;
_activeVehicle = nullptr;
clearMessages();
emit textMessageReceived(NULL);
emit textMessageReceived(nullptr);
}
// And now if there's an autopilot to follow, set up the UI.
......
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