Commit 44d97f51 authored by murata's avatar murata

comm: Change NULL or 0 to nullptr

parent d60ffb2b
...@@ -91,7 +91,7 @@ public: ...@@ -91,7 +91,7 @@ public:
QString devName () { return _device.name; } QString devName () { return _device.name; }
QString address (); QString address ();
QStringList nameList () { return _nameList; } QStringList nameList () { return _nameList; }
bool scanning () { return _deviceDiscover != NULL; } bool scanning () { return _deviceDiscover != nullptr; }
BluetoothData device () { return _device; } BluetoothData device () { return _device; }
......
...@@ -55,7 +55,7 @@ LinkConfiguration::LinkConfiguration(LinkConfiguration* copy) ...@@ -55,7 +55,7 @@ LinkConfiguration::LinkConfiguration(LinkConfiguration* copy)
void LinkConfiguration::copyFrom(LinkConfiguration* source) void LinkConfiguration::copyFrom(LinkConfiguration* source)
{ {
Q_ASSERT(source != NULL); Q_ASSERT(source != nullptr);
_link = source->link(); _link = source->link();
_name = source->name(); _name = source->name();
_dynamic = source->isDynamic(); _dynamic = source->isDynamic();
......
...@@ -39,7 +39,7 @@ class LinkInterface : public QThread ...@@ -39,7 +39,7 @@ class LinkInterface : public QThread
public: public:
virtual ~LinkInterface() { virtual ~LinkInterface() {
stopMavlinkMessagesTimer(); stopMavlinkMessagesTimer();
_config->setLink(NULL); _config->setLink(nullptr);
} }
Q_PROPERTY(bool active READ active NOTIFY activeChanged) Q_PROPERTY(bool active READ active NOTIFY activeChanged)
......
...@@ -70,7 +70,7 @@ MockLink::MockLink(SharedLinkConfigurationPointer& config) ...@@ -70,7 +70,7 @@ MockLink::MockLink(SharedLinkConfigurationPointer& config)
, _vehicleLatitude (_defaultVehicleLatitude + ((_vehicleSystemId - 128) * 0.0001)) // Slight offset for each vehicle , _vehicleLatitude (_defaultVehicleLatitude + ((_vehicleSystemId - 128) * 0.0001)) // Slight offset for each vehicle
, _vehicleLongitude (_defaultVehicleLongitude + ((_vehicleSystemId - 128) * 0.0001)) , _vehicleLongitude (_defaultVehicleLongitude + ((_vehicleSystemId - 128) * 0.0001))
, _vehicleAltitude (_defaultVehicleAltitude) , _vehicleAltitude (_defaultVehicleAltitude)
, _fileServer (NULL) , _fileServer (nullptr)
, _sendStatusText (false) , _sendStatusText (false)
, _apmSendHomePositionOnEmptyList (false) , _apmSendHomePositionOnEmptyList (false)
, _failureMode (MockConfiguration::FailNone) , _failureMode (MockConfiguration::FailNone)
......
...@@ -17,7 +17,7 @@ QGC_LOGGING_CATEGORY(MockLinkMissionItemHandlerLog, "MockLinkMissionItemHandlerL ...@@ -17,7 +17,7 @@ QGC_LOGGING_CATEGORY(MockLinkMissionItemHandlerLog, "MockLinkMissionItemHandlerL
MockLinkMissionItemHandler::MockLinkMissionItemHandler(MockLink* mockLink, MAVLinkProtocol* mavlinkProtocol) MockLinkMissionItemHandler::MockLinkMissionItemHandler(MockLink* mockLink, MAVLinkProtocol* mavlinkProtocol)
: _mockLink(mockLink) : _mockLink(mockLink)
, _missionItemResponseTimer(NULL) , _missionItemResponseTimer(nullptr)
, _failureMode(FailNone) , _failureMode(FailNone)
, _sendHomePositionOnEmptyList(false) , _sendHomePositionOnEmptyList(false)
, _mavlinkProtocol(mavlinkProtocol) , _mavlinkProtocol(mavlinkProtocol)
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
QGCJSBSimLink::QGCJSBSimLink(Vehicle* vehicle, QString startupArguments, QString remoteHost, QHostAddress host, quint16 port) QGCJSBSimLink::QGCJSBSimLink(Vehicle* vehicle, QString startupArguments, QString remoteHost, QHostAddress host, quint16 port)
: _vehicle(vehicle) : _vehicle(vehicle)
, socket(NULL) , socket(nullptr)
, process(NULL) , process(nullptr)
, startupArguments(startupArguments) , startupArguments(startupArguments)
{ {
// We're doing it wrong - because the Qt folks got the API wrong: // We're doing it wrong - because the Qt folks got the API wrong:
...@@ -337,13 +337,13 @@ bool QGCJSBSimLink::disconnectSimulation() ...@@ -337,13 +337,13 @@ bool QGCJSBSimLink::disconnectSimulation()
{ {
process->close(); process->close();
delete process; delete process;
process = NULL; process = nullptr;
} }
if (socket) if (socket)
{ {
socket->close(); socket->close();
delete socket; delete socket;
socket = NULL; socket = nullptr;
} }
connectState = false; connectState = false;
......
...@@ -35,9 +35,9 @@ QGCXPlaneLink::QGCXPlaneLink(Vehicle* vehicle, QString remoteHost, QHostAddress ...@@ -35,9 +35,9 @@ QGCXPlaneLink::QGCXPlaneLink(Vehicle* vehicle, QString remoteHost, QHostAddress
_vehicle(vehicle), _vehicle(vehicle),
remoteHost(QHostAddress("127.0.0.1")), remoteHost(QHostAddress("127.0.0.1")),
remotePort(49000), remotePort(49000),
socket(NULL), socket(nullptr),
process(NULL), process(nullptr),
terraSync(NULL), terraSync(nullptr),
barometerOffsetkPa(-8.0f), barometerOffsetkPa(-8.0f),
airframeID(QGCXPlaneLink::AIRFRAME_UNKNOWN), airframeID(QGCXPlaneLink::AIRFRAME_UNKNOWN),
xPlaneConnected(false), xPlaneConnected(false),
...@@ -75,7 +75,7 @@ QGCXPlaneLink::~QGCXPlaneLink() ...@@ -75,7 +75,7 @@ QGCXPlaneLink::~QGCXPlaneLink()
if (socket) { if (socket) {
socket->close(); socket->close();
socket->deleteLater(); socket->deleteLater();
socket = NULL; socket = nullptr;
} }
} }
...@@ -180,7 +180,7 @@ void QGCXPlaneLink::run() ...@@ -180,7 +180,7 @@ void QGCXPlaneLink::run()
emit statusMessage("Binding socket failed!"); emit statusMessage("Binding socket failed!");
socket->deleteLater(); socket->deleteLater();
socket = NULL; socket = nullptr;
return; return;
} }
...@@ -260,7 +260,7 @@ void QGCXPlaneLink::run() ...@@ -260,7 +260,7 @@ void QGCXPlaneLink::run()
socket->close(); socket->close();
socket->deleteLater(); socket->deleteLater();
socket = NULL; socket = nullptr;
emit simulationDisconnected(); emit simulationDisconnected();
emit simulationConnected(false); emit simulationConnected(false);
......
...@@ -32,7 +32,7 @@ static QStringList kSupportedBaudRates; ...@@ -32,7 +32,7 @@ static QStringList kSupportedBaudRates;
SerialLink::SerialLink(SharedLinkConfigurationPointer& config, bool isPX4Flow) SerialLink::SerialLink(SharedLinkConfigurationPointer& config, bool isPX4Flow)
: LinkInterface(config, isPX4Flow) : LinkInterface(config, isPX4Flow)
, _port(NULL) , _port(nullptr)
, _bytesRead(0) , _bytesRead(0)
, _stopp(false) , _stopp(false)
, _reqReset(false) , _reqReset(false)
...@@ -103,7 +103,7 @@ void SerialLink::_disconnect(void) ...@@ -103,7 +103,7 @@ void SerialLink::_disconnect(void)
if (_port) { if (_port) {
_port->close(); _port->close();
_port->deleteLater(); _port->deleteLater();
_port = NULL; _port = nullptr;
} }
#ifdef __android__ #ifdef __android__
...@@ -161,7 +161,7 @@ bool SerialLink::_hardwareConnect(QSerialPort::SerialPortError& error, QString& ...@@ -161,7 +161,7 @@ bool SerialLink::_hardwareConnect(QSerialPort::SerialPortError& error, QString&
qgcApp()->processEvents(QEventLoop::ExcludeUserInputEvents); qgcApp()->processEvents(QEventLoop::ExcludeUserInputEvents);
} }
delete _port; delete _port;
_port = NULL; _port = nullptr;
} }
qCDebug(SerialLinkLog) << "SerialLink: hardwareConnect to " << _serialConfig->portName(); qCDebug(SerialLinkLog) << "SerialLink: hardwareConnect to " << _serialConfig->portName();
...@@ -234,7 +234,7 @@ bool SerialLink::_hardwareConnect(QSerialPort::SerialPortError& error, QString& ...@@ -234,7 +234,7 @@ bool SerialLink::_hardwareConnect(QSerialPort::SerialPortError& error, QString&
emit communicationUpdate(getName(), tr("Error opening port: %1").arg(_port->errorString())); emit communicationUpdate(getName(), tr("Error opening port: %1").arg(_port->errorString()));
_port->close(); _port->close();
delete _port; delete _port;
_port = NULL; _port = nullptr;
return false; // couldn't open serial port return false; // couldn't open serial port
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
TCPLink::TCPLink(SharedLinkConfigurationPointer& config) TCPLink::TCPLink(SharedLinkConfigurationPointer& config)
: LinkInterface(config) : LinkInterface(config)
, _tcpConfig(qobject_cast<TCPConfiguration*>(config.data())) , _tcpConfig(qobject_cast<TCPConfiguration*>(config.data()))
, _socket(NULL) , _socket(nullptr)
, _socketIsConnected(false) , _socketIsConnected(false)
{ {
Q_ASSERT(_tcpConfig); Q_ASSERT(_tcpConfig);
...@@ -123,7 +123,7 @@ void TCPLink::_disconnect(void) ...@@ -123,7 +123,7 @@ void TCPLink::_disconnect(void)
_socket->disconnectFromHost(); // Disconnect tcp _socket->disconnectFromHost(); // Disconnect tcp
_socket->waitForDisconnected(); _socket->waitForDisconnected();
_socket->deleteLater(); // Make sure delete happens on correct thread _socket->deleteLater(); // Make sure delete happens on correct thread
_socket = NULL; _socket = nullptr;
emit disconnected(); emit disconnected();
} }
} }
...@@ -146,7 +146,7 @@ bool TCPLink::_connect(void) ...@@ -146,7 +146,7 @@ bool TCPLink::_connect(void)
bool TCPLink::_hardwareConnect() bool TCPLink::_hardwareConnect()
{ {
Q_ASSERT(_socket == NULL); Q_ASSERT(_socket == nullptr);
_socket = new QTcpSocket(); _socket = new QTcpSocket();
QSignalSpy errorSpy(_socket, static_cast<void (QTcpSocket::*)(QAbstractSocket::SocketError)>(&QTcpSocket::error)); QSignalSpy errorSpy(_socket, static_cast<void (QTcpSocket::*)(QAbstractSocket::SocketError)>(&QTcpSocket::error));
...@@ -165,7 +165,7 @@ bool TCPLink::_hardwareConnect() ...@@ -165,7 +165,7 @@ bool TCPLink::_hardwareConnect()
emit communicationError(tr("Link Error"), tr("Error on link %1. Connection failed").arg(getName())); emit communicationError(tr("Link Error"), tr("Error on link %1. Connection failed").arg(getName()));
} }
delete _socket; delete _socket;
_socket = NULL; _socket = nullptr;
return false; return false;
} }
_socketIsConnected = true; _socketIsConnected = true;
...@@ -281,7 +281,7 @@ void TCPConfiguration::copyFrom(LinkConfiguration *source) ...@@ -281,7 +281,7 @@ void TCPConfiguration::copyFrom(LinkConfiguration *source)
{ {
LinkConfiguration::copyFrom(source); LinkConfiguration::copyFrom(source);
TCPConfiguration* usource = dynamic_cast<TCPConfiguration*>(source); TCPConfiguration* usource = dynamic_cast<TCPConfiguration*>(source);
Q_ASSERT(usource != NULL); Q_ASSERT(usource != nullptr);
_port = usource->port(); _port = usource->port();
_address = usource->address(); _address = usource->address();
} }
......
...@@ -80,10 +80,10 @@ static bool contains_target(const QList<UDPCLient*> list, const QHostAddress& ad ...@@ -80,10 +80,10 @@ static bool contains_target(const QList<UDPCLient*> list, const QHostAddress& ad
UDPLink::UDPLink(SharedLinkConfigurationPointer& config) UDPLink::UDPLink(SharedLinkConfigurationPointer& config)
: LinkInterface(config) : LinkInterface(config)
#if defined(QGC_ZEROCONF_ENABLED) #if defined(QGC_ZEROCONF_ENABLED)
, _dnssServiceRef(NULL) , _dnssServiceRef(nullptr)
#endif #endif
, _running(false) , _running(false)
, _socket(NULL) , _socket(nullptr)
, _udpConfig(qobject_cast<UDPConfiguration*>(config.data())) , _udpConfig(qobject_cast<UDPConfiguration*>(config.data()))
, _connectState(false) , _connectState(false)
{ {
...@@ -253,7 +253,7 @@ void UDPLink::_disconnect(void) ...@@ -253,7 +253,7 @@ void UDPLink::_disconnect(void)
if (_socket) { if (_socket) {
// Make sure delete happen on correct thread // Make sure delete happen on correct thread
_socket->deleteLater(); _socket->deleteLater();
_socket = NULL; _socket = nullptr;
emit disconnected(); emit disconnected();
} }
_connectState = false; _connectState = false;
...@@ -281,7 +281,7 @@ bool UDPLink::_hardwareConnect() ...@@ -281,7 +281,7 @@ bool UDPLink::_hardwareConnect()
{ {
if (_socket) { if (_socket) {
delete _socket; delete _socket;
_socket = NULL; _socket = nullptr;
} }
QHostAddress host = QHostAddress::AnyIPv4; QHostAddress host = QHostAddress::AnyIPv4;
_socket = new QUdpSocket(this); _socket = new QUdpSocket(this);
......
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