Skip to content
Permalink
Browse files

removed V2 from QgsSymbolV2*

  • Loading branch information
3nids committed Aug 5, 2016
1 parent c16d139 commit 275736de921fc21ed1bf8f8c06db8ff7c5d8e1b6
Showing with 2,074 additions and 2,068 deletions.
  1. +21 −15 doc/api_break.dox
  2. +2 −2 python/core/composer/qgscomposerlegenditem.sip
  3. +2 −2 python/core/composer/qgscomposerpolygon.sip
  4. +2 −2 python/core/composer/qgscomposerpolyline.sip
  5. +1 −1 python/core/composer/qgslegendmodel.sip
  6. +1 −1 python/core/core.sip
  7. +6 −6 python/core/layertree/qgslayertreemodellegendnode.sip
  8. +4 −4 python/core/qgsconditionalstyle.sip
  9. +1 −1 python/core/qgsdiagramrendererv2.sip
  10. +2 −2 python/core/qgsexpressioncontext.sip
  11. +1 −1 python/core/qgsmaphittest.sip
  12. +2 −2 python/core/qgsvectorlayer.sip
  13. +2 −2 python/core/symbology-ng/qgs25drenderer.sip
  14. +5 −5 python/core/symbology-ng/qgsarrowsymbollayer.sip
  15. +15 −15 python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip
  16. +5 −5 python/core/symbology-ng/qgsellipsesymbollayerv2.sip
  17. +41 −41 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  18. +9 −9 python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
  19. +16 −16 python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip
  20. +2 −2 python/core/symbology-ng/qgsheatmaprenderer.sip
  21. +6 −6 python/core/symbology-ng/qgsinvertedpolygonrenderer.sip
  22. +5 −5 python/core/symbology-ng/qgslegendsymbolitemv2.sip
  23. +16 −16 python/core/symbology-ng/qgslinesymbollayerv2.sip
  24. +33 −33 python/core/symbology-ng/qgsmarkersymbollayerv2.sip
  25. +3 −3 python/core/symbology-ng/qgsnullsymbolrenderer.sip
  26. +8 −8 python/core/symbology-ng/qgspointdisplacementrenderer.sip
  27. +23 −23 python/core/symbology-ng/qgsrendererv2.sip
  28. +16 −16 python/core/symbology-ng/qgsrulebasedrendererv2.sip
  29. +9 −9 python/core/symbology-ng/qgssinglesymbolrendererv2.sip
  30. +6 −6 python/core/symbology-ng/qgsstylev2.sip
  31. +26 −26 python/core/symbology-ng/{qgssymbolv2.sip → qgssymbol.sip}
  32. +38 −38 python/core/symbology-ng/qgssymbollayer.sip
  33. +4 −4 python/core/symbology-ng/qgssymbollayerregistry.sip
  34. +11 −11 python/core/symbology-ng/qgssymbollayerutils.sip
  35. +6 −6 python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
  36. +1 −1 python/gui/gui.sip
  37. +1 −1 python/gui/qgsunitselectionwidget.sip
  38. +2 −2 python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip
  39. +3 −3 python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
  40. +1 −1 python/gui/symbology-ng/qgslayerpropertieswidget.sip
  41. +17 −17 python/gui/symbology-ng/qgsrendererv2widget.sip
  42. +1 −1 python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip
  43. +1 −1 python/gui/symbology-ng/qgssinglesymbolrendererv2widget.sip
  44. +1 −1 python/gui/symbology-ng/qgssymbollevelsv2dialog.sip
  45. +10 −10 python/gui/symbology-ng/{qgssymbolv2selectordialog.sip → qgssymbolselectordialog.sip}
  46. +2 −2 python/gui/symbology-ng/qgssymbolslistwidget.sip
  47. +2 −2 python/server/qgswmserver.sip
  48. +1 −1 resources/customization.xml
  49. +3 −3 src/app/composer/qgscomposerarrowwidget.cpp
  50. +5 −5 src/app/composer/qgscomposermapwidget.cpp
  51. +3 −3 src/app/composer/qgscomposerpolygonwidget.cpp
  52. +2 −2 src/app/composer/qgscomposerpolylinewidget.cpp
  53. +3 −3 src/app/composer/qgscomposershapewidget.cpp
  54. +2 −2 src/app/composer/qgscompositionwidget.cpp
  55. +5 −5 src/app/qgisapp.cpp
  56. +3 −3 src/app/qgsannotationwidget.cpp
  57. +13 −13 src/app/qgsapplayertreeviewmenuprovider.cpp
  58. +1 −1 src/app/qgsdecorationgrid.cpp
  59. +4 −4 src/app/qgsdecorationgriddialog.cpp
  60. +2 −2 src/app/qgsdiagramproperties.cpp
  61. +1 −1 src/app/qgsmaptooloffsetpointsymbol.cpp
  62. +1 −1 src/app/qgsmaptooloffsetpointsymbol.h
  63. +4 −4 src/app/qgsmaptoolpointsymbol.cpp
  64. +2 −2 src/app/qgsmaptoolrotatepointsymbols.cpp
  65. +1 −1 src/app/qgspointmarkeritem.cpp
  66. +9 −9 src/app/qgsprojectproperties.cpp
  67. +2 −2 src/core/CMakeLists.txt
  68. +1 −1 src/core/composer/qgscomposerlegend.h
  69. +7 −7 src/core/composer/qgscomposerlegenditem.cpp
  70. +4 −4 src/core/composer/qgscomposerlegenditem.h
  71. +1 −1 src/core/composer/qgscomposermapgrid.cpp
  72. +1 −1 src/core/composer/qgscomposermapoverview.cpp
  73. +1 −1 src/core/composer/qgscomposernodesitem.cpp
  74. +1 −1 src/core/composer/qgscomposerpolygon.cpp
  75. +3 −3 src/core/composer/qgscomposerpolygon.h
  76. +1 −1 src/core/composer/qgscomposerpolyline.cpp
  77. +3 −3 src/core/composer/qgscomposerpolyline.h
  78. +1 −1 src/core/composer/qgscomposershape.cpp
  79. +1 −1 src/core/composer/qgscomposition.cpp
  80. +1 −1 src/core/composer/qgslegendmodel.cpp
  81. +2 −2 src/core/composer/qgslegendmodel.h
  82. +33 −33 src/core/dxf/qgsdxfexport.cpp
  83. +7 −7 src/core/dxf/qgsdxfexport.h
  84. +1 −1 src/core/effects/qgsgloweffect.h
  85. +1 −1 src/core/effects/qgsshadoweffect.h
  86. +5 −5 src/core/layertree/qgslayertreemodel.cpp
  87. +19 −19 src/core/layertree/qgslayertreemodellegendnode.cpp
  88. +7 −7 src/core/layertree/qgslayertreemodellegendnode.h
  89. +2 −2 src/core/qgsconditionalstyle.cpp
  90. +6 −6 src/core/qgsconditionalstyle.h
  91. +1 −1 src/core/qgsdiagramrendererv2.cpp
  92. +1 −1 src/core/qgsdiagramrendererv2.h
  93. +1 −1 src/core/qgsexpressioncontext.cpp
  94. +3 −3 src/core/qgsexpressioncontext.h
  95. +1 −1 src/core/qgslegendrenderer.cpp
  96. +1 −1 src/core/qgslegendrenderer.h
  97. +3 −3 src/core/qgsmaphittest.cpp
  98. +2 −2 src/core/qgsmaphittest.h
  99. +1 −1 src/core/qgsmaplayerlegend.cpp
  100. +2 −2 src/core/qgspallabeling.cpp
  101. +15 −15 src/core/qgsvectorfilewriter.cpp
  102. +1 −1 src/core/qgsvectorfilewriter.h
  103. +3 −3 src/core/qgsvectorlayer.cpp
  104. +4 −4 src/core/qgsvectorlayer.h
  105. +4 −4 src/core/qgsvectorlayerlabelprovider.cpp
  106. +2 −2 src/core/qgsvectorlayerlabelprovider.h
  107. +13 −13 src/core/qgsvectorlayerrenderer.cpp
  108. +3 −3 src/core/symbology-ng/qgs25drenderer.cpp
  109. +3 −3 src/core/symbology-ng/qgs25drenderer.h
  110. +6 −6 src/core/symbology-ng/qgsarrowsymbollayer.cpp
  111. +6 −6 src/core/symbology-ng/qgsarrowsymbollayer.h
  112. +38 −38 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  113. +21 −21 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  114. +13 −13 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  115. +8 −8 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  116. +51 −51 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  117. +51 −51 src/core/symbology-ng/qgsfillsymbollayerv2.h
  118. +17 −17 src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp
  119. +11 −11 src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.h
  120. +50 −50 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  121. +21 −21 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  122. +4 −4 src/core/symbology-ng/qgsheatmaprenderer.cpp
  123. +3 −3 src/core/symbology-ng/qgsheatmaprenderer.h
  124. +13 −13 src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
  125. +6 −6 src/core/symbology-ng/qgsinvertedpolygonrenderer.h
  126. +3 −3 src/core/symbology-ng/qgslegendsymbolitemv2.cpp
  127. +8 −8 src/core/symbology-ng/qgslegendsymbolitemv2.h
  128. +25 −25 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  129. +19 −19 src/core/symbology-ng/qgslinesymbollayerv2.h
  130. +63 −63 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  131. +38 −38 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  132. +6 −6 src/core/symbology-ng/qgsnullsymbolrenderer.cpp
  133. +5 −5 src/core/symbology-ng/qgsnullsymbolrenderer.h
  134. +17 −17 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  135. +13 −13 src/core/symbology-ng/qgspointdisplacementrenderer.h
  136. +36 −36 src/core/symbology-ng/qgsrendererv2.cpp
  137. +26 −26 src/core/symbology-ng/qgsrendererv2.h
  138. +29 −29 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  139. +17 −17 src/core/symbology-ng/qgsrulebasedrendererv2.h
  140. +24 −24 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  141. +13 −13 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  142. +12 −12 src/core/symbology-ng/qgsstylev2.cpp
  143. +8 −8 src/core/symbology-ng/qgsstylev2.h
  144. +100 −100 src/core/symbology-ng/{qgssymbolv2.cpp → qgssymbol.cpp}
  145. +30 −30 src/core/symbology-ng/{qgssymbolv2.h → qgssymbol.h}
  146. +25 −25 src/core/symbology-ng/qgssymbollayer.cpp
  147. +37 −37 src/core/symbology-ng/qgssymbollayer.h
  148. +25 −25 src/core/symbology-ng/qgssymbollayerregistry.cpp
  149. +8 −8 src/core/symbology-ng/qgssymbollayerregistry.h
  150. +30 −30 src/core/symbology-ng/qgssymbollayerutils.cpp
  151. +14 −14 src/core/symbology-ng/qgssymbollayerutils.h
  152. +4 −4 src/core/symbology-ng/qgssymbologyv2conversion.cpp
  153. +6 −6 src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
  154. +6 −6 src/core/symbology-ng/qgsvectorfieldsymbollayer.h
  155. +2 −2 src/gui/CMakeLists.txt
  156. +4 −4 src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
  157. +1 −1 src/gui/attributetable/qgsfieldconditionalformatwidget.h
  158. +1 −1 src/gui/qgsannotationitem.cpp
  159. +3 −3 src/gui/qgshighlight.cpp
  160. +3 −3 src/gui/qgshighlight.h
  161. +1 −1 src/gui/qgsunitselectionwidget.h
  162. +26 −26 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  163. +3 −3 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  164. +18 −18 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  165. +5 −5 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  166. +1 −1 src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
  167. +1 −1 src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
  168. +5 −5 src/gui/symbology-ng/qgslayerpropertieswidget.cpp
  169. +3 −3 src/gui/symbology-ng/qgslayerpropertieswidget.h
  170. +1 −1 src/gui/symbology-ng/qgsnullsymbolrendererwidget.cpp
  171. +1 −1 src/gui/symbology-ng/qgsnullsymbolrendererwidget.h
  172. +2 −2 src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
  173. +1 −1 src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
  174. +38 −38 src/gui/symbology-ng/qgsrendererv2widget.cpp
  175. +22 −22 src/gui/symbology-ng/qgsrendererv2widget.h
  176. +10 −10 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  177. +4 −4 src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
  178. +5 −5 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  179. +4 −4 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  180. +5 −5 src/gui/symbology-ng/qgssizescalewidget.cpp
  181. +3 −3 src/gui/symbology-ng/qgssizescalewidget.h
  182. +3 −3 src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
  183. +20 −20 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  184. +7 −7 src/gui/symbology-ng/qgssymbollayerwidget.cpp
  185. +5 −5 src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  186. +77 −77 src/gui/symbology-ng/{qgssymbolv2selectordialog.cpp → qgssymbolselectordialog.cpp}
  187. +21 −21 src/gui/symbology-ng/{qgssymbolv2selectordialog.h → qgssymbolselectordialog.h}
  188. +12 −12 src/gui/symbology-ng/qgssymbolslistwidget.cpp
  189. +4 −4 src/gui/symbology-ng/qgssymbolslistwidget.h
  190. +4 −4 src/plugins/globe/globe_plugin.cpp
  191. +6 −6 src/plugins/grass/qgsgrasseditrenderer.cpp
  192. +3 −3 src/plugins/grass/qgsgrasseditrenderer.h
  193. +2 −2 src/server/qgssldconfigparser.cpp
  194. +1 −1 src/server/qgswfsserver.cpp
  195. +4 −4 src/server/qgswmsserver.cpp
  196. +2 −2 src/server/qgswmsserver.h
  197. +2 −2 src/ui/{qgssymbolv2selectordialogbase.ui → qgssymbolselectordialogbase.ui}
  198. +1 −1 tests/src/core/CMakeLists.txt
  199. +1 −1 tests/src/core/testqgs25drenderer.cpp
  200. +1 −1 tests/src/core/testqgsatlascomposition.cpp
  201. +1 −1 tests/src/core/testqgscentroidfillsymbol.cpp
  202. +1 −1 tests/src/core/testqgscomposerdd.cpp
  203. +1 −1 tests/src/core/testqgscomposerpaper.cpp
  204. +1 −1 tests/src/core/testqgscomposershapes.cpp
  205. +1 −1 tests/src/core/testqgsellipsemarker.cpp
  206. +1 −1 tests/src/core/testqgsfilledmarker.cpp
  207. +1 −1 tests/src/core/testqgsfontmarker.cpp
  208. +1 −1 tests/src/core/testqgsgradients.cpp
  209. +16 −16 tests/src/core/testqgslayertree.cpp
  210. +1 −1 tests/src/core/testqgslinefillsymbol.cpp
  211. +1 −1 tests/src/core/testqgspainteffect.cpp
  212. +1 −1 tests/src/core/testqgspointpatternfillsymbol.cpp
  213. +1 −1 tests/src/core/testqgsrasterfill.cpp
  214. +6 −6 tests/src/core/testqgsrulebasedrenderer.cpp
  215. +1 −1 tests/src/core/testqgsshapeburst.cpp
  216. +1 −1 tests/src/core/testqgssimplemarker.cpp
  217. +1 −1 tests/src/core/testqgssvgmarker.cpp
  218. +13 −13 tests/src/core/{testqgssymbolv2.cpp → testqgssymbol.cpp}
  219. +2 −2 tests/src/core/testqgsvectorlayer.cpp
  220. +1 −1 tests/src/python/CMakeLists.txt
  221. +53 −53 tests/src/python/acceptable_missing_doc.py
  222. +1 −1 tests/src/python/test_qgsarrowsymbollayer.py
  223. +6 −6 tests/src/python/test_qgsgeometrygeneratorsymbollayerv2.py
  224. +4 −4 tests/src/python/test_qgsgraduatedsymbolrendererv2.py
  225. +1 −1 tests/src/python/test_qgsmapunitscale.py
  226. +4 −4 tests/src/python/{test_qgssymbolv2.py → test_qgssymbol.py}
  227. +1 −1 tests/src/python/test_qgssymbollayer.py
  228. +1 −1 tests/src/python/test_qgsunittypes.py
  229. +2 −2 tests/src/python/test_qgsvectorlayer.py
  230. +1 −1 tests/src/python/test_qgsvectorlayereditbuffer.py
@@ -22,16 +22,22 @@ This page tries to maintain a list with incompatible changes that happened in pr

<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
<tr><th>API 2.x <th>API 3.X
<tr><td>QgsColorButtonV2 <td>QgsColorButton
<tr><td>QgsSymbolLayerV2 <td>QgsSymbolLayer
<tr><td>QgsSymbolLayerV2AbstractMetadata <td>QgsSymbolLayerAbstractMetadata
<tr><td>QgsSymbolLayerV2Metadata <td>QgsSymbolLayerMetadata
<tr><td>QgsSymbolLayerV2Registry <td>QgsSymbolLayerRegistry
<tr><td>QgsSymbolLayerV2Utils <td>QgsSymbolLayerUtils
<tr><td>QgsSymbolLayerV2Widget <td>QgsSymbolLayerWidget
<tr><th>QgsSymbolV2 <th>QgsSymbol
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem
<tr><td>QgsSymbolV2RenderContext <td>QgsSymbolRenderContext
<tr><td>QgsSymbolV2SelectorDialog <td>QgsSymbolSelectorDialog
<tr><td>QgsSymbolV2SelectorWidget <td>QgsSymbolSelectorWidget
</table>

\subsection qgis_api_break_3_0_removed_classes Removed Classes

<ul>
@@ -545,23 +551,23 @@ be returned instead of a null pointer if no transformation is required.</li>
<li>Constructor variant with QgsMapRenderer has been removed. Use the variant with QgsMapSettings.</li>
</ul>

\subsection qgis_api_break_3_0_QgsSymbolV2 QgsSymbolV2
\subsection qgis_api_break_3_0_QgsSymbol QgsSymbol (renamed from QgsSymbolV2)

<ul>
<li>The OutputUnit enum, including QgsSymbolV2::MM, QgsSymbolV2::MapUnit, QgsSymbolV2::Mixed, QgsSymbolV2::Pixel and QgsSymbolV2::Percentage has been moved to QgsUnitTypes
and renamed to RenderUnit. QgsSymbolV2::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbolV2::OutputUnit
parameters or QgsSymbolV2::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
<li>The OutputUnit enum, including QgsSymbol::MM, QgsSymbol::MapUnit, QgsSymbol::Mixed, QgsSymbol::Pixel and QgsSymbol::Percentage has been moved to QgsUnitTypes
and renamed to RenderUnit. QgsSymbol::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbol::OutputUnit
parameters or QgsSymbol::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
<li>startRender() now accepts a QgsFields reference, not a pointer.</li>
</ul>

\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
the variant which takes QgsSymbolV2RenderContext instead.</li>
the variant which takes QgsSymbolRenderContext instead.</li>
</ul>

\subsection qgis_api_break_3_0_QgsSymbolV2RenderContext QgsSymbolV2RenderContext
\subsection qgis_api_break_3_0_QgsSymbolRenderContext QgsSymbolRenderContext (renamed from QgsSymbolV2RenderContext)

<ul>
<li>The constructor now accepts a QgsFields reference, not a pointer.</li>
@@ -59,8 +59,8 @@ class QgsComposerSymbolV2Item: QgsComposerLegendItem
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true );

/** Set symbol (takes ownership)*/
void setSymbolV2( QgsSymbolV2* s /Transfer/ );
QgsSymbolV2* symbolV2();
void setSymbolV2( QgsSymbol* s /Transfer/ );
QgsSymbol* symbolV2();

ItemType itemType() const;
};
@@ -12,10 +12,10 @@ class QgsComposerPolygon: QgsComposerNodesItem
/** Overridden to return shape name */
virtual QString displayName() const;

/** Returns the QgsSymbolV2 used to draw the shape. */
/** Returns the QgsSymbol used to draw the shape. */
QgsFillSymbolV2* polygonStyleSymbol();

/** Set the QgsSymbolV2 used to draw the shape. */
/** Set the QgsSymbol used to draw the shape. */
void setPolygonStyleSymbol( QgsFillSymbolV2* symbol );

/** Return correct graphics item type. */
@@ -12,10 +12,10 @@ class QgsComposerPolyline: QgsComposerNodesItem
/** Overridden to return shape name */
virtual QString displayName() const;

/** Returns the QgsSymbolV2 used to draw the shape. */
/** Returns the QgsSymbol used to draw the shape. */
QgsLineSymbolV2* polylineStyleSymbol();

/** Set the QgsSymbolV2 used to draw the shape. */
/** Set the QgsSymbol used to draw the shape. */
void setPolylineStyleSymbol( QgsLineSymbolV2* symbol );

/** Overridden to return shape type */
@@ -41,7 +41,7 @@ class QgsLegendModel : QStandardItemModel
/** Updates the whole symbology of a layer*/
void updateLayer( QStandardItem* layerItem );
/** Tries to update a single classification item*/
void updateVectorV2ClassificationItem( QStandardItem* classificationItem, QgsSymbolV2* symbol, const QString& itemText );
void updateVectorV2ClassificationItem( QStandardItem* classificationItem, QgsSymbol* symbol, const QString& itemText );

void updateRasterClassificationItem( QStandardItem* classificationItem );

@@ -291,7 +291,7 @@
%Include symbology-ng/qgscptcityarchive.sip
%Include symbology-ng/qgsstylev2.sip
%Include symbology-ng/qgssvgcache.sip
%Include symbology-ng/qgssymbolv2.sip
%Include symbology-ng/qgssymbol.sip
%Include symbology-ng/qgsvectorcolorrampv2.sip

%Include symbology-ng/qgs25drenderer.sip
@@ -20,7 +20,7 @@ class QgsLayerTreeModelLegendNode : QObject
enum LegendNodeRoles
{
RuleKeyRole, //!< rule key of the node (QString)
SymbolV2LegacyRuleKeyRole, //!< for QgsSymbolV2LegendNode only - legacy rule key (void ptr, to be cast to QgsSymbolV2 ptr)
SymbolV2LegacyRuleKeyRole, //!< for QgsSymbolLegendNode only - legacy rule key (void ptr, to be cast to QgsSymbol ptr)
ParentRuleKeyRole //!< rule key of the parent legend node - for legends with tree hierarchy (QString). Added in 2.8
};

@@ -112,14 +112,14 @@ class QgsLayerTreeModelLegendNode : QObject
*
* @note added in 2.6
*/
class QgsSymbolV2LegendNode : QgsLayerTreeModelLegendNode
class QgsSymbolLegendNode : QgsLayerTreeModelLegendNode
{
%TypeHeaderCode
#include <qgslayertreemodellegendnode.h>
%End
public:
QgsSymbolV2LegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItemV2& item, QObject* parent /TransferThis/ = 0 );
~QgsSymbolV2LegendNode();
QgsSymbolLegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItemV2& item, QObject* parent /TransferThis/ = 0 );
~QgsSymbolLegendNode();

virtual Qt::ItemFlags flags() const;
virtual QVariant data( int role ) const;
@@ -149,15 +149,15 @@ class QgsSymbolV2LegendNode : QgsLayerTreeModelLegendNode
* @see setSymbol()
* @note added in QGIS 2.14
*/
const QgsSymbolV2* symbol() const;
const QgsSymbol* symbol() const;

/** Sets the symbol to be used by the legend node. The symbol change is also propagated
* to the associated vector layer's renderer.
* @param symbol new symbol for node. Ownership is transferred.
* @see symbol()
* @note added in QGIS 2.14
*/
void setSymbol( QgsSymbolV2* symbol /Transfer/ );
void setSymbol( QgsSymbol* symbol /Transfer/ );

public slots:

@@ -107,9 +107,9 @@ class QgsConditionalStyle

/**
* @brief Set the icon for the style. Icons are generated from symbols
* @param value QgsSymbolV2 to be used when generating the icon
* @param value QgsSymbol to be used when generating the icon
*/
void setSymbol( QgsSymbolV2* value );
void setSymbol( QgsSymbol* value );

/**
* @brief The name of the style.
@@ -131,9 +131,9 @@ class QgsConditionalStyle

/**
* @brief The symbol used to generate the icon for the style
* @return The QgsSymbolV2 used for the icon
* @return The QgsSymbol used for the icon
*/
QgsSymbolV2* symbol() const;
QgsSymbol* symbol() const;

/**
* @brief The text color set for style
@@ -252,7 +252,7 @@ class QgsDiagramSettings
%End
public:

//! @deprecated use QgsSymbolV2::OutputUnit instead
//! @deprecated use QgsSymbol::OutputUnit instead
enum SizeType
{
MM,
@@ -549,12 +549,12 @@ class QgsExpressionContextUtils
static QgsExpressionContextScope* mapSettingsScope( const QgsMapSettings &mapSettings ) /Factory/;

/**
* Updates a symbol scope related to a QgsSymbolV2 to an expression context.
* Updates a symbol scope related to a QgsSymbol to an expression context.
* @param symbol symbol to extract properties from
* @param symbolScope pointer to an existing scope to update
* @note added in QGIS 2.14
*/
static QgsExpressionContextScope* updateSymbolScope( const QgsSymbolV2* symbol, QgsExpressionContextScope* symbolScope = nullptr );
static QgsExpressionContextScope* updateSymbolScope( const QgsSymbol* symbol, QgsExpressionContextScope* symbolScope = nullptr );

/** Creates a new scope which contains variables and functions relating to a QgsComposition.
* For instance, number of pages and page sizes.
@@ -31,7 +31,7 @@ class QgsMapHitTest
* @note added in QGIS 2.12
* @see legendKeyVisible()
*/
bool symbolVisible( QgsSymbolV2* symbol, QgsVectorLayer* layer ) const;
bool symbolVisible( QgsSymbol* symbol, QgsVectorLayer* layer ) const;

/** Tests whether a given legend key is visible for a specified layer.
* @param ruleKey legend rule key
@@ -568,7 +568,7 @@ class QgsVectorLayer : QgsMapLayer
* @param symbol the symbol
* @return number of features rendered by symbol or -1 if failed or counts are not available
*/
long featureCount( QgsSymbolV2* symbol ) const;
long featureCount( QgsSymbol* symbol ) const;

/**
* Update the data source of the layer. The layer's renderer and legend will be preserved only
@@ -583,7 +583,7 @@ class QgsVectorLayer : QgsMapLayer
void setDataSource( const QString& dataSource, const QString& baseName, const QString& provider, bool loadDefaultStyleFlag = false );

/**
* Count features for symbols. Feature counts may be get by featureCount( QgsSymbolV2*).
* Count features for symbols. Feature counts may be get by featureCount( QgsSymbol*).
* @param showProgress show progress dialog
* @return true if calculated, false if failed or was canceled by user
*/
@@ -36,8 +36,8 @@ class Qgs25DRenderer : QgsFeatureRendererV2
QList<QString> usedAttributes();
QgsFeatureRendererV2* clone() const;

virtual QgsSymbolV2* symbolForFeature( QgsFeature& feature, QgsRenderContext& context );
virtual QgsSymbolV2List symbols( QgsRenderContext& context );
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context );
virtual QgsSymbolList symbols( QgsRenderContext& context );

/**
* Get the roof color
@@ -26,10 +26,10 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
virtual QgsArrowSymbolLayer* clone() const /Factory/;

/** Get the sub symbol used for filling */
virtual QgsSymbolV2* subSymbol();
virtual QgsSymbol* subSymbol();

/** Set the sub symbol used for filling */
virtual bool setSubSymbol( QgsSymbolV2* symbol /Transfer/ );
virtual bool setSubSymbol( QgsSymbol* symbol /Transfer/ );

/** Return a list of attributes required to render this feature */
virtual QSet<QString> usedAttributes() const;
@@ -136,13 +136,13 @@ class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
QString layerType() const;

/** Prepare the rendering */
void startRender( QgsSymbolV2RenderContext& context );
void startRender( QgsSymbolRenderContext& context );

/** End of the rendering */
void stopRender( QgsSymbolV2RenderContext& context );
void stopRender( QgsSymbolRenderContext& context );

/** Main drawing method */
void renderPolyline( const QPolygonF& points, QgsSymbolV2RenderContext& context );
void renderPolyline( const QPolygonF& points, QgsSymbolRenderContext& context );

void setColor( const QColor& c );
virtual QColor color() const;
@@ -6,19 +6,19 @@ class QgsRendererCategoryV2
public:

//! takes ownership of symbol
QgsRendererCategoryV2( const QVariant& value, QgsSymbolV2* symbol /Transfer/, const QString& label, bool render = true );
QgsRendererCategoryV2( const QVariant& value, QgsSymbol* symbol /Transfer/, const QString& label, bool render = true );

//! copy constructor
QgsRendererCategoryV2( const QgsRendererCategoryV2& cat );

~QgsRendererCategoryV2();

QVariant value() const;
QgsSymbolV2* symbol() const;
QgsSymbol* symbol() const;
QString label() const;

void setValue( const QVariant &value );
void setSymbol( QgsSymbolV2* s /Transfer/ );
void setSymbol( QgsSymbol* s /Transfer/ );
void setLabel( const QString &label );

// @note added in 2.5
@@ -50,10 +50,10 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
virtual ~QgsCategorizedSymbolRendererV2();

//! @note available in python as symbolForFeature2
virtual QgsSymbolV2* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=symbolForFeature2/;
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=symbolForFeature2/;

//! @note available in python as originalSymbolForFeature2
virtual QgsSymbolV2* originalSymbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=originalSymbolForFeature2/;
virtual QgsSymbol* originalSymbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=originalSymbolForFeature2/;

virtual void startRender( QgsRenderContext& context, const QgsFields& fields );

@@ -73,14 +73,14 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
virtual QString filter( const QgsFields& fields = QgsFields() );

//! @note available in python as symbols2
virtual QgsSymbolV2List symbols( QgsRenderContext& context ) /PyName=symbols2/;
virtual QgsSymbolList symbols( QgsRenderContext& context ) /PyName=symbols2/;

/** Update all the symbols but leave categories and colors. This method also sets the source
* symbol for the renderer.
* @param sym source symbol to use for categories. Ownership is not transferred.
* @see setSourceSymbol()
*/
void updateSymbols( QgsSymbolV2 * sym );
void updateSymbols( QgsSymbol * sym );

const QgsCategoryList& categories() const;

@@ -92,7 +92,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
int categoryIndexForLabel( const QString& val );

bool updateCategoryValue( int catIndex, const QVariant &value );
bool updateCategorySymbol( int catIndex, QgsSymbolV2* symbol /Transfer/ );
bool updateCategorySymbol( int catIndex, QgsSymbol* symbol /Transfer/ );
bool updateCategoryLabel( int catIndex, const QString& label );

//! @note added in 2.5
@@ -134,15 +134,15 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
* @see setSourceSymbol()
* @see sourceColorRamp()
*/
QgsSymbolV2* sourceSymbol();
QgsSymbol* sourceSymbol();

/** Sets the source symbol for the renderer, which is the base symbol used for the each categories' symbol before applying
* the categories' color.
* @param sym source symbol, ownership is transferred to the renderer
* @see sourceSymbol()
* @see setSourceColorRamp()
*/
void setSourceSymbol( QgsSymbolV2* sym /Transfer/ );
void setSourceSymbol( QgsSymbol* sym /Transfer/ );

/** Returns the source color ramp, from which each categories' color is derived.
* @see setSourceColorRamp()
@@ -174,8 +174,8 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
void setSizeScaleField( const QString& fieldOrExpression );
QString sizeScaleField() const;

void setScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod );
QgsSymbolV2::ScaleMethod scaleMethod() const;
void setScaleMethod( QgsSymbol::ScaleMethod scaleMethod );
QgsSymbol::ScaleMethod scaleMethod() const;

//! items of symbology items in legend should be checkable
//! @note added in 2.5
@@ -185,7 +185,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
// @note added in 2.5
virtual bool legendSymbolItemChecked( const QString& key );

virtual void setLegendSymbolItem( const QString& key, QgsSymbolV2* symbol /Transfer/ );
virtual void setLegendSymbolItem( const QString& key, QgsSymbol* symbol /Transfer/ );

//! item in symbology was checked
// @note added in 2.5
@@ -203,9 +203,9 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
protected:
void rebuildHash();

QgsSymbolV2* skipRender();
QgsSymbol* skipRender();

QgsSymbolV2* symbolForValue( const QVariant& value );
QgsSymbol* symbolForValue( const QVariant& value );

private:
QgsCategorizedSymbolRendererV2( const QgsCategorizedSymbolRendererV2 & );

0 comments on commit 275736d

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