Skip to content
Permalink
Browse files
Refactor properties
Remove QgsAbstractProperty and subclasses, and instead use a single
QgsProperty class which covers the use of QgsAbstractProperty
and its subclasses. This simplifies the API and avoids pointer
handling. QgsProperty is implicitly shared for memory efficiency
and inexpensive copies.
  • Loading branch information
nyalldawson committed Jan 23, 2017
1 parent 90e80c1 commit ffaa40edc46e2153a89f246e9f4e30b536442eda
Showing with 2,066 additions and 2,676 deletions.
  1. +1 −1 python/core/composer/qgscomposerutils.sip
  2. +1 −0 python/core/core.sip
  3. +25 −575 python/core/qgsproperty.sip
  4. +7 −253 python/core/qgspropertycollection.sip
  5. +140 −0 python/core/qgspropertytransformer.sip
  6. +1 −1 python/core/symbology-ng/qgslinesymbollayer.sip
  7. +6 −6 python/core/symbology-ng/qgssymbol.sip
  8. +1 −1 python/core/symbology-ng/qgssymbollayer.sip
  9. +1 −1 python/gui/qgsdatadefinedbutton.sip
  10. +9 −9 python/gui/symbology-ng/qgsrendererwidget.sip
  11. +1 −1 python/gui/symbology-ng/qgssizescalewidget.sip
  12. +13 −13 src/app/dwg/qgsdwgimportdialog.cpp
  13. +6 −6 src/app/qgslabelpropertydialog.cpp
  14. +12 −12 src/app/qgsmaptoollabel.cpp
  15. +5 −5 src/app/qgsmaptooloffsetpointsymbol.cpp
  16. +4 −4 src/app/qgsmaptoolrotatepointsymbols.cpp
  17. +2 −0 src/core/CMakeLists.txt
  18. +1 −1 src/core/composer/qgscomposerpicture.cpp
  19. +5 −5 src/core/composer/qgscomposerutils.cpp
  20. +1 −1 src/core/composer/qgscomposerutils.h
  21. +3 −3 src/core/qgsdiagramrenderer.cpp
  22. +4 −4 src/core/qgspallabeling.cpp
  23. +306 −523 src/core/qgsproperty.cpp
  24. +107 −529 src/core/qgsproperty.h
  25. +89 −0 src/core/qgsproperty_p.h
  26. +84 −130 src/core/qgspropertycollection.cpp
  27. +43 −42 src/core/qgspropertycollection.h
  28. +285 −0 src/core/qgspropertytransformer.cpp
  29. +348 −0 src/core/qgspropertytransformer.h
  30. +5 −5 src/core/qgsvectorlayerdiagramprovider.cpp
  31. +4 −4 src/core/symbology-ng/qgs25drenderer.cpp
  32. +1 −1 src/core/symbology-ng/qgs25drenderer.h
  33. +7 −7 src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp
  34. +5 −5 src/core/symbology-ng/qgsellipsesymbollayer.cpp
  35. +7 −7 src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp
  36. +2 −2 src/core/symbology-ng/qgslinesymbollayer.cpp
  37. +1 −1 src/core/symbology-ng/qgslinesymbollayer.h
  38. +1 −1 src/core/symbology-ng/qgspointclusterrenderer.cpp
  39. +6 −6 src/core/symbology-ng/qgsrenderer.cpp
  40. +4 −4 src/core/symbology-ng/qgsrulebasedrenderer.cpp
  41. +4 −4 src/core/symbology-ng/qgssinglesymbolrenderer.cpp
  42. +64 −67 src/core/symbology-ng/qgssymbol.cpp
  43. +12 −15 src/core/symbology-ng/qgssymbol.h
  44. +9 −9 src/core/symbology-ng/qgssymbollayer.cpp
  45. +2 −2 src/core/symbology-ng/qgssymbollayer.h
  46. +3 −4 src/gui/qgsdatadefinedbutton.h
  47. +14 −15 src/gui/qgsdatadefinedbuttonv2.cpp
  48. +3 −3 src/gui/qgsdatadefinedbuttonv2.h
  49. +2 −2 src/gui/qgshighlight.cpp
  50. +20 −20 src/gui/symbology-ng/qgsrendererwidget.cpp
  51. +9 −9 src/gui/symbology-ng/qgsrendererwidget.h
  52. +9 −9 src/gui/symbology-ng/qgssizescalewidget.cpp
  53. +1 −1 src/gui/symbology-ng/qgssizescalewidget.h
  54. +10 −10 src/gui/symbology-ng/qgssymbollayerwidget.cpp
  55. +18 −18 src/gui/symbology-ng/qgssymbolselectordialog.cpp
  56. +3 −3 src/gui/symbology-ng/qgssymbolselectordialog.h
  57. +15 −15 src/gui/symbology-ng/qgssymbolslistwidget.cpp
  58. +2 −2 tests/src/core/testqgscomposerdd.cpp
  59. +14 −14 tests/src/core/testqgscomposermap.cpp
  60. +4 −4 tests/src/core/testqgscomposerobject.cpp
  61. +4 −4 tests/src/core/testqgscomposerpicture.cpp
  62. +4 −4 tests/src/core/testqgscomposerscalebar.cpp
  63. +19 −19 tests/src/core/testqgscomposerutils.cpp
  64. +12 −12 tests/src/core/testqgsdiagram.cpp
  65. +1 −1 tests/src/core/testqgsellipsemarker.cpp
  66. +4 −4 tests/src/core/testqgsfilledmarker.cpp
  67. +1 −1 tests/src/core/testqgsfontmarker.cpp
  68. +5 −5 tests/src/core/testqgslabelingengine.cpp
  69. +1 −1 tests/src/core/testqgslinefillsymbol.cpp
  70. +2 −2 tests/src/core/testqgsmarkerlinesymbol.cpp
  71. +1 −1 tests/src/core/testqgspointpatternfillsymbol.cpp
  72. +229 −216 tests/src/core/testqgsproperty.cpp
  73. +10 −10 tests/src/core/testqgssimplemarker.cpp
  74. +1 −1 tests/src/core/testqgssvgmarker.cpp
@@ -114,7 +114,7 @@ class QgsComposerUtils
* @note this method was added in version 3.0
* @see readDataDefinedPropertyMap
*/
static QgsAbstractProperty* readOldDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property, const QDomElement &ddElem ) /Factory/;
static QgsProperty readOldDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property, const QDomElement &ddElem );

/** Returns a font where size is set in pixels and the size has been upscaled with FONT_WORKAROUND_SCALE
* to workaround QT font rendering bugs
@@ -120,6 +120,7 @@
%Include qgsprojectversion.sip
%Include qgsproperty.sip
%Include qgspropertycollection.sip
%Include qgspropertytransformer.sip
%Include qgsprovidermetadata.sip
%Include qgsproviderregistry.sip
%Include qgspythonrunner.sip

0 comments on commit ffaa40e

Please sign in to comment.