Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
aaf8e379
Commit
aaf8e379
authored
Aug 11, 2019
by
murata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Vehicle: Change NULL or 0 to nullptr
parent
44d97f51
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
ADSBVehicle.h
src/Vehicle/ADSBVehicle.h
+2
-2
GPSRTKFactGroup.h
src/Vehicle/GPSRTKFactGroup.h
+1
-1
MAVLinkLogManager.h
src/Vehicle/MAVLinkLogManager.h
+1
-1
MultiVehicleManager.cc
src/Vehicle/MultiVehicleManager.cc
+7
-7
MultiVehicleManager.h
src/Vehicle/MultiVehicleManager.h
+1
-1
No files found.
src/Vehicle/ADSBVehicle.h
View file @
aaf8e379
...
...
@@ -20,9 +20,9 @@ class ADSBVehicle : public QObject
Q_OBJECT
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
(
QString
callsign
READ
callsign
NOTIFY
callsignChanged
)
...
...
src/Vehicle/GPSRTKFactGroup.h
View file @
aaf8e379
...
...
@@ -17,7 +17,7 @@ class GPSRTKFactGroup : public FactGroup
Q_OBJECT
public:
GPSRTKFactGroup
(
QObject
*
parent
=
NULL
);
GPSRTKFactGroup
(
QObject
*
parent
=
nullptr
);
Q_PROPERTY
(
Fact
*
connected
READ
connected
CONSTANT
)
Q_PROPERTY
(
Fact
*
currentDuration
READ
currentDuration
CONSTANT
)
...
...
src/Vehicle/MAVLinkLogManager.h
View file @
aaf8e379
...
...
@@ -140,7 +140,7 @@ public:
bool
enableAutoStart
()
{
return
_enableAutoStart
;
}
bool
uploading
();
bool
logRunning
()
{
return
_logRunning
;
}
bool
canStartLog
()
{
return
_vehicle
!=
NULL
&&
!
_logginDenied
;
}
bool
canStartLog
()
{
return
_vehicle
!=
nullptr
&&
!
_logginDenied
;
}
bool
deleteAfterUpload
()
{
return
_deleteAfterUpload
;
}
bool
publicLog
()
{
return
_publicLog
;
}
int
windSpeed
()
{
return
_windSpeed
;
}
...
...
src/Vehicle/MultiVehicleManager.cc
View file @
aaf8e379
...
...
@@ -33,11 +33,11 @@ MultiVehicleManager::MultiVehicleManager(QGCApplication* app, QGCToolbox* toolbo
:
QGCTool
(
app
,
toolbox
)
,
_activeVehicleAvailable
(
false
)
,
_parameterReadyVehicleAvailable
(
false
)
,
_activeVehicle
(
NULL
)
,
_offlineEditingVehicle
(
NULL
)
,
_firmwarePluginManager
(
NULL
)
,
_joystickManager
(
NULL
)
,
_mavlinkProtocol
(
NULL
)
,
_activeVehicle
(
nullptr
)
,
_offlineEditingVehicle
(
nullptr
)
,
_firmwarePluginManager
(
nullptr
)
,
_joystickManager
(
nullptr
)
,
_mavlinkProtocol
(
nullptr
)
,
_gcsHeartbeatEnabled
(
true
)
{
QSettings
settings
;
...
...
@@ -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.
/// 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
())
{
newActiveVehicle
=
qobject_cast
<
Vehicle
*>
(
_vehicles
[
0
]);
}
...
...
@@ -338,7 +338,7 @@ Vehicle* MultiVehicleManager::getVehicleById(int vehicleId)
}
}
return
NULL
;
return
nullptr
;
}
void
MultiVehicleManager
::
setGcsHeartbeatEnabled
(
bool
gcsHeartBeatEnabled
)
...
...
src/Vehicle/MultiVehicleManager.h
View file @
aaf8e379
...
...
@@ -51,7 +51,7 @@ public:
Q_INVOKABLE
Vehicle
*
getVehicleById
(
int
vehicleId
);
UAS
*
activeUas
(
void
)
{
return
_activeVehicle
?
_activeVehicle
->
uas
()
:
NULL
;
}
UAS
*
activeUas
(
void
)
{
return
_activeVehicle
?
_activeVehicle
->
uas
()
:
nullptr
;
}
// Property accessors
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment