[API] Removed QgsSymbol, QgsMarkerCatalgoue and QgsSymbologyUtils

qgis · Apr 7, 2013 · ba49ef0 · ba49ef0
1 parent 7cc3031
commit ba49ef0
Show file tree

Hide file tree

Showing 57 changed files with 254 additions and 3,790 deletions.
diff --git a/python/CMakeLists.txt b/python/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

diff --git a/python/core/composer/qgscomposerlegenditem.sip b/python/core/composer/qgscomposerlegenditem.sip
@@ -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
 {

diff --git a/python/core/composer/qgslegendmodel.sip b/python/core/composer/qgslegendmodel.sip
@@ -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 );
 

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -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
diff --git a/python/core/symbology/qgsmarkercatalogue.sip b/python/core/symbology/qgsmarkercatalogue.sip
diff --git a/python/core/symbology/qgssymbol.sip b/python/core/symbology/qgssymbol.sip
diff --git a/python/core/symbology/qgssymbologyutils.sip b/python/core/symbology/qgssymbologyutils.sip
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -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

diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -23,7 +23,6 @@
 #include "qgsmapcanvasmap.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsrasterlayer.h"
-#include "qgssymbol.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 

diff --git a/src/app/legend/qgslegendlayer.h b/src/app/legend/qgslegendlayer.h
@@ -24,7 +24,6 @@ class QgsLegendLayer;
 class QgsLegendPropertyGroup;
 class QgsMapLayer;
 class QgsRasterLayer;
-class QgsSymbol;
 class QgsVectorLayer;
 
 class QTreeWidget;

diff --git a/src/app/legend/qgslegendvectorsymbologyitem.cpp b/src/app/legend/qgslegendvectorsymbologyitem.cpp
diff --git a/src/app/legend/qgslegendvectorsymbologyitem.h b/src/app/legend/qgslegendvectorsymbologyitem.h
diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp
@@ -18,7 +18,6 @@
 #include "qgsmapcanvas.h"
 #include "qgspointrotationitem.h"
 #include "qgsrendererv2.h"
-#include "qgssymbol.h"
 #include "qgssymbolv2.h"
 #include "qgsvectorlayer.h"
 #include <QGraphicsPixmapItem>