[QGIS Commit] r15507 - in trunk/qgis/src: app core

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-03-15 16:19:32 -0700 (Tue, 15 Mar 2011)
New Revision: 15507

Modified:
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
   trunk/qgis/src/core/qgsdiagramrendererv2.h
   trunk/qgis/src/core/qgsvectorlayer.h
Log:
fix warnings

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2011-03-15 23:19:12 UTC (rev 15506)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2011-03-15 23:19:32 UTC (rev 15507)
@@ -1626,6 +1626,9 @@
       case QGis::Polygon:
         mPlacementComboBox->setCurrentIndex( mPlacementComboBox->findData( 0 ) );
         break;
+      case QGis::UnknownGeometry:
+      case QGis::NoGeometry:
+	break;
     }
     mBackgroundColorButton->setColor( QColor( 255, 255, 255, 255 ) );
   }

Modified: trunk/qgis/src/core/qgsdiagramrendererv2.h
===================================================================
--- trunk/qgis/src/core/qgsdiagramrendererv2.h	2011-03-15 23:19:12 UTC (rev 15506)
+++ trunk/qgis/src/core/qgsdiagramrendererv2.h	2011-03-15 23:19:32 UTC (rev 15507)
@@ -72,7 +72,7 @@
     MapUnits
   };
 
-  QgsDiagramSettings(): minScaleDenominator( -1 ), maxScaleDenominator( -1 ), sizeType( MM )
+  QgsDiagramSettings(): sizeType( MM ), minScaleDenominator( -1 ), maxScaleDenominator( -1 )
   {}
   QFont font;
   QList< QColor > categoryColors;
@@ -121,7 +121,10 @@
   protected:
 
     /**Returns diagram settings for a feature (or false if the diagram for the feature is not to be rendered). Used internally within renderDiagram()
-      @param s out: diagram settings for the feature*/
+     * @param att attribute map
+     * @param c render context
+     * @param s out: diagram settings for the feature
+     */
     virtual bool diagramSettings( const QgsAttributeMap& att, const QgsRenderContext& c, QgsDiagramSettings& s ) = 0;
 
     /**Returns size of the diagram (in painter units) or an invalid size in case of error*/

Modified: trunk/qgis/src/core/qgsvectorlayer.h
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.h	2011-03-15 23:19:12 UTC (rev 15506)
+++ trunk/qgis/src/core/qgsvectorlayer.h	2011-03-15 23:19:32 UTC (rev 15507)
@@ -814,7 +814,8 @@
     void updateAttributeMapIndex( QgsAttributeMap& map, int oldIndex, int newIndex ) const;
 
     /**Registers label and diagram layer
-      @param attList attributes needed for labeling and diagrams will be added to the list
+      @param rendererContext render context
+      @param attributes attributes needed for labeling and diagrams will be added to the list
       @param labeling out: true if there will be labeling (ng) for this layer*/
     void prepareLabelingAndDiagrams( QgsRenderContext& rendererContext, QgsAttributeList& attributes, bool& labeling );