[QGIS Commit] r15513 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-03-16 01:00:22 -0700 (Wed, 16 Mar 2011)
New Revision: 15513

Modified:
   trunk/qgis/src/core/qgsmaprenderer.h
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Fix diagrams

Modified: trunk/qgis/src/core/qgsmaprenderer.h
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.h	2011-03-16 07:40:58 UTC (rev 15512)
+++ trunk/qgis/src/core/qgsmaprenderer.h	2011-03-16 08:00:22 UTC (rev 15513)
@@ -74,7 +74,7 @@
     //! @note: this method was added in version 1.6
     virtual int prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices, QgsRenderContext& ctx ) = 0;
     //! adds a diagram layer to the labeling engine
-    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings& s ) { return 0; };
+    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings* s ) { return 0; }
     //! called for every feature
     virtual void registerFeature( QgsVectorLayer* layer, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() ) = 0;
     //! called for every diagram feature

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2011-03-16 07:40:58 UTC (rev 15512)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2011-03-16 08:00:22 UTC (rev 15513)
@@ -5191,7 +5191,7 @@
     if ( mDiagramRenderer && mDiagramLayerSettings )
     {
       mDiagramLayerSettings->renderer = mDiagramRenderer;
-      rendererContext.labelingEngine()->addDiagramLayer( this, *mDiagramLayerSettings );
+      rendererContext.labelingEngine()->addDiagramLayer( this, mDiagramLayerSettings );
       //add attributes needed by the diagram renderer
       QList<int> att = mDiagramRenderer->diagramAttributes();
       QList<int>::const_iterator attIt = att.constBegin();