Skip to content

Commit 02b3865

Browse files
committed
Code formatting
1 parent c8495ea commit 02b3865

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

src/app/qgsattributesformproperties.cpp

+31-26
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ QgsAttributesFormProperties::QgsAttributesFormProperties( QgsVectorLayer *layer,
1111
if ( !layer )
1212
return;
1313

14-
setupUi(this);
14+
setupUi( this );
1515

1616
// drag tree (not mixup with drag queen)
1717
QGridLayout *mDragListWidgetLayout = new QGridLayout;
1818
mDragTree = new DnDTree( mLayer, mDragListWidget );
1919
mDragListWidgetLayout->addWidget( mDragTree );
20-
mDragListWidget->setLayout(mDragListWidgetLayout);
20+
mDragListWidget->setLayout( mDragListWidgetLayout );
2121
mDragTree->setHeaderLabels( QStringList() << tr( "Label" ) );
2222
mDragTree->type = DnDTree::Type::Drag;
2323

2424
// drop tree
2525
QGridLayout *mDropListWidgetLayout = new QGridLayout;
2626
mDropTree = new DnDTree( mLayer, mDropListWidget );
2727
mDropListWidgetLayout->addWidget( mDropTree );
28-
mDropListWidgetLayout->setMargin(0);
29-
mDropListWidget->setLayout(mDropListWidgetLayout);
28+
mDropListWidgetLayout->setMargin( 0 );
29+
mDropListWidget->setLayout( mDropListWidgetLayout );
3030
mDropTree->setHeaderLabels( QStringList() << tr( "Label" ) );
3131
mDropTree->type = DnDTree::Type::Drop;
3232

@@ -51,8 +51,8 @@ QgsAttributesFormProperties::~QgsAttributesFormProperties()
5151

5252
void QgsAttributesFormProperties::init()
5353
{
54-
loadAttributeEditorTree(mDragTree);
55-
loadAttributeEditorTree(mDropTree);
54+
loadAttributeEditorTree( mDragTree );
55+
loadAttributeEditorTree( mDropTree );
5656
loadAttributeTypeDialog();
5757
}
5858

@@ -63,27 +63,27 @@ void QgsAttributesFormProperties::loadAttributeTypeDialog()
6363

6464
FieldConfig cfg;
6565

66-
int index = mDragTree->mIndexedWidgets.indexOf(mDragTree->currentItem());
66+
int index = mDragTree->mIndexedWidgets.indexOf( mDragTree->currentItem() );
6767

68-
if( index<0 ) index=0;
68+
if ( index < 0 ) index = 0;
6969

7070
Q_FOREACH ( QTreeWidgetItem *wdg, mDragTree->mIndexedWidgets )
7171
{
72-
if ( mDragTree->invisibleRootItem()->indexOfChild(wdg) == index)
72+
if ( mDragTree->invisibleRootItem()->indexOfChild( wdg ) == index )
7373
{
74-
cfg = wdg->data(0, FieldConfigRole ).value<FieldConfig>();
74+
cfg = wdg->data( 0, FieldConfigRole ).value<FieldConfig>();
7575
}
7676
}
7777

7878
// AttributeTypeDialog
7979

80-
mAttributeTypeFrame->layout()->removeWidget(mAttributeTypeDialog );
80+
mAttributeTypeFrame->layout()->removeWidget( mAttributeTypeDialog );
8181
delete mAttributeTypeDialog;
8282

8383
//
8484
mAttributeTypeDialog = new QgsAttributeTypeDialog( mLayer, index, mAttributeTypeFrame );
8585

86-
mAttributeTypeDialog->setFieldEditable( cfg.mEditable );
86+
mAttributeTypeDialog->setFieldEditable( cfg.mEditable );
8787
mAttributeTypeDialog->setLabelOnTop( cfg.mLabelOnTop );
8888
mAttributeTypeDialog->setNotNull( cfg.mConstraints & QgsFieldConstraints::ConstraintNotNull );
8989
mAttributeTypeDialog->setNotNullEnforced( cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintNotNull, QgsFieldConstraints::ConstraintStrengthHard ) == QgsFieldConstraints::ConstraintStrengthHard );
@@ -112,7 +112,7 @@ void QgsAttributesFormProperties::loadAttributeTypeDialog()
112112
mAttributeTypeFrame->setLayout( new QVBoxLayout( mAttributeTypeFrame ) );
113113
mAttributeTypeFrame->layout()->setMargin( 0 );
114114

115-
mAttributeTypeFrame->layout()->addWidget(mAttributeTypeDialog );
115+
mAttributeTypeFrame->layout()->addWidget( mAttributeTypeDialog );
116116
}
117117

118118

@@ -148,7 +148,7 @@ void QgsAttributesFormProperties::storeAttributeTypeDialog()
148148

149149
cfg.mConstraintDescription = mAttributeTypeDialog->constraintExpressionDescription();
150150
cfg.mConstraint = mAttributeTypeDialog->constraintExpression();
151-
mLayer->setDefaultValueExpression( mAttributeTypeDialog->fieldIdx() , mAttributeTypeDialog->defaultValueExpression() );
151+
mLayer->setDefaultValueExpression( mAttributeTypeDialog->fieldIdx(), mAttributeTypeDialog->defaultValueExpression() );
152152

153153
cfg.mEditorWidgetType = mAttributeTypeDialog->editorWidgetType();
154154
cfg.mEditorWidgetConfig = mAttributeTypeDialog->editorWidgetConfig();
@@ -162,9 +162,9 @@ void QgsAttributesFormProperties::storeAttributeTypeDialog()
162162

163163
Q_FOREACH ( QTreeWidgetItem *wdg, mDragTree->mIndexedWidgets )
164164
{
165-
if ( mDragTree->invisibleRootItem()->indexOfChild(wdg) == mAttributeTypeDialog->fieldIdx() )
165+
if ( mDragTree->invisibleRootItem()->indexOfChild( wdg ) == mAttributeTypeDialog->fieldIdx() )
166166
{
167-
wdg->setData(0, FieldConfigRole, QVariant::fromValue<FieldConfig>( cfg ) );
167+
wdg->setData( 0, FieldConfigRole, QVariant::fromValue<FieldConfig>( cfg ) );
168168
}
169169
}
170170
}
@@ -173,7 +173,7 @@ QgsAttributesFormProperties::FieldConfig QgsAttributesFormProperties::configForC
173173
{
174174
Q_FOREACH ( QTreeWidgetItem *wdg, mDragTree->mIndexedWidgets )
175175
{
176-
if ( mDragTree->invisibleRootItem()->indexOfChild(wdg) == index )
176+
if ( mDragTree->invisibleRootItem()->indexOfChild( wdg ) == index )
177177
{
178178
return wdg->data( 0, FieldConfigRole ).value<FieldConfig>();
179179
}
@@ -185,7 +185,7 @@ QgsAttributesFormProperties::FieldConfig QgsAttributesFormProperties::configForC
185185
}
186186

187187

188-
QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAttributeEditorElement *const widgetDef, QTreeWidgetItem *parent, DnDTree* mTree)
188+
QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAttributeEditorElement *const widgetDef, QTreeWidgetItem *parent, DnDTree *mTree )
189189
{
190190
QTreeWidgetItem *newWidget = nullptr;
191191
switch ( widgetDef->type() )
@@ -242,9 +242,10 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
242242

243243

244244

245-
void QgsAttributesFormProperties::loadAttributeEditorTree(DnDTree* mTree)
245+
void QgsAttributesFormProperties::loadAttributeEditorTree( DnDTree *mTree )
246246
{
247-
if( mTree->type==DnDTree::Type::Drop ){
247+
if ( mTree->type == DnDTree::Type::Drop )
248+
{
248249
// tabs and groups info
249250
mTree->clear();
250251
mTree->setSortingEnabled( false );
@@ -255,10 +256,12 @@ void QgsAttributesFormProperties::loadAttributeEditorTree(DnDTree* mTree)
255256

256257
Q_FOREACH ( QgsAttributeEditorElement *wdg, mLayer->editFormConfig().tabs() )
257258
{
258-
loadAttributeEditorTreeItem( wdg, mTree->invisibleRootItem(), mTree);
259+
loadAttributeEditorTreeItem( wdg, mTree->invisibleRootItem(), mTree );
259260
}
260261

261-
}else{
262+
}
263+
else
264+
{
262265
mTree->clear();
263266
mTree->setSortingEnabled( false );
264267
mTree->setSelectionBehavior( QAbstractItemView::SelectRows );
@@ -269,14 +272,16 @@ void QgsAttributesFormProperties::loadAttributeEditorTree(DnDTree* mTree)
269272
mTree->mIndexedWidgets.clear();
270273

271274
const QgsFields &fields = mLayer->fields();
272-
for ( int i = 0; i < fields.count(); ++i ){
273-
DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Field, fields.at( i ).name());
275+
for ( int i = 0; i < fields.size(); ++i )
276+
{
277+
DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Field, fields.at( i ).name() );
274278
itemData.setShowLabel( true );
275279

276280
FieldConfig cfg( mLayer, i );
277281
QgsGui::editorWidgetRegistry()->name( cfg.mEditorWidgetType );
278282

279-
itemData.setData(0, FieldConfigRole, QVariant::fromValue<FieldConfig>( cfg ) );
283+
284+
itemData.setData( 0, FieldConfigRole, QVariant::fromValue<FieldConfig>( cfg ) );
280285

281286
mTree->mIndexedWidgets.insert( i, mTree->addItem( mTree->invisibleRootItem(), itemData ) );
282287
}
@@ -401,7 +406,7 @@ void QgsAttributesFormProperties::apply()
401406

402407
for ( QTreeWidgetItemIterator it( mDragTree ); *it; ++it )
403408
{
404-
int idx = mDragTree->invisibleRootItem()->indexOfChild((*it));
409+
int idx = mDragTree->invisibleRootItem()->indexOfChild( ( *it ) );
405410
QString name = mLayer->fields().at( idx ).name();
406411
FieldConfig cfg = configForChild( idx );
407412

0 commit comments

Comments
 (0)