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

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
 {

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 );
 

python/core/core.sip

@@ -163,15 +163,8 @@
 %Include raster/qgscubicrasterresampler.sip
 %Include raster/qgsmultibandcolorrenderer.sip
 
-%Include renderer/qgscontinuouscolorrenderer.sip
-%Include renderer/qgsgraduatedsymbolrenderer.sip
-%Include renderer/qgsrenderer.sip
-%Include renderer/qgssinglesymbolrenderer.sip
-%Include renderer/qgsuniquevaluerenderer.sip
-
 %Include symbology-ng/qgsstylev2.sip
 %Include symbology-ng/qgssvgcache.sip
-%Include symbology-ng/qgssymbologyv2conversion.sip
 %Include symbology-ng/qgssymbolv2.sip
 %Include symbology-ng/qgscolorbrewerpalette.sip
 %Include symbology-ng/qgscptcityarchive.sip
@@ -193,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

python/core/qgsvectorlayer.sip

@@ -242,12 +242,6 @@ class QgsVectorLayer : QgsMapLayer
     /** Returns the bounding box of the selected features. If there is no selection, QgsRectangle(0,0,0,0) is returned */
     QgsRectangle boundingBoxOfSelected();
 
-    /** Returns a pointer to the renderer */
-    const QgsRenderer* renderer() const;
-
-    /** Sets the renderer. If a renderer is already present, it is deleted */
-    void setRenderer( QgsRenderer * r /Transfer/ );
-
     /** Sets diagram rendering object (takes ownership) */
     void setDiagramRenderer( QgsDiagramRendererV2* r /Transfer/ );
     const QgsDiagramRendererV2* diagramRenderer() const;
@@ -262,14 +256,6 @@ class QgsVectorLayer : QgsMapLayer
      * @note added in 1.4
      */
     void setRendererV2( QgsFeatureRendererV2* r /Transfer/ );
-    /** Return whether using renderer V2.
-     * @note added in 1.4
-     */
-    bool isUsingRendererV2();
-    /** set whether to use renderer V2 for drawing.
-     * @note added in 1.4
-     */
-    void setUsingRendererV2( bool usingRendererV2 );
 
     /** Draw layer with renderer V2.
      * @note added in 1.4