Skip to content

Commit 1746451

Browse files
committed
#9254: use Q_DECL_DEPRECATED in wellKnownMarkerXXX functions
XXX
1 parent 2752107 commit 1746451

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/core/symbology-ng/qgssymbollayerv2utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ void QgsSymbolLayerV2Utils::fillToSld( QDomDocument &doc, QDomElement &element,
15211521
QColor borderColor = !patternName.startsWith( "brush://" ) ? color : QColor();
15221522

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

15271527
bool QgsSymbolLayerV2Utils::fillFromSld( QDomElement &element, Qt::BrushStyle &brushStyle, QColor &color )

src/core/symbology-ng/qgssymbollayerv2utils.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,14 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
147147
QColor &color, double &size );
148148

149149
/** @deprecated Use wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element, QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle, double borderWidth, double size ) instead */
150-
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
150+
Q_DECL_DEPRECATED static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
151151
QString name, QColor color, QColor borderColor = QColor(),
152152
double borderWidth = -1, double size = -1 );
153153
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
154154
QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle,
155155
double borderWidth = -1, double size = -1 );
156156
/** @deprecated Use wellKnownMarkerFromSld( QDomElement &element, QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle, double &borderWidth, double &size ) instead */
157-
static bool wellKnownMarkerFromSld( QDomElement &element,
157+
Q_DECL_DEPRECATED static bool wellKnownMarkerFromSld( QDomElement &element,
158158
QString &name, QColor &color, QColor &borderColor,
159159
double &borderWidth, double &size );
160160
static bool wellKnownMarkerFromSld( QDomElement &element,

0 commit comments

Comments
 (0)