Skip to content

Commit

Permalink
[API] Removed QgsSymbol, QgsMarkerCatalgoue and QgsSymbologyUtils
Browse files Browse the repository at this point in the history
  • Loading branch information
wonder-sk committed Apr 7, 2013
1 parent 7cc3031 commit ba49ef0
Show file tree
Hide file tree
Showing 57 changed files with 254 additions and 3,790 deletions.
2 changes: 0 additions & 2 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 0 additions & 27 deletions python/core/composer/qgscomposerlegenditem.sip
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class QgsComposerLegendItem : QStandardItem
{
GroupItem = QStandardItem::UserType,
LayerItem,
SymbologyItem,
SymbologyV2Item,
RasterSymbolItem
};
Expand All @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion python/core/composer/qgslegendmodel.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
4 changes: 0 additions & 4 deletions python/core/core.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
47 changes: 0 additions & 47 deletions python/core/symbology/qgsmarkercatalogue.sip

This file was deleted.

125 changes: 0 additions & 125 deletions python/core/symbology/qgssymbol.sip

This file was deleted.

23 changes: 0 additions & 23 deletions python/core/symbology/qgssymbologyutils.sip

This file was deleted.

3 changes: 1 addition & 2 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/app/legend/qgslegendlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "qgsmapcanvasmap.h"
#include "qgsmaplayerregistry.h"
#include "qgsrasterlayer.h"
#include "qgssymbol.h"
#include "qgsvectorlayer.h"
#include "qgsvectordataprovider.h"

Expand Down
1 change: 0 additions & 1 deletion src/app/legend/qgslegendlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class QgsLegendLayer;
class QgsLegendPropertyGroup;
class QgsMapLayer;
class QgsRasterLayer;
class QgsSymbol;
class QgsVectorLayer;

class QTreeWidget;
Expand Down
38 changes: 0 additions & 38 deletions src/app/legend/qgslegendvectorsymbologyitem.cpp

This file was deleted.

39 changes: 0 additions & 39 deletions src/app/legend/qgslegendvectorsymbologyitem.h

This file was deleted.

1 change: 0 additions & 1 deletion src/app/qgsmaptoolrotatepointsymbols.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "qgsmapcanvas.h"
#include "qgspointrotationitem.h"
#include "qgsrendererv2.h"
#include "qgssymbol.h"
#include "qgssymbolv2.h"
#include "qgsvectorlayer.h"
#include <QGraphicsPixmapItem>
Expand Down
Loading

0 comments on commit ba49ef0

Please sign in to comment.