Rule based labeling RAII

m-kuhn · m-kuhn · commit 2ab58c94dbf4 · 2019-03-10T17:27:50.000+01:00
diff --git a/python/core/auto_generated/qgsrulebasedlabeling.sip.in b/python/core/auto_generated/qgsrulebasedlabeling.sip.in
@@ -269,6 +269,7 @@ Constructs the labeling from given tree of rules (takes ownership)
     ~QgsRuleBasedLabeling();
 
     QgsRuleBasedLabeling::Rule *rootRule();
+    const Rule *rootRule() const;
 
     static QgsRuleBasedLabeling *create( const QDomElement &element, const QgsReadWriteContext &context ) /Factory/;
 %Docstring
diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp
@@ -411,7 +411,16 @@ QgsRuleBasedLabeling *QgsRuleBasedLabeling::clone() const
 
 QgsRuleBasedLabeling::~QgsRuleBasedLabeling()
 {
-  delete mRootRule;
+}
+
+QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule()
+{
+  return mRootRule.get();
+}
+
+const QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::rootRule() const SIP_SKIP
+{
+  return mRootRule.get();
 }
 
 
diff --git a/src/core/qgsrulebasedlabeling.h b/src/core/qgsrulebasedlabeling.h
@@ -346,8 +346,8 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling
     explicit QgsRuleBasedLabeling( QgsRuleBasedLabeling::Rule *root SIP_TRANSFER );
     ~QgsRuleBasedLabeling() override;
 
-    QgsRuleBasedLabeling::Rule *rootRule() { return mRootRule; }
-    const Rule *rootRule() const SIP_SKIP { return mRootRule; }
+    QgsRuleBasedLabeling::Rule *rootRule();
+    const Rule *rootRule() const;
 
     //! Create the instance from a DOM element with saved configuration
     static QgsRuleBasedLabeling *create( const QDomElement &element, const QgsReadWriteContext &context ) SIP_FACTORY;
@@ -375,7 +375,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling
     void toSld( QDomNode &parent, const QgsStringMap &props ) const override;
 
   protected:
-    Rule *mRootRule = nullptr;
+    std::unique_ptr<Rule> mRootRule;
 };
 
 #ifndef SIP_RUN
