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
5b743555
Commit
5b743555
authored
Aug 11, 2019
by
murata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FirmwarePlugin: Change NULL or 0 to nullptr
parent
f6658d4a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
APMFirmwarePlugin.h
src/FirmwarePlugin/APM/APMFirmwarePlugin.h
+1
-1
APMFirmwarePluginFactory.cc
src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
+5
-5
APMParameterMetaData.cc
src/FirmwarePlugin/APM/APMParameterMetaData.cc
+3
-3
ArduSubFirmwarePlugin.h
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
+1
-1
CameraMetaData.h
src/FirmwarePlugin/CameraMetaData.h
+1
-1
FirmwarePluginManager.cc
src/FirmwarePlugin/FirmwarePluginManager.cc
+1
-1
No files found.
src/FirmwarePlugin/APM/APMFirmwarePlugin.h
View file @
5b743555
...
...
@@ -148,7 +148,7 @@ class APMFirmwarePluginInstanceData : public QObject
Q_OBJECT
public:
APMFirmwarePluginInstanceData
(
QObject
*
parent
=
NULL
);
APMFirmwarePluginInstanceData
(
QObject
*
parent
=
nullptr
);
bool
textSeverityAdjustmentNeeded
;
};
...
...
src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
View file @
5b743555
...
...
@@ -16,10 +16,10 @@
APMFirmwarePluginFactory
APMFirmwarePluginFactory
;
APMFirmwarePluginFactory
::
APMFirmwarePluginFactory
(
void
)
:
_arduCopterPluginInstance
(
NULL
)
,
_arduPlanePluginInstance
(
NULL
)
,
_arduRoverPluginInstance
(
NULL
)
,
_arduSubPluginInstance
(
NULL
)
:
_arduCopterPluginInstance
(
nullptr
)
,
_arduPlanePluginInstance
(
nullptr
)
,
_arduRoverPluginInstance
(
nullptr
)
,
_arduSubPluginInstance
(
nullptr
)
{
}
...
...
@@ -74,5 +74,5 @@ FirmwarePlugin* APMFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPIL
}
}
return
NULL
;
return
nullptr
;
}
src/FirmwarePlugin/APM/APMParameterMetaData.cc
View file @
5b743555
...
...
@@ -157,7 +157,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
bool
badMetaData
=
true
;
QStack
<
int
>
xmlState
;
APMFactMetaDataRaw
*
rawMetaData
=
NULL
;
APMFactMetaDataRaw
*
rawMetaData
=
nullptr
;
xmlState
.
push
(
XmlStateNone
);
...
...
@@ -285,7 +285,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
// Done loading this parameter
// Reset for next parameter
qCDebug
(
APMParameterMetaDataVerboseLog
)
<<
"done loading parameter"
;
rawMetaData
=
NULL
;
rawMetaData
=
nullptr
;
badMetaData
=
false
;
xmlState
.
pop
();
}
else
if
(
elementName
==
"parameters"
)
{
...
...
@@ -422,7 +422,7 @@ bool APMParameterMetaData::parseParameterAttributes(QXmlStreamReader& xml, APMFa
void
APMParameterMetaData
::
addMetaDataToFact
(
Fact
*
fact
,
MAV_TYPE
vehicleType
)
{
const
QString
mavTypeString
=
mavTypeToString
(
vehicleType
);
APMFactMetaDataRaw
*
rawMetaData
=
NULL
;
APMFactMetaDataRaw
*
rawMetaData
=
nullptr
;
// check if we have metadata for fact, use generic otherwise
if
(
_vehicleTypeToParametersMap
[
mavTypeString
].
contains
(
fact
->
name
()))
{
...
...
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
View file @
5b743555
...
...
@@ -33,7 +33,7 @@ class APMSubmarineFactGroup : public FactGroup
Q_OBJECT
public:
APMSubmarineFactGroup
(
QObject
*
parent
=
NULL
);
APMSubmarineFactGroup
(
QObject
*
parent
=
nullptr
);
Q_PROPERTY
(
Fact
*
camTilt
READ
camTilt
CONSTANT
)
Q_PROPERTY
(
Fact
*
tetherTurns
READ
tetherTurns
CONSTANT
)
...
...
src/FirmwarePlugin/CameraMetaData.h
View file @
5b743555
...
...
@@ -26,7 +26,7 @@ public:
bool
landscape
,
bool
fixedOrientation
,
double
minTriggerInterval
,
QObject
*
parent
=
NULL
);
QObject
*
parent
=
nullptr
);
Q_PROPERTY
(
QString
name
READ
name
CONSTANT
)
///< Camera name
Q_PROPERTY
(
double
sensorWidth
READ
sensorWidth
CONSTANT
)
///< Sensor size in millimeters
...
...
src/FirmwarePlugin/FirmwarePluginManager.cc
View file @
5b743555
...
...
@@ -89,5 +89,5 @@ FirmwarePluginFactory* FirmwarePluginManager::_findPluginFactory(MAV_AUTOPILOT f
}
}
return
NULL
;
return
nullptr
;
}
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