Add some const

qgis · Aug 24, 2017 · 500348eec38462a249a18bce7432066032f34b3a · 500348e
1 parent 64aa405
commit 500348eec38462a249a18bce7432066032f34b3a
Unified Split

Showing with 10 additions and 10 deletions.

+1 −1 src/app/qgsvectorlayerproperties.cpp

+2 −2 src/core/qgsvectorlayer.cpp

+1 −1 src/core/qgsvectorlayercache.cpp

+6 −6 src/gui/qgsattributeform.cpp
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1435,4 +1435,4 @@ void QgsVectorLayerProperties::updateFieldsPropertiesDialog()
 void QgsVectorLayerProperties::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html" ) );
-}
+}
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2274,7 +2274,7 @@ bool QgsVectorLayer::changeAttributeValue( QgsFeatureId fid, int field, const QV
       if ( !feature.isValid() )
         return false;
 
-      QgsFeature joinFeature = mJoinBuffer->joinedFeatureOf( info, feature );
+      const QgsFeature joinFeature = mJoinBuffer->joinedFeatureOf( info, feature );
 
       if ( joinFeature.isValid() )
         return info->joinLayer()->changeAttributeValue( joinFeature.id(), srcFieldIndex, newValue, oldValue );
@@ -2486,7 +2486,7 @@ bool QgsVectorLayer::deleteFeaturesFromJoinedLayers( QgsFeatureIds fids )
     {
       if ( info.isEditable() && info.hasCascadedDelete() )
       {
-        QgsFeature joinFeature = mJoinBuffer->joinedFeatureOf( &info, getFeature( fid ) );
+        const QgsFeature joinFeature = mJoinBuffer->joinedFeatureOf( &info, getFeature( fid ) );
         if ( joinFeature.isValid() )
           info.joinLayer()->deleteFeature( joinFeature.id() );
       }

diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp
@@ -244,7 +244,7 @@ void QgsVectorLayerCache::onJoinAttributeValueChanged( QgsFeatureId fid, int fie
   {
     if ( joinLayer == info.joinLayer() )
     {
-      QgsFeature feature = mLayer->joinBuffer()->targetedFeatureOf( &info, joinLayer->getFeature( fid ) );
+      const QgsFeature feature = mLayer->joinBuffer()->targetedFeatureOf( &info, joinLayer->getFeature( fid ) );
 
       const QString fieldName = info.prefixedFieldName( joinLayer->fields().field( field ) );
       const int fieldIndex = mLayer->fields().indexFromName( fieldName );

diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -2070,20 +2070,20 @@ void QgsAttributeForm::updateIcon( QgsEditorWidgetWrapper *eww )
 
       if ( !info->isEditable() )
       {
-        QString file = QStringLiteral( "/mIconJoinNotEditable.svg" );
-        QString tooltip = tr( "Join settings do not allow editing" );
+        const QString file = QStringLiteral( "/mIconJoinNotEditable.svg" );
+        const QString tooltip = tr( "Join settings do not allow editing" );
         reloadIcon( file, tooltip, mIconMap[eww->widget()] );
       }
       else if ( mMode == QgsAttributeForm::AddFeatureMode && !info->hasUpsertOnEdit() )
       {
-        QString file = QStringLiteral( "mIconJoinHasNotUpsertOnEdit.svg" );
-        QString tooltip = tr( "Join settings do not allow upsert on edit" );
+        const QString file = QStringLiteral( "mIconJoinHasNotUpsertOnEdit.svg" );
+        const QString tooltip = tr( "Join settings do not allow upsert on edit" );
         reloadIcon( file, tooltip, mIconMap[eww->widget()] );
       }
       else if ( !info->joinLayer()->isEditable() )
       {
-        QString file = QStringLiteral( "/mIconJoinedLayerNotEditable.svg" );
-        QString tooltip = tr( "Joined layer is not toggled editable" );
+        const QString file = QStringLiteral( "/mIconJoinedLayerNotEditable.svg" );
+        const QString tooltip = tr( "Joined layer is not toggled editable" );
         reloadIcon( file, tooltip, mIconMap[eww->widget()] );
       }
     }