Browse Source

QtLocationPlugin: Change NULL or 0 to nullptr

QGC4.4
murata 6 years ago
parent
commit
24d73dc77c
  1. 4
      src/QtLocationPlugin/QGCMapTileSet.cpp
  2. 8
      src/QtLocationPlugin/QGCMapUrlEngine.cpp
  3. 4
      src/QtLocationPlugin/QGCTileCacheWorker.cpp
  4. 4
      src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp

4
src/QtLocationPlugin/QGCMapTileSet.cpp

@ -48,11 +48,11 @@ QGCCachedTileSet::QGCCachedTileSet(const QString& name) @@ -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)
{

8
src/QtLocationPlugin/QGCMapUrlEngine.cpp

@ -42,7 +42,7 @@ UrlFactory::UrlFactory() @@ -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) @@ -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) @@ -521,7 +521,7 @@ UrlFactory::_networkReplyError(QNetworkReply::NetworkError error)
void
UrlFactory::_replyDestroyed()
{
_googleReply = NULL;
_googleReply = nullptr;
}
#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]);
}
_googleReply->deleteLater();
_googleReply = NULL;
_googleReply = nullptr;
}
#endif

4
src/QtLocationPlugin/QGCTileCacheWorker.cpp

@ -675,7 +675,7 @@ QGCCacheWorker::_importSets(QGCMapTask* mtask) @@ -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() @@ -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.";

4
src/QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp

@ -82,7 +82,7 @@ QGeoServiceProviderFactoryQGC::createRoutingManagerEngine( @@ -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( @@ -91,5 +91,5 @@ QGeoServiceProviderFactoryQGC::createPlaceManagerEngine(
const QVariantMap &, QGeoServiceProvider::Error *, QString *) const
{
// Not implemented for QGC
return NULL;
return nullptr;
}

Loading…
Cancel
Save