fix martin's review

lbartoletti · lbartoletti · commit 5e5fdf948979 · 2018-04-24T17:44:52.000+02:00
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -331,7 +331,7 @@ bool QgsSymbolLegendNode::setData( const QVariant &value, int role )
   vlayer->renderer()->checkLegendSymbolItem( mItem.ruleKey(), value == Qt::Checked );
 
   emit dataChanged();
-  emit vlayer->styleChanged();
+  vlayer->emitStyleChanged();
 
   vlayer->triggerRepaint();
 
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -637,9 +637,6 @@ QgsPointLocator::QgsPointLocator( QgsVectorLayer *layer, const QgsCoordinateRefe
   connect( mLayer, &QgsVectorLayer::featureDeleted, this, &QgsPointLocator::onFeatureDeleted );
   connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsPointLocator::onGeometryChanged );
   connect( mLayer, &QgsVectorLayer::dataChanged, this, &QgsPointLocator::destroyIndex );
-  connect( mLayer, &QgsVectorLayer::rendererChanged, this, &QgsPointLocator::destroyIndex );
-  connect( mLayer, &QgsVectorLayer::styleChanged, this, &QgsPointLocator::destroyIndex );
-  connect( mLayer, &QgsVectorLayer::layerModified, this, &QgsPointLocator::destroyIndex );
 }
 
 
@@ -669,6 +666,7 @@ void QgsPointLocator::setRenderContext( const QgsRenderContext &context )
 {
   mContext = std::unique_ptr<QgsRenderContext>( new QgsRenderContext( context ) );
 
+  connect( mLayer, &QgsVectorLayer::styleChanged, this, &QgsPointLocator::destroyIndex );
   destroyIndex();
 }
 
@@ -740,10 +738,10 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
     if ( !f.hasGeometry() )
       continue;
 
-    if ( ctx && renderer )
+    if ( filter && ctx && renderer )
     {
       ctx->expressionContext().setFeature( f );
-      if ( filter && !renderer->willRenderFeature( f, *ctx ) )
+      if ( !renderer->willRenderFeature( f, *ctx ) )
       {
         continue;
       }
diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h
@@ -285,7 +285,6 @@ class CORE_EXPORT QgsPointLocator : public QObject
     //! flag whether the layer is currently empty (i.e. mRTree is null but it is not necessary to rebuild it)
     bool mIsEmptyLayer;
 
-    QgsFeatureIds mFeatureIds;
 
     //! R-tree containing spatial index
     QgsCoordinateTransform mTransform;
diff --git a/tests/src/core/testqgssnappingutils.cpp b/tests/src/core/testqgssnappingutils.cpp
@@ -136,7 +136,6 @@ class TestQgsSnappingUtils : public QObject
       QVERIFY( !m.hasVertex() );
 
       u.setEnableSnappingForInvisibleFeature( true );
-      mVL->styleChanged();
       m = u.snapToMap( QPoint( 2, 2 ) );
       QVERIFY( m.isValid() );
       QVERIFY( m.hasVertex() );

Original file line number	Diff line number	Diff line change
`@@ -637,9 +637,6 @@ QgsPointLocator::QgsPointLocator( QgsVectorLayer *layer, const QgsCoordinateRefe`
`637`	`637`	`connect( mLayer, &QgsVectorLayer::featureDeleted, this, &QgsPointLocator::onFeatureDeleted );`
`638`	`638`	`connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsPointLocator::onGeometryChanged );`
`639`	`639`	`connect( mLayer, &QgsVectorLayer::dataChanged, this, &QgsPointLocator::destroyIndex );`
`640`		`- connect( mLayer, &QgsVectorLayer::rendererChanged, this, &QgsPointLocator::destroyIndex );`
`641`		`- connect( mLayer, &QgsVectorLayer::styleChanged, this, &QgsPointLocator::destroyIndex );`
`642`		`- connect( mLayer, &QgsVectorLayer::layerModified, this, &QgsPointLocator::destroyIndex );`
`643`	`640`	`}`
`644`	`641`
`645`	`642`
`@@ -669,6 +666,7 @@ void QgsPointLocator::setRenderContext( const QgsRenderContext &context )`
`669`	`666`	`{`
`670`	`667`	`mContext = std::unique_ptr<QgsRenderContext>( new QgsRenderContext( context ) );`
`671`	`668`
	`669`	`+ connect( mLayer, &QgsVectorLayer::styleChanged, this, &QgsPointLocator::destroyIndex );`
`672`	`670`	`destroyIndex();`
`673`	`671`	`}`
`674`	`672`
`@@ -740,10 +738,10 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )`
`740`	`738`	`if ( !f.hasGeometry() )`
`741`	`739`	`continue;`
`742`	`740`
`743`		`- if ( ctx && renderer )`
	`741`	`+ if ( filter && ctx && renderer )`
`744`	`742`	`{`
`745`	`743`	`ctx->expressionContext().setFeature( f );`
`746`		`- if ( filter && !renderer->willRenderFeature( f, *ctx ) )`
	`744`	`+ if ( !renderer->willRenderFeature( f, *ctx ) )`
`747`	`745`	`{`
`748`	`746`	`continue;`
`749`	`747`	`}`