Skip to content
Permalink
Browse files

Merge pull request #3355 from 3nids/V2removal

remove V2 in some classes
  • Loading branch information
3nids committed Aug 5, 2016
2 parents 19ab72c + acbf5cd commit ab57541d86910df5e35a85fd64ed0ad465ff6c86
Showing with 4,554 additions and 4,532 deletions.
  1. +30 −8 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. +5 −5 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. +6 −6 python/core/symbology-ng/qgsarrowsymbollayer.sip
  15. +15 −15 python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip
  16. +7 −7 python/core/symbology-ng/qgsellipsesymbollayerv2.sip
  17. +54 −54 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  18. +12 −12 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. +20 −20 python/core/symbology-ng/qgslinesymbollayerv2.sip
  24. +40 −40 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. +1 −1 python/core/symbology-ng/qgssvgcache.sip
  32. +38 −38 python/core/symbology-ng/{qgssymbolv2.sip → qgssymbol.sip}
  33. +50 −50 python/core/symbology-ng/{qgssymbollayerv2.sip → qgssymbollayer.sip}
  34. +85 −0 python/core/symbology-ng/qgssymbollayerregistry.sip
  35. +21 −21 python/core/symbology-ng/{qgssymbollayerv2utils.sip → qgssymbollayerutils.sip}
  36. +0 −85 python/core/symbology-ng/qgssymbollayerv2registry.sip
  37. +2 −2 python/core/symbology-ng/{qgssymbologyv2conversion.sip → qgssymbologyconversion.sip}
  38. +8 −8 python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
  39. +3 −3 python/gui/gui.sip
  40. +1 −1 python/gui/qgsunitselectionwidget.sip
  41. +4 −4 python/gui/symbology-ng/qgsarrowsymbollayerwidget.sip
  42. +2 −2 python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip
  43. +4 −4 python/gui/symbology-ng/qgsellipsesymbollayerv2widget.sip
  44. +3 −3 python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
  45. +3 −3 python/gui/symbology-ng/qgslayerpropertieswidget.sip
  46. +17 −17 python/gui/symbology-ng/qgsrendererv2widget.sip
  47. +1 −1 python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip
  48. +1 −1 python/gui/symbology-ng/qgssinglesymbolrendererv2widget.sip
  49. +81 −81 python/gui/symbology-ng/{qgssymbollayerv2widget.sip → qgssymbollayerwidget.sip}
  50. +4 −4 python/gui/symbology-ng/{qgssymbollevelsv2dialog.sip → qgssymbollevelsdialog.sip}
  51. +14 −14 python/gui/symbology-ng/{qgssymbolv2selectordialog.sip → qgssymbolselectordialog.sip}
  52. +2 −2 python/gui/symbology-ng/qgssymbolslistwidget.sip
  53. +4 −4 python/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.sip
  54. +2 −2 python/server/qgswmserver.sip
  55. +2 −2 resources/customization.xml
  56. +4 −4 src/app/composer/qgscomposerarrowwidget.cpp
  57. +9 −9 src/app/composer/qgscomposermapwidget.cpp
  58. +5 −5 src/app/composer/qgscomposerpolygonwidget.cpp
  59. +4 −4 src/app/composer/qgscomposerpolylinewidget.cpp
  60. +5 −5 src/app/composer/qgscomposershapewidget.cpp
  61. +4 −4 src/app/composer/qgscompositionwidget.cpp
  62. +5 −5 src/app/qgisapp.cpp
  63. +5 −5 src/app/qgsannotationwidget.cpp
  64. +13 −13 src/app/qgsapplayertreeviewmenuprovider.cpp
  65. +15 −15 src/app/qgsdecorationgrid.cpp
  66. +8 −8 src/app/qgsdecorationgriddialog.cpp
  67. +1 −1 src/app/qgsdecorationitem.cpp
  68. +4 −4 src/app/qgsdiagramproperties.cpp
  69. +2 −2 src/app/qgslabelinggui.cpp
  70. +5 −5 src/app/qgsmaptooloffsetpointsymbol.cpp
  71. +1 −1 src/app/qgsmaptooloffsetpointsymbol.h
  72. +4 −4 src/app/qgsmaptoolpointsymbol.cpp
  73. +2 −2 src/app/qgsmaptoolrotatepointsymbols.cpp
  74. +2 −2 src/app/qgsoptions.cpp
  75. +1 −1 src/app/qgspointmarkeritem.cpp
  76. +14 −14 src/app/qgsprojectproperties.cpp
  77. +1 −1 src/app/qgsrulebasedlabelingwidget.cpp
  78. +1 −1 src/app/qgsvectorlayerproperties.cpp
  79. +10 −10 src/core/CMakeLists.txt
  80. +7 −7 src/core/composer/qgscomposerarrow.cpp
  81. +7 −7 src/core/composer/qgscomposeritem.cpp
  82. +3 −3 src/core/composer/qgscomposerlegend.cpp
  83. +1 −1 src/core/composer/qgscomposerlegend.h
  84. +10 −10 src/core/composer/qgscomposerlegenditem.cpp
  85. +4 −4 src/core/composer/qgscomposerlegenditem.h
  86. +7 −7 src/core/composer/qgscomposermap.cpp
  87. +18 −18 src/core/composer/qgscomposermapgrid.cpp
  88. +4 −4 src/core/composer/qgscomposermapoverview.cpp
  89. +2 −2 src/core/composer/qgscomposernodesitem.cpp
  90. +5 −5 src/core/composer/qgscomposerpicture.cpp
  91. +4 −4 src/core/composer/qgscomposerpolygon.cpp
  92. +3 −3 src/core/composer/qgscomposerpolygon.h
  93. +4 −4 src/core/composer/qgscomposerpolyline.cpp
  94. +3 −3 src/core/composer/qgscomposerpolyline.h
  95. +5 −5 src/core/composer/qgscomposerscalebar.cpp
  96. +10 −10 src/core/composer/qgscomposershape.cpp
  97. +7 −7 src/core/composer/qgscomposertable.cpp
  98. +11 −11 src/core/composer/qgscomposertablev2.cpp
  99. +4 −4 src/core/composer/qgscomposition.cpp
  100. +4 −4 src/core/composer/qgslegendmodel.cpp
  101. +2 −2 src/core/composer/qgslegendmodel.h
  102. +1 −1 src/core/composer/qgspaperitem.cpp
  103. +4 −4 src/core/diagram/qgsdiagram.cpp
  104. +38 −38 src/core/dxf/qgsdxfexport.cpp
  105. +12 −12 src/core/dxf/qgsdxfexport.h
  106. +3 −3 src/core/effects/qgscoloreffect.cpp
  107. +7 −7 src/core/effects/qgsgloweffect.cpp
  108. +1 −1 src/core/effects/qgsgloweffect.h
  109. +7 −7 src/core/effects/qgsshadoweffect.cpp
  110. +1 −1 src/core/effects/qgsshadoweffect.h
  111. +5 −5 src/core/effects/qgstransformeffect.cpp
  112. +6 −6 src/core/layertree/qgslayertreemodel.cpp
  113. +24 −24 src/core/layertree/qgslayertreemodellegendnode.cpp
  114. +7 −7 src/core/layertree/qgslayertreemodellegendnode.h
  115. +6 −6 src/core/qgscolorscheme.cpp
  116. +5 −5 src/core/qgsconditionalstyle.cpp
  117. +6 −6 src/core/qgsconditionalstyle.h
  118. +10 −10 src/core/qgsdiagramrendererv2.cpp
  119. +1 −1 src/core/qgsdiagramrendererv2.h
  120. +13 −13 src/core/qgsexpression.cpp
  121. +3 −3 src/core/qgsexpressioncontext.cpp
  122. +3 −3 src/core/qgsexpressioncontext.h
  123. +1 −1 src/core/qgslegendrenderer.cpp
  124. +1 −1 src/core/qgslegendrenderer.h
  125. +7 −7 src/core/qgsmaphittest.cpp
  126. +2 −2 src/core/qgsmaphittest.h
  127. +1 −1 src/core/qgsmaplayerlegend.cpp
  128. +77 −77 src/core/qgspallabeling.cpp
  129. +17 −17 src/core/qgsvectorfilewriter.cpp
  130. +3 −3 src/core/qgsvectorfilewriter.h
  131. +6 −6 src/core/qgsvectorlayer.cpp
  132. +4 −4 src/core/qgsvectorlayer.h
  133. +4 −4 src/core/qgsvectorlayerlabelprovider.cpp
  134. +2 −2 src/core/qgsvectorlayerlabelprovider.h
  135. +14 −14 src/core/qgsvectorlayerrenderer.cpp
  136. +8 −8 src/core/symbology-ng/qgs25drenderer.cpp
  137. +3 −3 src/core/symbology-ng/qgs25drenderer.h
  138. +29 −29 src/core/symbology-ng/qgsarrowsymbollayer.cpp
  139. +8 −8 src/core/symbology-ng/qgsarrowsymbollayer.h
  140. +56 −56 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  141. +21 −21 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  142. +2 −2 src/core/symbology-ng/qgscolorbrewerpalette.h
  143. +3 −3 src/core/symbology-ng/qgscptcityarchive.cpp
  144. +108 −108 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  145. +10 −10 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  146. +357 −357 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  147. +65 −65 src/core/symbology-ng/qgsfillsymbollayerv2.h
  148. +19 −19 src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp
  149. +15 −15 src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.h
  150. +70 −70 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  151. +21 −21 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  152. +14 −14 src/core/symbology-ng/qgsheatmaprenderer.cpp
  153. +3 −3 src/core/symbology-ng/qgsheatmaprenderer.h
  154. +15 −15 src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp
  155. +6 −6 src/core/symbology-ng/qgsinvertedpolygonrenderer.h
  156. +3 −3 src/core/symbology-ng/qgslegendsymbolitemv2.cpp
  157. +8 −8 src/core/symbology-ng/qgslegendsymbolitemv2.h
  158. +125 −125 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  159. +24 −24 src/core/symbology-ng/qgslinesymbollayerv2.h
  160. +294 −294 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  161. +46 −46 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  162. +6 −6 src/core/symbology-ng/qgsnullsymbolrenderer.cpp
  163. +5 −5 src/core/symbology-ng/qgsnullsymbolrenderer.h
  164. +29 −29 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  165. +13 −13 src/core/symbology-ng/qgspointdisplacementrenderer.h
  166. +37 −37 src/core/symbology-ng/qgsrendererv2.cpp
  167. +26 −26 src/core/symbology-ng/qgsrendererv2.h
  168. +37 −37 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  169. +17 −17 src/core/symbology-ng/qgsrulebasedrendererv2.h
  170. +38 −38 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  171. +13 −13 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  172. +24 −24 src/core/symbology-ng/qgsstylev2.cpp
  173. +10 −10 src/core/symbology-ng/qgsstylev2.h
  174. +2 −2 src/core/symbology-ng/qgssvgcache.cpp
  175. +1 −1 src/core/symbology-ng/qgssvgcache.h
  176. +163 −163 src/core/symbology-ng/{qgssymbolv2.cpp → qgssymbol.cpp}
  177. +46 −46 src/core/symbology-ng/{qgssymbolv2.h → qgssymbol.h}
  178. +120 −120 src/core/symbology-ng/{qgssymbollayerv2.cpp → qgssymbollayer.cpp}
  179. +51 −51 src/core/symbology-ng/{qgssymbollayerv2.h → qgssymbollayer.h}
  180. +36 −36 src/core/symbology-ng/{qgssymbollayerv2registry.cpp → qgssymbollayerregistry.cpp}
  181. +153 −0 src/core/symbology-ng/qgssymbollayerregistry.h
  182. +191 −191 src/core/symbology-ng/{qgssymbollayerv2utils.cpp → qgssymbollayerutils.cpp}
  183. +28 −28 src/core/symbology-ng/{qgssymbollayerv2utils.h → qgssymbollayerutils.h}
  184. +0 −153 src/core/symbology-ng/qgssymbollayerv2registry.h
  185. +16 −16 src/core/symbology-ng/{qgssymbologyv2conversion.cpp → qgssymbologyconversion.cpp}
  186. +5 −5 src/core/symbology-ng/{qgssymbologyv2conversion.h → qgssymbologyconversion.h}
  187. +7 −7 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  188. +22 −22 src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
  189. +9 −9 src/core/symbology-ng/qgsvectorfieldsymbollayer.h
  190. +6 −6 src/gui/CMakeLists.txt
  191. +1 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  192. +6 −6 src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
  193. +1 −1 src/gui/attributetable/qgsfieldconditionalformatwidget.h
  194. +2 −2 src/gui/effects/qgseffectstackpropertieswidget.cpp
  195. +4 −4 src/gui/qgsannotationitem.cpp
  196. +5 −5 src/gui/qgscolorbutton.cpp
  197. +1 −1 src/gui/qgscolordialog.cpp
  198. +12 −12 src/gui/qgscolorschemelist.cpp
  199. +5 −5 src/gui/qgscolorwidgets.cpp
  200. +3 −3 src/gui/qgscompoundcolorwidget.cpp
  201. +3 −3 src/gui/qgsgradientstopeditor.cpp
  202. +6 −6 src/gui/qgshighlight.cpp
  203. +3 −3 src/gui/qgshighlight.h
  204. +1 −1 src/gui/qgsunitselectionwidget.h
  205. +3 −3 src/gui/symbology-ng/qgsarrowsymbollayerwidget.cpp
  206. +5 −5 src/gui/symbology-ng/qgsarrowsymbollayerwidget.h
  207. +30 −30 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  208. +3 −3 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  209. +4 −4 src/gui/symbology-ng/qgscolorrampcombobox.cpp
  210. +5 −5 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  211. +4 −4 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  212. +5 −5 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  213. +21 −21 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  214. +5 −5 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  215. +1 −1 src/gui/symbology-ng/qgsheatmaprendererwidget.cpp
  216. +1 −1 src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp
  217. +26 −26 src/gui/symbology-ng/qgslayerpropertieswidget.cpp
  218. +8 −8 src/gui/symbology-ng/qgslayerpropertieswidget.h
  219. +1 −1 src/gui/symbology-ng/qgsnullsymbolrendererwidget.cpp
  220. +1 −1 src/gui/symbology-ng/qgsnullsymbolrendererwidget.h
  221. +4 −4 src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
  222. +1 −1 src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
  223. +40 −40 src/gui/symbology-ng/qgsrendererv2widget.cpp
  224. +22 −22 src/gui/symbology-ng/qgsrendererv2widget.h
  225. +15 −15 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  226. +4 −4 src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
  227. +5 −5 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  228. +4 −4 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  229. +7 −7 src/gui/symbology-ng/qgssizescalewidget.cpp
  230. +3 −3 src/gui/symbology-ng/qgssizescalewidget.h
  231. +6 −6 src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
  232. +23 −23 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  233. +7 −7 src/gui/symbology-ng/qgssvgselectorwidget.cpp
  234. +1 −1 src/gui/symbology-ng/qgssvgselectorwidget.h
  235. +67 −67 src/gui/symbology-ng/{qgssymbollayerv2widget.cpp → qgssymbollayerwidget.cpp}
  236. +70 −70 src/gui/symbology-ng/{qgssymbollayerv2widget.h → qgssymbollayerwidget.h}
  237. +20 −20 src/gui/symbology-ng/{qgssymbollevelsv2dialog.cpp → qgssymbollevelsdialog.cpp}
  238. +9 −9 src/gui/symbology-ng/{qgssymbollevelsv2dialog.h → qgssymbollevelsdialog.h}
  239. +97 −97 src/gui/symbology-ng/{qgssymbolv2selectordialog.cpp → qgssymbolselectordialog.cpp}
  240. +26 −26 src/gui/symbology-ng/{qgssymbolv2selectordialog.h → qgssymbolselectordialog.h}
  241. +15 −15 src/gui/symbology-ng/qgssymbolslistwidget.cpp
  242. +4 −4 src/gui/symbology-ng/qgssymbolslistwidget.h
  243. +3 −3 src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
  244. +3 −3 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
  245. +5 −5 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
  246. +2 −2 src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
  247. +4 −4 src/plugins/globe/globe_plugin.cpp
  248. +9 −9 src/plugins/grass/qgsgrasseditrenderer.cpp
  249. +3 −3 src/plugins/grass/qgsgrasseditrenderer.h
  250. +2 −2 src/server/qgssldconfigparser.cpp
  251. +1 −1 src/server/qgswfsserver.cpp
  252. +4 −4 src/server/qgswmsserver.cpp
  253. +2 −2 src/server/qgswmsserver.h
  254. +4 −4 src/ui/{qgssymbollevelsv2dialogbase.ui → qgssymbollevelsdialogbase.ui}
  255. +2 −2 src/ui/{qgssymbolv2selectordialogbase.ui → qgssymbolselectordialogbase.ui}
  256. +1 −1 tests/src/core/CMakeLists.txt
  257. +1 −1 tests/src/core/testqgs25drenderer.cpp
  258. +1 −1 tests/src/core/testqgsatlascomposition.cpp
  259. +1 −1 tests/src/core/testqgscentroidfillsymbol.cpp
  260. +1 −1 tests/src/core/testqgscomposerdd.cpp
  261. +1 −1 tests/src/core/testqgscomposerpaper.cpp
  262. +1 −1 tests/src/core/testqgscomposershapes.cpp
  263. +1 −1 tests/src/core/testqgsellipsemarker.cpp
  264. +1 −1 tests/src/core/testqgsfilledmarker.cpp
  265. +1 −1 tests/src/core/testqgsfontmarker.cpp
  266. +1 −1 tests/src/core/testqgsgradients.cpp
  267. +1 −1 tests/src/core/testqgsimageoperation.cpp
  268. +16 −16 tests/src/core/testqgslayertree.cpp
  269. +1 −1 tests/src/core/testqgslinefillsymbol.cpp
  270. +7 −7 tests/src/core/testqgspainteffect.cpp
  271. +1 −1 tests/src/core/testqgspointpatternfillsymbol.cpp
  272. +1 −1 tests/src/core/testqgsrasterfill.cpp
  273. +6 −6 tests/src/core/testqgsrulebasedrenderer.cpp
  274. +1 −1 tests/src/core/testqgsshapeburst.cpp
  275. +1 −1 tests/src/core/testqgssimplemarker.cpp
  276. +1 −1 tests/src/core/testqgssvgmarker.cpp
  277. +21 −21 tests/src/core/{testqgssymbolv2.cpp → testqgssymbol.cpp}
  278. +2 −2 tests/src/core/testqgsvectorlayer.cpp
  279. +2 −2 tests/src/python/CMakeLists.txt
  280. +71 −71 tests/src/python/acceptable_missing_doc.py
  281. +1 −1 tests/src/python/test_qgsarrowsymbollayer.py
  282. +6 −6 tests/src/python/test_qgsgeometrygeneratorsymbollayerv2.py
  283. +9 −9 tests/src/python/test_qgsgraduatedsymbolrendererv2.py
  284. +54 −54 tests/src/python/test_qgsmapunitscale.py
  285. +4 −4 tests/src/python/{test_qgssymbolv2.py → test_qgssymbol.py}
  286. +6 −6 tests/src/python/{test_qgssymbollayerv2.py → test_qgssymbollayer.py}
  287. +1 −1 tests/src/python/test_qgsunittypes.py
  288. +2 −2 tests/src/python/test_qgsvectorlayer.py
  289. +1 −1 tests/src/python/test_qgsvectorlayereditbuffer.py
@@ -18,6 +18,28 @@ 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 <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><td>QgsSymbolLevelsV2Dialog <td>QgsSymbolLevelsDialog
<tr><td>QgsSymbologyV2Conversion <td>QgsSymbologyConversion
<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>
@@ -531,30 +553,30 @@ 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_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
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>
<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>
@@ -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
@@ -312,13 +312,13 @@
%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

%Include symbology-ng/qgssymbologyv2conversion.sip
%Include symbology-ng/qgssymbologyconversion.sip

%Include dxf/qgsdxfexport.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
@@ -20,16 +20,16 @@ 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/;

/** 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;

0 comments on commit ab57541

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