From 7b70df8dc4dd95e804cd8a81a7477d43d455fe3a Mon Sep 17 00:00:00 2001 From: murata Date: Sun, 11 Aug 2019 17:17:05 +0900 Subject: [PATCH] uas: Change NULL or 0 to nullptr --- src/uas/FileManager.cc | 2 +- src/uas/UAS.cc | 2 +- src/uas/UASMessageHandler.cc | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/uas/FileManager.cc b/src/uas/FileManager.cc index a4de1d37c..06f8866b6 100644 --- a/src/uas/FileManager.cc +++ b/src/uas/FileManager.cc @@ -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) diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc index ce7a04c9a..2d27e5b45 100644 --- a/src/uas/UAS.cc +++ b/src/uas/UAS.cc @@ -1547,5 +1547,5 @@ void UAS::shutdownVehicle(void) simulation->deleteLater(); } #endif - _vehicle = NULL; + _vehicle = nullptr; } diff --git a/src/uas/UASMessageHandler.cc b/src/uas/UASMessageHandler.cc index 1e2ae5186..5167bb8cd 100644 --- a/src/uas/UASMessageHandler.cc +++ b/src/uas/UASMessageHandler.cc @@ -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. -- 2.22.0