Skip to content
Permalink
Browse files
removed V2 from QgsSymbolLayerV2*
  • Loading branch information
@3nids
3nids committed Aug 5, 2016
1 parent 19ab72c commit c16d1393a217278cdc96e66a514bae2a1495bc49
Unified Split
Showing with 2,558 additions and 2,544 deletions.
  1. +16 −2 doc/api_break.dox
  2. +3 −3 python/core/core.sip
  3. +1 −1 python/core/symbology-ng/qgsarrowsymbollayer.sip
  4. +2 −2 python/core/symbology-ng/qgsellipsesymbollayerv2.sip
  5. +13 −13 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  6. +3 −3 python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
  7. +4 −4 python/core/symbology-ng/qgslinesymbollayerv2.sip
  8. +7 −7 python/core/symbology-ng/qgsmarkersymbollayerv2.sip
  9. +1 −1 python/core/symbology-ng/qgssvgcache.sip
  10. +13 −13 python/core/symbology-ng/{qgssymbollayerv2.sip → qgssymbollayer.sip}
  11. +85 −0 python/core/symbology-ng/qgssymbollayerregistry.sip
  12. +10 −10 python/core/symbology-ng/{qgssymbollayerv2utils.sip → qgssymbollayerutils.sip}
  13. +0 −85 python/core/symbology-ng/qgssymbollayerv2registry.sip
  14. +14 −14 python/core/symbology-ng/qgssymbolv2.sip
  15. +2 −2 python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
  16. +1 −1 python/gui/gui.sip
  17. +4 −4 python/gui/symbology-ng/qgsarrowsymbollayerwidget.sip
  18. +4 −4 python/gui/symbology-ng/qgsellipsesymbollayerv2widget.sip
  19. +3 −3 python/gui/symbology-ng/qgslayerpropertieswidget.sip
  20. +81 −81 python/gui/symbology-ng/{qgssymbollayerv2widget.sip → qgssymbollayerwidget.sip}
  21. +4 −4 python/gui/symbology-ng/qgssymbolv2selectordialog.sip
  22. +4 −4 python/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.sip
  23. +1 −1 src/app/composer/qgscomposerarrowwidget.cpp
  24. +4 −4 src/app/composer/qgscomposermapwidget.cpp
  25. +2 −2 src/app/composer/qgscomposerpolygonwidget.cpp
  26. +2 −2 src/app/composer/qgscomposerpolylinewidget.cpp
  27. +2 −2 src/app/composer/qgscomposershapewidget.cpp
  28. +2 −2 src/app/composer/qgscompositionwidget.cpp
  29. +2 −2 src/app/qgsannotationwidget.cpp
  30. +14 −14 src/app/qgsdecorationgrid.cpp
  31. +4 −4 src/app/qgsdecorationgriddialog.cpp
  32. +1 −1 src/app/qgsdecorationitem.cpp
  33. +2 −2 src/app/qgsdiagramproperties.cpp
  34. +2 −2 src/app/qgslabelinggui.cpp
  35. +4 −4 src/app/qgsmaptooloffsetpointsymbol.cpp
  36. +2 −2 src/app/qgsoptions.cpp
  37. +5 −5 src/app/qgsprojectproperties.cpp
  38. +1 −1 src/app/qgsrulebasedlabelingwidget.cpp
  39. +6 −6 src/core/CMakeLists.txt
  40. +7 −7 src/core/composer/qgscomposerarrow.cpp
  41. +7 −7 src/core/composer/qgscomposeritem.cpp
  42. +3 −3 src/core/composer/qgscomposerlegend.cpp
  43. +4 −4 src/core/composer/qgscomposerlegenditem.cpp
  44. +7 −7 src/core/composer/qgscomposermap.cpp
  45. +17 −17 src/core/composer/qgscomposermapgrid.cpp
  46. +3 −3 src/core/composer/qgscomposermapoverview.cpp
  47. +1 −1 src/core/composer/qgscomposernodesitem.cpp
  48. +5 −5 src/core/composer/qgscomposerpicture.cpp
  49. +3 −3 src/core/composer/qgscomposerpolygon.cpp
  50. +3 −3 src/core/composer/qgscomposerpolyline.cpp
  51. +5 −5 src/core/composer/qgscomposerscalebar.cpp
  52. +9 −9 src/core/composer/qgscomposershape.cpp
  53. +7 −7 src/core/composer/qgscomposertable.cpp
  54. +11 −11 src/core/composer/qgscomposertablev2.cpp
  55. +3 −3 src/core/composer/qgscomposition.cpp
  56. +3 −3 src/core/composer/qgslegendmodel.cpp
  57. +1 −1 src/core/composer/qgspaperitem.cpp
  58. +4 −4 src/core/diagram/qgsdiagram.cpp
  59. +17 −17 src/core/dxf/qgsdxfexport.cpp
  60. +11 −11 src/core/dxf/qgsdxfexport.h
  61. +3 −3 src/core/effects/qgscoloreffect.cpp
  62. +7 −7 src/core/effects/qgsgloweffect.cpp
  63. +7 −7 src/core/effects/qgsshadoweffect.cpp
  64. +5 −5 src/core/effects/qgstransformeffect.cpp
  65. +1 −1 src/core/layertree/qgslayertreemodel.cpp
  66. +5 −5 src/core/layertree/qgslayertreemodellegendnode.cpp
  67. +6 −6 src/core/qgscolorscheme.cpp
  68. +4 −4 src/core/qgsconditionalstyle.cpp
  69. +9 −9 src/core/qgsdiagramrendererv2.cpp
  70. +13 −13 src/core/qgsexpression.cpp
  71. +2 −2 src/core/qgsexpressioncontext.cpp
  72. +4 −4 src/core/qgsmaphittest.cpp
  73. +75 −75 src/core/qgspallabeling.cpp
  74. +2 −2 src/core/qgsvectorfilewriter.cpp
  75. +2 −2 src/core/qgsvectorfilewriter.h
  76. +1 −1 src/core/qgsvectorlayer.cpp
  77. +1 −1 src/core/qgsvectorlayerrenderer.cpp
  78. +5 −5 src/core/symbology-ng/qgs25drenderer.cpp
  79. +23 −23 src/core/symbology-ng/qgsarrowsymbollayer.cpp
  80. +2 −2 src/core/symbology-ng/qgsarrowsymbollayer.h
  81. +20 −20 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  82. +2 −2 src/core/symbology-ng/qgscolorbrewerpalette.h
  83. +3 −3 src/core/symbology-ng/qgscptcityarchive.cpp
  84. +95 −95 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  85. +2 −2 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  86. +306 −306 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  87. +14 −14 src/core/symbology-ng/qgsfillsymbollayerv2.h
  88. +3 −3 src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp
  89. +4 −4 src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.h
  90. +22 −22 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  91. +10 −10 src/core/symbology-ng/qgsheatmaprenderer.cpp
  92. +2 −2 src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
  93. +100 −100 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  94. +5 −5 src/core/symbology-ng/qgslinesymbollayerv2.h
  95. +241 −241 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  96. +8 −8 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  97. +12 −12 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  98. +1 −1 src/core/symbology-ng/qgsrendererv2.cpp
  99. +9 −9 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  100. +15 −15 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  101. +14 −14 src/core/symbology-ng/qgsstylev2.cpp
  102. +2 −2 src/core/symbology-ng/qgsstylev2.h
  103. +2 −2 src/core/symbology-ng/qgssvgcache.cpp
  104. +1 −1 src/core/symbology-ng/qgssvgcache.h
  105. +108 −108 src/core/symbology-ng/{qgssymbollayerv2.cpp → qgssymbollayer.cpp}
  106. +15 −15 src/core/symbology-ng/{qgssymbollayerv2.h → qgssymbollayer.h}
  107. +31 −31 src/core/symbology-ng/{qgssymbollayerv2registry.cpp → qgssymbollayerregistry.cpp}
  108. +153 −0 src/core/symbology-ng/qgssymbollayerregistry.h
  109. +173 −173 src/core/symbology-ng/{qgssymbollayerv2utils.cpp → qgssymbollayerutils.cpp}
  110. +15 −15 src/core/symbology-ng/{qgssymbollayerv2utils.h → qgssymbollayerutils.h}
  111. +0 −153 src/core/symbology-ng/qgssymbollayerv2registry.h
  112. +3 −3 src/core/symbology-ng/qgssymbologyv2conversion.cpp
  113. +72 −72 src/core/symbology-ng/qgssymbolv2.cpp
  114. +20 −20 src/core/symbology-ng/qgssymbolv2.h
  115. +7 −7 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  116. +16 −16 src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
  117. +3 −3 src/core/symbology-ng/qgsvectorfieldsymbollayer.h
  118. +2 −2 src/gui/CMakeLists.txt
  119. +1 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  120. +2 −2 src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
  121. +2 −2 src/gui/effects/qgseffectstackpropertieswidget.cpp
  122. +3 −3 src/gui/qgsannotationitem.cpp
  123. +5 −5 src/gui/qgscolorbutton.cpp
  124. +1 −1 src/gui/qgscolordialog.cpp
  125. +12 −12 src/gui/qgscolorschemelist.cpp
  126. +5 −5 src/gui/qgscolorwidgets.cpp
  127. +3 −3 src/gui/qgscompoundcolorwidget.cpp
  128. +3 −3 src/gui/qgsgradientstopeditor.cpp
  129. +3 −3 src/gui/qgshighlight.cpp
  130. +3 −3 src/gui/symbology-ng/qgsarrowsymbollayerwidget.cpp
  131. +5 −5 src/gui/symbology-ng/qgsarrowsymbollayerwidget.h
  132. +4 −4 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  133. +4 −4 src/gui/symbology-ng/qgscolorrampcombobox.cpp
  134. +5 −5 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  135. +4 −4 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  136. +5 −5 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  137. +3 −3 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  138. +23 −23 src/gui/symbology-ng/qgslayerpropertieswidget.cpp
  139. +6 −6 src/gui/symbology-ng/qgslayerpropertieswidget.h
  140. +2 −2 src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
  141. +4 −4 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  142. +2 −2 src/gui/symbology-ng/qgssizescalewidget.cpp
  143. +3 −3 src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
  144. +3 −3 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  145. +7 −7 src/gui/symbology-ng/qgssvgselectorwidget.cpp
  146. +1 −1 src/gui/symbology-ng/qgssvgselectorwidget.h
  147. +60 −60 src/gui/symbology-ng/{qgssymbollayerv2widget.cpp → qgssymbollayerwidget.cpp}
  148. +70 −70 src/gui/symbology-ng/{qgssymbollayerv2widget.h → qgssymbollayerwidget.h}
  149. +5 −5 src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  150. +3 −3 src/gui/symbology-ng/qgssymbolslistwidget.cpp
  151. +25 −25 src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
  152. +6 −6 src/gui/symbology-ng/qgssymbolv2selectordialog.h
  153. +3 −3 src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
  154. +3 −3 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
  155. +5 −5 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
  156. +2 −2 src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
  157. +3 −3 src/plugins/grass/qgsgrasseditrenderer.cpp
  158. +1 −1 tests/src/core/testqgsimageoperation.cpp
  159. +6 −6 tests/src/core/testqgspainteffect.cpp
  160. +8 −8 tests/src/core/testqgssymbolv2.cpp
  161. +1 −1 tests/src/python/CMakeLists.txt
  162. +19 −19 tests/src/python/acceptable_missing_doc.py
  163. +5 −5 tests/src/python/test_qgsgraduatedsymbolrendererv2.py
  164. +54 −54 tests/src/python/test_qgsmapunitscale.py
  165. +5 −5 tests/src/python/{test_qgssymbollayerv2.py → test_qgssymbollayer.py}
18 doc/api_break.dox
View file
@@ -18,6 +18,20 @@ This page tries to maintain a list with incompatible changes that happened in pr

\section qgis_api_break_3_0 QGIS 3.0

\subsection qgis_api_break_3_0_renamed_classes Renamed Classes

<table>
<caption id="renamed_classes">Renamed classes</caption>
<tr><th>API 2.x<th>API 3.X
<tr><td>QgsColorButtonV2 <tr><td>QgsColorButton
<tr><td>QgsSymbolLayerV2 <tr><td>QgsSymbolLayer
<tr><td>QgsSymbolLayerV2AbstractMetadata <tr><td>QgsSymbolLayerAbstractMetadata
<tr><td>QgsSymbolLayerV2Metadata <tr><td>QgsSymbolLayerMetadata
<tr><td>QgsSymbolLayerV2Registry <tr><td>QgsSymbolLayerRegistry
<tr><td>QgsSymbolLayerV2Utils <tr><td>QgsSymbolLayerUtils
<tr><td>QgsSymbolLayerV2Widget <tr><td>QgsSymbolLayerWidget
</table>

\subsection qgis_api_break_3_0_removed_classes Removed Classes

<ul>
@@ -540,7 +554,7 @@ parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::Rend
<li>startRender() now accepts a QgsFields reference, not a pointer.</li>
</ul>

\subsection qgis_api_break_3_0_QgsSymbolLayerV2 QgsSymbolLayerV2
\subsection qgis_api_break_3_0_QgsSymbolLayer QgsSymbolLayer (renamed from QgsSymbolLayerV2)

<ul>
<li>The deprecated prepareExpressions( const QgsFields* fields, double scale = -1.0 ) method has been removed. Use
@@ -554,7 +568,7 @@ the variant which takes QgsSymbolV2RenderContext instead.</li>
<li>fields() now returns a QgsFields value, not a pointer.</li>
</ul>

\subsection qgis_api_break_3_0_QgsSymbolLayerV2Utils QgsSymbolLayerV2Utils
\subsection qgis_api_break_3_0_QgsSymbolLayerUtils QgsSymbolLayerUtils (renamed from QgsSymbolLayerUtilsV2)

<ul>
<li>encodeOutputUnit() and decodeOutputUnit() were removed. QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.</li>
6 python/core/core.sip
View file
@@ -312,9 +312,9 @@
%Include symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
%Include symbology-ng/qgslinesymbollayerv2.sip
%Include symbology-ng/qgsmarkersymbollayerv2.sip
%Include symbology-ng/qgssymbollayerv2.sip
%Include symbology-ng/qgssymbollayerv2registry.sip
%Include symbology-ng/qgssymbollayerv2utils.sip
%Include symbology-ng/qgssymbollayer.sip
%Include symbology-ng/qgssymbollayerregistry.sip
%Include symbology-ng/qgssymbollayerutils.sip
%Include symbology-ng/qgsvectorfieldsymbollayer.sip
%Include symbology-ng/qgsarrowsymbollayer.sip

2 python/core/symbology-ng/qgsarrowsymbollayer.sip
View file
@@ -20,7 +20,7 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
*
* @return A new QgsArrowSymbolLayer
*/
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;

/** Virtual constructor */
virtual QgsArrowSymbolLayer* clone() const /Factory/;
4 python/core/symbology-ng/qgsellipsesymbollayerv2.sip
View file
@@ -8,8 +8,8 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
QgsEllipseSymbolLayerV2();
~QgsEllipseSymbolLayerV2();

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

void renderPoint( QPointF point, QgsSymbolV2RenderContext& context );
QString layerType() const;
26 python/core/symbology-ng/qgsfillsymbollayerv2.sip
View file
@@ -15,8 +15,8 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2

// static stuff

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// implemented from base classes

@@ -156,7 +156,7 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2

// static stuff

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;

// implemented from base classes

@@ -254,7 +254,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2

// static stuff

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;

// implemented from base classes

@@ -510,7 +510,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
QgsRasterFillSymbolLayer( const QString& imageFilePath = QString() );
~QgsRasterFillSymbolLayer();

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() );
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() );

// implemented from base classes
QString layerType() const;
@@ -671,8 +671,8 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
QgsSVGFillSymbolLayer( const QByteArray& svgData, double width = 20, double rotation = 0.0 );
~QgsSVGFillSymbolLayer();

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// implemented from base classes

@@ -747,8 +747,8 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
QgsLinePatternFillSymbolLayer();
~QgsLinePatternFillSymbolLayer();

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

QString layerType() const;

@@ -855,8 +855,8 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
QgsPointPatternFillSymbolLayer();
~QgsPointPatternFillSymbolLayer();

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

QString layerType() const;

@@ -959,8 +959,8 @@ class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2

// static stuff

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// implemented from base classes

6 python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
View file
@@ -12,13 +12,13 @@
* (at your option) any later version. *
* *
***************************************************************************/
class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayerV2
class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayer
{
%TypeHeaderCode
#include "qgsgeometrygeneratorsymbollayerv2.h"
%End
public:
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() );
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() );

QString layerType() const;

@@ -42,7 +42,7 @@ class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayerV2

void stopRender( QgsSymbolV2RenderContext& context );

QgsSymbolLayerV2* clone() const;
QgsSymbolLayer* clone() const;

QgsStringMap properties() const;

8 python/core/symbology-ng/qgslinesymbollayerv2.sip
View file
@@ -11,8 +11,8 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2

// static stuff

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// implemented from base classes

@@ -123,7 +123,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
*
* @return A new MarkerLineSymbolLayerV2
*/
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;

/**
* Create a new MarkerLineSymbolLayerV2 from SLD
@@ -132,7 +132,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
*
* @return A new MarkerLineSymbolLayerV2
*/
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// implemented from base classes

14 python/core/symbology-ng/qgsmarkersymbollayerv2.sip
View file
@@ -193,13 +193,13 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
* @param properties a property map containing symbol properties (see properties())
* @returns new QgsSimpleMarkerSymbolLayerV2
*/
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;

/** Creates a new QgsSimpleMarkerSymbolLayerV2 from an SLD XML element.
* @param element XML element containing SLD definition of symbol
* @returns new QgsSimpleMarkerSymbolLayerV2
*/
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// reimplemented from base classes

@@ -381,7 +381,7 @@ class QgsFilledMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase
* @param properties a property map containing symbol properties (see properties())
* @returns new QgsFilledMarkerSymbolLayer
*/
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;

QString layerType() const;
void startRender( QgsSymbolV2RenderContext& context );
@@ -417,8 +417,8 @@ class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2

// static stuff

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// implemented from base classes

@@ -490,8 +490,8 @@ class QgsFontMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2

// static stuff

static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayerV2* createFromSld( QDomElement &element ) /Factory/;
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;

// implemented from base classes

2 python/core/symbology-ng/qgssvgcache.sip
View file
@@ -175,7 +175,7 @@ class QgsSvgCache : QObject
QgsSvgCache( QObject * parent /TransferThis/ = 0 );

/** Creates new cache entry and returns pointer to it
* @param file Absolute or relative path to SVG file. If the path is relative the file is searched by QgsSymbolLayerV2Utils::symbolNameToPath() in SVG paths.
* @param file Absolute or relative path to SVG file. If the path is relative the file is searched by QgsSymbolLayerUtils::symbolNameToPath() in SVG paths.
* in settings svg/searchPathsForSVG
* @param size size of cached image
* @param fill color of fill
26 ...on/core/symbology-ng/qgssymbollayerv2.sip → python/core/symbology-ng/qgssymbollayer.sip
View file
@@ -1,7 +1,7 @@
class QgsSymbolLayerV2
class QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayerv2.h>
#include <qgssymbollayer.h>
#include <qgslinesymbollayerv2.h>
%End

@@ -70,7 +70,7 @@ class QgsSymbolLayerV2

public:

virtual ~QgsSymbolLayerV2();
virtual ~QgsSymbolLayer();

/**
* The fill color.
@@ -109,7 +109,7 @@ class QgsSymbolLayerV2
/**
* Shall be reimplemented by subclasses to create a deep copy of the instance.
*/
virtual QgsSymbolLayerV2* clone() const = 0 /Factory/;
virtual QgsSymbolLayer* clone() const = 0 /Factory/;

virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;

@@ -299,7 +299,7 @@ class QgsSymbolLayerV2
void setPaintEffect( QgsPaintEffect* effect /Transfer/);

protected:
QgsSymbolLayerV2( QgsSymbolV2::SymbolType type, bool locked = false );
QgsSymbolLayer( QgsSymbolV2::SymbolType type, bool locked = false );

/** Prepares all data defined property expressions for evaluation. This should
* be called prior to evaluating data defined properties.
@@ -329,13 +329,13 @@ class QgsSymbolLayerV2
/** Copies all data defined properties of this layer to another symbol layer.
* @param destLayer destination layer
*/
void copyDataDefinedProperties( QgsSymbolLayerV2* destLayer ) const;
void copyDataDefinedProperties( QgsSymbolLayer* destLayer ) const;

/** Copies paint effect of this layer to another symbol layer
* @param destLayer destination layer
* @note added in QGIS 2.9
*/
void copyPaintEffect( QgsSymbolLayerV2* destLayer ) const;
void copyPaintEffect( QgsSymbolLayer* destLayer ) const;

};

@@ -345,10 +345,10 @@ class QgsSymbolLayerV2
* \class QgsMarkerSymbolLayerV2
* \brief Abstract base class for marker symbol layers.
*/
class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
class QgsMarkerSymbolLayerV2 : QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayerv2.h>
#include <qgssymbollayer.h>
%End
public:

@@ -598,10 +598,10 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayerV2
static QPointF _rotatedOffset( QPointF offset, double angle );
};

class QgsLineSymbolLayerV2 : QgsSymbolLayerV2
class QgsLineSymbolLayerV2 : QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayerv2.h>
#include <qgssymbollayer.h>
%End

public:
@@ -658,10 +658,10 @@ class QgsLineSymbolLayerV2 : QgsSymbolLayerV2
QgsLineSymbolLayerV2( bool locked = false );
};

class QgsFillSymbolLayerV2 : QgsSymbolLayerV2
class QgsFillSymbolLayerV2 : QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayerv2.h>
#include <qgssymbollayer.h>
%End

public:

0 comments on commit c16d139

Please sign in to comment.