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
3405d7de
Commit
3405d7de
authored
5 years ago
by
murata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QmlControls: Change NULL or 0 to nullptr
parent
7b70df8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
CoordinateVector.h
src/QmlControls/CoordinateVector.h
+2
-2
EditPositionDialogController.cc
src/QmlControls/EditPositionDialogController.cc
+1
-1
No files found.
src/QmlControls/CoordinateVector.h
View file @
3405d7de
...
@@ -19,8 +19,8 @@ class CoordinateVector : public QObject
...
@@ -19,8 +19,8 @@ class CoordinateVector : public QObject
Q_OBJECT
Q_OBJECT
public:
public:
CoordinateVector
(
QObject
*
parent
=
NULL
);
CoordinateVector
(
QObject
*
parent
=
nullptr
);
CoordinateVector
(
const
QGeoCoordinate
&
coordinate1
,
const
QGeoCoordinate
&
coordinate2
,
QObject
*
parent
=
NULL
);
CoordinateVector
(
const
QGeoCoordinate
&
coordinate1
,
const
QGeoCoordinate
&
coordinate2
,
QObject
*
parent
=
nullptr
);
Q_PROPERTY
(
QGeoCoordinate
coordinate1
MEMBER
_coordinate1
NOTIFY
coordinate1Changed
)
Q_PROPERTY
(
QGeoCoordinate
coordinate1
MEMBER
_coordinate1
NOTIFY
coordinate1Changed
)
Q_PROPERTY
(
QGeoCoordinate
coordinate2
MEMBER
_coordinate2
NOTIFY
coordinate2Changed
)
Q_PROPERTY
(
QGeoCoordinate
coordinate2
MEMBER
_coordinate2
NOTIFY
coordinate2Changed
)
...
...
This diff is collapsed.
Click to expand it.
src/QmlControls/EditPositionDialogController.cc
View file @
3405d7de
...
@@ -29,7 +29,7 @@ EditPositionDialogController::EditPositionDialogController(void)
...
@@ -29,7 +29,7 @@ EditPositionDialogController::EditPositionDialogController(void)
,
_northingFact
(
0
,
_northingFactName
,
FactMetaData
::
valueTypeDouble
)
,
_northingFact
(
0
,
_northingFactName
,
FactMetaData
::
valueTypeDouble
)
{
{
if
(
_metaDataMap
.
isEmpty
())
{
if
(
_metaDataMap
.
isEmpty
())
{
_metaDataMap
=
FactMetaData
::
createMapFromJsonFile
(
QStringLiteral
(
":/json/EditPositionDialog.FactMetaData.json"
),
NULL
/* QObject parent */
);
_metaDataMap
=
FactMetaData
::
createMapFromJsonFile
(
QStringLiteral
(
":/json/EditPositionDialog.FactMetaData.json"
),
nullptr
/* QObject parent */
);
}
}
_latitudeFact
.
setMetaData
(
_metaDataMap
[
_latitudeFactName
]);
_latitudeFact
.
setMetaData
(
_metaDataMap
[
_latitudeFactName
]);
...
...
This diff is collapsed.
Click to expand it.
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