Skip to content

Commit f2d6209

Browse files
committed
rename QgsAttributeTypeDialog::setWidgetV2Config & QgsAttributeTypeDialog::setWidgetV2Type
1 parent 6306fb8 commit f2d6209

6 files changed

+23
-24
lines changed

src/app/qgsattributetypedialog.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ const QgsEditorWidgetConfig QgsAttributeTypeDialog::editorWidgetConfig()
125125
return QgsEditorWidgetConfig();
126126
}
127127

128-
void QgsAttributeTypeDialog::setWidgetV2Type( const QString& type )
128+
void QgsAttributeTypeDialog::setWidgetType( const QString& type )
129129
{
130130
for ( int i = 0; i < selectionListWidget->count(); i++ )
131131
{
@@ -147,7 +147,7 @@ void QgsAttributeTypeDialog::setWidgetV2Type( const QString& type )
147147

148148
if ( cfgWdg )
149149
{
150-
cfgWdg->setConfig( mWidgetV2Config );
150+
cfgWdg->setConfig( mWidgetConfig );
151151

152152
stackedWidget->addWidget( cfgWdg );
153153
stackedWidget->setCurrentWidget( cfgWdg );
@@ -160,9 +160,9 @@ void QgsAttributeTypeDialog::setWidgetV2Type( const QString& type )
160160
}
161161
}
162162

163-
void QgsAttributeTypeDialog::setWidgetV2Config( const QgsEditorWidgetConfig& config )
163+
void QgsAttributeTypeDialog::setWidgetConfig( const QgsEditorWidgetConfig& config )
164164
{
165-
mWidgetV2Config = config;
165+
mWidgetConfig = config;
166166
}
167167

168168
bool QgsAttributeTypeDialog::fieldEditable() const
@@ -219,5 +219,5 @@ void QgsAttributeTypeDialog::on_selectionListWidget_currentRowChanged( int index
219219
{
220220
const QString editType = selectionListWidget->item( index )->data( Qt::UserRole ).toString();
221221

222-
setWidgetV2Type( editType );
222+
setWidgetType( editType );
223223
}

src/app/qgsattributetypedialog.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttribut
4141

4242
const QString editorWidgetText();
4343

44-
void setWidgetV2Type( const QString& type );
44+
void setWidgetType( const QString& type );
4545

4646
const QgsEditorWidgetConfig editorWidgetConfig();
4747

48-
void setWidgetV2Config( const QgsEditorWidgetConfig& config );
48+
void setWidgetConfig( const QgsEditorWidgetConfig& config );
4949

5050
/**
5151
* Setter for checkbox to label on top
@@ -115,7 +115,7 @@ class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttribut
115115
QgsVectorLayer *mLayer;
116116
int mFieldIdx;
117117

118-
QgsEditorWidgetConfig mWidgetV2Config;
118+
QgsEditorWidgetConfig mWidgetConfig;
119119

120120
//! Cached configuration dialog (lazy loaded)
121121
QMap< QString, QgsEditorConfigWidget* > mEditorConfigWidgets;

src/app/qgsfieldsproperties.cpp

+9-10
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ void QgsFieldsProperties::setRow( int row, int idx, const QgsField& field )
323323

324324
FieldConfig cfg( mLayer, idx );
325325
QPushButton *pb;
326-
pb = new QPushButton( QgsEditorWidgetRegistry::instance()->name( cfg.mEditorWidgetV2Type ) );
326+
pb = new QPushButton( QgsEditorWidgetRegistry::instance()->name( cfg.mEditorWidgetType ) );
327327
cfg.mButton = pb;
328328
mFieldsList->setCellWidget( row, attrEditTypeCol, pb );
329329

@@ -545,8 +545,8 @@ void QgsFieldsProperties::attributeTypeDialog()
545545
attributeTypeDialog.setExpression( cfg.mConstraint );
546546
attributeTypeDialog.setExpressionDescription( cfg.mConstraintDescription );
547547

548-
attributeTypeDialog.setWidgetV2Config( cfg.mEditorWidgetV2Config );
549-
attributeTypeDialog.setWidgetV2Type( cfg.mEditorWidgetV2Type );
548+
attributeTypeDialog.setWidgetConfig( cfg.mEditorWidgetConfig );
549+
attributeTypeDialog.setWidgetType( cfg.mEditorWidgetType );
550550

551551
if ( !attributeTypeDialog.exec() )
552552
return;
@@ -557,8 +557,8 @@ void QgsFieldsProperties::attributeTypeDialog()
557557
cfg.mConstraintDescription = attributeTypeDialog.expressionDescription();
558558
cfg.mConstraint = attributeTypeDialog.expression();
559559

560-
cfg.mEditorWidgetV2Type = attributeTypeDialog.editorWidgetType();
561-
cfg.mEditorWidgetV2Config = attributeTypeDialog.editorWidgetConfig();
560+
cfg.mEditorWidgetType = attributeTypeDialog.editorWidgetType();
561+
cfg.mEditorWidgetConfig = attributeTypeDialog.editorWidgetConfig();
562562

563563
pb->setText( attributeTypeDialog.editorWidgetText() );
564564

@@ -932,8 +932,8 @@ void QgsFieldsProperties::apply()
932932
mLayer->editFormConfig()->setExpressionDescription( i, cfg.mConstraintDescription );
933933
mLayer->editFormConfig()->setExpression( i, cfg.mConstraint );
934934

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 );
937937

938938
if ( mFieldsList->item( i, attrWMSCol )->checkState() == Qt::Unchecked )
939939
{
@@ -1013,9 +1013,8 @@ QgsFieldsProperties::FieldConfig::FieldConfig( QgsVectorLayer* layer, int idx )
10131013
mNotNull = layer->editFormConfig()->notNull( idx );
10141014
mConstraint = layer->editFormConfig()->expression( idx );
10151015
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 );
10191018
}
10201019

10211020
/*

src/app/qgsfieldsproperties.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope
102102
QString mConstraint;
103103
QString mConstraintDescription;
104104
QPushButton* mButton;
105-
QString mEditorWidgetV2Type;
106-
QMap<QString, QVariant> mEditorWidgetV2Config;
105+
QString mEditorWidgetType;
106+
QMap<QString, QVariant> mEditorWidgetConfig;
107107
};
108108

109109
public:

src/core/qgseditformconfig.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ QString QgsEditFormConfig::widgetType( int fieldIdx ) const
3030
if ( fieldIdx < 0 || fieldIdx >= mFields.count() )
3131
return "TextEdit";
3232

33-
return mEditorWidgetV2Types.value( mFields.at( fieldIdx ).name(), "TextEdit" );
33+
return mEditorWidgetTypes.value( mFields.at( fieldIdx ).name(), "TextEdit" );
3434
}
3535

3636
QString QgsEditFormConfig::widgetType( const QString& fieldName ) const
3737
{
38-
return mEditorWidgetV2Types.value( fieldName, "TextEdit" );
38+
return mEditorWidgetTypes.value( fieldName, "TextEdit" );
3939
}
4040

4141
QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( int fieldIdx ) const
@@ -59,7 +59,7 @@ void QgsEditFormConfig::setFields( const QgsFields& fields )
5959
void QgsEditFormConfig::setWidgetType( int attrIdx, const QString& widgetType )
6060
{
6161
if ( attrIdx >= 0 && attrIdx < mFields.count() )
62-
mEditorWidgetV2Types[ mFields.at( attrIdx ).name()] = widgetType;
62+
mEditorWidgetTypes[ mFields.at( attrIdx ).name()] = widgetType;
6363
}
6464

6565
void QgsEditFormConfig::setWidgetConfig( int attrIdx, const QgsEditorWidgetConfig& config )

src/core/qgseditformconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ class CORE_EXPORT QgsEditFormConfig : public QObject
685685
QMap< QString, bool> mLabelOnTop;
686686
QMap< QString, bool> mNotNull;
687687

688-
QMap<QString, QString> mEditorWidgetV2Types;
688+
QMap<QString, QString> mEditorWidgetTypes;
689689
QMap<QString, QgsEditorWidgetConfig > mWidgetConfigs;
690690

691691
/** Defines the default layout to use for the attribute editor (Drag and drop, UI File, Generated) */

0 commit comments

Comments
 (0)