Fix sip subclassing for properties

qgis · Jan 23, 2017 · ef3f61f · ef3f61f
1 parent 53ba1a1
commit ef3f61f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/python/core/qgsproperty.sip b/python/core/qgsproperty.sip
@@ -15,11 +15,11 @@ class QgsAbstractProperty
 %End
 
 %ConvertToSubClassCode
-  if (dynamic_cast<QgsStaticProperty*>(sipCpp) != NULL)
+  if ( sipCpp->propertyType() == QgsAbstractProperty::StaticProperty )
 	sipType = sipType_QgsStaticProperty;
-  else if (dynamic_cast<QgsFieldBasedProperty*>(sipCpp) != NULL)
+  else if ( sipCpp->propertyType() == QgsAbstractProperty::FieldBasedProperty )
 	sipType = sipType_QgsFieldBasedProperty;
-  else if (dynamic_cast<QgsExpressionBasedProperty*>(sipCpp) != NULL)
+  else if ( sipCpp->propertyType() == QgsAbstractProperty::ExpressionBasedProperty )
 	sipType = sipType_QgsExpressionBasedProperty;
   else
 	sipType = sipType_QgsAbstractProperty;

diff --git a/python/core/qgspropertycollection.sip b/python/core/qgspropertycollection.sip
@@ -10,6 +10,16 @@ class QgsAbstractPropertyCollection
 %TypeHeaderCode
 #include <qgspropertycollection.h>
 %End
+
+%ConvertToSubClassCode
+  if ( dynamic_cast<QgsPropertyCollection*>(sipCpp) )
+	sipType = sipType_QgsPropertyCollection;
+  else if ( dynamic_cast<QgsPropertyCollectionStack*>(sipCpp) )
+	sipType = sipType_QgsPropertyCollectionStack;
+  else
+	sipType = sipType_QgsAbstractPropertyCollection;
+%End
+
   public:
 
     QgsAbstractPropertyCollection( const QString& name = QString() );