Commit 24d73dc7 authored by murata's avatar murata

QtLocationPlugin: Change NULL or 0 to nullptr

parent 5b743555
...@@ -48,11 +48,11 @@ QGCCachedTileSet::QGCCachedTileSet(const QString& name) ...@@ -48,11 +48,11 @@ QGCCachedTileSet::QGCCachedTileSet(const QString& name)
, _downloading(false) , _downloading(false)
, _id(0) , _id(0)
, _type(UrlFactory::Invalid) , _type(UrlFactory::Invalid)
, _networkManager(NULL) , _networkManager(nullptr)
, _errorCount(0) , _errorCount(0)
, _noMoreTiles(false) , _noMoreTiles(false)
, _batchRequested(false) , _batchRequested(false)
, _manager(NULL) , _manager(nullptr)
, _selected(false) , _selected(false)
{ {
......
...@@ -42,7 +42,7 @@ UrlFactory::UrlFactory() ...@@ -42,7 +42,7 @@ UrlFactory::UrlFactory()
: _timeout(5 * 1000) : _timeout(5 * 1000)
#ifndef QGC_NO_GOOGLE_MAPS #ifndef QGC_NO_GOOGLE_MAPS
, _googleVersionRetrieved(false) , _googleVersionRetrieved(false)
, _googleReply(NULL) , _googleReply(nullptr)
#endif #endif
{ {
QStringList langs = QLocale::system().uiLanguages(); QStringList langs = QLocale::system().uiLanguages();
...@@ -512,7 +512,7 @@ UrlFactory::_networkReplyError(QNetworkReply::NetworkError error) ...@@ -512,7 +512,7 @@ UrlFactory::_networkReplyError(QNetworkReply::NetworkError error)
if(_googleReply) if(_googleReply)
{ {
_googleReply->deleteLater(); _googleReply->deleteLater();
_googleReply = NULL; _googleReply = nullptr;
} }
} }
#endif #endif
...@@ -521,7 +521,7 @@ UrlFactory::_networkReplyError(QNetworkReply::NetworkError error) ...@@ -521,7 +521,7 @@ UrlFactory::_networkReplyError(QNetworkReply::NetworkError error)
void void
UrlFactory::_replyDestroyed() UrlFactory::_replyDestroyed()
{ {
_googleReply = NULL; _googleReply = nullptr;
} }
#endif #endif
...@@ -563,7 +563,7 @@ UrlFactory::_googleVersionCompleted() ...@@ -563,7 +563,7 @@ UrlFactory::_googleVersionCompleted()
_versionGoogleTerrain = QString("t@%1,r@%2").arg(gc[1]).arg(gc[2]); _versionGoogleTerrain = QString("t@%1,r@%2").arg(gc[1]).arg(gc[2]);
} }
_googleReply->deleteLater(); _googleReply->deleteLater();
_googleReply = NULL; _googleReply = nullptr;
} }
#endif #endif
......
...@@ -675,7 +675,7 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask) ...@@ -675,7 +675,7 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask)
//-- Close and delete old database //-- Close and delete old database
if(_db) { if(_db) {
delete _db; delete _db;
_db = NULL; _db = nullptr;
QSqlDatabase::removeDatabase(kSession); QSqlDatabase::removeDatabase(kSession);
} }
QFile file(_databasePath); QFile file(_databasePath);
...@@ -989,7 +989,7 @@ QGCCacheWorker::_init() ...@@ -989,7 +989,7 @@ QGCCacheWorker::_init()
_failed = true; _failed = true;
} }
delete _db; delete _db;
_db = NULL; _db = nullptr;
QSqlDatabase::removeDatabase(kSession); QSqlDatabase::removeDatabase(kSession);
} else { } else {
qCritical() << "Could not find suitable cache directory."; qCritical() << "Could not find suitable cache directory.";
......
...@@ -82,7 +82,7 @@ QGeoServiceProviderFactoryQGC::createRoutingManagerEngine( ...@@ -82,7 +82,7 @@ QGeoServiceProviderFactoryQGC::createRoutingManagerEngine(
const QVariantMap &, QGeoServiceProvider::Error *, QString *) const const QVariantMap &, QGeoServiceProvider::Error *, QString *) const
{ {
// Not implemented for QGC // Not implemented for QGC
return NULL; return nullptr;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -91,5 +91,5 @@ QGeoServiceProviderFactoryQGC::createPlaceManagerEngine( ...@@ -91,5 +91,5 @@ QGeoServiceProviderFactoryQGC::createPlaceManagerEngine(
const QVariantMap &, QGeoServiceProvider::Error *, QString *) const const QVariantMap &, QGeoServiceProvider::Error *, QString *) const
{ {
// Not implemented for QGC // Not implemented for QGC
return NULL; return nullptr;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment