From 563ab0330f81f8c24b86109ff687903e6ebf7f04 Mon Sep 17 00:00:00 2001
From: Ivan Ivanov <ivan.ivanov@suricactus.com>
Date: Tue, 24 Mar 2020 01:18:52 +0200
Subject: [PATCH]  Fix: make "Part" struct dependent definitions private

---
 .../symbology/qgsfillsymbollayer.sip.in           |  7 -------
 src/core/symbology/qgsfillsymbollayer.h           | 15 +++++++--------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in b/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in
index 2eee9aa242ab..9ff70c8307f7 100644
--- 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
index 400ea90a34dd..9b4b751af7a7 100644
--- a/src/core/symbology/qgsfillsymbollayer.h
+++ b/src/core/symbology/qgsfillsymbollayer.h
@@ -2016,13 +2016,6 @@ 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;
@@ -2030,7 +2023,6 @@ class CORE_EXPORT QgsCentroidFillSymbolLayer : public QgsFillSymbolLayer
     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