diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -1437,7 +1437,7 @@ void QgsGrassEdit::checkOrphan( int field, int cat )
     return;
 
   // Delete record
-  error = mProvider->deleteAttributes( field, cat );
+  error = mProvider->deleteAttribute( field, cat );
   if ( !error->isEmpty() )
   {
     QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot delete orphan record: " )

diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -1542,7 +1542,7 @@ QgsGrassMapcalcObject::~QgsGrassMapcalcObject()
   QgsDebugMsg( "exited." );
 }
 
-int QgsGrassMapcalcObject::type()
+int QgsGrassMapcalcObject::type() const
 {
   return mType;
 }

diff --git a/src/plugins/grass/qgsgrassmapcalc.h b/src/plugins/grass/qgsgrassmapcalc.h
@@ -363,7 +363,7 @@ class QgsGrassMapcalcObject: public QGraphicsRectItem, public QgsGrassMapcalcIte
                        QgsGrassMapcalcConnector *connector = 0, int end = 0 );
 
     // Object type
-    int type();
+    virtual int type() const;
 
     // Value
     QString value() { return mValue; }

diff --git a/src/plugins/grass/qtermwidget/Screen.cpp b/src/plugins/grass/qtermwidget/Screen.cpp
@@ -566,6 +566,7 @@ void Screen::copyFromScreen( Character* dest , int startLine , int count ) const
 
 void Screen::getImage( Character* dest, int size, int startLine, int endLine ) const
 {
+  Q_UNUSED( size );
   Q_ASSERT( startLine >= 0 );
   Q_ASSERT( endLine >= startLine && endLine < hist->getLines() + lines );
 

diff --git a/src/plugins/grass/qtermwidget/ShellCommand.cpp b/src/plugins/grass/qtermwidget/ShellCommand.cpp
@@ -65,7 +65,7 @@ ShellCommand::ShellCommand( const QString& command , const QStringList& argument
   _arguments = arguments;
 
   if ( !_arguments.isEmpty() )
-    _arguments[0] == command;
+    _arguments[0] = command;
 }
 QString ShellCommand::fullCommand() const
 {

diff --git a/src/plugins/heatmap/heatmapgui.cpp b/src/plugins/heatmap/heatmapgui.cpp
@@ -190,19 +190,22 @@ void HeatmapGui::on_cellYLineEdit_editingFinished()
 
 void HeatmapGui::on_radiusFieldUnitCombo_currentIndexChanged( int index )
 {
+  Q_UNUSED( index );
   updateBBox();
   // DebugMsg to avoid index not used warning
   QgsDebugMsg( QString( "Unit index set to %1" ).arg( index ) );
 }
 
 void HeatmapGui::on_mRadiusUnitCombo_currentIndexChanged( int index )
 {
+  Q_UNUSED( index );
   QgsDebugMsg( QString( "Unit index set to %1" ).arg( index ) );
   updateBBox();
 }
 
 void HeatmapGui::on_mInputVectorCombo_currentIndexChanged( int index )
 {
+  Q_UNUSED( index );
   if ( advancedGroupBox->isChecked() )
   {
     populateFields();
@@ -213,6 +216,7 @@ void HeatmapGui::on_mInputVectorCombo_currentIndexChanged( int index )
 
 void HeatmapGui::on_radiusFieldCombo_currentIndexChanged( int index )
 {
+  Q_UNUSED( index );
   updateBBox();
   QgsDebugMsg( QString( "Radius Field index changed to %1" ).arg( index ) );
 }

diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -2279,7 +2279,7 @@ QString *QgsGrassProvider::insertAttributes( int field, int cat )
   return executeSql( field, query );
 }
 
-QString *QgsGrassProvider::deleteAttributes( int field, int cat )
+QString *QgsGrassProvider::deleteAttribute( int field, int cat )
 {
   QgsDebugMsg( QString( "field = %1 cat = %2" ).arg( field ).arg( cat ) );
 

diff --git a/src/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h
@@ -429,7 +429,7 @@ class GRASS_EXPORT QgsGrassProvider : public QgsVectorDataProvider
      *   @param cat
      *   @return empty string or error message
      */
-    QString *deleteAttributes( int field, int cat );
+    QString *deleteAttribute( int field, int cat );
 
     /** Check if a database row exists and it is orphan (no more lines with
      *  that category)

diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -512,7 +512,9 @@ void QgsMssqlProvider::select( QgsAttributeList fetchAttributes,
     }
   }
   else
+  {
     QgsDebugMsg( "QgsMssqlProvider::select no fields have been requested" );
+  }
 }
 
 // update the extent, feature count, wkb type and srid for this layer

diff --git a/src/providers/mssql/qgsmssqltablemodel.cpp b/src/providers/mssql/qgsmssqltablemodel.cpp
@@ -310,8 +310,10 @@ QIcon QgsMssqlTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBNoGeometry:
       return QIcon( QgsDataItem::getThemePixmap( "/mIconTableLayer.png" ) );
     case QGis::WKBUnknown:
-      return QIcon( QgsDataItem::getThemePixmap( "/mIconLayer.png" ) );
+      break;
   }
+
+  return QIcon( QgsDataItem::getThemePixmap( "/mIconLayer.png" ) );
 }
 
 bool QgsMssqlTableModel::setData( const QModelIndex &idx, const QVariant &value, int role )

diff --git a/src/providers/osm/osmhandler.cpp b/src/providers/osm/osmhandler.cpp
@@ -98,20 +98,17 @@ OsmHandler::~OsmHandler()
   sqlite3_finalize( mStmtInsertVersion );
 }
 
-
 bool OsmHandler::startDocument()
 {
   sqlite3_exec( mDatabase, "BEGIN;", 0, 0, 0 );
   return true;
 }
 
-
-QString OsmHandler::errorString()
+QString OsmHandler::errorString() const
 {
   return mError;
 }
 
-
 bool OsmHandler::startElement( const QString & pUri, const QString & pLocalName, const QString & pName, const QXmlAttributes & pAttrs )
 {
   Q_UNUSED( pUri );

diff --git a/src/providers/osm/osmhandler.h b/src/providers/osm/osmhandler.h
@@ -84,7 +84,7 @@ class OsmHandler: public QXmlDefaultHandler
      * Returns information on error that occures while parsing.
      * @return info on error that occures while parsing
      */
-    QString errorString();
+    QString errorString() const;
 
   public:
     int mPointCnt;

diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp
@@ -311,8 +311,10 @@ QIcon QgsPgTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBNoGeometry:
       return QIcon( QgsDataItem::getThemePixmap( "/mIconTableLayer.png" ) );
     case QGis::WKBUnknown:
-      return QIcon( QgsDataItem::getThemePixmap( "/mIconLayer.png" ) );
+      break;
   }
+
+  return QIcon( QgsDataItem::getThemePixmap( "/mIconLayer.png" ) );
 }
 
 bool QgsPgTableModel::setData( const QModelIndex &idx, const QVariant &value, int role )

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -750,15 +750,13 @@ void QgsPostgresProvider::appendPkParams( QgsFeatureId featureId, QStringList &p
 
       for ( int i = 0; i < mPrimaryKeyAttrs.size(); i++ )
       {
-        int idx = mPrimaryKeyAttrs[i];
-
         if ( i < pkVals.size() )
         {
           params << pkVals[i].toString();
         }
         else
         {
-          QgsDebugMsg( QString( "FAILURE: Key value %1 for feature %2 not found." ).arg( idx ).arg( featureId ) );
+          QgsDebugMsg( QString( "FAILURE: Key value %1 for feature %2 not found." ).arg( mPrimaryKeyAttrs[i] ).arg( featureId ) );
           params << "NULL";
         }
       }

diff --git a/src/providers/sqlanywhere/qgssqlanywhereprovider.cpp b/src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
@@ -465,7 +465,7 @@ QgsSqlAnywhereProvider::subsetString()
 } // QgsSqlAnywhereProvider::subsetString()
 
 bool
-QgsSqlAnywhereProvider::setSubsetString( QString theSQL )
+QgsSqlAnywhereProvider::setSubsetString( QString theSQL, bool )
 {
   QString   prevSubsetString = mSubsetString;
   QString   prevKeyColumn = mKeyColumn;

diff --git a/src/providers/sqlanywhere/qgssqlanywhereprovider.h b/src/providers/sqlanywhere/qgssqlanywhereprovider.h
@@ -76,7 +76,7 @@ class QgsSqlAnywhereProvider: public QgsVectorDataProvider
     virtual QString subsetString();
 
     /** mutator for sql where clause used to limit dataset size */
-    virtual bool setSubsetString( QString theSQL );
+    virtual bool setSubsetString( QString theSQL, bool updateFeatureCount = true );
     virtual bool supportsSubsetString() { return true; }
 
     /** Select features based on a bounding rectangle. Features can be retrieved with calls to nextFeature.

diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -49,7 +49,7 @@ static const QString GML_NAMESPACE = "http://www.opengis.net/gml";
 QgsWFSProvider::QgsWFSProvider( const QString& uri )
     : QgsVectorDataProvider( uri ),
     mNetworkRequestFinished( true ),
-    mEncoding( QgsWFSProvider::GET ),
+    mRequestEncoding( QgsWFSProvider::GET ),
     mUseIntersect( false ),
     mWKBType( QGis::WKBUnknown ),
     mSourceCRS( 0 ),
@@ -69,11 +69,11 @@ QgsWFSProvider::QgsWFSProvider( const QString& uri )
   //Local url or HTTP?  [WBC 111221] refactored from getFeature()
   if ( uri.startsWith( "http" ) )
   {
-    mEncoding = QgsWFSProvider::GET;
+    mRequestEncoding = QgsWFSProvider::GET;
   }
   else
   {
-    mEncoding = QgsWFSProvider::FILE;
+    mRequestEncoding = QgsWFSProvider::FILE;
   }
 
   //create mSourceCRS from url if possible [WBC 111221] refactored from GetFeatureGET()
@@ -346,7 +346,7 @@ void QgsWFSProvider::select( QgsAttributeList fetchAttributes,
 
 int QgsWFSProvider::getFeature( const QString& uri )
 {
-  if ( mEncoding == QgsWFSProvider::GET )
+  if ( mRequestEncoding == QgsWFSProvider::GET )
   {
     return getFeatureGET( uri, mGeometryAttribute );
   }
@@ -721,7 +721,7 @@ int QgsWFSProvider::describeFeatureType( const QString& uri, QString& geometryAt
 {
   fields.clear();
   //Local url or HTTP?  WBC111221 refactored here from getFeature()
-  switch ( mEncoding )
+  switch ( mRequestEncoding )
   {
     case QgsWFSProvider::GET:
     {
@@ -2382,6 +2382,7 @@ bool QgsWFSProvider::initGetRenderedOnly( const QgsRectangle rect )
 
 QGis::WkbType QgsWFSProvider::geomTypeFromPropertyType( QString attName, QString propType )
 {
+  Q_UNUSED( attName );
   const QStringList geomTypes = ( QStringList()
                                   //all GML v.2.1.3 _geometryProperty group members, except MultiGeometryPropertyType
                                   //sequence must exactly match enum Qgis::WkbType

diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h
@@ -101,8 +101,8 @@ class QgsWFSProvider: public QgsVectorDataProvider
     /* new functions */
 
     /**Sets the encoding type in which the provider makes requests and interprets
-     results. Posibilities are GET, POST, SOAP*/
-    void setEncoding( QgsWFSProvider::REQUEST_ENCODING e ) {mEncoding = e;}
+     results. Possibilities are GET, POST, SOAP*/
+    void setRequestEncoding( QgsWFSProvider::REQUEST_ENCODING e ) {mRequestEncoding = e;}
 
     /**Makes a GetFeatures, receives the features from the wfs server (as GML), converts them to QgsFeature and
        stores them in a vector*/
@@ -166,7 +166,7 @@ class QgsWFSProvider: public QgsVectorDataProvider
     /**Name of geometry attribute*/
     QString mGeometryAttribute;
     /**The encoding used for request/response. Can be GET, POST or SOAP*/
-    REQUEST_ENCODING mEncoding;
+    REQUEST_ENCODING mRequestEncoding;
     /**Bounding box for the layer*/
     QgsRectangle mExtent;
     /**Spatial filter for the layer*/

diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
@@ -422,12 +422,12 @@ class QgsWmsProvider : public QgsRasterDataProvider
      * (in order from bottom to top)
      * \note   layers must have been previously added.
      */
-    void setLayerOrder( QStringList const & layers );
+    virtual void setLayerOrder( QStringList const & layers );
 
     /**
      * Set the visibility of the given sublayer name
      */
-    void setSubLayerVisibility( QString const & name, bool vis );
+    virtual void setSubLayerVisibility( const QString &name, bool vis );
 
     /**
      * Get the image encoding (as a MIME type) used in the transfer from the WMS server
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
       else
+      {
         QgsDebugMsg( "QgsMssqlProvider::select no fields have been requested" );
+      }
     }
     // update the extent, feature count, wkb type and srid for this layer
@@ Expand Down @@