Skip to content
Permalink
Browse files

#9254: use Q_DECL_DEPRECATED in wellKnownMarkerXXX functions

XXX
  • Loading branch information
ahuarte47 committed Jan 2, 2014
1 parent 2752107 commit 17464511f0fc8cd533b2a128d4227de0571e1af0
@@ -1521,7 +1521,7 @@ void QgsSymbolLayerV2Utils::fillToSld( QDomDocument &doc, QDomElement &element,
QColor borderColor = !patternName.startsWith( "brush://" ) ? color : QColor();

/* Use WellKnownName tag to handle QT brush styles. */
wellKnownMarkerToSld( doc, graphicElem, patternName, fillColor, borderColor );
wellKnownMarkerToSld( doc, graphicElem, patternName, fillColor, borderColor, Qt::SolidLine, -1, -1 );
}

bool QgsSymbolLayerV2Utils::fillFromSld( QDomElement &element, Qt::BrushStyle &brushStyle, QColor &color )
@@ -147,14 +147,14 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
QColor &color, double &size );

/** @deprecated Use wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element, QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle, double borderWidth, double size ) instead */
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
Q_DECL_DEPRECATED static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
QString name, QColor color, QColor borderColor = QColor(),
double borderWidth = -1, double size = -1 );
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle,
double borderWidth = -1, double size = -1 );
/** @deprecated Use wellKnownMarkerFromSld( QDomElement &element, QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle, double &borderWidth, double &size ) instead */
static bool wellKnownMarkerFromSld( QDomElement &element,
Q_DECL_DEPRECATED static bool wellKnownMarkerFromSld( QDomElement &element,
QString &name, QColor &color, QColor &borderColor,
double &borderWidth, double &size );
static bool wellKnownMarkerFromSld( QDomElement &element,

0 comments on commit 1746451

Please sign in to comment.
You can’t perform that action at this time.