diff --git a/python/analysis/network/qgsarcproperter.sip b/python/analysis/network/qgsarcproperter.sip index f59ac836326..322f2b3e540 100644 --- a/python/analysis/network/qgsarcproperter.sip +++ b/python/analysis/network/qgsarcproperter.sip @@ -19,9 +19,9 @@ class QgsArcProperter %ConvertToSubClassCode if ( dynamic_cast< QgsDistanceArcProperter* > ( sipCpp ) != NULL ) - sipClass = sipClass_QgsDistanceArcProperter; + sipType = sipType_QgsDistanceArcProperter; else - sipClass = NULL; + sipType = NULL; %End public: diff --git a/python/analysis/network/qgsgraphbuilderintr.sip b/python/analysis/network/qgsgraphbuilderintr.sip index ee8e122f285..bab95c4f13f 100644 --- a/python/analysis/network/qgsgraphbuilderintr.sip +++ b/python/analysis/network/qgsgraphbuilderintr.sip @@ -15,9 +15,9 @@ class QgsGraphBuilderInterface %ConvertToSubClassCode if ( dynamic_cast< QgsGraphBuilder* > ( sipCpp ) != NULL ) - sipClass = sipClass_QgsGraphBuilder; + sipType = sipType_QgsGraphBuilder; else - sipClass = NULL; + sipType = NULL; %End public: diff --git a/python/analysis/network/qgsgraphdirector.sip b/python/analysis/network/qgsgraphdirector.sip index 0d74889a976..aa620a56769 100644 --- a/python/analysis/network/qgsgraphdirector.sip +++ b/python/analysis/network/qgsgraphdirector.sip @@ -15,9 +15,9 @@ class QgsGraphDirector : QObject %ConvertToSubClassCode if ( dynamic_cast< QgsLineVectorLayerDirector* > ( sipCpp ) != NULL ) - sipClass = sipClass_QgsLineVectorLayerDirector; + sipType = sipType_QgsLineVectorLayerDirector; else - sipClass = NULL; + sipType = NULL; %End diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip index 07ad17e9318..7aa7a4886a7 100644 --- a/python/core/composer/qgscomposeritem.sip +++ b/python/core/composer/qgscomposeritem.sip @@ -26,63 +26,63 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem switch (sipCpp->type()) { case QgsComposerItem::ComposerItem: - sipClass = sipClass_QgsComposerItem; + sipType = sipType_QgsComposerItem; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerArrow: - sipClass = sipClass_QgsComposerArrow; + sipType = sipType_QgsComposerArrow; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerItemGroup: - sipClass = sipClass_QgsComposerItemGroup; + sipType = sipType_QgsComposerItemGroup; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerLabel: - sipClass = sipClass_QgsComposerLabel; + sipType = sipType_QgsComposerLabel; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerLegend: - sipClass = sipClass_QgsComposerLegend; + sipType = sipType_QgsComposerLegend; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerMap: - sipClass = sipClass_QgsComposerMap; + sipType = sipType_QgsComposerMap; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerPaper: - sipClass = sipClass_QgsPaperItem; + sipType = sipType_QgsPaperItem; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerPicture: - sipClass = sipClass_QgsComposerPicture; + sipType = sipType_QgsComposerPicture; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerScaleBar: - sipClass = sipClass_QgsComposerScaleBar; + sipType = sipType_QgsComposerScaleBar; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerShape: - sipClass = sipClass_QgsComposerShape; + sipType = sipType_QgsComposerShape; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerTable: - sipClass = sipClass_QgsComposerTable; + sipType = sipType_QgsComposerTable; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerAttributeTable: - sipClass = sipClass_QgsComposerAttributeTable; + sipType = sipType_QgsComposerAttributeTable; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerTextTable: - sipClass = sipClass_QgsComposerTextTable; + sipType = sipType_QgsComposerTextTable; *sipCppRet = static_cast(sipCpp); break; case QgsComposerItem::ComposerFrame: - sipClass = sipClass_QgsComposerFrame; + sipType = sipType_QgsComposerFrame; *sipCppRet = static_cast(sipCpp); break; default: - sipClass = 0; + sipType = 0; } %End diff --git a/python/core/composer/qgscomposermultiframe.sip b/python/core/composer/qgscomposermultiframe.sip index 10901e6f4e2..a7b3305c867 100644 --- a/python/core/composer/qgscomposermultiframe.sip +++ b/python/core/composer/qgscomposermultiframe.sip @@ -20,15 +20,15 @@ class QgsComposerMultiFrame: QgsComposerObject %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsComposerHtml; + sipType = sipType_QgsComposerHtml; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsComposerAttributeTableV2; + sipType = sipType_QgsComposerAttributeTableV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsComposerTableV2; + sipType = sipType_QgsComposerTableV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsComposerMultiFrame; + sipType = sipType_QgsComposerMultiFrame; else - sipClass = NULL; + sipType = NULL; %End public: diff --git a/python/core/effects/qgspainteffect.sip b/python/core/effects/qgspainteffect.sip index 59c40278ef6..f77107b9332 100644 --- a/python/core/effects/qgspainteffect.sip +++ b/python/core/effects/qgspainteffect.sip @@ -30,39 +30,39 @@ class QgsPaintEffect %ConvertToSubClassCode if (sipCpp->type() == "drawSource" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsDrawSourceEffect; + sipType = sipType_QgsDrawSourceEffect; } else if (sipCpp->type() == "effectStack" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsEffectStack; + sipType = sipType_QgsEffectStack; } else if (sipCpp->type() == "blur" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsBlurEffect; + sipType = sipType_QgsBlurEffect; } else if (sipCpp->type() == "dropShadow" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsDropShadowEffect; + sipType = sipType_QgsDropShadowEffect; } else if (sipCpp->type() == "outerGlow" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsOuterGlowEffect; + sipType = sipType_QgsOuterGlowEffect; } else if (sipCpp->type() == "innerGlow" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsInnerGlowEffect; + sipType = sipType_QgsInnerGlowEffect; } else if (sipCpp->type() == "transform" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsTransformEffect; + sipType = sipType_QgsTransformEffect; } else if (sipCpp->type() == "color" && dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsColorEffect; + sipType = sipType_QgsColorEffect; } else { - sipClass = 0; + sipType = 0; } %End diff --git a/python/core/geometry/qgsabstractgeometryv2.sip b/python/core/geometry/qgsabstractgeometryv2.sip index d3a25dc527c..987bad49c0f 100644 --- a/python/core/geometry/qgsabstractgeometryv2.sip +++ b/python/core/geometry/qgsabstractgeometryv2.sip @@ -36,31 +36,31 @@ class QgsAbstractGeometryV2 %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsPointV2; + sipType = sipType_QgsPointV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsLineStringV2; + sipType = sipType_QgsLineStringV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsCircularStringV2; + sipType = sipType_QgsCircularStringV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsCompoundCurveV2; + sipType = sipType_QgsCompoundCurveV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsPolygonV2; + sipType = sipType_QgsPolygonV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsCurvePolygonV2; + sipType = sipType_QgsCurvePolygonV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsMultiPointV2; + sipType = sipType_QgsMultiPointV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsMultiLineStringV2; + sipType = sipType_QgsMultiLineStringV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsMultiPolygonV2; + sipType = sipType_QgsMultiPolygonV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsMultiSurfaceV2; + sipType = sipType_QgsMultiSurfaceV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsMultiCurveV2; + sipType = sipType_QgsMultiCurveV2; else if (dynamic_cast(sipCpp) != NULL ) - sipClass = sipClass_QgsGeometryCollectionV2; + sipType = sipType_QgsGeometryCollectionV2; else - sipClass = 0; + sipType = 0; %End public: diff --git a/python/core/gps/qgsgpsconnection.sip b/python/core/gps/qgsgpsconnection.sip index 59e48799e75..31830ad1b58 100644 --- a/python/core/gps/qgsgpsconnection.sip +++ b/python/core/gps/qgsgpsconnection.sip @@ -49,11 +49,11 @@ class QgsGPSConnection: QObject %ConvertToSubClassCode if (sipCpp->inherits("QgsGpsdConnection")) - sipClass = sipClass_QgsGpsdConnection; + sipType = sipType_QgsGpsdConnection; else if (sipCpp->inherits("QgsNMEAConnection")) - sipClass = sipClass_QgsNMEAConnection; + sipType = sipType_QgsNMEAConnection; else - sipClass = NULL; + sipType = NULL; %End public: diff --git a/python/core/qgsdataprovider.sip b/python/core/qgsdataprovider.sip index b36216ca6a7..8e98ccaf92f 100644 --- a/python/core/qgsdataprovider.sip +++ b/python/core/qgsdataprovider.sip @@ -9,15 +9,15 @@ class QgsDataProvider : QObject %ConvertToSubClassCode if (sipCpp->inherits("QgsVectorDataProvider")) { - sipClass = sipClass_QgsVectorDataProvider; + sipType = sipType_QgsVectorDataProvider; } else if (sipCpp->inherits("QgsRasterDataProvider")) { - sipClass = sipClass_QgsRasterDataProvider; + sipType = sipType_QgsRasterDataProvider; } else { - sipClass = 0; + sipType = 0; } %End diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip index c4ef6061e3e..16bff3fdaf1 100644 --- a/python/core/qgsexpression.sip +++ b/python/core/qgsexpression.sip @@ -363,14 +363,14 @@ class QgsExpression %ConvertToSubClassCode switch (sipCpp->nodeType()) { - case QgsExpression::ntUnaryOperator: sipClass = sipClass_QgsExpression_NodeUnaryOperator; break; - case QgsExpression::ntBinaryOperator: sipClass = sipClass_QgsExpression_NodeBinaryOperator; break; - case QgsExpression::ntInOperator: sipClass = sipClass_QgsExpression_NodeInOperator; break; - case QgsExpression::ntFunction: sipClass = sipClass_QgsExpression_NodeFunction; break; - case QgsExpression::ntLiteral: sipClass = sipClass_QgsExpression_NodeLiteral; break; - case QgsExpression::ntColumnRef: sipClass = sipClass_QgsExpression_NodeColumnRef; break; - case QgsExpression::ntCondition: sipClass = sipClass_QgsExpression_NodeCondition; break; - default: sipClass = 0; break; + case QgsExpression::ntUnaryOperator: sipType = sipType_QgsExpression_NodeUnaryOperator; break; + case QgsExpression::ntBinaryOperator: sipType = sipType_QgsExpression_NodeBinaryOperator; break; + case QgsExpression::ntInOperator: sipType = sipType_QgsExpression_NodeInOperator; break; + case QgsExpression::ntFunction: sipType = sipType_QgsExpression_NodeFunction; break; + case QgsExpression::ntLiteral: sipType = sipType_QgsExpression_NodeLiteral; break; + case QgsExpression::ntColumnRef: sipType = sipType_QgsExpression_NodeColumnRef; break; + case QgsExpression::ntCondition: sipType = sipType_QgsExpression_NodeCondition; break; + default: sipType = 0; break; } %End diff --git a/python/core/qgsfeature.sip b/python/core/qgsfeature.sip index 5a65122752b..59663c78d0d 100644 --- a/python/core/qgsfeature.sip +++ b/python/core/qgsfeature.sip @@ -110,7 +110,7 @@ class QgsFeature %TypeHeaderCode #include #if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01) -#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) +#define sipType_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) #endif %End diff --git a/python/core/qgsmaplayer.sip b/python/core/qgsmaplayer.sip index ef8c4adb712..947fb952b54 100644 --- a/python/core/qgsmaplayer.sip +++ b/python/core/qgsmaplayer.sip @@ -12,24 +12,24 @@ class QgsMapLayer : QObject %ConvertToSubClassCode if (sipCpp->inherits("QgsMapLayer")) { - sipClass = sipClass_QgsMapLayer; + sipType = sipType_QgsMapLayer; QgsMapLayer* layer = qobject_cast(sipCpp); if (layer->type() == QgsMapLayer::VectorLayer) { - sipClass = sipClass_QgsVectorLayer; + sipType = sipType_QgsVectorLayer; } else if (layer->type() == QgsMapLayer::RasterLayer) { - sipClass = sipClass_QgsRasterLayer; + sipType = sipType_QgsRasterLayer; } else if (layer->type() == QgsMapLayer::PluginLayer) { - sipClass = sipClass_QgsPluginLayer; + sipType = sipType_QgsPluginLayer; } } else { - sipClass = 0; + sipType = 0; } %End diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip index e37011ba266..88d5e651de1 100644 --- a/python/core/qgsvectorlayer.sip +++ b/python/core/qgsvectorlayer.sip @@ -12,14 +12,14 @@ class QgsAttributeEditorElement : QObject %ConvertToSubClassCode QgsAttributeEditorElement* e = qobject_cast( sipCpp ); - sipClass = 0; + sipType = 0; if ( e ) { switch ( e->type() ) { - case QgsAttributeEditorElement::AeTypeContainer: sipClass = sipClass_QgsAttributeEditorContainer; break; - case QgsAttributeEditorElement::AeTypeField: sipClass = sipClass_QgsAttributeEditorField; break; - case QgsAttributeEditorElement::AeTypeRelation: sipClass = sipClass_QgsAttributeEditorRelation; break; + case QgsAttributeEditorElement::AeTypeContainer: sipType = sipType_QgsAttributeEditorContainer; break; + case QgsAttributeEditorElement::AeTypeField: sipType = sipType_QgsAttributeEditorField; break; + case QgsAttributeEditorElement::AeTypeRelation: sipType = sipType_QgsAttributeEditorRelation; break; } } %End diff --git a/python/core/raster/qgsrasterinterface.sip b/python/core/raster/qgsrasterinterface.sip index 4c2f498616f..1fa11f360d2 100644 --- a/python/core/raster/qgsrasterinterface.sip +++ b/python/core/raster/qgsrasterinterface.sip @@ -27,39 +27,39 @@ class QgsRasterInterface %ConvertToSubClassCode if ( dynamic_cast(sipCpp)) - sipClass = sipClass_QgsBrightnessContrastFilter; + sipType = sipType_QgsBrightnessContrastFilter; else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsHueSaturationFilter; + sipType = sipType_QgsHueSaturationFilter; else if (dynamic_cast(sipCpp)) { - sipClass = sipClass_QgsRasterDataProvider; + sipType = sipType_QgsRasterDataProvider; // use static cast because QgsRasterDataProvider has multiple inheritance // and we would end up with bad pointer otherwise! *sipCppRet = static_cast(sipCpp); } else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsRasterNuller; + sipType = sipType_QgsRasterNuller; else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsRasterProjector; + sipType = sipType_QgsRasterProjector; else if (dynamic_cast(sipCpp)) { if ( dynamic_cast(sipCpp)) - sipClass = sipClass_QgsMultiBandColorRenderer; + sipType = sipType_QgsMultiBandColorRenderer; else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsPalettedRasterRenderer; + sipType = sipType_QgsPalettedRasterRenderer; else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsSingleBandColorDataRenderer; + sipType = sipType_QgsSingleBandColorDataRenderer; else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsSingleBandGrayRenderer; + sipType = sipType_QgsSingleBandGrayRenderer; else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsSingleBandPseudoColorRenderer; + sipType = sipType_QgsSingleBandPseudoColorRenderer; else - sipClass = sipClass_QgsRasterRenderer; + sipType = sipType_QgsRasterRenderer; } else if (dynamic_cast(sipCpp)) - sipClass = sipClass_QgsRasterResampleFilter; + sipType = sipType_QgsRasterResampleFilter; else - sipClass = 0; + sipType = 0; %End public: diff --git a/python/core/raster/qgsrasterresampler.sip b/python/core/raster/qgsrasterresampler.sip index ce199326c57..320a7cfd1f9 100644 --- a/python/core/raster/qgsrasterresampler.sip +++ b/python/core/raster/qgsrasterresampler.sip @@ -9,11 +9,11 @@ class QgsRasterResampler %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsBilinearRasterResampler; + sipType = sipType_QgsBilinearRasterResampler; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsCubicRasterResampler; + sipType = sipType_QgsCubicRasterResampler; else - sipClass = 0; + sipType = 0; %End public: diff --git a/python/core/raster/qgsrastershaderfunction.sip b/python/core/raster/qgsrastershaderfunction.sip index 33575cc19e7..686cd501d03 100644 --- a/python/core/raster/qgsrastershaderfunction.sip +++ b/python/core/raster/qgsrastershaderfunction.sip @@ -8,11 +8,11 @@ class QgsRasterShaderFunction %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsColorRampShader; + sipType = sipType_QgsColorRampShader; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsPseudoColorShader; + sipType = sipType_QgsPseudoColorShader; else - sipClass = 0; + sipType = 0; %End diff --git a/python/core/symbology-ng/qgsrendererv2.sip b/python/core/symbology-ng/qgsrendererv2.sip index 68cdde5dc9e..b406522f91f 100644 --- a/python/core/symbology-ng/qgsrendererv2.sip +++ b/python/core/symbology-ng/qgsrendererv2.sip @@ -36,21 +36,21 @@ class QgsFeatureRendererV2 %ConvertToSubClassCode if (sipCpp->type() == "singleSymbol") - sipClass = sipClass_QgsSingleSymbolRendererV2; + sipType = sipType_QgsSingleSymbolRendererV2; else if (sipCpp->type() == "categorizedSymbol") - sipClass = sipClass_QgsCategorizedSymbolRendererV2; + sipType = sipType_QgsCategorizedSymbolRendererV2; else if (sipCpp->type() == "graduatedSymbol") - sipClass = sipClass_QgsGraduatedSymbolRendererV2; + sipType = sipType_QgsGraduatedSymbolRendererV2; else if (sipCpp->type() == "RuleRenderer") - sipClass = sipClass_QgsRuleBasedRendererV2; + sipType = sipType_QgsRuleBasedRendererV2; else if (sipCpp->type() == "heatmapRenderer") - sipClass = sipClass_QgsHeatmapRenderer; + sipType = sipType_QgsHeatmapRenderer; else if (sipCpp->type() == "invertedPolygonRenderer") - sipClass = sipClass_QgsInvertedPolygonRenderer; + sipType = sipType_QgsInvertedPolygonRenderer; else if (sipCpp->type() == "pointDisplacement") - sipClass = sipClass_QgsPointDisplacementRenderer; + sipType = sipType_QgsPointDisplacementRenderer; else - sipClass = 0; + sipType = 0; %End public: diff --git a/python/core/symbology-ng/qgssymbollayerv2.sip b/python/core/symbology-ng/qgssymbollayerv2.sip index 13d298296db..085ff7638c5 100644 --- a/python/core/symbology-ng/qgssymbollayerv2.sip +++ b/python/core/symbology-ng/qgssymbollayerv2.sip @@ -10,56 +10,56 @@ class QgsSymbolLayerV2 { case QgsSymbolV2::Marker: if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsEllipseSymbolLayerV2; + sipType = sipType_QgsEllipseSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsFontMarkerSymbolLayerV2; + sipType = sipType_QgsFontMarkerSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsSimpleMarkerSymbolLayerV2; + sipType = sipType_QgsSimpleMarkerSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsSvgMarkerSymbolLayerV2; + sipType = sipType_QgsSvgMarkerSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsVectorFieldSymbolLayer; + sipType = sipType_QgsVectorFieldSymbolLayer; else - sipClass = sipClass_QgsMarkerSymbolLayerV2; + sipType = sipType_QgsMarkerSymbolLayerV2; break; case QgsSymbolV2::Line: if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsMarkerLineSymbolLayerV2; + sipType = sipType_QgsMarkerLineSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsSimpleLineSymbolLayerV2; + sipType = sipType_QgsSimpleLineSymbolLayerV2; else - sipClass = sipClass_QgsLineSymbolLayerV2; + sipType = sipType_QgsLineSymbolLayerV2; break; case QgsSymbolV2::Fill: if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsSimpleFillSymbolLayerV2; + sipType = sipType_QgsSimpleFillSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) { if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsLinePatternFillSymbolLayer; + sipType = sipType_QgsLinePatternFillSymbolLayer; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsPointPatternFillSymbolLayer; + sipType = sipType_QgsPointPatternFillSymbolLayer; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsSVGFillSymbolLayer; + sipType = sipType_QgsSVGFillSymbolLayer; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsRasterFillSymbolLayer; + sipType = sipType_QgsRasterFillSymbolLayer; else - sipClass = sipClass_QgsImageFillSymbolLayer; + sipType = sipType_QgsImageFillSymbolLayer; } else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsCentroidFillSymbolLayerV2; + sipType = sipType_QgsCentroidFillSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsGradientFillSymbolLayerV2; + sipType = sipType_QgsGradientFillSymbolLayerV2; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsShapeburstFillSymbolLayerV2; + sipType = sipType_QgsShapeburstFillSymbolLayerV2; else - sipClass = sipClass_QgsFillSymbolLayerV2; + sipType = sipType_QgsFillSymbolLayerV2; break; default: - sipClass = 0; + sipType = 0; break; } %End diff --git a/python/core/symbology-ng/qgssymbolv2.sip b/python/core/symbology-ng/qgssymbolv2.sip index 91956c2e80d..2aae914459d 100644 --- a/python/core/symbology-ng/qgssymbolv2.sip +++ b/python/core/symbology-ng/qgssymbolv2.sip @@ -10,10 +10,10 @@ class QgsSymbolV2 %ConvertToSubClassCode switch (sipCpp->type()) { - case QgsSymbolV2::Marker: sipClass = sipClass_QgsMarkerSymbolV2; break; - case QgsSymbolV2::Line: sipClass = sipClass_QgsLineSymbolV2; break; - case QgsSymbolV2::Fill: sipClass = sipClass_QgsFillSymbolV2; break; - default: sipClass = 0; break; + case QgsSymbolV2::Marker: sipType = sipType_QgsMarkerSymbolV2; break; + case QgsSymbolV2::Line: sipType = sipType_QgsLineSymbolV2; break; + case QgsSymbolV2::Fill: sipType = sipType_QgsFillSymbolV2; break; + default: sipType = 0; break; } %End diff --git a/python/core/symbology-ng/qgsvectorcolorrampv2.sip b/python/core/symbology-ng/qgsvectorcolorrampv2.sip index 57a895c0e6e..cca1c6ef7b9 100644 --- a/python/core/symbology-ng/qgsvectorcolorrampv2.sip +++ b/python/core/symbology-ng/qgsvectorcolorrampv2.sip @@ -6,17 +6,17 @@ class QgsVectorColorRampV2 %ConvertToSubClassCode if (sipCpp->type() == "gradient") - sipClass = sipClass_QgsVectorGradientColorRampV2; + sipType = sipType_QgsVectorGradientColorRampV2; else if (sipCpp->type() == "random") - sipClass = sipClass_QgsVectorRandomColorRampV2; + sipType = sipType_QgsVectorRandomColorRampV2; else if (sipCpp->type() == "randomcolors") - sipClass = sipClass_QgsRandomColorsV2; + sipType = sipType_QgsRandomColorsV2; else if (sipCpp->type() == "colorbrewer") - sipClass = sipClass_QgsVectorColorBrewerColorRampV2; + sipType = sipType_QgsVectorColorBrewerColorRampV2; else if (sipCpp->type() == "cpt-city") - sipClass = sipClass_QgsCptCityColorRampV2; + sipType = sipType_QgsCptCityColorRampV2; else - sipClass = 0; + sipType = 0; %End public: diff --git a/python/gui/qgscomposerview.sip b/python/gui/qgscomposerview.sip index b26a91edcdc..9aa146dca93 100644 --- a/python/gui/qgscomposerview.sip +++ b/python/gui/qgscomposerview.sip @@ -13,9 +13,9 @@ class QgsComposerView : QGraphicsView %ConvertToSubClassCode if (sipCpp->inherits("QgsComposerView")) - sipClass = sipClass_QgsComposerView; + sipType = sipType_QgsComposerView; else - sipClass = NULL; + sipType = NULL; %End public: diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip index 04e095ded34..d3edac75af2 100644 --- a/python/gui/qgsmapcanvas.sip +++ b/python/gui/qgsmapcanvas.sip @@ -31,9 +31,9 @@ class QgsMapCanvas : QGraphicsView %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsMapCanvas; + sipType = sipType_QgsMapCanvas; else - sipClass = NULL; + sipType = NULL; %End public: diff --git a/python/gui/qgsmapcanvasmap.sip b/python/gui/qgsmapcanvasmap.sip index b14b8d580c0..148af522064 100644 --- a/python/gui/qgsmapcanvasmap.sip +++ b/python/gui/qgsmapcanvasmap.sip @@ -15,11 +15,11 @@ class QgsMapCanvasMap : QgsMapCanvasItem %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) { - sipClass = sipClass_QgsMapCanvasMap; + sipType = sipType_QgsMapCanvasMap; } else { - sipClass = NULL; + sipType = NULL; } %End diff --git a/python/gui/qgsmapmouseevent.sip b/python/gui/qgsmapmouseevent.sip index 84b33160972..acf4ea89b7a 100644 --- a/python/gui/qgsmapmouseevent.sip +++ b/python/gui/qgsmapmouseevent.sip @@ -24,6 +24,14 @@ class QgsMapMouseEvent : QMouseEvent %TypeHeaderCode #include "qgsmapmouseevent.h" %End + +%ConvertToSubClassCode + if ( dynamic_cast( sipCpp ) ) + sipType = sipType_QgsMapMouseEvent; + else + sipType = 0; +%End + public: enum SnappingMode diff --git a/python/gui/qgsmaptool.sip b/python/gui/qgsmaptool.sip index 3c9cb4404d9..d2862c09ae4 100644 --- a/python/gui/qgsmaptool.sip +++ b/python/gui/qgsmaptool.sip @@ -19,15 +19,15 @@ class QgsMapTool : QObject %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsMapToolZoom; + sipType = sipType_QgsMapToolZoom; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsMapToolPan; + sipType = sipType_QgsMapToolPan; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsMapToolEmitPoint; + sipType = sipType_QgsMapToolEmitPoint; else if (dynamic_cast(sipCpp) != NULL) - sipClass = sipClass_QgsMapToolIdentify; + sipType = sipType_QgsMapToolIdentify; else - sipClass = NULL; + sipType = NULL; %End public: