Skip to content
Permalink
Browse files

[API] Removed QgsSymbol, QgsMarkerCatalgoue and QgsSymbologyUtils

  • Loading branch information
wonder-sk committed Apr 7, 2013
1 parent 7cc3031 commit ba49ef078ce9f3d9ba596f8f192b93965207866b
Showing with 254 additions and 3,790 deletions.
  1. +0 −2 python/CMakeLists.txt
  2. +0 −27 python/core/composer/qgscomposerlegenditem.sip
  3. +0 −1 python/core/composer/qgslegendmodel.sip
  4. +0 −4 python/core/core.sip
  5. +0 −47 python/core/symbology/qgsmarkercatalogue.sip
  6. +0 −125 python/core/symbology/qgssymbol.sip
  7. +0 −23 python/core/symbology/qgssymbologyutils.sip
  8. +1 −2 src/app/CMakeLists.txt
  9. +0 −1 src/app/legend/qgslegendlayer.cpp
  10. +0 −1 src/app/legend/qgslegendlayer.h
  11. +0 −38 src/app/legend/qgslegendvectorsymbologyitem.cpp
  12. +0 −39 src/app/legend/qgslegendvectorsymbologyitem.h
  13. +0 −1 src/app/qgsmaptoolrotatepointsymbols.cpp
  14. +0 −10 src/core/CMakeLists.txt
  15. +4 −149 src/core/composer/qgscomposerlegend.cpp
  16. +0 −5 src/core/composer/qgscomposerlegend.h
  17. +1 −96 src/core/composer/qgscomposerlegenditem.cpp
  18. +0 −29 src/core/composer/qgscomposerlegenditem.h
  19. +0 −80 src/core/composer/qgslegendmodel.cpp
  20. +0 −6 src/core/composer/qgslegendmodel.h
  21. +0 −1 src/core/qgsmaplayer.cpp
  22. +224 −3 src/core/symbology-ng/qgssymbologyv2conversion.cpp
  23. +8 −0 src/core/symbology-ng/qgssymbologyv2conversion.h
  24. +0 −418 src/core/symbology/qgsmarkercatalogue.cpp
  25. +0 −90 src/core/symbology/qgsmarkercatalogue.h
  26. +0 −718 src/core/symbology/qgssymbol.cpp
  27. +0 −281 src/core/symbology/qgssymbol.h
  28. +0 −1,403 src/core/symbology/qgssymbologyutils.cpp
  29. +0 −45 src/core/symbology/qgssymbologyutils.h
  30. +0 −1 src/gui/CMakeLists.txt
  31. +0 −1 src/gui/qgsattributedialog.cpp
  32. +0 −1 src/gui/qgsattributeeditor.cpp
  33. +0 −1 src/mapserver/CMakeLists.txt
  34. +0 −1 src/mapserver/qgswfsserver.cpp
  35. +0 −106 src/mapserver/qgswmsserver.cpp
  36. +1 −6 src/mapserver/qgswmsserver.h
  37. +1 −1 src/plugins/compass/CMakeLists.txt
  38. +0 −2 src/plugins/coordinate_capture/CMakeLists.txt
  39. +1 −1 src/plugins/delimited_text/CMakeLists.txt
  40. +1 −1 src/plugins/diagram_overlay/CMakeLists.txt
  41. +0 −1 src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
  42. +5 −5 src/plugins/diagram_overlay/qgswkndiagramfactory.cpp
  43. +0 −1 src/plugins/dxf2shp_converter/CMakeLists.txt
  44. +1 −1 src/plugins/georeferencer/CMakeLists.txt
  45. +1 −1 src/plugins/globe/CMakeLists.txt
  46. +0 −1 src/plugins/grass/CMakeLists.txt
  47. +0 −1 src/plugins/interpolation/CMakeLists.txt
  48. +1 −1 src/plugins/offline_editing/CMakeLists.txt
  49. +1 −1 src/plugins/oracle_raster/CMakeLists.txt
  50. +1 −1 src/plugins/plugin_template/CMakeLists.txt
  51. +0 −1 src/plugins/spatialquery/CMakeLists.txt
  52. +1 −1 src/plugins/spit/CMakeLists.txt
  53. +0 −1 src/plugins/sqlanywhere/CMakeLists.txt
  54. +1 −1 src/plugins/topology/CMakeLists.txt
  55. +0 −1 src/python/CMakeLists.txt
  56. +0 −2 tests/src/analysis/CMakeLists.txt
  57. +0 −2 tests/src/core/CMakeLists.txt
@@ -39,8 +39,6 @@ INCLUDE_DIRECTORIES(
../src/core/diagram
../src/core/gps
../src/core/raster
../src/core/renderer
../src/core/symbology
../src/core/symbology-ng

../src/gui/raster
@@ -14,7 +14,6 @@ class QgsComposerLegendItem : QStandardItem
{
GroupItem = QStandardItem::UserType,
LayerItem,
SymbologyItem,
SymbologyV2Item,
RasterSymbolItem
};
@@ -32,32 +31,6 @@ class QgsComposerLegendItem : QStandardItem
void writeXMLChildren( QDomElement& elem, QDomDocument& doc ) const;
};

class QgsComposerSymbolItem : QgsComposerLegendItem
{
%TypeHeaderCode
#include <qgscomposerlegenditem.h>
%End
public:

QgsComposerSymbolItem();
QgsComposerSymbolItem( const QString& text );
QgsComposerSymbolItem( const QIcon& icon, const QString& text );
virtual ~QgsComposerSymbolItem();

virtual QStandardItem* clone() const /Factory/;

virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXML( const QDomElement& itemElem, bool xServerAvailable = true );

/**Set symbol (takes ownership)*/
void setSymbol( QgsSymbol* s /Transfer/ );
QgsSymbol* symbol();

void setLayerID( const QString& id );
QString layerID() const;

ItemType itemType() const;
};

class QgsComposerSymbolV2Item: QgsComposerLegendItem
{
@@ -36,7 +36,6 @@ class QgsLegendModel: QStandardItemModel
/**Updates the whole symbology of a layer*/
void updateLayer( QStandardItem* layerItem );
/**Tries to update a single classification item*/
void updateVectorClassificationItem( QStandardItem* classificationItem, QgsSymbol* symbol, QString itemText );
void updateVectorV2ClassificationItem( QStandardItem* classificationItem, QgsSymbolV2* symbol, QString itemText );
void updateRasterClassificationItem( QStandardItem* classificationItem );

@@ -186,7 +186,3 @@
%Include symbology-ng/qgslinesymbollayerv2.sip
%Include symbology-ng/qgsmarkersymbollayerv2.sip
%Include symbology-ng/qgssymbollayerv2registry.sip

%Include symbology/qgsmarkercatalogue.sip
%Include symbology/qgssymbol.sip
%Include symbology/qgssymbologyutils.sip

This file was deleted.

This file was deleted.

This file was deleted.

@@ -137,7 +137,6 @@ SET(QGIS_APP_SRCS
legend/qgslegendpropertyitem.cpp
legend/qgslegendsymbologygroup.cpp
legend/qgslegendsymbologyitem.cpp
legend/qgslegendvectorsymbologyitem.cpp
legend/qgslayerorder.cpp

ogr/qgsogrhelperfunctions.cpp
@@ -409,7 +408,7 @@ INCLUDE_DIRECTORIES(
../analysis/raster ../analysis/openstreetmap
../core
../core/gps
../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
../core/composer ../core/raster ../core/symbology-ng
../gui ../gui/symbology-ng ../gui/attributetable ../gui/raster
../plugins
../python
@@ -23,7 +23,6 @@
#include "qgsmapcanvasmap.h"
#include "qgsmaplayerregistry.h"
#include "qgsrasterlayer.h"
#include "qgssymbol.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"

@@ -24,7 +24,6 @@ class QgsLegendLayer;
class QgsLegendPropertyGroup;
class QgsMapLayer;
class QgsRasterLayer;
class QgsSymbol;
class QgsVectorLayer;

class QTreeWidget;

This file was deleted.

This file was deleted.

@@ -18,7 +18,6 @@
#include "qgsmapcanvas.h"
#include "qgspointrotationitem.h"
#include "qgsrendererv2.h"
#include "qgssymbol.h"
#include "qgssymbolv2.h"
#include "qgsvectorlayer.h"
#include <QGraphicsPixmapItem>

0 comments on commit ba49ef0

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