From 3e2d9c544554ab21987dcd0c77b4cb918c92d309 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Sun, 2 Jul 2017 16:58:54 +0200 Subject: [PATCH] Add consistency between ptrs and ref --- python/core/qgsvectorlayerjoinbuffer.sip | 2 +- src/core/qgsvectorlayerjoinbuffer.cpp | 10 +++++----- src/core/qgsvectorlayerjoinbuffer.h | 2 +- src/gui/qgsattributeform.cpp | 6 +++--- src/gui/qgsattributeform.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/python/core/qgsvectorlayerjoinbuffer.sip b/python/core/qgsvectorlayerjoinbuffer.sip index 0b4ac37d86d..bae1a284915 100644 --- a/python/core/qgsvectorlayerjoinbuffer.sip +++ b/python/core/qgsvectorlayerjoinbuffer.sip @@ -108,7 +108,7 @@ Quick way to test if there is any join at all :rtype: list of const QgsVectorLayerJoinInfo %End - QgsFeature joinedFeatureOf( const QgsVectorLayerJoinInfo &info, const QgsFeature &feature ) const; + QgsFeature joinedFeatureOf( const QgsVectorLayerJoinInfo *info, const QgsFeature &feature ) const; %Docstring Returns the joined feature corresponding to the feature. \param info the vector join information diff --git a/src/core/qgsvectorlayerjoinbuffer.cpp b/src/core/qgsvectorlayerjoinbuffer.cpp index a72c6186172..7f3790c63af 100644 --- a/src/core/qgsvectorlayerjoinbuffer.cpp +++ b/src/core/qgsvectorlayerjoinbuffer.cpp @@ -412,14 +412,14 @@ QList QgsVectorLayerJoinBuffer::joinsWhereFieldI return infos; } -QgsFeature QgsVectorLayerJoinBuffer::joinedFeatureOf( const QgsVectorLayerJoinInfo &info, const QgsFeature &feature ) const +QgsFeature QgsVectorLayerJoinBuffer::joinedFeatureOf( const QgsVectorLayerJoinInfo *info, const QgsFeature &feature ) const { QgsFeature joinedFeature; - if ( info.joinLayer() ) + if ( info->joinLayer() ) { - const QVariant targetValue = feature.attribute( info.targetFieldName() ); - QString fieldRef = QgsExpression::quotedColumnRef( info.joinFieldName() ); + const QVariant targetValue = feature.attribute( info->targetFieldName() ); + QString fieldRef = QgsExpression::quotedColumnRef( info->joinFieldName() ); QString quotedVal = QgsExpression::quotedValue( targetValue.toString() ); const QString filter = QString( "%1 = %2" ).arg( fieldRef, quotedVal ); @@ -427,7 +427,7 @@ QgsFeature QgsVectorLayerJoinBuffer::joinedFeatureOf( const QgsVectorLayerJoinIn request.setFilterExpression( filter ); request.setLimit( 1 ); - QgsFeatureIterator it = info.joinLayer()->getFeatures( request ); + QgsFeatureIterator it = info->joinLayer()->getFeatures( request ); it.nextFeature( joinedFeature ); } diff --git a/src/core/qgsvectorlayerjoinbuffer.h b/src/core/qgsvectorlayerjoinbuffer.h index 61d23f5b1fd..bcd33118fb4 100644 --- a/src/core/qgsvectorlayerjoinbuffer.h +++ b/src/core/qgsvectorlayerjoinbuffer.h @@ -96,7 +96,7 @@ class CORE_EXPORT QgsVectorLayerJoinBuffer : public QObject * \param feature the feature of the target layer * \since QGIS 3.0 */ - QgsFeature joinedFeatureOf( const QgsVectorLayerJoinInfo &info, const QgsFeature &feature ) const; + QgsFeature joinedFeatureOf( const QgsVectorLayerJoinInfo *info, const QgsFeature &feature ) const; //! Create a copy of the join buffer //! \since QGIS 2.6 diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp index d36d53c9701..1ef4790c99e 100644 --- a/src/gui/qgsattributeform.cpp +++ b/src/gui/qgsattributeform.cpp @@ -1936,12 +1936,12 @@ void QgsAttributeForm::ContainerInformation::apply( QgsExpressionContext *expres } } -QgsFeature QgsAttributeForm::joinedFeature( const QgsVectorLayerJoinInfo &info, const QgsFeature &feature ) const +QgsFeature QgsAttributeForm::joinedFeature( const QgsVectorLayerJoinInfo *info, const QgsFeature &feature ) const { QgsFeature joinedFeature = mLayer->joinBuffer()->joinedFeatureOf( info, feature ); if ( !joinedFeature.isValid() ) - joinedFeature = QgsVectorLayerUtils::createFeature( info.joinLayer(), QgsGeometry(), QgsAttributeMap() ); + joinedFeature = QgsVectorLayerUtils::createFeature( info->joinLayer(), QgsGeometry(), QgsAttributeMap() ); return joinedFeature; } @@ -1960,7 +1960,7 @@ void QgsAttributeForm::updateJoinedFields( const QgsEditorWidgetWrapper &eww ) if ( !info->isDynamicFormEnabled() ) continue; - QgsFeature joinFeature = joinedFeature( *info, formFeature ); + QgsFeature joinFeature = joinedFeature( info, formFeature ); QStringList *subsetFields = info->joinFieldNamesSubset(); if ( subsetFields ) diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h index ba5496461a7..393d60bd817 100644 --- a/src/gui/qgsattributeform.h +++ b/src/gui/qgsattributeform.h @@ -273,7 +273,7 @@ class GUI_EXPORT QgsAttributeForm : public QWidget void initPython(); - QgsFeature joinedFeature( const QgsVectorLayerJoinInfo &info, const QgsFeature &feature ) const; + QgsFeature joinedFeature( const QgsVectorLayerJoinInfo *info, const QgsFeature &feature ) const; void updateJoinedFields( const QgsEditorWidgetWrapper &eww );