Skip to content
Permalink
Browse files

fix warnings

  • Loading branch information
jef-n committed Jan 12, 2014
1 parent 9f78682 commit 134dc4899a7608a38838792d7125f4d6405c57be
Showing with 4 additions and 3 deletions.
  1. +3 −3 src/core/qgsdiagramrendererv2.h
  2. +1 −0 src/mapserver/qgsprojectparser.cpp
@@ -195,7 +195,7 @@ class CORE_EXPORT QgsDiagramRendererV2
* @param c render context
* @param s out: diagram settings for the feature
*/
virtual bool diagramSettings( const QgsFeature&, const QgsRenderContext& c, QgsDiagramSettings& s ) = 0;
virtual bool diagramSettings( const QgsFeature &feature, const QgsRenderContext& c, QgsDiagramSettings& s ) = 0;

/**Returns size of the diagram (in painter units) or an invalid size in case of error*/
virtual QSizeF diagramSize( const QgsFeature& features, const QgsRenderContext& c ) = 0;
@@ -233,7 +233,7 @@ class CORE_EXPORT QgsSingleCategoryDiagramRenderer : public QgsDiagramRendererV2
void writeXML( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;

protected:
bool diagramSettings( const QgsFeature&, const QgsRenderContext& c, QgsDiagramSettings& s );
bool diagramSettings( const QgsFeature &feature, const QgsRenderContext& c, QgsDiagramSettings& s );

QSizeF diagramSize( const QgsFeature&, const QgsRenderContext& c );

@@ -281,7 +281,7 @@ class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer : public QgsDiagramRend
void writeXML( QDomElement& layerElem, QDomDocument& doc, const QgsVectorLayer* layer ) const;

protected:
bool diagramSettings( const QgsFeature&, const QgsRenderContext& c, QgsDiagramSettings& s );
bool diagramSettings( const QgsFeature &feature, const QgsRenderContext& c, QgsDiagramSettings& s );

QSizeF diagramSize( const QgsFeature&, const QgsRenderContext& c );

@@ -1898,6 +1898,7 @@ int QgsProjectParser::layersAndStyles( QStringList& layers, QStringList& styles

QDomDocument QgsProjectParser::getStyle( const QString& styleName, const QString& layerName ) const
{
Q_UNUSED( styleName );
QStringList layerList;
layerList.append( layerName );
return getStyles( layerList );

0 comments on commit 134dc48

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