From accdc23e0b03c49c05b58ed16a27474ba33bf79f Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 20 Mar 2018 08:33:43 +1000 Subject: [PATCH] Fix sip subclassing of metadata subclasses --- python/core/metadata/qgsabstractmetadatabase.sip.in | 2 +- src/core/metadata/qgsabstractmetadatabase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/core/metadata/qgsabstractmetadatabase.sip.in b/python/core/metadata/qgsabstractmetadatabase.sip.in index 078c02140f7..ae01512c165 100644 --- a/python/core/metadata/qgsabstractmetadatabase.sip.in +++ b/python/core/metadata/qgsabstractmetadatabase.sip.in @@ -43,7 +43,7 @@ using QgsNativeMetadataValidator. %ConvertToSubClassCode if ( dynamic_cast< QgsLayerMetadata * >( sipCpp ) != NULL ) sipType = sipType_QgsLayerMetadata; - else if ( dynamic_cast< QgsLayerMetadata * >( sipCpp ) != NULL ) + else if ( dynamic_cast< QgsProjectMetadata * >( sipCpp ) != NULL ) sipType = sipType_QgsProjectMetadata; else sipType = NULL; diff --git a/src/core/metadata/qgsabstractmetadatabase.h b/src/core/metadata/qgsabstractmetadatabase.h index e8ceddce116..1e3bd7e4b22 100644 --- a/src/core/metadata/qgsabstractmetadatabase.h +++ b/src/core/metadata/qgsabstractmetadatabase.h @@ -57,7 +57,7 @@ class CORE_EXPORT QgsAbstractMetadataBase SIP_CONVERT_TO_SUBCLASS_CODE if ( dynamic_cast< QgsLayerMetadata * >( sipCpp ) != NULL ) sipType = sipType_QgsLayerMetadata; - else if ( dynamic_cast< QgsLayerMetadata * >( sipCpp ) != NULL ) + else if ( dynamic_cast< QgsProjectMetadata * >( sipCpp ) != NULL ) sipType = sipType_QgsProjectMetadata; else sipType = NULL;