Skip to content

Commit 6a84e07

Browse files
committedMay 31, 2015
fix warnings
1 parent 56620e2 commit 6a84e07

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed
 

‎src/core/layertree/qgslayertreemodellegendnode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ QSizeF QgsLayerTreeModelLegendNode::drawSymbolText( const QgsLegendSettings& set
9999

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

102-
double labelX, labelY;
102+
double labelX = 0.0, labelY = 0.0;
103103
if ( ctx )
104104
{
105105
ctx->painter->setPen( settings.fontColor() );

‎src/core/qgsmaptopixel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include "qgslogger.h"
2525

26-
// @deprecated in 2.8
2726
QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
2827
double xc,
2928
double yc,
@@ -56,6 +55,7 @@ QgsMapToPixel::QgsMapToPixel()
5655
updateMatrix();
5756
}
5857

58+
// @deprecated in 2.8
5959
QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
6060
double height,
6161
double ymin,

‎src/core/qgspalgeometry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class QgsPalGeometry : public PalGeometry
5151
QString text() { return mText; }
5252

5353
/** Returns the text component corresponding to a specified label part
54-
* @param partId. Set to -1 for labels which are not broken into parts (eg, non-curved labels), or the required
54+
* @param partId Set to -1 for labels which are not broken into parts (eg, non-curved labels), or the required
5555
* part index for labels which are broken into parts (curved labels)
5656
* @note added in QGIS 2.10
5757
*/

‎src/providers/oracle/qgsoraclefeatureiterator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
229229
}
230230

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

234234
return true;
235235
}

‎src/server/qgsserverinterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class SERVER_EXPORT QgsServerInterface
4343

4444
/**
4545
* Set the request handler
46-
* @param QgsRequestHandler
46+
* @param requestHandler request handler
4747
*/
4848
virtual void setRequestHandler( QgsRequestHandler* requestHandler ) = 0;
4949

0 commit comments

Comments
 (0)
Please sign in to comment.