Remove some unnecessary delete guards

nyalldawson · nyalldawson · commit d9ebd3b84b44 · 2017-09-11T17:11:50.000+10:00
Via clang-tidy readability-delete-null-pointer
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4402,8 +4402,7 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )
     {
       QString msg = tr( "%1 is not a valid or recognized data source" ).arg( composedURI );
       messageBar()->pushMessage( tr( "Invalid Data Source" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );
-      if ( layer )
-        delete layer;
+      delete layer;
     }
   }
 
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -1983,8 +1983,7 @@ QgsExpressionNode *QgsOgcUtils::nodeLiteralFromOgcFilter( QDomElement &element,
       operand = nodeFromOgcFilter( operandElem, errorMessage );
       if ( !operand )
       {
-        if ( root )
-          delete root;
+        delete root;
 
         errorMessage = QObject::tr( "'%1' is an invalid or not supported content for ogc:Literal" ).arg( operandElem.tagName() );
         return nullptr;
@@ -2075,14 +2074,9 @@ QgsExpressionNode *QgsOgcUtils::nodeIsBetweenFromOgcFilter( QDomElement &element
 
   if ( !operand || !lowerBound || !operand2 || !upperBound )
   {
-    if ( operand )
-      delete operand;
-
-    if ( lowerBound )
-      delete lowerBound;
-
-    if ( upperBound )
-      delete upperBound;
+    delete operand;
+    delete lowerBound;
+    delete upperBound;
 
     errorMessage = QObject::tr( "missing some required sub-elements in ogc:PropertyIsBetween" );
     return nullptr;
diff --git a/src/core/qgsvectorlayerexporter.cpp b/src/core/qgsvectorlayerexporter.cpp
@@ -114,9 +114,7 @@ QgsVectorLayerExporter::QgsVectorLayerExporter( const QString &uri,
     mError = ErrInvalidLayer;
     mErrorMessage = QObject::tr( "Loading of layer failed" );
 
-    if ( vectorProvider )
-      delete vectorProvider;
-
+    delete vectorProvider;
     return;
   }
 
diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
@@ -331,9 +331,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs
     error = writeDataRaster( pipe, iter, nCols, nRows, outputExtent, crs, destDataType, destHasNoDataValueList, destNoDataValueList, destProvider, feedback );
   }
 
-  if ( destProvider )
-    delete destProvider;
-
+  delete destProvider;
   return error;
 }
 
@@ -616,8 +614,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste
     ++fileIndex;
   }
 
-  if ( destProvider )
-    delete destProvider;
+  delete destProvider;
 
   qgsFree( redData );
   qgsFree( greenData );
diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
@@ -1032,7 +1032,8 @@ bool QgsDelimitedTextProvider::setSubsetString( const QString &subset, bool upda
     QString previousSubset = mSubsetString;
     mSubsetString = nonNullSubset;
     mSubsetExpression = expression;
-    if ( tmpSubsetExpression ) delete tmpSubsetExpression;
+    delete tmpSubsetExpression;
+
     // Update the feature count and extents if requested
 
     // Usage of updateFeatureCount is a bit painful, basically expect that it

Original file line number	Diff line number	Diff line change
`@@ -4402,8 +4402,7 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )`
`4402`	`4402`	`{`
`4403`	`4403`	`QString msg = tr( "%1 is not a valid or recognized data source" ).arg( composedURI );`
`4404`	`4404`	`messageBar()->pushMessage( tr( "Invalid Data Source" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );`
`4405`		`- if ( layer )`
`4406`		`- delete layer;`
	`4405`	`+ delete layer;`
`4407`	`4406`	`}`
`4408`	`4407`	`}`
`4409`	`4408`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,7 @@ QgsVectorLayerExporter::QgsVectorLayerExporter( const QString &uri,`
`114`	`114`	`mError = ErrInvalidLayer;`
`115`	`115`	`mErrorMessage = QObject::tr( "Loading of layer failed" );`
`116`	`116`
`117`		`- if ( vectorProvider )`
`118`		`- delete vectorProvider;`
`119`		`-`
	`117`	`+ delete vectorProvider;`
`120`	`118`	`return;`
`121`	`119`	`}`
`122`	`120`
Original file line number	Diff line number	Diff line change
`@@ -331,9 +331,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeDataRaster( const Qgs`
`331`	`331`	`error = writeDataRaster( pipe, iter, nCols, nRows, outputExtent, crs, destDataType, destHasNoDataValueList, destNoDataValueList, destProvider, feedback );`
`332`	`332`	`}`
`333`	`333`
`334`		`- if ( destProvider )`
`335`		`- delete destProvider;`
`336`		`-`
	`334`	`+ delete destProvider;`
`337`	`335`	`return error;`
`338`	`336`	`}`
`339`	`337`
`@@ -616,8 +614,7 @@ QgsRasterFileWriter::WriterError QgsRasterFileWriter::writeImageRaster( QgsRaste`
`616`	`614`	`++fileIndex;`
`617`	`615`	`}`
`618`	`616`
`619`		`- if ( destProvider )`
`620`		`- delete destProvider;`
	`617`	`+ delete destProvider;`
`621`	`618`
`622`	`619`	`qgsFree( redData );`
`623`	`620`	`qgsFree( greenData );`