Fix issues with writing to temporary objects

nyalldawson · nyalldawson · commit 35ecdd1a98c8 · 2016-10-22T22:46:17.000+10:00
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++;
 

Original file line number	Diff line number	Diff line change
`@@ -2115,7 +2115,7 @@ void QgsVectorLayer::removeFieldAlias( int attIndex )`
`2115`	`2115`	`return;`
`2116`	`2116`
`2117`	`2117`	`QString name = fields().at( attIndex ).name();`
`2118`		`- mFields.at( attIndex ).setAlias( QString() );`
	`2118`	`+ mFields[ attIndex ].setAlias( QString() );`
`2119`	`2119`	`if ( mAttributeAliasMap.contains( name ) )`
`2120`	`2120`	`{`
`2121`	`2121`	`mAttributeAliasMap.remove( name );`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,9 @@ void QgsVectorLayerUndoCommandDeleteAttribute::undo()`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`
`414`		`- mBuffer->L->editFormConfig().setWidgetConfig( mFieldName, mOldEditorWidgetConfig );`
	`414`	`+ QgsEditFormConfig formConfig = mBuffer->L->editFormConfig();`
	`415`	`+ formConfig.setWidgetConfig( mFieldName, mOldEditorWidgetConfig );`
	`416`	`+ mBuffer->L->setEditFormConfig( formConfig );`
`415`	`417`
`416`	`418`	`emit mBuffer->attributeAdded( mFieldIndex );`
`417`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,9 @@ void QgsGrassPlugin::addFeature()`
`515`	`515`	`grassProvider->setNewFeatureType( GV_AREA );`
`516`	`516`	`formSuppress = QgsEditFormConfig::SuppressOn;`
`517`	`517`	`}`
`518`		`- vectorLayer->editFormConfig().setSuppress( formSuppress );`
	`518`	`+ QgsEditFormConfig formConfig = vectorLayer->editFormConfig();`
	`519`	`+ formConfig.setSuppress( formSuppress );`
	`520`	`+ vectorLayer->setEditFormConfig( formConfig );`
`519`	`521`	`}`
`520`	`522`
`521`	`523`	`void QgsGrassPlugin::onSplitFeaturesTriggered( bool checked )`