fix warnings from clang/gcc 4.7

python/core/qgsmaplayer.sip

@@ -168,7 +168,7 @@ public:
 
        @returns true if successful
     */
-    bool writeXML(QDomNode & layer_node, QDomDocument & document) const;
+    bool writeXML(QDomNode & layer_node, QDomDocument & document);
 
     /** Set a custom property for layer. Properties are stored in a map and saved in project file.
      *  @note Added in v1.4 */

src/analysis/interpolation/TriDecorator.h

@@ -36,8 +36,8 @@ class TriDecorator: public Triangulation
     virtual bool calcPoint( double x, double y, Point3D* result );
     virtual Point3D* getPoint( unsigned int i ) const;
     virtual int getNumberOfPoints() const;
-    virtual bool getTriangle( double x, double y, Point3D* p1, int* n1, Point3D* p2, int* n2, Point3D* p3, int* n3 );
-    virtual bool getTriangle( double x, double y, Point3D* p1, Point3D* p2, Point3D* p3 );
+    bool getTriangle( double x, double y, Point3D* p1, int* n1, Point3D* p2, int* n2, Point3D* p3, int* n3 );
+    bool getTriangle( double x, double y, Point3D* p1, Point3D* p2, Point3D* p3 );
     virtual int getOppositePoint( int p1, int p2 );
     virtual QList<int>* getSurroundingTriangles( int pointno );
     virtual double getXMax() const;

src/analysis/raster/qgsrastercalcparser.yy

@@ -110,6 +110,7 @@ void addToTmpNodes(QgsRasterCalcNode* node)
 void joinTmpNodes(QgsRasterCalcNode* parent, QgsRasterCalcNode* left, QgsRasterCalcNode* right)
 {
   bool res;
+  Q_UNUSED( res );
 
   if (left)
   {

src/analysis/vector/qgsgeometryanalyzer.cpp

@@ -1175,6 +1175,7 @@ QgsPoint QgsGeometryAnalyzer::createPointOffset( double x, double y, double dist
   normalY *= ( dist / normalLength );
 
   double debugLength = sqrt( normalX * normalX + normalY * normalY ); //control
+  Q_UNUSED( debugLength );
 
   return QgsPoint( x - normalX, y - normalY ); //negative values -> left side, positive values -> right side
 }

src/analysis/vector/qgsgeometryanalyzer.h

@@ -148,7 +148,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer
                                bool forceSingleType = false );
     /**Create geometry offset relative to line geometry.
         @param geom the geometry to modify
-        @param the line geometry to wich the feature is referenced
+        @param lineGeom the line geometry to wich the feature is referenced
         @param offset the offset value in layer unit. Negativ value means offset towards left, positive value is offset to the right side*/
     void createOffsetGeometry( QgsGeometry* geom, QgsGeometry* lineGeom, double offset );
     QgsPoint createPointOffset( double x, double y, double dist, QgsGeometry* lineGeom ) const;

src/app/legend/qgslegend.cpp

@@ -244,7 +244,7 @@ void QgsLegend::removeAll()
   mDropTarget = 0;
 }
 
-void QgsLegend::selectAll( bool select )
+void QgsLegend::selectAll( bool visible )
 {
   if ( !mMapCanvas || mMapCanvas->isDrawing() )
   {
@@ -259,7 +259,7 @@ void QgsLegend::selectAll( bool select )
     QgsLegendItem* litem = dynamic_cast<QgsLegendItem *>( theItem );
     if ( litem && litem->type() == QgsLegendItem::LEGEND_LAYER )
     {
-      theItem->setCheckState( 0, select ? Qt::Checked : Qt::Unchecked );
+      theItem->setCheckState( 0, visible ? Qt::Checked : Qt::Unchecked );
       handleItemChange( theItem, 0 );
     }
   }

src/app/legend/qgslegend.h

@@ -227,7 +227,7 @@ class QgsLegend : public QTreeWidget
      * the legend, and in the map.
      * @return void
      */
-    void selectAll( bool select );
+    void selectAll( bool visible );
 
     /*!
      * Slot called when user wishes to add a new empty layer group to the legend.

src/app/main.cpp

@@ -75,6 +75,7 @@ typedef SInt32 SRefCon;
 #include "qgslogger.h"
 
 #if defined(linux) && ! defined(ANDROID)
+#include <unistd.h>
 #include <execinfo.h>
 #endif
 

src/core/pal/hashtable.hpp

@@ -230,7 +230,7 @@ namespace pal
 
 
   template <typename Data>
-  bool HashTable<Data>::removeElement( const char * key )
+  bool HashTable<Data>::removeElement( const char * )
   {
     // TODO: Remove the element that has this key from the hash table.
     // Return true if the entry is found or false otherwise.

src/core/qgscoordinatereferencesystem.cpp

@@ -299,6 +299,7 @@ bool QgsCoordinateReferenceSystem::axisInverted() const
   {
     OGRAxisOrientation orientation;
     const char *axis0 = OSRGetAxis( mCRS, mGeoFlag ? "GEOGCS" : "PROJCS", 0, &orientation );
+    Q_UNUSED( axis0 );
     mAxisInverted = mGeoFlag
                     ? ( orientation == OAO_East || orientation == OAO_West || orientation == OAO_Other )
                     : ( orientation == OAO_North || orientation == OAO_South );

src/core/qgsdataprovider.h

@@ -191,7 +191,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
      * (in order from bottom to top)
      * \note   layers must have been previously added.
      */
-    virtual void setLayerOrder( QStringList layers )
+    virtual void setLayerOrder( const QStringList &layers )
     {
       //prevent unused var warnings
       if ( layers.count() < 1 )
@@ -205,7 +205,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
     /**
      * Set the visibility of the given sublayer name
      */
-    virtual void setSubLayerVisibility( QString name, bool vis )
+    virtual void setSubLayerVisibility( const QString &name, bool vis )
     {
       //prevent unused var warnings
       if ( name.isEmpty() || !vis )

src/core/qgsdiagram.h

@@ -15,6 +15,7 @@ class QgsRenderContext;
 class CORE_EXPORT QgsDiagram
 {
   public:
+    virtual ~QgsDiagram() {}
     /**Draws the diagram at the given position (in pixel coordinates)*/
     virtual void renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position ) = 0;
     virtual QString diagramName() const = 0;

src/core/qgsexpression.h

@@ -242,7 +242,7 @@ class CORE_EXPORT QgsExpression
     {
       public:
         NodeList() {}
-        ~NodeList() { foreach( Node* n, mList ) delete n; }
+        virtual ~NodeList() { foreach( Node* n, mList ) delete n; }
         void append( Node* node ) { mList.append( node ); }
         int count() { return mList.count(); }
         QList<Node*> list() { return mList; }
@@ -314,7 +314,7 @@ class CORE_EXPORT QgsExpression
     {
       public:
         NodeInOperator( Node* node, NodeList* list, bool notin = false ) : mNode( node ), mList( list ), mNotIn( notin ) {}
-        ~NodeInOperator() { delete mNode; delete mList; }
+        virtual ~NodeInOperator() { delete mNode; delete mList; }
 
         Node* node() { return mNode; }
         bool isNotIn() { return mNotIn; }
@@ -341,7 +341,7 @@ class CORE_EXPORT QgsExpression
       public:
         NodeFunction( int fnIndex, NodeList* args ): mFnIndex( fnIndex ), mArgs( args ) {}
         //NodeFunction( QString name, NodeList* args ) : mName(name), mArgs(args) {}
-        ~NodeFunction() { delete mArgs; }
+        virtual ~NodeFunction() { delete mArgs; }
 
         int fnIndex() { return mFnIndex; }
         NodeList* args() { return mArgs; }

src/core/qgsmaplayer.cpp

@@ -480,12 +480,12 @@ float QgsMapLayer::maximumScale()
 }
 
 
-QStringList QgsMapLayer::subLayers()
+QStringList QgsMapLayer::subLayers() const
 {
   return QStringList();  // Empty
 }
 
-void QgsMapLayer::setLayerOrder( QStringList layers )
+void QgsMapLayer::setLayerOrder( const QStringList &layers )
 {
   Q_UNUSED( layers );
   // NOOP

src/core/qgsmaplayer.h

@@ -132,18 +132,17 @@ class CORE_EXPORT QgsMapLayer : public QObject
      * Returns the sublayers of this layer
      * (Useful for providers that manage their own layers, such as WMS)
      */
-    virtual QStringList subLayers();
+    virtual QStringList subLayers() const;
 
     /**
      * Reorders the *previously selected* sublayers of this layer from bottom to top
      * (Useful for providers that manage their own layers, such as WMS)
      */
-    virtual void setLayerOrder( QStringList layers );
+    virtual void setLayerOrder( const QStringList &layers );
 
     /** Set the visibility of the given sublayer name */
     virtual void setSubLayerVisibility( QString name, bool vis );
 
-
     /** True if the layer can be edited */
     virtual bool isEditable() const;
 

src/core/qgssearchstringparser.yy

@@ -215,6 +215,7 @@ void addToTmpNodes(QgsSearchTreeNode* node)
 void joinTmpNodes(QgsSearchTreeNode* parent, QgsSearchTreeNode* left, QgsSearchTreeNode* right)
 {
   bool res;
+  Q_UNUSED( res );
 
   if (left)
   {

src/core/raster/qgsrasterlayer.cpp

@@ -2837,7 +2837,7 @@ void QgsRasterLayer::setRedBandName( QString const & theBandName )
   mRedBandName = validateBandName( theBandName );
 }
 
-void QgsRasterLayer::setSubLayerVisibility( QString const & name, bool vis )
+void QgsRasterLayer::setSubLayerVisibility( QString name, bool vis )
 {
 
   if ( mDataProvider )

src/core/raster/qgsrasterlayer.h

@@ -634,7 +634,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     void showProgress( int theValue );
 
     /** \brief Returns the sublayers of this layer - Useful for providers that manage their own layers, such as WMS */
-    QStringList subLayers() const;
+    virtual QStringList subLayers() const;
 
     /** \brief Draws a thumbnail of the rasterlayer into the supplied pixmap pointer */
     void thumbnailAsPixmap( QPixmap * theQPixmap );
@@ -647,20 +647,20 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     void triggerRepaint();
 
     //
-    // Virtural methods
+    // Virtual methods
     //
     /**
      * Reorders the *previously selected* sublayers of this layer from bottom to top
      *
      * (Useful for providers that manage their own layers, such as WMS)
      *
      */
-    virtual void setLayerOrder( const QStringList & layers );
+    virtual void setLayerOrder( const QStringList &layers );
 
     /**
      * Set the visibility of the given sublayer name
      */
-    virtual void setSubLayerVisibility( const QString & name, bool vis );
+    virtual void setSubLayerVisibility( QString name, bool vis );
 
     /** Time stamp of data source in the moment when data/metadata were loaded by provider */
     virtual QDateTime timestamp() const { return mDataProvider->timestamp() ; }

src/core/renderer/qgsgraduatedsymbolrenderer.cpp

@@ -346,7 +346,7 @@ bool QgsGraduatedSymbolRenderer::writeXML( QDomNode & layer_node, QDomDocument &
   QString modeValue = "";
   if ( mMode == QgsGraduatedSymbolRenderer::Empty )
   {
-    modeValue == "Empty";
+    modeValue = "Empty";
   }
   else if ( QgsGraduatedSymbolRenderer::Quantile )
   {

src/core/spatialite/spatialite.c

@@ -57581,7 +57581,7 @@ Parse (void *yyp,		/* The parser */
 #define __STDC_LIMIT_MACROS 1
 #endif
 
-/* #include <inttypes.h> */
+#include <inttypes.h>
 typedef int8_t flex_int8_t;
 typedef uint8_t flex_uint8_t;
 typedef int16_t flex_int16_t;

src/core/symbology-ng/qgsrendererv2registry.h

@@ -24,6 +24,7 @@ class CORE_EXPORT QgsRendererV2AbstractMetadata
   public:
     QgsRendererV2AbstractMetadata( QString name, QString visibleName, QIcon icon = QIcon() )
         : mName( name ), mVisibleName( visibleName ), mIcon( icon ) {}
+    virtual ~QgsRendererV2AbstractMetadata() {}
 
     QString name() const { return mName; }
     QString visibleName() const { return mVisibleName; }

src/core/symbology-ng/qgsrulebasedrendererv2.cpp

@@ -446,9 +446,13 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::create( QDomElement&
   {
     Rule* childRule = create( childRuleElem, symbolMap );
     if ( childRule )
+    {
       rule->appendChild( childRule );
+    }
     else
+    {
       QgsDebugMsg( "failed to init a child rule!" );
+    }
     childRuleElem = childRuleElem.nextSiblingElement( "rule" );
   }
 

src/core/symbology-ng/qgssymbollayerv2registry.h

@@ -19,6 +19,8 @@ class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata
     QgsSymbolLayerV2AbstractMetadata( QString name, QString visibleName, QgsSymbolV2::SymbolType type )
         : mName( name ), mVisibleName( visibleName ), mType( type ) {}
 
+    virtual ~QgsSymbolLayerV2AbstractMetadata() {}
+
     QString name() const { return mName; }
     QString visibleName() const { return mVisibleName; }
     QgsSymbolV2::SymbolType type() const { return mType; }

src/gui/attributetable/qgsattributetablememorymodel.cpp

@@ -115,10 +115,11 @@ void QgsAttributeTableMemoryModel::featureDeleted( QgsFeatureId fid )
   QgsAttributeTableModel::featureDeleted( fid );
 }
 
-void QgsAttributeTableMemoryModel::featureAdded( QgsFeatureId fid )
+void QgsAttributeTableMemoryModel::featureAdded( QgsFeatureId fid, bool inOperation )
 {
   QgsDebugMsg( "entered." );
   Q_UNUSED( fid );
+  Q_UNUSED( inOperation );
   loadLayer();
 }
 

src/gui/attributetable/qgsattributetablememorymodel.h

@@ -59,8 +59,9 @@ class QgsAttributeTableMemoryModel : public QgsAttributeTableModel
     /**
      * Launched when a feature has been deleted
      * @param fid feature id
+     * @param inOperation guard insertion with beginInsertRows() / endInsertRows()
      */
-    virtual void featureAdded( QgsFeatureId fid );
+    virtual void featureAdded( QgsFeatureId fid, bool inOperation = true );
     /**
      * Launched when layer has been deleted
      */

src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp

@@ -754,7 +754,9 @@ bool QgsRuleBasedRendererV2Model::removeRows( int row, int count, const QModelIn
       //parentRule->takeChildAt( row );
     }
     else
+    {
       QgsDebugMsg( "trying to remove invalid index - this should not happen!" );
+    }
   }
 
   endRemoveRows();

src/mapserver/qgswmsserver.cpp

@@ -281,7 +281,7 @@ QImage* QgsWMSServer::getLegendGraphics()
 {
   if ( !mConfigParser || !mMapRenderer )
   {
-    return false;
+    return 0;
   }
 
   QStringList layersList, stylesList;

src/plugins/georeferencer/qgsleastsquares.cpp

@@ -94,10 +94,10 @@ void QgsLeastSquares::helmert( std::vector<QgsPoint> mapCoords,
      that this is correct but I derived it myself late at night. Look at
      helmert.jpg if you suspect bugs. */
 
-  double MData[] = { A,   -B,    n,    0,
-                     B,    A,    0,    n,
-                     G + H,  0,    A,    B,
-                     0,    G + H, -B,    A
+  double MData[] = { A,   -B, ( double ) n,    0.,
+                     B,    A,    0., ( double ) n,
+                     G + H,  0.,    A,    B,
+                     0.,    G + H, -B,    A
                    };
 
   double bData[] = { C,    D,    E + F,  J - I };
@@ -151,8 +151,8 @@ void QgsLeastSquares::affine( std::vector<QgsPoint> mapCoords,
      I *think* that this is correct but I derived it myself late at night.
      Look at affine.jpg if you suspect bugs. */
 
-  double MData[] = { A,    B,    0,    0,    n,    0,
-                     0,    0,    A,    B,    0,    n,
+  double MData[] = { A,    B,    0,    0, ( double ) n,    0,
+                     0,    0,    A,    B,    0, ( double ) n,
                      E,    G,    0,    0,    A,    0,
                      G,    F,    0,    0,    B,    0,
                      0,    0,    E,    G,    0,    A,

src/plugins/globe/globe_plugin.h

@@ -196,6 +196,7 @@ namespace osgEarth
         public:
           virtual void onMouseDown( class Control* control, int mouseButtonMask ) { Q_UNUSED( control ); Q_UNUSED( mouseButtonMask ); }
           virtual void onClick( class Control* control, int mouseButtonMask, const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa ) { Q_UNUSED( control ); Q_UNUSED( mouseButtonMask ); Q_UNUSED( ea ); Q_UNUSED( aa ); }
+          virtual void onClick( class Control* control, int mouseButtonMask ) { Q_UNUSED( control ); Q_UNUSED( mouseButtonMask ); }
       };
 
       class NavigationControl : public ImageControl

src/plugins/globe/qgsosgearthtilesource.cpp

@@ -83,7 +83,7 @@ osg::Image* QgsOsgEarthTileSource::createImage( const TileKey& key, ProgressCall
       return 0;
     }
 
-    QImage* qImage = createImage( target_width, target_height );
+    QImage* qImage = createQImage( target_width, target_height );
     if ( !qImage )
     {
       return 0;
@@ -121,7 +121,7 @@ osg::Image* QgsOsgEarthTileSource::createImage( const TileKey& key, ProgressCall
   return image.release();
 }
 
-QImage* QgsOsgEarthTileSource::createImage( int width, int height ) const
+QImage* QgsOsgEarthTileSource::createQImage( int width, int height ) const
 {
   if ( width < 0 || height < 0 )
   {

src/plugins/globe/qgsosgearthtilesource.h

@@ -25,8 +25,7 @@ namespace osgEarth
 
         osg::Image* createImage( const TileKey& key, ProgressCallback* progress );
 
-        osg::HeightField* createHeightField( const TileKey* key,
-                                             ProgressCallback* progress )
+        virtual osg::HeightField* createHeightField( const TileKey &key, ProgressCallback* progress )
         {
           Q_UNUSED( key );
           Q_UNUSED( progress );
@@ -48,7 +47,7 @@ namespace osgEarth
 
       private:
 
-        QImage* createImage( int width, int height ) const;
+        QImage* createQImage( int width, int height ) const;
         bool intersects( const TileKey* key );
 
         //! Pointer to the QGIS interface object