Fix: make "Part" struct dependent definitions private

qgis · May 26, 2020 · 563ab03 · 563ab03
1 parent 899d3fe
commit 563ab03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in b/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in
@@ -2239,13 +2239,6 @@ Sets whether point markers should be ``clipped`` to the current part boundary on
 
 
   protected:
-    struct Part
-    {
-      QPolygonF exterior;
-      QList<QPolygonF> rings;
-    };
-
-    void render( QgsRenderContext &context, const QVector<Part> &parts, const QgsFeature &feature, bool selected );
 
 
 

diff --git a/src/core/symbology/qgsfillsymbollayer.h b/src/core/symbology/qgsfillsymbollayer.h
@@ -2016,21 +2016,13 @@ class CORE_EXPORT QgsCentroidFillSymbolLayer : public QgsFillSymbolLayer
     void stopFeatureRender( const QgsFeature &feature, QgsRenderContext &context ) override;
 
   protected:
-    struct Part
-    {
-      QPolygonF exterior;
-      QList<QPolygonF> rings;
-    };
-
-    void render( QgsRenderContext &context, const QVector<Part> &parts, const QgsFeature &feature, bool selected );
 
     std::unique_ptr< QgsMarkerSymbol > mMarker;
     bool mPointOnSurface = false;
     bool mPointOnAllParts = true;
     bool mClipPoints = false;
     bool mClipOnCurrentPartOnly = false;
 
-    QVector<Part> mCurrentParts;
     bool mRenderingFeature = false;
 
     QgsFeatureId mCurrentFeatureId = -1;
@@ -2040,7 +2032,14 @@ class CORE_EXPORT QgsCentroidFillSymbolLayer : public QgsFillSymbolLayer
 #ifdef SIP_RUN
     QgsCentroidFillSymbolLayer( const QgsCentroidFillSymbolLayer &other );
 #endif
+    struct Part
+    {
+      QPolygonF exterior;
+      QList<QPolygonF> rings;
+    };
 
+    void render( QgsRenderContext &context, const QVector<Part> &parts, const QgsFeature &feature, bool selected );
+    QVector<Part> mCurrentParts;
 };
 
 #endif