Fix style in previous commit regarding comparisons against nullptr

rouault · rouault · commit ed08ffb2aa94 · 2016-05-04T22:00:31.000+02:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -46,7 +46,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
   mFeatureFetched = false;
 
   mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mProvider->dataSourceUri() );
-  if ( mConn->ds == nullptr )
+  if ( !mConn->ds )
   {
     return;
   }
@@ -59,15 +59,15 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
   {
     ogrLayer = OGR_DS_GetLayerByName( mConn->ds, TO8( mSource->mLayerName ) );
   }
-  if ( ogrLayer == nullptr )
+  if ( !ogrLayer )
   {
     return;
   }
 
   if ( !mSource->mSubsetString.isEmpty() )
   {
     ogrLayer = QgsOgrProviderUtils::setSubsetString( ogrLayer, mConn->ds, mSource->mEncoding, mSource->mSubsetString );
-    if ( ogrLayer == nullptr )
+    if ( !ogrLayer )
     {
       return;
     }
@@ -224,7 +224,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 
-  if ( mClosed || ogrLayer == nullptr )
+  if ( mClosed || !ogrLayer )
     return false;
 
   if ( mRequest.filterType() == QgsFeatureRequest::FilterFid )
@@ -268,7 +268,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )
 
 bool QgsOgrFeatureIterator::rewind()
 {
-  if ( mClosed || ogrLayer == nullptr )
+  if ( mClosed || !ogrLayer )
     return false;
 
   OGR_L_ResetReading( ogrLayer );
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -396,7 +396,7 @@ bool QgsOgrProvider::setSubsetString( const QString& theSQL, bool updateFeatureC
 {
   QgsCPLErrorHandler handler;
 
-  if ( ogrDataSource == nullptr )
+  if ( !ogrDataSource )
     return false;
 
   if ( theSQL == mSubsetString && mFeaturesCounted >= 0 )
@@ -729,7 +729,7 @@ void QgsOgrProvider::loadFields()
   QgsOgrConnPool::instance()->invalidateConnections( dataSourceUri() );
   //the attribute fields need to be read again when the encoding changes
   mAttributeFields.clear();
-  if ( ogrLayer == nullptr )
+  if ( !ogrLayer )
     return;
 
   if ( mOgrGeometryTypeFilter != wkbUnknown )
@@ -2828,7 +2828,7 @@ bool QgsOgrProvider::syncToDisc()
 
 void QgsOgrProvider::recalculateFeatureCount()
 {
-  if ( ogrLayer == nullptr )
+  if ( !ogrLayer )
   {
     mFeaturesCounted = 0;
     return;
@@ -3061,7 +3061,7 @@ void QgsOgrProvider::open( OpenMode mode )
 
       ogrLayer = ogrOrigLayer;
     }
-    if ( ogrLayer != nullptr )
+    if ( ogrLayer )
     {
       mValid = true;
       mDynamicWriteAccess = true;
@@ -3133,7 +3133,7 @@ bool QgsOgrProvider::enterUpdateMode()
     QgsDebugMsg( QString( "Reopening %1 in update mode" ).arg( dataSourceUri() ) );
     close();
     open( OpenModeForceUpdate );
-    if ( ogrDataSource == nullptr || !mWriteAccess )
+    if ( !ogrDataSource || !mWriteAccess )
     {
       QgsMessageLog::logMessage( tr( "Cannot reopen datasource %1 in update mode" ).arg( dataSourceUri() ), tr( "OGR" ) );
       pushError( tr( "Cannot reopen datasource %1 in update mode" ).arg( dataSourceUri() ) );
@@ -3166,7 +3166,7 @@ bool QgsOgrProvider::leaveUpdateMode()
     QgsDebugMsg( QString( "Reopening %1 in read-only mode" ).arg( dataSourceUri() ) );
     close();
     open( OpenModeForceReadOnly );
-    if ( ogrDataSource == nullptr )
+    if ( !ogrDataSource )
     {
       QgsMessageLog::logMessage( tr( "Cannot reopen datasource %1 in read-only mode" ).arg( dataSourceUri() ), tr( "OGR" ) );
       pushError( tr( "Cannot reopen datasource %1 in read-only mode" ).arg( dataSourceUri() ) );

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool`
`46`	`46`	`mFeatureFetched = false;`
`47`	`47`
`48`	`48`	`mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mProvider->dataSourceUri() );`
`49`		`- if ( mConn->ds == nullptr )`
	`49`	`+ if ( !mConn->ds )`
`50`	`50`	`{`
`51`	`51`	`return;`
`52`	`52`	`}`
`@@ -59,15 +59,15 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool`
`59`	`59`	`{`
`60`	`60`	`ogrLayer = OGR_DS_GetLayerByName( mConn->ds, TO8( mSource->mLayerName ) );`
`61`	`61`	`}`
`62`		`- if ( ogrLayer == nullptr )`
	`62`	`+ if ( !ogrLayer )`
`63`	`63`	`{`
`64`	`64`	`return;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if ( !mSource->mSubsetString.isEmpty() )`
`68`	`68`	`{`
`69`	`69`	`ogrLayer = QgsOgrProviderUtils::setSubsetString( ogrLayer, mConn->ds, mSource->mEncoding, mSource->mSubsetString );`
`70`		`- if ( ogrLayer == nullptr )`
	`70`	`+ if ( !ogrLayer )`
`71`	`71`	`{`
`72`	`72`	`return;`
`73`	`73`	`}`
`@@ -224,7 +224,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )`
`224`	`224`	`{`
`225`	`225`	`feature.setValid( false );`
`226`	`226`
`227`		`- if ( mClosed \|\| ogrLayer == nullptr )`
	`227`	`+ if ( mClosed \|\| !ogrLayer )`
`228`	`228`	`return false;`
`229`	`229`
`230`	`230`	`if ( mRequest.filterType() == QgsFeatureRequest::FilterFid )`
`@@ -268,7 +268,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )`
`268`	`268`
`269`	`269`	`bool QgsOgrFeatureIterator::rewind()`
`270`	`270`	`{`
`271`		`- if ( mClosed \|\| ogrLayer == nullptr )`
	`271`	`+ if ( mClosed \|\| !ogrLayer )`
`272`	`272`	`return false;`
`273`	`273`
`274`	`274`	`OGR_L_ResetReading( ogrLayer );`