@@ -323,7 +323,7 @@ void QgsFieldsProperties::setRow( int row, int idx, const QgsField& field )
323
323
324
324
FieldConfig cfg ( mLayer , idx );
325
325
QPushButton *pb;
326
- pb = new QPushButton ( QgsEditorWidgetRegistry::instance ()->name ( cfg.mEditorWidgetV2Type ) );
326
+ pb = new QPushButton ( QgsEditorWidgetRegistry::instance ()->name ( cfg.mEditorWidgetType ) );
327
327
cfg.mButton = pb;
328
328
mFieldsList ->setCellWidget ( row, attrEditTypeCol, pb );
329
329
@@ -545,8 +545,8 @@ void QgsFieldsProperties::attributeTypeDialog()
545
545
attributeTypeDialog.setExpression ( cfg.mConstraint );
546
546
attributeTypeDialog.setExpressionDescription ( cfg.mConstraintDescription );
547
547
548
- attributeTypeDialog.setWidgetV2Config ( cfg.mEditorWidgetV2Config );
549
- attributeTypeDialog.setWidgetV2Type ( cfg.mEditorWidgetV2Type );
548
+ attributeTypeDialog.setWidgetConfig ( cfg.mEditorWidgetConfig );
549
+ attributeTypeDialog.setWidgetType ( cfg.mEditorWidgetType );
550
550
551
551
if ( !attributeTypeDialog.exec () )
552
552
return ;
@@ -557,8 +557,8 @@ void QgsFieldsProperties::attributeTypeDialog()
557
557
cfg.mConstraintDescription = attributeTypeDialog.expressionDescription ();
558
558
cfg.mConstraint = attributeTypeDialog.expression ();
559
559
560
- cfg.mEditorWidgetV2Type = attributeTypeDialog.editorWidgetType ();
561
- cfg.mEditorWidgetV2Config = attributeTypeDialog.editorWidgetConfig ();
560
+ cfg.mEditorWidgetType = attributeTypeDialog.editorWidgetType ();
561
+ cfg.mEditorWidgetConfig = attributeTypeDialog.editorWidgetConfig ();
562
562
563
563
pb->setText ( attributeTypeDialog.editorWidgetText () );
564
564
@@ -932,8 +932,8 @@ void QgsFieldsProperties::apply()
932
932
mLayer ->editFormConfig ()->setExpressionDescription ( i, cfg.mConstraintDescription );
933
933
mLayer ->editFormConfig ()->setExpression ( i, cfg.mConstraint );
934
934
935
- mLayer ->editFormConfig ()->setWidgetType ( idx, cfg.mEditorWidgetV2Type );
936
- mLayer ->editFormConfig ()->setWidgetConfig ( idx, cfg.mEditorWidgetV2Config );
935
+ mLayer ->editFormConfig ()->setWidgetType ( idx, cfg.mEditorWidgetType );
936
+ mLayer ->editFormConfig ()->setWidgetConfig ( idx, cfg.mEditorWidgetConfig );
937
937
938
938
if ( mFieldsList ->item ( i, attrWMSCol )->checkState () == Qt::Unchecked )
939
939
{
@@ -1013,9 +1013,8 @@ QgsFieldsProperties::FieldConfig::FieldConfig( QgsVectorLayer* layer, int idx )
1013
1013
mNotNull = layer->editFormConfig ()->notNull ( idx );
1014
1014
mConstraint = layer->editFormConfig ()->expression ( idx );
1015
1015
mConstraintDescription = layer->editFormConfig ()->expressionDescription ( idx );
1016
- mEditorWidgetV2Type = layer->editFormConfig ()->widgetType ( idx );
1017
- mEditorWidgetV2Config = layer->editFormConfig ()->widgetConfig ( idx );
1018
-
1016
+ mEditorWidgetType = layer->editFormConfig ()->widgetType ( idx );
1017
+ mEditorWidgetConfig = layer->editFormConfig ()->widgetConfig ( idx );
1019
1018
}
1020
1019
1021
1020
/*
0 commit comments