Skip to content

Commit ab0dccf

Browse files
m-kuhnm-kuhn
committedDec 20, 2016
Rename vl parameters to layer
·
ltr-3_40final-3_0_0
1 parent 826c440 commit ab0dccf

15 files changed

+44
-42
lines changed
 

‎python/core/fieldkit/qgskeyvaluefieldkit.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ class QgsKeyValueFieldKit : QgsFieldKit
2121
public:
2222
QgsKeyValueFieldKit();
2323
QString id() const;
24-
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
24+
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
2525
};

‎python/core/fieldkit/qgslistfieldkit.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ class QgsListFieldKit : QgsFieldKit
2424

2525
QString id() const;
2626

27-
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
27+
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
2828
};

‎python/core/fieldkit/qgsrelationreferencefieldkit.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class QgsRelationReferenceFieldKit : QgsFieldKit
2424

2525
QString id() const;
2626

27-
virtual QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
27+
virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2828

29-
virtual QVariant sortValue( QgsVectorLayer *vl, int fieldIdx, const QVariantMap&config, const QVariant& cache, const QVariant& value ) const override;
29+
virtual QVariant sortValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap&config, const QVariant& cache, const QVariant& value ) const override;
3030
};

‎python/core/fieldkit/qgsvaluemapfieldkit.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QgsValueMapFieldKit : QgsFieldKit
2323

2424
QString id() const;
2525

26-
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
26+
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
2727

28-
QVariant sortValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
28+
QVariant sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
2929
};

‎python/core/fieldkit/qgsvaluerelationfieldkit.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ class QgsValueRelationFieldKit : QgsFieldKit
3535
QgsValueRelationFieldKit();
3636

3737
QString id() const;
38-
QString representValue( QgsVectorLayer *layer, int fieldIdx, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const;
38+
QString representValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const;
3939

40-
QVariant sortValue( QgsVectorLayer *vl, int fieldIdx, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const;
40+
QVariant sortValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const;
4141

42-
QVariant createCache( QgsVectorLayer *vl, int fieldIdx, const QVariantMap &config ) const;
42+
QVariant createCache( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config ) const;
4343

4444
static ValueRelationCache createCache( const QVariantMap& config );
4545
};

‎src/core/fieldkit/qgskeyvaluefieldkit.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ QString QgsKeyValueFieldKit::id() const
2727
return QStringLiteral( "KeyValue" );
2828
}
2929

30-
QString QgsKeyValueFieldKit::representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
30+
QString QgsKeyValueFieldKit::representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
3131
{
32-
Q_UNUSED( vl );
33-
Q_UNUSED( fieldIdx );
32+
Q_UNUSED( layer );
33+
Q_UNUSED( fieldIndex );
3434
Q_UNUSED( config );
3535
Q_UNUSED( cache );
3636

‎src/core/fieldkit/qgskeyvaluefieldkit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CORE_EXPORT QgsKeyValueFieldKit : public QgsFieldKit
2424
QgsKeyValueFieldKit();
2525

2626
QString id() const override;
27-
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
27+
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2828
};
2929

3030
#endif // QGSKEYVALUEFIELDKIT_H

‎src/core/fieldkit/qgslistfieldkit.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ QString QgsListFieldKit::id() const
2727
return QStringLiteral( "List" );
2828
}
2929

30-
QString QgsListFieldKit::representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
30+
QString QgsListFieldKit::representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
3131
{
32-
Q_UNUSED( vl );
33-
Q_UNUSED( fieldIdx );
32+
Q_UNUSED( layer );
33+
Q_UNUSED( fieldIndex );
3434
Q_UNUSED( config );
3535
Q_UNUSED( cache );
3636

‎src/core/fieldkit/qgslistfieldkit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CORE_EXPORT QgsListFieldKit : public QgsFieldKit
2525

2626
QString id() const override;
2727

28-
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
28+
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2929
};
3030

3131
#endif // QGSLISTFIELDKIT_H

‎src/core/fieldkit/qgsrelationreferencefieldkit.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ QString QgsRelationReferenceFieldKit::id() const
3232
return QStringLiteral( "RelationReference" );
3333
}
3434

35-
QString QgsRelationReferenceFieldKit::representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
35+
QString QgsRelationReferenceFieldKit::representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
3636
{
3737
Q_UNUSED( cache );
3838

@@ -49,15 +49,15 @@ QString QgsRelationReferenceFieldKit::representValue( QgsVectorLayer* vl, int fi
4949
return value.toString();
5050
}
5151
QgsVectorLayer* referencingLayer = relation.referencingLayer();
52-
if ( vl != referencingLayer )
52+
if ( layer != referencingLayer )
5353
{
54-
QgsMessageLog::logMessage( "representValue() with inconsistent vl parameter w.r.t relation referencingLayer" );
54+
QgsMessageLog::logMessage( "representValue() with inconsistent layer parameter w.r.t relation referencingLayer" );
5555
return value.toString();
5656
}
5757
int referencingFieldIdx = referencingLayer->fields().lookupField( relation.fieldPairs().at( 0 ).first );
58-
if ( referencingFieldIdx != fieldIdx )
58+
if ( referencingFieldIdx != fieldIndex )
5959
{
60-
QgsMessageLog::logMessage( "representValue() with inconsistent fieldIdx parameter w.r.t relation referencingFieldIdx" );
60+
QgsMessageLog::logMessage( "representValue() with inconsistent fieldIndex parameter w.r.t relation referencingFieldIdx" );
6161
return value.toString();
6262
}
6363
QgsVectorLayer* referencedLayer = relation.referencedLayer();
@@ -68,7 +68,7 @@ QString QgsRelationReferenceFieldKit::representValue( QgsVectorLayer* vl, int fi
6868
}
6969

7070
// Attributes from the referencing layer
71-
QgsAttributes attrs = QgsAttributes( vl->fields().count() );
71+
QgsAttributes attrs = QgsAttributes( layer->fields().count() );
7272
// Set the value on the foreign key field of the referencing record
7373
attrs[ referencingFieldIdx ] = value;
7474

@@ -93,7 +93,7 @@ QString QgsRelationReferenceFieldKit::representValue( QgsVectorLayer* vl, int fi
9393
return title;
9494
}
9595

96-
QVariant QgsRelationReferenceFieldKit::sortValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
96+
QVariant QgsRelationReferenceFieldKit::sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
9797
{
98-
return representValue( vl, fieldIdx, config, cache, value );
98+
return representValue( layer, fieldIndex, config, cache, value );
9999
}

‎src/core/fieldkit/qgsrelationreferencefieldkit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class CORE_EXPORT QgsRelationReferenceFieldKit : public QgsFieldKit
2525

2626
QString id() const override;
2727

28-
virtual QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
28+
virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
2929

30-
virtual QVariant sortValue( QgsVectorLayer *vl, int fieldIdx, const QVariantMap&config, const QVariant& cache, const QVariant& value ) const override;
30+
virtual QVariant sortValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap&config, const QVariant& cache, const QVariant& value ) const override;
3131
};
3232

3333
#endif // QGSRELATIONREFERENCEFIELDKIT_H

‎src/core/fieldkit/qgsvaluemapfieldkit.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ QString QgsValueMapFieldKit::id() const
2727
return QStringLiteral( "ValueMap" );
2828
}
2929

30-
QString QgsValueMapFieldKit::representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
30+
QString QgsValueMapFieldKit::representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
3131
{
3232
Q_UNUSED( cache )
3333

@@ -37,10 +37,10 @@ QString QgsValueMapFieldKit::representValue( QgsVectorLayer* vl, int fieldIdx, c
3737
else
3838
valueInternalText = value.toString();
3939

40-
return config.key( valueInternalText, QVariant( QStringLiteral( "(%1)" ).arg( vl->fields().at( fieldIdx ).displayString( value ) ) ).toString() );
40+
return config.key( valueInternalText, QVariant( QStringLiteral( "(%1)" ).arg( layer->fields().at( fieldIndex ).displayString( value ) ) ).toString() );
4141
}
4242

43-
QVariant QgsValueMapFieldKit::sortValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
43+
QVariant QgsValueMapFieldKit::sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
4444
{
45-
return representValue( vl, fieldIdx, config, cache, value );
45+
return representValue( layer, fieldIndex, config, cache, value );
4646
}

‎src/core/fieldkit/qgsvaluemapfieldkit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class CORE_EXPORT QgsValueMapFieldKit : public QgsFieldKit
2727

2828
QString id() const override;
2929

30-
QString representValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
30+
QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
3131

32-
QVariant sortValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
32+
QVariant sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
3333
};
3434

3535
#endif // QGSVALUEMAPFIELDKIT_H

‎src/core/fieldkit/qgsvaluerelationfieldkit.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ QString QgsValueRelationFieldKit::id() const
4242
return QStringLiteral( "ValueRelation" );
4343
}
4444

45-
QString QgsValueRelationFieldKit::representValue( QgsVectorLayer* layer, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
45+
QString QgsValueRelationFieldKit::representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
4646
{
4747
Q_UNUSED( layer )
48-
Q_UNUSED( fieldIdx )
48+
Q_UNUSED( fieldIndex )
4949

5050
QHash<QString, QString> vrCache;
5151

@@ -55,7 +55,7 @@ QString QgsValueRelationFieldKit::representValue( QgsVectorLayer* layer, int fie
5555
}
5656
else
5757
{
58-
vrCache = createCache( layer, fieldIdx, config ).value<QHash<QString, QString>>();
58+
vrCache = createCache( layer, fieldIndex, config ).value<QHash<QString, QString>>();
5959
}
6060

6161
if ( config.value( QStringLiteral( "AllowMulti" ) ).toBool() )
@@ -90,13 +90,15 @@ QString QgsValueRelationFieldKit::representValue( QgsVectorLayer* layer, int fie
9090
return QStringLiteral( "(%1)" ).arg( value.toString() );
9191
}
9292

93-
QVariant QgsValueRelationFieldKit::sortValue( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
93+
QVariant QgsValueRelationFieldKit::sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const
9494
{
95-
return representValue( vl, fieldIdx, config, cache, value );
95+
return representValue( layer, fieldIndex, config, cache, value );
9696
}
9797

98-
QVariant QgsValueRelationFieldKit::createCache( QgsVectorLayer* vl, int fieldIdx, const QVariantMap& config ) const
98+
QVariant QgsValueRelationFieldKit::createCache( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config ) const
9999
{
100+
Q_UNUSED( layer )
101+
Q_UNUSED( fieldIndex )
100102
return QVariant::fromValue<ValueRelationCache>( createCache( config ) );
101103

102104
}

‎src/core/fieldkit/qgsvaluerelationfieldkit.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ class CORE_EXPORT QgsValueRelationFieldKit : public QgsFieldKit
4343
QgsValueRelationFieldKit();
4444

4545
QString id() const override;
46-
QString representValue( QgsVectorLayer *layer, int fieldIdx, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const override;
46+
QString representValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const override;
4747

48-
QVariant sortValue( QgsVectorLayer *vl, int fieldIdx, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const override;
48+
QVariant sortValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const override;
4949

50-
QVariant createCache( QgsVectorLayer *vl, int fieldIdx, const QVariantMap &config ) const override;
50+
QVariant createCache( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config ) const override;
5151

5252
static ValueRelationCache createCache( const QVariantMap& config );
5353
};

0 commit comments

Comments
 (0)
Please sign in to comment.