Skip to content

Commit

Permalink
fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 31, 2015
1 parent 56620e2 commit 6a84e07
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/core/layertree/qgslayertreemodellegendnode.cpp
Expand Up @@ -99,7 +99,7 @@ QSizeF QgsLayerTreeModelLegendNode::drawSymbolText( const QgsLegendSettings& set

labelSize.rheight() = lines.count() * textHeight + ( lines.count() - 1 ) * settings.lineSpacing();

double labelX, labelY;
double labelX = 0.0, labelY = 0.0;
if ( ctx )
{
ctx->painter->setPen( settings.fontColor() );
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsmaptopixel.cpp
Expand Up @@ -23,7 +23,6 @@

#include "qgslogger.h"

// @deprecated in 2.8
QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
double xc,
double yc,
Expand Down Expand Up @@ -56,6 +55,7 @@ QgsMapToPixel::QgsMapToPixel()
updateMatrix();
}

// @deprecated in 2.8
QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
double height,
double ymin,
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspalgeometry.h
Expand Up @@ -51,7 +51,7 @@ class QgsPalGeometry : public PalGeometry
QString text() { return mText; }

/** Returns the text component corresponding to a specified label part
* @param partId. Set to -1 for labels which are not broken into parts (eg, non-curved labels), or the required
* @param partId Set to -1 for labels which are not broken into parts (eg, non-curved labels), or the required
* part index for labels which are broken into parts (curved labels)
* @note added in QGIS 2.10
*/
Expand Down
2 changes: 1 addition & 1 deletion src/providers/oracle/qgsoraclefeatureiterator.cpp
Expand Up @@ -229,7 +229,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
}

feature.setValid( true );
feature.setFields( &mSource->mFields ); // allow name-based attribute lookups
feature.setFields( mSource->mFields ); // allow name-based attribute lookups

return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsserverinterface.h
Expand Up @@ -43,7 +43,7 @@ class SERVER_EXPORT QgsServerInterface

/**
* Set the request handler
* @param QgsRequestHandler
* @param requestHandler request handler
*/
virtual void setRequestHandler( QgsRequestHandler* requestHandler ) = 0;

Expand Down

0 comments on commit 6a84e07

Please sign in to comment.