Replace another expresion with createFieldEqualityExpression, remove …

…unused variables
qgis · Jul 6, 2017 · 29c4fcf · 29c4fcf
1 parent 963e25e
commit 29c4fcf
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/core/qgsrelation.cpp b/src/core/qgsrelation.cpp
@@ -168,8 +168,6 @@ QString QgsRelation::getRelatedFeaturesFilter( const QgsFeature &feature ) const
 
   Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, mFieldPairs )
   {
-    int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );
-    QgsField referencingField = referencingLayer()->fields().at( referencingIdx );
     QVariant val( feature.attribute( fieldPair.referencedField() ) );
     conditions << QgsExpression::createFieldEqualityExpression( fieldPair.referencingField(), val );
   }
@@ -183,12 +181,8 @@ QgsFeatureRequest QgsRelation::getReferencedFeatureRequest( const QgsAttributes
 
   Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, mFieldPairs )
   {
-    int referencedIdx = referencedLayer()->fields().indexFromName( fieldPair.referencedField() );
     int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() );
-
-    QgsField referencedField = referencedLayer()->fields().at( referencedIdx );
-
-    conditions << QStringLiteral( "%1 = %2" ).arg( QgsExpression::quotedColumnRef( fieldPair.referencedField() ), QgsExpression::quotedValue( attributes.at( referencingIdx ) ) );
+    conditions << QgsExpression::createFieldEqualityExpression( fieldPair.referencedField(), attributes.at( referencingIdx ) );
   }
 
   QgsFeatureRequest myRequest;