Use QgsLayerStyleOverride in QgsMapHitTest::runHitTestLayer

Author: nirvn

src/core/qgsmaphittest.cpp

@@ -101,9 +101,9 @@ bool QgsMapHitTest::legendKeyVisible( const QString &ruleKey, QgsVectorLayer *la
 
 void QgsMapHitTest::runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols, SymbolSet &usedSymbolsRuleKey, QgsRenderContext &context )
 {
-  bool hasStyleOverride = mSettings.layerStyleOverrides().contains( vl->id() );
-  if ( hasStyleOverride )
-    vl->styleManager()->setOverrideStyle( mSettings.layerStyleOverrides().value( vl->id() ) );
+  QgsLayerStyleOverride styleOverride( vl );
+  if ( mSettings.layerStyleOverrides().contains( vl->id() ) )
+    styleOverride.setOverrideStyle( mSettings.layerStyleOverrides().value( vl->id() ) );
 
   std::unique_ptr< QgsFeatureRenderer > r( vl->renderer()->clone() );
   bool moreSymbolsPerFeature = r->capabilities() & QgsFeatureRenderer::MoreSymbolsPerFeature;
@@ -199,8 +199,5 @@ void QgsMapHitTest::runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols,
     usedSymbols = lUsedSymbols;
     usedSymbolsRuleKey = lUsedSymbolsRuleKey;
   }
-
-  if ( hasStyleOverride )
-    vl->styleManager()->restoreOverrideStyle();
 }