Update QgsRuleBasedRenderer::RenderJob

qgis · Jun 11, 2020 · 01e879c · 01e879c
1 parent 71cf5af
commit 01e879c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in b/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in
@@ -38,15 +38,17 @@ the rules and draws features with symbols from rules that match.
 
     struct RenderJob
     {
-      RenderJob( QgsRuleBasedRenderer::FeatureToRender &_ftr, QgsSymbol *_s );
+        RenderJob( QgsRuleBasedRenderer::FeatureToRender &_ftr, QgsSymbol *_s );
 
-
-      QgsRuleBasedRenderer::FeatureToRender &ftr;
+        QgsRuleBasedRenderer::FeatureToRender &ftr;
 %Docstring
 Feature to render
 %End
 
-      QgsSymbol *symbol;
+        QgsSymbol *symbol;
+
+      private:
+        RenderJob &operator=( const RenderJob & );
     };
 
     struct RenderLevel

diff --git a/src/core/symbology/qgsrulebasedrenderer.h b/src/core/symbology/qgsrulebasedrenderer.h
@@ -65,23 +65,21 @@ class CORE_EXPORT QgsRuleBasedRenderer : public QgsFeatureRenderer
      */
     struct RenderJob
     {
-      RenderJob( QgsRuleBasedRenderer::FeatureToRender &_ftr, QgsSymbol *_s )
-        : ftr( _ftr )
-        , symbol( _s )
-      {}
+        RenderJob( QgsRuleBasedRenderer::FeatureToRender &_ftr, QgsSymbol *_s )
+          : ftr( _ftr )
+          , symbol( _s )
+        {}
 
-      QgsRuleBasedRenderer::RenderJob &operator=( const QgsRuleBasedRenderer::RenderJob &rj )
-      {
-        symbol = rj.symbol;
-        ftr = rj.ftr;
-        return *this;
-      }
+        //! Feature to render
+        QgsRuleBasedRenderer::FeatureToRender &ftr;
 
-      //! Feature to render
-      QgsRuleBasedRenderer::FeatureToRender &ftr;
+        //! Symbol to render feature with (not owned by this object).
+        QgsSymbol *symbol = nullptr;
 
-      //! Symbol to render feature with (not owned by this object).
-      QgsSymbol *symbol = nullptr;
+      private:
+#ifdef SIP_RUN
+        RenderJob &operator=( const RenderJob & );
+#endif
     };
 
     /**