Fix clang-tidy redundant .get() calls

qgis · Sep 11, 2017 · 6ca50a0 · 6ca50a0
1 parent f2875a9
commit 6ca50a0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/core/expression/qgsexpression.cpp b/src/core/expression/qgsexpression.cpp
@@ -290,7 +290,7 @@ bool QgsExpression::needsGeometry() const
 
 void QgsExpression::initGeomCalculator()
 {
-  if ( d->mCalc.get() )
+  if ( d->mCalc )
     return;
 
   // Use planimetric as default

diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -795,6 +795,6 @@ void QgsDataDefinedSizeLegendNode::cacheImage() const
       context.reset( new QgsRenderContext );
       context->setScaleFactor( 96 / 25.4 );
     }
-    mImage = mSettings->collapsedLegendImage( *context.get() );
+    mImage = mSettings->collapsedLegendImage( *context );
   }
 }
diff --git a/src/core/symbology/qgsmarkersymbollayer.cpp b/src/core/symbology/qgsmarkersymbollayer.cpp
@@ -1560,7 +1560,7 @@ QString QgsFilledMarkerSymbolLayer::layerType() const
 
 void QgsFilledMarkerSymbolLayer::startRender( QgsSymbolRenderContext &context )
 {
-  if ( mFill.get() )
+  if ( mFill )
   {
     mFill->startRender( context.renderContext(), context.fields() );
   }
@@ -1570,7 +1570,7 @@ void QgsFilledMarkerSymbolLayer::startRender( QgsSymbolRenderContext &context )
 
 void QgsFilledMarkerSymbolLayer::stopRender( QgsSymbolRenderContext &context )
 {
-  if ( mFill.get() )
+  if ( mFill )
   {
     mFill->stopRender( context.renderContext() );
   }

diff --git a/src/core/symbology/qgsnullsymbolrenderer.cpp b/src/core/symbology/qgsnullsymbolrenderer.cpp
@@ -68,7 +68,7 @@ void QgsNullSymbolRenderer::startRender( QgsRenderContext &context, const QgsFie
 
 void QgsNullSymbolRenderer::stopRender( QgsRenderContext &context )
 {
-  if ( mSymbol.get() )
+  if ( mSymbol )
   {
     mSymbol->stopRender( context );
   }

diff --git a/src/providers/ogr/qgsgeopackagerasterwritertask.cpp b/src/providers/ogr/qgsgeopackagerasterwritertask.cpp
@@ -30,7 +30,7 @@ QgsGeoPackageRasterWriterTask::QgsGeoPackageRasterWriterTask( const QgsMimeDataU
 void QgsGeoPackageRasterWriterTask::cancel()
 {
   mError = QgsGeoPackageRasterWriter::WriterError::ErrUserCanceled;
-  mFeedback.get()->cancel();
+  mFeedback->cancel();
 }
 
 bool QgsGeoPackageRasterWriterTask::run()