From 183dd8eed6258fbc8ed3219dd61d32584e7c1c22 Mon Sep 17 00:00:00 2001 From: ahuarte47 Date: Wed, 1 Jan 2014 03:04:26 +0100 Subject: [PATCH] #9254: define overloaded wellKnownMarkerFromSld function in sip in sip --- python/core/symbology-ng/qgssymbollayerv2utils.sip | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/python/core/symbology-ng/qgssymbollayerv2utils.sip b/python/core/symbology-ng/qgssymbollayerv2utils.sip index fcbb621d8b4..2e8807dcf2c 100644 --- a/python/core/symbology-ng/qgssymbollayerv2utils.sip +++ b/python/core/symbology-ng/qgssymbollayerv2utils.sip @@ -122,11 +122,9 @@ class QgsSymbolLayerV2Utils static bool wellKnownMarkerFromSld( QDomElement &element, QString &name, QColor &color, QColor &borderColor, double &borderWidth, double &size ) /Deprecated/ ; - /** TODO: Enable to override deprecated wellKnownMarkerFromSld function static bool wellKnownMarkerFromSld( QDomElement &element, QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle, - double &borderWidth, double &size ); - */ + double &borderWidth, double &size ) /PyName=wellKnownMarkerFromSld2/ ; static void externalMarkerToSld( QDomDocument &doc, QDomElement &element, QString path, QString format, int *markIndex = 0,