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
24d73dc7
Commit
24d73dc7
authored
Aug 11, 2019
by
murata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QtLocationPlugin: Change NULL or 0 to nullptr
parent
5b743555
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
QGCMapTileSet.cpp
src/QtLocationPlugin/QGCMapTileSet.cpp
+2
-2
QGCMapUrlEngine.cpp
src/QtLocationPlugin/QGCMapUrlEngine.cpp
+4
-4
QGCTileCacheWorker.cpp
src/QtLocationPlugin/QGCTileCacheWorker.cpp
+2
-2
QGeoServiceProviderPluginQGC.cpp
src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
+2
-2
No files found.
src/QtLocationPlugin/QGCMapTileSet.cpp
View file @
24d73dc7
...
...
@@ -48,11 +48,11 @@ QGCCachedTileSet::QGCCachedTileSet(const QString& name)
,
_downloading
(
false
)
,
_id
(
0
)
,
_type
(
UrlFactory
::
Invalid
)
,
_networkManager
(
NULL
)
,
_networkManager
(
nullptr
)
,
_errorCount
(
0
)
,
_noMoreTiles
(
false
)
,
_batchRequested
(
false
)
,
_manager
(
NULL
)
,
_manager
(
nullptr
)
,
_selected
(
false
)
{
...
...
src/QtLocationPlugin/QGCMapUrlEngine.cpp
View file @
24d73dc7
...
...
@@ -42,7 +42,7 @@ UrlFactory::UrlFactory()
:
_timeout
(
5
*
1000
)
#ifndef QGC_NO_GOOGLE_MAPS
,
_googleVersionRetrieved
(
false
)
,
_googleReply
(
NULL
)
,
_googleReply
(
nullptr
)
#endif
{
QStringList
langs
=
QLocale
::
system
().
uiLanguages
();
...
...
@@ -512,7 +512,7 @@ UrlFactory::_networkReplyError(QNetworkReply::NetworkError error)
if
(
_googleReply
)
{
_googleReply
->
deleteLater
();
_googleReply
=
NULL
;
_googleReply
=
nullptr
;
}
}
#endif
...
...
@@ -521,7 +521,7 @@ UrlFactory::_networkReplyError(QNetworkReply::NetworkError error)
void
UrlFactory
::
_replyDestroyed
()
{
_googleReply
=
NULL
;
_googleReply
=
nullptr
;
}
#endif
...
...
@@ -563,7 +563,7 @@ UrlFactory::_googleVersionCompleted()
_versionGoogleTerrain
=
QString
(
"t@%1,r@%2"
).
arg
(
gc
[
1
]).
arg
(
gc
[
2
]);
}
_googleReply
->
deleteLater
();
_googleReply
=
NULL
;
_googleReply
=
nullptr
;
}
#endif
...
...
src/QtLocationPlugin/QGCTileCacheWorker.cpp
View file @
24d73dc7
...
...
@@ -675,7 +675,7 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
//-- Close and delete old database
if
(
_db
)
{
delete
_db
;
_db
=
NULL
;
_db
=
nullptr
;
QSqlDatabase
::
removeDatabase
(
kSession
);
}
QFile
file
(
_databasePath
);
...
...
@@ -989,7 +989,7 @@ QGCCacheWorker::_init()
_failed
=
true
;
}
delete
_db
;
_db
=
NULL
;
_db
=
nullptr
;
QSqlDatabase
::
removeDatabase
(
kSession
);
}
else
{
qCritical
()
<<
"Could not find suitable cache directory."
;
...
...
src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
View file @
24d73dc7
...
...
@@ -82,7 +82,7 @@ QGeoServiceProviderFactoryQGC::createRoutingManagerEngine(
const
QVariantMap
&
,
QGeoServiceProvider
::
Error
*
,
QString
*
)
const
{
// Not implemented for QGC
return
NULL
;
return
nullptr
;
}
//-----------------------------------------------------------------------------
...
...
@@ -91,5 +91,5 @@ QGeoServiceProviderFactoryQGC::createPlaceManagerEngine(
const
QVariantMap
&
,
QGeoServiceProvider
::
Error
*
,
QString
*
)
const
{
// Not implemented for QGC
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