[QGIS Commit] r11512 - trunk/qgis/src/core/renderer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-08-26 09:56:41 -0400 (Wed, 26 Aug 2009)
New Revision: 11512

Modified:
   trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp
   trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h
Log:
Apply patch #1896 from gislab

Modified: trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp
===================================================================
--- trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp	2009-08-26 12:28:52 UTC (rev 11511)
+++ trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.cpp	2009-08-26 13:56:41 UTC (rev 11512)
@@ -74,16 +74,6 @@
   }
 }
 
-const QList<QgsSymbol*> QgsUniqueValueRenderer::symbols() const
-{
-  QList <QgsSymbol*> symbollist;
-  for ( QMap<QString, QgsSymbol*>::const_iterator it = mSymbols.begin(); it != mSymbols.end(); ++it )
-  {
-    symbollist.append( it.value() );
-  }
-  return symbollist;
-}
-
 void QgsUniqueValueRenderer::insertValue( QString name, QgsSymbol* symbol )
 {
   mSymbols.insert( name, symbol );

Modified: trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h
===================================================================
--- trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h	2009-08-26 12:28:52 UTC (rev 11511)
+++ trunk/qgis/src/core/renderer/qgsuniquevaluerenderer.h	2009-08-26 13:56:41 UTC (rev 11512)
@@ -62,7 +62,7 @@
     /**Returns the index of the classification field*/
     int classificationField() const;
     /**Return symbology items*/
-    const QList<QgsSymbol*> symbols() const;
+    const QList<QgsSymbol*> symbols() const { return mSymbols.values(); }
     QgsRenderer* clone() const;
   protected:
     /**Field index used for classification*/