Fix issues with writing to temporary objects

qgis · Oct 22, 2016 · 35ecdd1 · 35ecdd1
1 parent a3968a2
commit 35ecdd1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2115,7 +2115,7 @@ void QgsVectorLayer::removeFieldAlias( int attIndex )
     return;
 
   QString name = fields().at( attIndex ).name();
-  mFields.at( attIndex ).setAlias( QString() );
+  mFields[ attIndex ].setAlias( QString() );
   if ( mAttributeAliasMap.contains( name ) )
   {
     mAttributeAliasMap.remove( name );

diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp
@@ -411,7 +411,9 @@ void QgsVectorLayerUndoCommandDeleteAttribute::undo()
     }
   }
 
-  mBuffer->L->editFormConfig().setWidgetConfig( mFieldName, mOldEditorWidgetConfig );
+  QgsEditFormConfig formConfig = mBuffer->L->editFormConfig();
+  formConfig.setWidgetConfig( mFieldName, mOldEditorWidgetConfig );
+  mBuffer->L->setEditFormConfig( formConfig );
 
   emit mBuffer->attributeAdded( mFieldIndex );
 }

diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -515,7 +515,9 @@ void QgsGrassPlugin::addFeature()
     grassProvider->setNewFeatureType( GV_AREA );
     formSuppress = QgsEditFormConfig::SuppressOn;
   }
-  vectorLayer->editFormConfig().setSuppress( formSuppress );
+  QgsEditFormConfig formConfig = vectorLayer->editFormConfig();
+  formConfig.setSuppress( formSuppress );
+  vectorLayer->setEditFormConfig( formConfig );
 }
 
 void QgsGrassPlugin::onSplitFeaturesTriggered( bool checked )

diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -1128,8 +1128,10 @@ void QgsGrassProvider::startEditing( QgsVectorLayer *vectorLayer )
 
   // TODO: enable cats editing once all consequences are implemented
   // disable cat and topo symbol editing
-  vectorLayer->editFormConfig().setReadOnly( mLayer->keyColumn(), true );
-  vectorLayer->editFormConfig().setReadOnly( mLayer->fields().size() - 1, true );
+  QgsEditFormConfig formConfig = vectorLayer->editFormConfig();
+  formConfig.setReadOnly( mLayer->keyColumn(), true );
+  formConfig.setReadOnly( mLayer->fields().size() - 1, true );
+  vectorLayer->setEditFormConfig( formConfig );
 
   mEditedCount++;