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
35bab343
Commit
35bab343
authored
Aug 11, 2019
by
murata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QGC: Change NULL or 0 to nullptr
parent
397c66ce
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
QGCComboBox.h
src/QGCComboBox.h
+1
-1
QGCFileDownload.h
src/QGCFileDownload.h
+1
-1
QGCLoggingCategory.cc
src/QGCLoggingCategory.cc
+1
-1
QGCMapPalette.h
src/QGCMapPalette.h
+1
-1
QGCQGeoCoordinate.h
src/QGCQGeoCoordinate.h
+1
-1
QGCTemporaryFile.h
src/QGCTemporaryFile.h
+1
-1
TerrainTile.cc
src/TerrainTile.cc
+3
-3
No files found.
src/QGCComboBox.h
View file @
35bab343
...
...
@@ -23,7 +23,7 @@ class QGCComboBox : public QComboBox {
Q_OBJECT
public:
QGCComboBox
(
QWidget
*
parent
=
NULL
);
QGCComboBox
(
QWidget
*
parent
=
nullptr
);
/// @brief Sets the current index on the combo. Signals activated, as well as currentIndexChanged.
void
simulateUserSetCurrentIndex
(
int
index
);
...
...
src/QGCFileDownload.h
View file @
35bab343
...
...
@@ -18,7 +18,7 @@ class QGCFileDownload : public QNetworkAccessManager
Q_OBJECT
public:
QGCFileDownload
(
QObject
*
parent
=
NULL
);
QGCFileDownload
(
QObject
*
parent
=
nullptr
);
/// Download the specified remote file.
/// @param remoteFile File to download. Can be http address or file system path.
...
...
src/QGCLoggingCategory.cc
View file @
35bab343
...
...
@@ -25,7 +25,7 @@ QGC_LOGGING_CATEGORY(GeotaggingLog, "GeotaggingLog")
QGC_LOGGING_CATEGORY
(
RTKGPSLog
,
"RTKGPSLog"
)
QGC_LOGGING_CATEGORY
(
GuidedActionsControllerLog
,
"GuidedActionsControllerLog"
)
QGCLoggingCategoryRegister
*
_instance
=
NULL
;
QGCLoggingCategoryRegister
*
_instance
=
nullptr
;
const
char
*
QGCLoggingCategoryRegister
::
_filterRulesSettingsGroup
=
"LoggingFilters"
;
QGCLoggingCategoryRegister
*
QGCLoggingCategoryRegister
::
instance
(
void
)
...
...
src/QGCMapPalette.h
View file @
35bab343
...
...
@@ -47,7 +47,7 @@ class QGCMapPalette : public QObject
Q_PROPERTY
(
QColor
thumbJoystick
READ
thumbJoystick
NOTIFY
paletteChanged
)
public:
QGCMapPalette
(
QObject
*
parent
=
NULL
);
QGCMapPalette
(
QObject
*
parent
=
nullptr
);
/// Text color
QColor
text
(
void
)
const
{
return
_text
[
_lightColors
?
0
:
1
];
}
...
...
src/QGCQGeoCoordinate.h
View file @
35bab343
...
...
@@ -18,7 +18,7 @@ class QGCQGeoCoordinate : public QObject
Q_OBJECT
public:
QGCQGeoCoordinate
(
const
QGeoCoordinate
&
coord
,
QObject
*
parent
=
NULL
);
QGCQGeoCoordinate
(
const
QGeoCoordinate
&
coord
,
QObject
*
parent
=
nullptr
);
Q_PROPERTY
(
QGeoCoordinate
coordinate
READ
coordinate
WRITE
setCoordinate
NOTIFY
coordinateChanged
)
Q_PROPERTY
(
bool
dirty
READ
dirty
WRITE
setDirty
NOTIFY
dirtyChanged
)
...
...
src/QGCTemporaryFile.h
View file @
35bab343
...
...
@@ -28,7 +28,7 @@ public:
// QStandardPaths::TempLocation directory.
// @param template Template for file name following QTemporaryFile rules. Template should NOT include
// directory path, only file name.
QGCTemporaryFile
(
const
QString
&
fileTemplate
,
QObject
*
parent
=
NULL
);
QGCTemporaryFile
(
const
QString
&
fileTemplate
,
QObject
*
parent
=
nullptr
);
/// @brief Opens the file in ReadWrite mode.
/// @returns false - open failed
...
...
src/TerrainTile.cc
View file @
35bab343
...
...
@@ -24,7 +24,7 @@ TerrainTile::TerrainTile()
:
_minElevation
(
-
1.0
)
,
_maxElevation
(
-
1.0
)
,
_avgElevation
(
-
1.0
)
,
_data
(
NULL
)
,
_data
(
nullptr
)
,
_gridSizeLat
(
-
1
)
,
_gridSizeLon
(
-
1
)
,
_isValid
(
false
)
...
...
@@ -39,7 +39,7 @@ TerrainTile::~TerrainTile()
delete
_data
[
i
];
}
delete
_data
;
_data
=
NULL
;
_data
=
nullptr
;
}
}
...
...
@@ -48,7 +48,7 @@ TerrainTile::TerrainTile(QByteArray byteArray)
:
_minElevation
(
-
1.0
)
,
_maxElevation
(
-
1.0
)
,
_avgElevation
(
-
1.0
)
,
_data
(
NULL
)
,
_data
(
nullptr
)
,
_gridSizeLat
(
-
1
)
,
_gridSizeLon
(
-
1
)
,
_isValid
(
false
)
...
...
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