Misc clazy fixes

qgis · Sep 25, 2017 · f952e6a · f952e6a
1 parent 6c74502
commit f952e6a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h
@@ -162,7 +162,7 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
      * \note This property is only used for image exports.
      * \since QGIS 3.0
      */
-    void setFileFormat( QString format ) { mFileFormat = format; }
+    void setFileFormat( const QString &format ) { mFileFormat = format; }
 
     bool sortFeatures() const { return mSortFeatures; }
     void setSortFeatures( bool doSort ) { mSortFeatures = doSort; }

diff --git a/src/core/gps/qgsgpsdetector.cpp b/src/core/gps/qgsgpsdetector.cpp
@@ -190,7 +190,7 @@ void QgsGPSDetector::advance()
   connect( mConn, &QObject::destroyed, this, &QgsGPSDetector::connDestroyed );
 
   // leave 2s to pickup a valid string
-  QTimer::singleShot( 2000, this, SLOT( advance() ) );
+  QTimer::singleShot( 2000, this, &QgsGPSDetector::advance );
 }
 
 void QgsGPSDetector::detected( const QgsGPSInformation &info )

diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h
@@ -184,7 +184,7 @@ class CORE_EXPORT QgsRenderContext
      * Will be used to convert meter distances to active MapUnit values for QgsUnitTypes::RenderMetersInMapUnits
      * \since QGIS 3.0
      */
-    void setDistanceArea( const QgsDistanceArea distanceArea ) {mDistanceArea = distanceArea ;}
+    void setDistanceArea( const QgsDistanceArea &distanceArea ) {mDistanceArea = distanceArea ;}
 
     /**
      * Sets the scaling factor for the render to convert painter units

diff --git a/src/core/qgsvectorlayereditpassthrough.cpp b/src/core/qgsvectorlayereditpassthrough.cpp
@@ -45,7 +45,8 @@ bool QgsVectorLayerEditPassthrough::addFeature( QgsFeature &f )
   if ( !modify( cmd ) ) // modify takes owneship -> no need for cmd to be a smart ptr
     return false;
 
-  f = cmd->features().last();
+  const QgsFeatureList features = cmd->features();
+  f = features.at( features.count() - 1 );
   return true;
 }
 

diff --git a/src/core/symbology/qgsinvertedpolygonrenderer.cpp b/src/core/symbology/qgsinvertedpolygonrenderer.cpp
@@ -89,7 +89,7 @@ void QgsInvertedPolygonRenderer::checkLegendSymbolItem( const QString &key, bool
   if ( !mSubRenderer )
     return;
 
-  return mSubRenderer->checkLegendSymbolItem( key, state );
+  mSubRenderer->checkLegendSymbolItem( key, state );
 }
 
 void QgsInvertedPolygonRenderer::startRender( QgsRenderContext &context, const QgsFields &fields )

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -2193,7 +2193,7 @@ void QgsMapCanvas::schedulePreviewJob( int number )
   mPreviewTimer.setSingleShot( true );
   mPreviewTimer.setInterval( 250 );
   disconnect( mPreviewTimerConnection );
-  mPreviewTimerConnection = connect( &mPreviewTimer, &QTimer::timeout, [ = ]()
+  mPreviewTimerConnection = connect( &mPreviewTimer, &QTimer::timeout, this, [ = ]()
   {
     startPreviewJob( number );
   }

diff --git a/src/gui/qgsmetadatawidget.cpp b/src/gui/qgsmetadatawidget.cpp
@@ -515,7 +515,7 @@ bool QgsMetadataWidget::checkMetadata() const
   if ( results == false )
   {
     errors = QStringLiteral();
-    for ( const QgsMetadataValidator::ValidationResult &result : validationResults )
+    for ( const QgsMetadataValidator::ValidationResult &result : qgsAsConst( validationResults ) )
     {
       errors += QLatin1String( "<b>" ) % result.section;
       if ( ! result.identifier.isNull() )

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2472,7 +2472,7 @@ bool QgsPostgresProvider::deleteAttributes( const QgsAttributeIds &ids )
     QList<int> idsList = ids.values();
     std::sort( idsList.begin(), idsList.end(), std::greater<int>() );
 
-    for ( QList<int>::const_iterator iter = idsList.begin(); iter != idsList.end(); ++iter )
+    for ( auto iter = idsList.constBegin(); iter != idsList.constEnd(); ++iter )
     {
       int index = *iter;
       if ( index < 0 || index >= mAttributeFields.count() )