Skip to content
Permalink
Browse files

fix warnings

git-svn-id: http://svn.osgeo.org/qgis/trunk@15507 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Mar 15, 2011
1 parent 88d4389 commit 59ce32eb2c7021cd306bdd81956916748e4866f7
Showing with 10 additions and 3 deletions.
  1. +3 −0 src/app/qgsvectorlayerproperties.cpp
  2. +5 −2 src/core/qgsdiagramrendererv2.h
  3. +2 −1 src/core/qgsvectorlayer.h
@@ -1626,6 +1626,9 @@ void QgsVectorLayerProperties::initDiagramTab()
case QGis::Polygon:
mPlacementComboBox->setCurrentIndex( mPlacementComboBox->findData( 0 ) );
break;
case QGis::UnknownGeometry:
case QGis::NoGeometry:
break;
}
mBackgroundColorButton->setColor( QColor( 255, 255, 255, 255 ) );
}
@@ -72,7 +72,7 @@ struct CORE_EXPORT QgsDiagramSettings
MapUnits
};

QgsDiagramSettings(): minScaleDenominator( -1 ), maxScaleDenominator( -1 ), sizeType( MM )
QgsDiagramSettings(): sizeType( MM ), minScaleDenominator( -1 ), maxScaleDenominator( -1 )
{}
QFont font;
QList< QColor > categoryColors;
@@ -121,7 +121,10 @@ class CORE_EXPORT QgsDiagramRendererV2
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*/
@@ -814,7 +814,8 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
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 );

0 comments on commit 59ce32e

Please sign in to comment.
You can’t perform that action at this time.