From 6a84e07cc2e598757c02d23e5af91ab11dbd29f8 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Sun, 31 May 2015 18:57:39 +0200
Subject: [PATCH] fix warnings

---
 src/core/layertree/qgslayertreemodellegendnode.cpp | 2 +-
 src/core/qgsmaptopixel.cpp                         | 2 +-
 src/core/qgspalgeometry.h                          | 2 +-
 src/providers/oracle/qgsoraclefeatureiterator.cpp  | 2 +-
 src/server/qgsserverinterface.h                    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
index 8cd440cf5b8..54b5ae3b9c6 100644
--- a/src/core/layertree/qgslayertreemodellegendnode.cpp
+++ b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -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() );
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
index 8e641450044..b7849c3be94 100644
--- a/src/core/qgsmaptopixel.cpp
+++ b/src/core/qgsmaptopixel.cpp
@@ -23,7 +23,6 @@
 
 #include "qgslogger.h"
 
-// @deprecated in 2.8
 QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
                               double xc,
                               double yc,
@@ -56,6 +55,7 @@ QgsMapToPixel::QgsMapToPixel()
   updateMatrix();
 }
 
+// @deprecated in 2.8
 QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
                               double height,
                               double ymin,
diff --git a/src/core/qgspalgeometry.h b/src/core/qgspalgeometry.h
index 037e2d4b8cb..1dbd968bfe8 100644
--- a/src/core/qgspalgeometry.h
+++ b/src/core/qgspalgeometry.h
@@ -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
      */
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
index 39318bf0036..6eeff508423 100644
--- a/src/providers/oracle/qgsoraclefeatureiterator.cpp
+++ b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -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;
   }
diff --git a/src/server/qgsserverinterface.h b/src/server/qgsserverinterface.h
index f85f358e5e0..deedb57075c 100644
--- a/src/server/qgsserverinterface.h
+++ b/src/server/qgsserverinterface.h
@@ -43,7 +43,7 @@ class SERVER_EXPORT QgsServerInterface
 
     /**
      * Set the request handler
-     * @param QgsRequestHandler
+     * @param requestHandler request handler
      */
     virtual void setRequestHandler( QgsRequestHandler* requestHandler ) = 0;