diff --git a/src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp b/src/app/pluginmanager/qgspluginsortfilterproxymodel.cpp
@@ -30,9 +30,9 @@ bool QgsPluginSortFilterProxyModel::filterAcceptsRow( int sourceRow, const QMode
 
   if ( ! sourceModel()->data( inx, SPACER_ROLE ).toString().isEmpty() )
   {
-     // it's a status spacer.
-     // TODO: the condition below is only suitable for status spacers
-     return ( filterByStatus( inx ) &&  mAcceptedStatuses.count()>1 && sourceModel()->data( inx, SPACER_ROLE ).toString() == mAcceptedSpacers );
+    // it's a status spacer.
+    // TODO: the condition below is only suitable for status spacers
+    return ( filterByStatus( inx ) &&  mAcceptedStatuses.count() > 1 && sourceModel()->data( inx, SPACER_ROLE ).toString() == mAcceptedSpacers );
   }
 
   return ( filterByStatus( inx ) && sourceModel()->data( inx, filterRole() ).toString().contains( filterRegExp() ) );

diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
@@ -29,8 +29,10 @@
 #include <QDialog>
 #include <QMouseEvent>
 
-QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ),
-    mActiveItem( 0 ), mCurrentMoveAction( QgsAnnotationItem::NoAction ), mLastMousePosition( 0, 0 )
+QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas )
+    : QgsMapTool( canvas )
+    , mCurrentMoveAction( QgsAnnotationItem::NoAction )
+    , mLastMousePosition( 0, 0 )
 {
   mCursor = QCursor( Qt::ArrowCursor );
 }

diff --git a/src/app/qgsmaptoolannotation.h b/src/app/qgsmaptoolannotation.h
@@ -48,10 +48,8 @@ class QgsMapToolAnnotation: public QgsMapTool
     /**Switches visibility states of text items*/
     void toggleTextItemVisibilities();
 
-    QgsAnnotationItem* mActiveItem;
     QgsAnnotationItem::MouseMoveAction mCurrentMoveAction;
     QPointF mLastMousePosition;
-
 };
 
 #endif // QGSMAPTOOLANNOTATION_H
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
@@ -254,17 +254,17 @@ bool QgsPluginRegistry::checkQgisVersion( QString minVersion, QString maxVersion
 
   // build XxYyZz strings with trailing zeroes if needed
   QString minVer = QString( "%1%2%3" ).arg( minVerMajor, 2, 10, QChar( '0' ) )
-                                      .arg( minVerMinor, 2, 10, QChar( '0' ) )
-                                      .arg( minVerBugfix, 2, 10, QChar( '0' ) );
+                   .arg( minVerMinor, 2, 10, QChar( '0' ) )
+                   .arg( minVerBugfix, 2, 10, QChar( '0' ) );
   QString maxVer = QString( "%1%2%3" ).arg( maxVerMajor, 2, 10, QChar( '0' ) )
-                                      .arg( maxVerMinor, 2, 10, QChar( '0' ) )
-                                      .arg( maxVerBugfix, 2, 10, QChar( '0' ) );
+                   .arg( maxVerMinor, 2, 10, QChar( '0' ) )
+                   .arg( maxVerBugfix, 2, 10, QChar( '0' ) );
   QString curVer = QString( "%1%2%3" ).arg( qgisMajor, 2, 10, QChar( '0' ) )
-                                      .arg( qgisMinor, 2, 10, QChar( '0' ) )
-                                      .arg( qgisBugfix, 2, 10, QChar( '0' ) );
+                   .arg( qgisMinor, 2, 10, QChar( '0' ) )
+                   .arg( qgisBugfix, 2, 10, QChar( '0' ) );
 
   // compare
-  return ( minVer <= curVer && maxVer >= curVer);
+  return ( minVer <= curVer && maxVer >= curVer );
 }
 
 

diff --git a/src/app/qgstipfactory.cpp b/src/app/qgstipfactory.cpp
@@ -190,7 +190,7 @@ QgsTipFactory::QgsTipFactory() : QObject()
                         " Plugins->Manage and Install Plugins menu. In addition there are a lot"
                         " of Python plugins contributed by the user community that can be"
                         " installed via this same menu. Don't miss out on all QGIS has to offer!"
-			" Check out the plugins and see what they can do for you." ) );
+                        " Check out the plugins and see what they can do for you." ) );
   addGenericTip( myTip );
 
   /* Template for adding more tips

diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
@@ -30,7 +30,6 @@ QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,
     , yMax( ymax )
     , yMin( ymin )
     , xMin( xmin )
-    , xMax( 0 )                 // XXX wasn't originally specified?  Why?
 {
 }
 

diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h
@@ -121,8 +121,6 @@ class CORE_EXPORT QgsMapToPixel
     double yMax;
     double yMin;
     double xMin;
-    double xMax;
-
 };
 
 

diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -187,14 +187,14 @@ QgsProviderRegistry::QgsProviderRegistry( QString pluginPath )
 
     // now get raster file filters, if any
     // this replaces deprecated QgsRasterLayer::buildSupportedRasterFileFilter
-    buildsupportedrasterfilefilter_t *pBuild = 
+    buildsupportedrasterfilefilter_t *pBuild =
       ( buildsupportedrasterfilefilter_t * ) cast_to_fptr( myLib.resolve( "buildSupportedRasterFileFilter" ) );
     if ( pBuild )
     {
       QString fileRasterFilters;
       pBuild( fileRasterFilters );
 
-      QgsDebugMsg( "raster filters: "+fileRasterFilters);
+      QgsDebugMsg( "raster filters: " + fileRasterFilters );
       if ( !fileRasterFilters.isEmpty() )
         mRasterFileFilters += fileRasterFilters;
 

diff --git a/src/mapserver/qgsconfigparser.cpp b/src/mapserver/qgsconfigparser.cpp
@@ -551,9 +551,9 @@ QgsComposition* QgsConfigParser::createPrintComposition( const QString& composer
   }
 
   //replace html url
-  foreach (const QgsComposerHtml *currentHtml, composerHtmls )
+  foreach ( const QgsComposerHtml *currentHtml, composerHtmls )
   {
-    QgsComposerHtml * html = const_cast<QgsComposerHtml *>(currentHtml);
+    QgsComposerHtml * html = const_cast<QgsComposerHtml *>( currentHtml );
     QgsComposerFrame *htmlFrame = html->frame( 0 );
     QString htmlId = htmlFrame->id();
     QString url = parameterMap.value( htmlId.toUpper() );

diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -827,7 +827,7 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
         else if ( metadataUrlType == "TC211" )
         {
           metaUrlElem.setAttribute( "type", "ISO19115:2003" );
-        } 
+        }
         else
         {
           metaUrlElem.setAttribute( "type", metadataUrlType );

diff --git a/src/plugins/dxf2shp_converter/builder.cpp b/src/plugins/dxf2shp_converter/builder.cpp
@@ -43,7 +43,6 @@ Builder::Builder( std::string theFname,
     fetchedprims( 0 ),
     fetchedtexts( 0 ),
     ignoringBlock( false ),
-    awaiting_polyline_vertices( 0 ),
     current_polyline_pointcount( 0 ),
     currentBlockX( 0.0 ),
     currentBlockY( 0.0 )

diff --git a/src/plugins/dxf2shp_converter/builder.h b/src/plugins/dxf2shp_converter/builder.h
@@ -74,24 +74,15 @@ class Builder: public DL_CreationAdapter
     std::vector <SHPObject *> shpObjects; // all read objects are stored here
     std::vector <DL_TextData> textObjects;
 
-    int numlayers;
-    int numpoints;
-    int numlines;
-    int numplines;
-
     int fetchedprims;
     int fetchedtexts;
 
     bool ignoringBlock;
     bool current_polyline_willclose;
     bool store_next_vertex_for_polyline_close;
 
-    int awaiting_polyline_vertices;
     long current_polyline_pointcount;
 
-    SHPObject *currently_Adding_PolyLine;
-
-
     double closePolyX, closePolyY, closePolyZ;
     double currentBlockX, currentBlockY;
 };
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h
@@ -403,9 +403,6 @@ class DL_Dxf
     int* hatchEdgeIndex;
     bool dropEdges;
 
-    // Bulge for the next vertex.
-    double bulge;
-
     // Only the useful part of the group code
     char groupCodeTmp[DL_DXF_MAXLINE+1];
     // ...same as integer

diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_exception.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_exception.h
@@ -53,8 +53,7 @@ class DL_NullStrExc : public DL_Exception {}
  */
 class DL_GroupCodeExc : public DL_Exception
 {
-    DL_GroupCodeExc( int gc = 0 ) : groupCode( gc ) {}
-    int groupCode;
+    DL_GroupCodeExc() {}
 };
 #endif
 
diff --git a/src/plugins/globe/globe_plugin.h b/src/plugins/globe/globe_plugin.h
@@ -183,7 +183,7 @@ class QueryCoordinatesHandler : public osgGA::GUIEventHandler
   public:
     QueryCoordinatesHandler( GlobePlugin* globe, osgEarth::Util::ElevationManager* elevMan,
                              const osgEarth::SpatialReference* mapSRS )
-        :  mGlobe( globe ), _mapSRS( mapSRS ), _elevMan( elevMan ), _mouseDown( false ) { }
+        :  mGlobe( globe ), _mapSRS( mapSRS ), _elevMan( elevMan ) { }
 
     bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa );
 
@@ -193,23 +193,19 @@ class QueryCoordinatesHandler : public osgGA::GUIEventHandler
     GlobePlugin* mGlobe;
     osg::ref_ptr<const SpatialReference> _mapSRS;
     osg::ref_ptr<osgEarth::Util::ElevationManager> _elevMan;
-    bool _mouseDown;
 };
 #endif
 
 
 class KeyboardControlHandler : public osgGA::GUIEventHandler
 {
   public:
-    KeyboardControlHandler( osgEarth::Util::EarthManipulator* manip, QgisInterface *qGisIface ) : _manip( manip ), mQGisIface( qGisIface ) { }
+    KeyboardControlHandler( osgEarth::Util::EarthManipulator* manip, QgisInterface * ) : _manip( manip ) { }
 
     bool handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa );
 
   private:
     osg::observer_ptr<osgEarth::Util::EarthManipulator> _manip;
-
-    //! Pointer to the QGIS interface object
-    QgisInterface *mQGisIface;
 };
 
 

diff --git a/src/plugins/globe/osgEarthUtil/Controls b/src/plugins/globe/osgEarthUtil/Controls
@@ -292,7 +292,6 @@ namespace osgEarth { namespace Util { namespace Controls21
         osg::ref_ptr<osg::Image> _image;
         float _rotation_rad;
         bool _fixSizeForRot;
-        osg::Geometry* _geom;
     };
 
     /**

diff --git a/src/plugins/globe/osgEarthUtil/Controls.cpp b/src/plugins/globe/osgEarthUtil/Controls.cpp
@@ -1854,7 +1854,7 @@ ControlNodeBin::draw( const ControlContext& context, bool newContext, int bin )
               const osg::Vec2f& size = control->renderSize();
 
               // calculate the rendering offset based on alignment:
-              float x, y;
+              float x = 0.0, y = 0.0;
 
               if ( node->anchorPoint().isSet() )
               {

diff --git a/src/plugins/offline_editing/offline_editing_plugin_gui.cpp b/src/plugins/offline_editing/offline_editing_plugin_gui.cpp
@@ -154,7 +154,7 @@ void QgsOfflineEditingPluginGui::on_buttonBox_rejected()
 // TODO: help
 void QgsOfflineEditingPluginGui::on_buttonBox_helpRequested()
 {
-  QgsContextHelp::run( context_id );
+  QgsContextHelp::run( metaObject()->className() );
 }
 
 void QgsOfflineEditingPluginGui::restoreState()

diff --git a/src/plugins/offline_editing/offline_editing_plugin_gui.h b/src/plugins/offline_editing/offline_editing_plugin_gui.h
@@ -39,7 +39,6 @@ class QgsOfflineEditingPluginGui : public QDialog, private Ui::QgsOfflineEditing
     void saveState();
     void restoreState();
 
-    static const int context_id = 0;
     QString mOfflineDataPath;
     QString mOfflineDbFile;
     QStringList mSelectedLayerIds;

diff --git a/src/plugins/roadgraph/exportdlg.cpp b/src/plugins/roadgraph/exportdlg.cpp
@@ -111,5 +111,5 @@ void RgExportDlg::on_buttonBox_rejected()
 
 void RgExportDlg::on_buttonBox_helpRequested()
 {
-  QgsContextHelp::run( context_id );
+  QgsContextHelp::run( metaObject()->className() );
 }
diff --git a/src/plugins/roadgraph/exportdlg.h b/src/plugins/roadgraph/exportdlg.h
@@ -38,10 +38,9 @@ class RgExportDlg : public QDialog
   public:
     RgExportDlg( QWidget* parent = 0, Qt::WFlags fl = 0 );
     ~RgExportDlg();
+
   public:
     QgsVectorLayer* mapLayer() const;
-  private:
-    static const int context_id = 0;
 
   private slots:
     void on_buttonBox_accepted();

diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -185,7 +185,8 @@ void QgsOgrFeatureIterator::getFeatureAttribute( OGRFeatureH ogrFet, QgsFeature
           value = QDateTime( QDate( year, month, day ), QTime( hour, minute, second ) );
       }
       break;
-      default: assert( NULL && "unsupported field type" );
+      default:
+        assert( 0 && "unsupported field type" );
     }
   }
   else

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -528,7 +528,7 @@ QStringList QgsOgrProvider::subLayers() const
     QString theLayerName = FROM8( OGR_FD_GetName( fdef ) );
     OGRwkbGeometryType layerGeomType = OGR_FD_GetGeomType( fdef );
 
-    QgsDebugMsg( QString("layerGeomType = %1").arg( layerGeomType ) );
+    QgsDebugMsg( QString( "layerGeomType = %1" ).arg( layerGeomType ) );
 
     if ( layerGeomType != wkbUnknown )
     {

diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -101,7 +101,7 @@ void QgsPythonUtilsImpl::initPython( QgisInterface* interface )
   foreach ( const QString& clsName, apiV2classes )
   {
     if ( !runString( QString( "sip.setapi('%1', 2)" ).arg( clsName ),
-                     QObject::tr( "Couldn't set SIP API versions.") + "\n" + QObject::tr( "Python support will be disabled." ) ) )
+                     QObject::tr( "Couldn't set SIP API versions." ) + "\n" + QObject::tr( "Python support will be disabled." ) ) )
     {
       exitPython();
       return;

diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui
@@ -1910,7 +1910,7 @@ p, li { white-space: pre-wrap; }
                    <widget class="QLineEdit" name="mLayerKeywordListLineEdit"/>
                   </item>
                   <item row="6" column="1">
-                   <layout class="QHBoxLayout" name="horizontalLayout_7">
+                   <layout class="QHBoxLayout" name="horizontalLayout_13">
                     <item>
                      <widget class="QLineEdit" name="mLayerDataUrlLineEdit"/>
                     </item>

diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -1525,7 +1525,7 @@
                      </widget>
                     </item>
                     <item>
-                     <spacer name="horizontalSpacer_4">
+                     <spacer name="horizontalSpacer_5">
                       <property name="orientation">
                        <enum>Qt::Horizontal</enum>
                       </property>
-Original file line number
+Diff line change
@@ Expand Up / @@ -827,7 +827,7 @@ void QgsProjectParser::addLayers( QDomDocument &doc, @@
             else if ( metadataUrlType == "TC211" )
             {
               metaUrlElem.setAttribute( "type", "ISO19115:2003" );
-            }
+            }
             else
             {
               metaUrlElem.setAttribute( "type", metadataUrlType );
@@ Expand Down @@