diff --git a/src/analysis/interpolation/Node.h b/src/analysis/interpolation/Node.h
index 174cb409999..f2e9d1dac84 100644
--- a/src/analysis/interpolation/Node.h
+++ b/src/analysis/interpolation/Node.h
@@ -42,7 +42,9 @@ class ANALYSIS_EXPORT Node
     void setPoint( Point3D* p );
 };
 
-inline Node::Node() : mPoint( nullptr ), mNext( nullptr )
+inline Node::Node()
+    : mPoint( nullptr )
+    , mNext( nullptr )
 {
 
 }
diff --git a/src/analysis/interpolation/ParametricLine.h b/src/analysis/interpolation/ParametricLine.h
index c764f380dcc..127a42108ba 100644
--- a/src/analysis/interpolation/ParametricLine.h
+++ b/src/analysis/interpolation/ParametricLine.h
@@ -58,12 +58,18 @@ class ANALYSIS_EXPORT ParametricLine
 
 //-----------------------------------------constructors and destructor----------------------
 
-inline ParametricLine::ParametricLine() : mDegree( 0 ), mParent( nullptr ), mControlPoly( nullptr )
+inline ParametricLine::ParametricLine()
+    : mDegree( 0 )
+    , mParent( nullptr )
+    , mControlPoly( nullptr )
 {
 
 }
 
-inline ParametricLine::ParametricLine( ParametricLine* par, QVector<Point3D*>* controlpoly ) : mDegree( 0 ), mParent( par ), mControlPoly( controlpoly )
+inline ParametricLine::ParametricLine( ParametricLine* par, QVector<Point3D*>* controlpoly )
+    : mDegree( 0 )
+    , mParent( par )
+    , mControlPoly( controlpoly )
 {
 
 }
diff --git a/src/analysis/interpolation/Point3D.h b/src/analysis/interpolation/Point3D.h
index 25a3f0d6823..a38cc8f8372 100644
--- a/src/analysis/interpolation/Point3D.h
+++ b/src/analysis/interpolation/Point3D.h
@@ -54,12 +54,18 @@ class ANALYSIS_EXPORT Point3D
     void setZ( double z );
 };
 
-inline Point3D::Point3D() : mX( 0 ), mY( 0 ), mZ( 0 )
+inline Point3D::Point3D()
+    : mX( 0 )
+    , mY( 0 )
+    , mZ( 0 )
 {
 
 }
 
-inline Point3D::Point3D( double x, double y, double z ) : mX( x ), mY( y ), mZ( z )
+inline Point3D::Point3D( double x, double y, double z )
+    : mX( x )
+    , mY( y )
+    , mZ( z )
 {
 
 }
diff --git a/src/analysis/interpolation/Vector3D.h b/src/analysis/interpolation/Vector3D.h
index 9297c255574..b967544a779 100644
--- a/src/analysis/interpolation/Vector3D.h
+++ b/src/analysis/interpolation/Vector3D.h
@@ -65,12 +65,18 @@ class ANALYSIS_EXPORT Vector3D
 
 //------------------------------------------constructors------------------------------------
 
-inline Vector3D::Vector3D( double x, double y, double z ) : mX( x ), mY( y ), mZ( z )
+inline Vector3D::Vector3D( double x, double y, double z )
+    : mX( x )
+    , mY( y )
+    , mZ( z )
 {
 
 }
 
-inline Vector3D::Vector3D() : mX( 0 ), mY( 0 ), mZ( 0 )//using a list
+inline Vector3D::Vector3D()
+    : mX( 0 )
+    , mY( 0 )
+    , mZ( 0 )//using a list
 {
 
 }
diff --git a/src/analysis/network/qgsgraphbuilder.cpp b/src/analysis/network/qgsgraphbuilder.cpp
index 3fd8d463243..f0dec236cd2 100644
--- a/src/analysis/network/qgsgraphbuilder.cpp
+++ b/src/analysis/network/qgsgraphbuilder.cpp
@@ -21,8 +21,8 @@
 #include <qgsfeature.h>
 #include <qgsgeometry.h>
 
-QgsGraphBuilder::QgsGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool otfEnabled, double topologyTolerance, const QString& ellipsoidID ) :
-    QgsGraphBuilderInterface( crs, otfEnabled, topologyTolerance, ellipsoidID )
+QgsGraphBuilder::QgsGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool otfEnabled, double topologyTolerance, const QString& ellipsoidID )
+    : QgsGraphBuilderInterface( crs, otfEnabled, topologyTolerance, ellipsoidID )
 {
   mGraph = new QgsGraph();
 }
diff --git a/src/analysis/network/qgsgraphbuilderintr.h b/src/analysis/network/qgsgraphbuilderintr.h
index 96fd739857e..3bba88d1090 100644
--- a/src/analysis/network/qgsgraphbuilderintr.h
+++ b/src/analysis/network/qgsgraphbuilderintr.h
@@ -41,8 +41,10 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
      * @param topologyTolerance sqrt distance between source point as one graph vertex
      * @param ellipsoidID ellipsoid for edge measurement
      */
-    QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = "WGS84" ) :
-        mCrs( crs ), mCtfEnabled( ctfEnabled ), mTopologyTolerance( topologyTolerance )
+    QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = "WGS84" )
+        : mCrs( crs )
+        , mCtfEnabled( ctfEnabled )
+        , mTopologyTolerance( topologyTolerance )
     {
       mDa.setSourceCrs( mCrs.srsid() );
       mDa.setEllipsoid( ellipsoidID );
diff --git a/src/analysis/openstreetmap/qgsosmbase.h b/src/analysis/openstreetmap/qgsosmbase.h
index 7f0c5d9fb63..1bef04a4efc 100644
--- a/src/analysis/openstreetmap/qgsosmbase.h
+++ b/src/analysis/openstreetmap/qgsosmbase.h
@@ -57,7 +57,10 @@ class ANALYSIS_EXPORT QgsOSMNode : public QgsOSMElement
 {
   public:
     QgsOSMNode() : mPoint() {}
-    QgsOSMNode( QgsOSMId id, const QgsPoint& point ) : QgsOSMElement( QgsOSMElementID::Node, id ), mPoint( point ) {}
+    QgsOSMNode( QgsOSMId id, const QgsPoint& point )
+        : QgsOSMElement( QgsOSMElementID::Node, id )
+        , mPoint( point )
+    {}
 
     QgsPoint point() const { return mPoint; }
 
@@ -77,7 +80,10 @@ class ANALYSIS_EXPORT QgsOSMWay : public QgsOSMElement
 {
   public:
     QgsOSMWay() {}
-    QgsOSMWay( QgsOSMId id, const QList<QgsOSMId>& nodes ) : QgsOSMElement( QgsOSMElementID::Way, id ), mNodes( nodes ) {}
+    QgsOSMWay( QgsOSMId id, const QList<QgsOSMId>& nodes )
+        : QgsOSMElement( QgsOSMElementID::Way, id )
+        , mNodes( nodes )
+    {}
 
     QList<QgsOSMId> nodes() const { return mNodes; }
 
diff --git a/src/analysis/openstreetmap/qgsosmdownload.cpp b/src/analysis/openstreetmap/qgsosmdownload.cpp
index adef53d5fc1..b8ebaaa95fa 100644
--- a/src/analysis/openstreetmap/qgsosmdownload.cpp
+++ b/src/analysis/openstreetmap/qgsosmdownload.cpp
@@ -22,7 +22,8 @@ QString QgsOSMDownload::queryFromRect( const QgsRectangle& rect )
 
 
 QgsOSMDownload::QgsOSMDownload()
-    : mServiceUrl( defaultServiceUrl() ), mReply( nullptr )
+    : mServiceUrl( defaultServiceUrl() )
+    , mReply( nullptr )
 {
 }
 
diff --git a/src/analysis/raster/qgsaspectfilter.cpp b/src/analysis/raster/qgsaspectfilter.cpp
index f5743cf725a..e70ea6badf7 100644
--- a/src/analysis/raster/qgsaspectfilter.cpp
+++ b/src/analysis/raster/qgsaspectfilter.cpp
@@ -17,8 +17,8 @@
 
 #include "qgsaspectfilter.h"
 
-QgsAspectFilter::QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ) :
-    QgsDerivativeFilter( inputFile, outputFile, outputFormat )
+QgsAspectFilter::QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat )
+    : QgsDerivativeFilter( inputFile, outputFile, outputFormat )
 {
 
 }
diff --git a/src/analysis/vector/qgstransectsample.cpp b/src/analysis/vector/qgstransectsample.cpp
index 11a1b02039a..8c574e2c057 100644
--- a/src/analysis/vector/qgstransectsample.cpp
+++ b/src/analysis/vector/qgstransectsample.cpp
@@ -15,10 +15,21 @@
 QgsTransectSample::QgsTransectSample( QgsVectorLayer* strataLayer, const QString& strataIdAttribute, const QString& minDistanceAttribute, const QString& nPointsAttribute, DistanceUnits minDistUnits,
                                       QgsVectorLayer* baselineLayer, bool shareBaseline, const QString& baselineStrataId, const QString& outputPointLayer,
                                       const QString& outputLineLayer, const QString& usedBaselineLayer, double minTransectLength,
-                                      double baselineBufferDistance, double baselineSimplificationTolerance ): mStrataLayer( strataLayer ),
-    mStrataIdAttribute( strataIdAttribute ), mMinDistanceAttribute( minDistanceAttribute ), mNPointsAttribute( nPointsAttribute ), mBaselineLayer( baselineLayer ), mShareBaseline( shareBaseline ),
-    mBaselineStrataId( baselineStrataId ), mOutputPointLayer( outputPointLayer ), mOutputLineLayer( outputLineLayer ), mUsedBaselineLayer( usedBaselineLayer ),
-    mMinDistanceUnits( minDistUnits ), mMinTransectLength( minTransectLength ), mBaselineBufferDistance( baselineBufferDistance ), mBaselineSimplificationTolerance( baselineSimplificationTolerance )
+                                      double baselineBufferDistance, double baselineSimplificationTolerance )
+    : mStrataLayer( strataLayer )
+    , mStrataIdAttribute( strataIdAttribute )
+    , mMinDistanceAttribute( minDistanceAttribute )
+    , mNPointsAttribute( nPointsAttribute )
+    , mBaselineLayer( baselineLayer )
+    , mShareBaseline( shareBaseline )
+    , mBaselineStrataId( baselineStrataId )
+    , mOutputPointLayer( outputPointLayer )
+    , mOutputLineLayer( outputLineLayer )
+    , mUsedBaselineLayer( usedBaselineLayer )
+    , mMinDistanceUnits( minDistUnits )
+    , mMinTransectLength( minTransectLength )
+    , mBaselineBufferDistance( baselineBufferDistance )
+    , mBaselineSimplificationTolerance( baselineSimplificationTolerance )
 {
 }
 
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
index d5515444c56..f506fca26fa 100644
--- a/src/app/composer/qgscomposer.h
+++ b/src/app/composer/qgscomposer.h
@@ -616,7 +616,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
 
     struct PanelStatus
     {
-      PanelStatus( bool visible = true, bool active = false ) : isVisible( visible ), isActive( active ) {}
+      PanelStatus( bool visible = true, bool active = false )
+          : isVisible( visible )
+          , isActive( active )
+      {}
       bool isVisible;
       bool isActive;
     };
diff --git a/src/app/openstreetmap/qgsosmdownloaddialog.cpp b/src/app/openstreetmap/qgsosmdownloaddialog.cpp
index 26ee397ab88..05a4f3f5db9 100644
--- a/src/app/openstreetmap/qgsosmdownloaddialog.cpp
+++ b/src/app/openstreetmap/qgsosmdownloaddialog.cpp
@@ -30,7 +30,8 @@
 #include "qgsosmdownload.h"
 
 QgsOSMDownloadDialog::QgsOSMDownloadDialog( QWidget* parent )
-    : QDialog( parent ), mDownload( new QgsOSMDownload )
+    : QDialog( parent )
+    , mDownload( new QgsOSMDownload )
 {
   setupUi( this );
 
diff --git a/src/app/openstreetmap/qgsosmexportdialog.cpp b/src/app/openstreetmap/qgsosmexportdialog.cpp
index ad8029cb018..3f0dfe34733 100644
--- a/src/app/openstreetmap/qgsosmexportdialog.cpp
+++ b/src/app/openstreetmap/qgsosmexportdialog.cpp
@@ -27,8 +27,9 @@
 #include <QSettings>
 #include <QStandardItemModel>
 
-QgsOSMExportDialog::QgsOSMExportDialog( QWidget *parent ) :
-    QDialog( parent ), mDatabase( new QgsOSMDatabase )
+QgsOSMExportDialog::QgsOSMExportDialog( QWidget *parent )
+    : QDialog( parent )
+    , mDatabase( new QgsOSMDatabase )
 {
   setupUi( this );
 
diff --git a/src/app/openstreetmap/qgsosmimportdialog.cpp b/src/app/openstreetmap/qgsosmimportdialog.cpp
index bde7bc92153..513f8530a32 100644
--- a/src/app/openstreetmap/qgsosmimportdialog.cpp
+++ b/src/app/openstreetmap/qgsosmimportdialog.cpp
@@ -23,7 +23,8 @@
 #include "qgsosmimport.h"
 
 QgsOSMImportDialog::QgsOSMImportDialog( QWidget* parent )
-    : QDialog( parent ), mImport( new QgsOSMXmlImport )
+    : QDialog( parent )
+    , mImport( new QgsOSMXmlImport )
 {
   setupUi( this );
 
diff --git a/src/app/qgsapplayertreeviewmenuprovider.h b/src/app/qgsapplayertreeviewmenuprovider.h
index 32de46cc946..219f70fd66b 100644
--- a/src/app/qgsapplayertreeviewmenuprovider.h
+++ b/src/app/qgsapplayertreeviewmenuprovider.h
@@ -25,7 +25,11 @@ class QAction;
 struct LegendLayerAction
 {
   LegendLayerAction( QAction* a, const QString& m, const QString& i, bool all )
-      : action( a ), menu( m ), id( i ), allLayers( all ) {}
+      : action( a )
+      , menu( m )
+      , id( i )
+      , allLayers( all )
+  {}
   QAction* action;
   QString menu;
   QString id;
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
index 8e4277649b3..ef31b069164 100644
--- a/src/app/qgsbrowserdockwidget.cpp
+++ b/src/app/qgsbrowserdockwidget.cpp
@@ -62,8 +62,8 @@ void QgsBrowserPropertiesWrapLabel::adjustHeight( QSizeF size )
   setMaximumHeight( height );
 }
 
-QgsBrowserPropertiesWidget::QgsBrowserPropertiesWidget( QWidget* parent ) :
-    QWidget( parent )
+QgsBrowserPropertiesWidget::QgsBrowserPropertiesWidget( QWidget* parent )
+    : QWidget( parent )
 {
 }
 
@@ -102,8 +102,8 @@ QgsBrowserPropertiesWidget* QgsBrowserPropertiesWidget::createWidget( QgsDataIte
   return propertiesWidget;
 }
 
-QgsBrowserLayerProperties::QgsBrowserLayerProperties( QWidget* parent ) :
-    QgsBrowserPropertiesWidget( parent )
+QgsBrowserLayerProperties::QgsBrowserLayerProperties( QWidget* parent )
+    : QgsBrowserPropertiesWidget( parent )
 {
   setupUi( this );
 
@@ -215,8 +215,8 @@ void QgsBrowserLayerProperties::setCondensedMode( bool condensedMode )
   }
 }
 
-QgsBrowserDirectoryProperties::QgsBrowserDirectoryProperties( QWidget* parent ) :
-    QgsBrowserPropertiesWidget( parent )
+QgsBrowserDirectoryProperties::QgsBrowserDirectoryProperties( QWidget* parent )
+    : QgsBrowserPropertiesWidget( parent )
     , mDirectoryWidget( nullptr )
 {
   setupUi( this );
@@ -236,8 +236,8 @@ void QgsBrowserDirectoryProperties::setItem( QgsDataItem* item )
   mLayout->addWidget( mDirectoryWidget );
 }
 
-QgsBrowserPropertiesDialog::QgsBrowserPropertiesDialog( const QString& settingsSection, QWidget* parent ) :
-    QDialog( parent )
+QgsBrowserPropertiesDialog::QgsBrowserPropertiesDialog( const QString& settingsSection, QWidget* parent )
+    : QDialog( parent )
     , mPropertiesWidget( nullptr )
     , mSettingsSection( settingsSection )
 {
@@ -262,8 +262,8 @@ void QgsBrowserPropertiesDialog::setItem( QgsDataItem* item )
   setWindowTitle( item->type() == QgsDataItem::Layer ? tr( "Layer Properties" ) : tr( "Directory Properties" ) );
 }
 
-QgsBrowserDockWidget::QgsBrowserDockWidget( const QString& name, QWidget * parent ) :
-    QDockWidget( parent )
+QgsBrowserDockWidget::QgsBrowserDockWidget( const QString& name, QWidget * parent )
+    : QDockWidget( parent )
     , mModel( nullptr )
     , mProxyModel( nullptr )
     , mPropertiesWidgetEnabled( false )
diff --git a/src/app/qgsconfigureshortcutsdialog.cpp b/src/app/qgsconfigureshortcutsdialog.cpp
index 9903b626611..714dc27eba6 100644
--- a/src/app/qgsconfigureshortcutsdialog.cpp
+++ b/src/app/qgsconfigureshortcutsdialog.cpp
@@ -29,7 +29,8 @@
 #include <QSettings>
 
 QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget* parent )
-    : QDialog( parent ), mGettingShortcut( false )
+    : QDialog( parent )
+    , mGettingShortcut( false )
 {
   setupUi( this );
 
diff --git a/src/app/qgsdecorationcopyrightdialog.cpp b/src/app/qgsdecorationcopyrightdialog.cpp
index bddcb70fbf3..e5e4850aba1 100644
--- a/src/app/qgsdecorationcopyrightdialog.cpp
+++ b/src/app/qgsdecorationcopyrightdialog.cpp
@@ -24,7 +24,8 @@
 #include <QPushButton>
 
 QgsDecorationCopyrightDialog::QgsDecorationCopyrightDialog( QgsDecorationCopyright& deco, QWidget* parent )
-    : QDialog( parent ), mDeco( deco )
+    : QDialog( parent )
+    , mDeco( deco )
 {
   setupUi( this );
 
diff --git a/src/app/qgsdecorationgriddialog.cpp b/src/app/qgsdecorationgriddialog.cpp
index 366391bc3af..df52eb3402a 100644
--- a/src/app/qgsdecorationgriddialog.cpp
+++ b/src/app/qgsdecorationgriddialog.cpp
@@ -30,7 +30,10 @@
 #include <QSettings>
 
 QgsDecorationGridDialog::QgsDecorationGridDialog( QgsDecorationGrid& deco, QWidget* parent )
-    : QDialog( parent ), mDeco( deco ), mLineSymbol( nullptr ), mMarkerSymbol( nullptr )
+    : QDialog( parent )
+    , mDeco( deco )
+    , mLineSymbol( nullptr )
+    , mMarkerSymbol( nullptr )
 {
   setupUi( this );
 
diff --git a/src/app/qgsdecorationnortharrowdialog.cpp b/src/app/qgsdecorationnortharrowdialog.cpp
index 1c16535b751..5b356429496 100644
--- a/src/app/qgsdecorationnortharrowdialog.cpp
+++ b/src/app/qgsdecorationnortharrowdialog.cpp
@@ -22,7 +22,8 @@
 #include <QPushButton>
 
 QgsDecorationNorthArrowDialog::QgsDecorationNorthArrowDialog( QgsDecorationNorthArrow& deco, QWidget* parent )
-    : QDialog( parent ), mDeco( deco )
+    : QDialog( parent )
+    , mDeco( deco )
 {
   setupUi( this );
 
diff --git a/src/app/qgsdecorationscalebardialog.cpp b/src/app/qgsdecorationscalebardialog.cpp
index 27ecf9caf9f..65d246829f1 100644
--- a/src/app/qgsdecorationscalebardialog.cpp
+++ b/src/app/qgsdecorationscalebardialog.cpp
@@ -21,7 +21,8 @@
 #include <QPushButton>
 
 QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar& deco, int units, QWidget* parent )
-    : QDialog( parent ), mDeco( deco )
+    : QDialog( parent )
+    , mDeco( deco )
 {
   setupUi( this );
 
diff --git a/src/app/qgsformannotationdialog.cpp b/src/app/qgsformannotationdialog.cpp
index bc14b4c79c6..f556e7e0752 100644
--- a/src/app/qgsformannotationdialog.cpp
+++ b/src/app/qgsformannotationdialog.cpp
@@ -20,7 +20,9 @@
 #include <QGraphicsScene>
 
 QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent, Qt::WindowFlags f )
-    : QDialog( parent, f ), mItem( item ), mEmbeddedWidget( nullptr )
+    : QDialog( parent, f )
+    , mItem( item )
+    , mEmbeddedWidget( nullptr )
 {
   setupUi( this );
   mEmbeddedWidget = new QgsAnnotationWidget( mItem );
diff --git a/src/app/qgshtmlannotationdialog.cpp b/src/app/qgshtmlannotationdialog.cpp
index fbdd2f48638..b1586f97e8e 100644
--- a/src/app/qgshtmlannotationdialog.cpp
+++ b/src/app/qgshtmlannotationdialog.cpp
@@ -20,7 +20,9 @@
 #include <QGraphicsScene>
 
 QgsHtmlAnnotationDialog::QgsHtmlAnnotationDialog( QgsHtmlAnnotationItem* item, QWidget * parent, Qt::WindowFlags f )
-    : QDialog( parent, f ), mItem( item ), mEmbeddedWidget( nullptr )
+    : QDialog( parent, f )
+    , mItem( item )
+    , mEmbeddedWidget( nullptr )
 {
   setupUi( this );
   setWindowTitle( tr( "HTML annotation" ) );
diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
index 9b7412abb99..6691f22e7d8 100644
--- a/src/app/qgsidentifyresultsdialog.h
+++ b/src/app/qgsidentifyresultsdialog.h
@@ -263,8 +263,11 @@ class QgsIdentifyResultsDialogMapLayerAction : public QAction
     Q_OBJECT
 
   public:
-    QgsIdentifyResultsDialogMapLayerAction( const QString &name, QObject *parent, QgsMapLayerAction* action, QgsMapLayer* layer, QgsFeature * f ) :
-        QAction( name, parent ), mAction( action ), mFeature( f ), mLayer( layer )
+    QgsIdentifyResultsDialogMapLayerAction( const QString &name, QObject *parent, QgsMapLayerAction* action, QgsMapLayer* layer, QgsFeature * f )
+        : QAction( name, parent )
+        , mAction( action )
+        , mFeature( f )
+        , mLayer( layer )
     {}
 
   public slots:
diff --git a/src/app/qgsmapstylingwidget.cpp b/src/app/qgsmapstylingwidget.cpp
index 0f79bd61e1c..70f153e3fb0 100644
--- a/src/app/qgsmapstylingwidget.cpp
+++ b/src/app/qgsmapstylingwidget.cpp
@@ -10,8 +10,11 @@
 #include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"
 
-QgsMapStylingWidget::QgsMapStylingWidget( QgsMapCanvas* canvas, QWidget *parent ) :
-    QWidget( parent ), mMapCanvas( canvas ), mBlockAutoApply( false ), mCurrentLayer( nullptr )
+QgsMapStylingWidget::QgsMapStylingWidget( QgsMapCanvas* canvas, QWidget *parent )
+    : QWidget( parent )
+    , mMapCanvas( canvas )
+    , mBlockAutoApply( false )
+    , mCurrentLayer( nullptr )
 {
   QBoxLayout* layout = new QVBoxLayout();
   layout->setContentsMargins( 0, 0, 0, 0 );
diff --git a/src/app/qgsmaptoolcircularstringradius.cpp b/src/app/qgsmaptoolcircularstringradius.cpp
index 25ed90320ca..e12e3e7d2a8 100644
--- a/src/app/qgsmaptoolcircularstringradius.cpp
+++ b/src/app/qgsmaptoolcircularstringradius.cpp
@@ -26,10 +26,10 @@
 #include <cmath>
 
 QgsMapToolCircularStringRadius::QgsMapToolCircularStringRadius( QgsMapToolCapture* parentTool, QgsMapCanvas* canvas, CaptureMode mode )
-    : QgsMapToolAddCircularString( parentTool, canvas, mode ),
-    mTemporaryEndPoint( QgsPointV2() ),
-    mRadius( 0.0 ),
-    mRadiusSpinBox( nullptr )
+    : QgsMapToolAddCircularString( parentTool, canvas, mode )
+    , mTemporaryEndPoint( QgsPointV2() )
+    , mRadius( 0.0 )
+    , mRadiusSpinBox( nullptr )
 {
 
 }
diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp
index 27097ace369..848f39f1c51 100644
--- a/src/app/qgsmaptoolrotatepointsymbols.cpp
+++ b/src/app/qgsmaptoolrotatepointsymbols.cpp
@@ -28,14 +28,14 @@
 #include <QMouseEvent>
 
 QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas )
-    : QgsMapToolEdit( canvas ),
-    mActiveLayer( nullptr ),
-    mFeatureNumber( 0 ),
-    mCurrentMouseAzimut( 0.0 ),
-    mCurrentRotationFeature( 0.0 ),
-    mRotating( false ),
-    mRotationItem( nullptr ),
-    mCtrlPressed( false )
+    : QgsMapToolEdit( canvas )
+    , mActiveLayer( nullptr )
+    , mFeatureNumber( 0 )
+    , mCurrentMouseAzimut( 0.0 )
+    , mCurrentRotationFeature( 0.0 )
+    , mRotating( false )
+    , mRotationItem( nullptr )
+    , mCtrlPressed( false )
 {
 
 }
diff --git a/src/app/qgsmaptoolselectradius.cpp b/src/app/qgsmaptoolselectradius.cpp
index b0b0a29b9c6..98800188fd4 100644
--- a/src/app/qgsmaptoolselectradius.cpp
+++ b/src/app/qgsmaptoolselectradius.cpp
@@ -31,7 +31,8 @@ email                : jpalmer at linz dot govt dot nz
 const int RADIUS_SEGMENTS = 40;
 
 QgsMapToolSelectRadius::QgsMapToolSelectRadius( QgsMapCanvas* canvas )
-    : QgsMapTool( canvas ), mDragging( false )
+    : QgsMapTool( canvas )
+    , mDragging( false )
 {
   mRubberBand = nullptr;
   mCursor = Qt::ArrowCursor;
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
index f4f2077e690..0ed69ad5634 100644
--- a/src/app/qgsmeasuredialog.cpp
+++ b/src/app/qgsmeasuredialog.cpp
@@ -34,7 +34,8 @@
 
 
 QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f )
-    : QDialog( tool->canvas()->topLevelWidget(), f ), mTool( tool )
+    : QDialog( tool->canvas()->topLevelWidget(), f )
+    , mTool( tool )
 {
   setupUi( this );
 
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
index aeebe2f4f6b..507ccaad2aa 100644
--- a/src/app/qgsoptions.cpp
+++ b/src/app/qgsoptions.cpp
@@ -71,9 +71,9 @@
  * \class QgsOptions - Set user options and preferences
  * Constructor
  */
-QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
-    QgsOptionsDialogBase( "Options", parent, fl ),
-    mSettings( nullptr )
+QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
+    : QgsOptionsDialogBase( "Options", parent, fl )
+    , mSettings( nullptr )
 {
   setupUi( this );
 
diff --git a/src/app/qgspluginmetadata.cpp b/src/app/qgspluginmetadata.cpp
index 5431bb26abc..1cb2e25cd1f 100644
--- a/src/app/qgspluginmetadata.cpp
+++ b/src/app/qgspluginmetadata.cpp
@@ -20,10 +20,10 @@
 #include "qgspluginmetadata.h"
 QgsPluginMetadata::QgsPluginMetadata( const QString& _libraryPath,
                                       const QString& _name,
-                                      QgisPlugin * _plugin ):
-    m_name( _name ),
-    libraryPath( _libraryPath ),
-    m_plugin( _plugin )
+                                      QgisPlugin * _plugin )
+    : m_name( _name )
+    , libraryPath( _libraryPath )
+    , m_plugin( _plugin )
 {
 
 }
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
index 83b6d696739..1d0d57aaaa6 100644
--- a/src/app/qgspluginregistry.cpp
+++ b/src/app/qgspluginregistry.cpp
@@ -52,7 +52,8 @@ QgsPluginRegistry *QgsPluginRegistry::instance()
 }
 
 QgsPluginRegistry::QgsPluginRegistry()
-    : mPythonUtils( nullptr ), mQgisInterface( nullptr )
+    : mPythonUtils( nullptr )
+    , mQgisInterface( nullptr )
 {
 // constructor does nothing
 }
diff --git a/src/app/qgsrelationadddlg.cpp b/src/app/qgsrelationadddlg.cpp
index 3c552d95501..d0b9cc8a889 100644
--- a/src/app/qgsrelationadddlg.cpp
+++ b/src/app/qgsrelationadddlg.cpp
@@ -1,8 +1,8 @@
 #include "qgsrelationadddlg.h"
 #include "qgsvectorlayer.h"
 
-QgsRelationAddDlg::QgsRelationAddDlg( QWidget *parent ) :
-    QDialog( parent )
+QgsRelationAddDlg::QgsRelationAddDlg( QWidget *parent )
+    : QDialog( parent )
 {
   setupUi( this );
 
diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
index 3df6852ffed..a7c78d6b69d 100644
--- a/src/app/qgsrelationmanagerdialog.cpp
+++ b/src/app/qgsrelationmanagerdialog.cpp
@@ -18,10 +18,10 @@
 #include "qgsrelationmanager.h"
 #include "qgsvectorlayer.h"
 
-QgsRelationManagerDialog::QgsRelationManagerDialog( QgsRelationManager* relationMgr, QWidget *parent ) :
-    QWidget( parent ),
-    Ui::QgsRelationManagerDialogBase(),
-    mRelationManager( relationMgr )
+QgsRelationManagerDialog::QgsRelationManagerDialog( QgsRelationManager* relationMgr, QWidget *parent )
+    : QWidget( parent )
+    , Ui::QgsRelationManagerDialogBase()
+    , mRelationManager( relationMgr )
 {
   setupUi( this );
 }
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
index c356cb0f2d8..1338ac719f2 100644
--- a/src/core/composer/qgsatlascomposition.cpp
+++ b/src/core/composer/qgsatlascomposition.cpp
@@ -162,7 +162,10 @@ void QgsAtlasComposition::setSortKeyAttributeIndex( int idx )
 class FieldSorter
 {
   public:
-    FieldSorter( QgsAtlasComposition::SorterKeys& keys, bool ascending = true ) : mKeys( keys ), mAscending( ascending ) {}
+    FieldSorter( QgsAtlasComposition::SorterKeys& keys, bool ascending = true )
+        : mKeys( keys )
+        , mAscending( ascending )
+    {}
 
     bool operator()( const QPair< QgsFeatureId, QString > & id1, const QPair< QgsFeatureId, QString >& id2 )
     {
diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp
index 93d93e0a424..9c53d0197d3 100644
--- a/src/core/composer/qgscomposerattributetable.cpp
+++ b/src/core/composer/qgscomposerattributetable.cpp
@@ -25,7 +25,8 @@
 //QgsComposerAttributeTableCompare
 
 QgsComposerAttributeTableCompare::QgsComposerAttributeTableCompare()
-    : mCurrentSortColumn( 0 ), mAscending( true )
+    : mCurrentSortColumn( 0 )
+    , mAscending( true )
 {
 }
 
diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp
index 925c90d4cd1..3f2f2081754 100644
--- a/src/core/composer/qgscomposerattributetablev2.cpp
+++ b/src/core/composer/qgscomposerattributetablev2.cpp
@@ -30,7 +30,8 @@
 //QgsComposerAttributeTableCompareV2
 
 QgsComposerAttributeTableCompareV2::QgsComposerAttributeTableCompareV2()
-    : mCurrentSortColumn( 0 ), mAscending( true )
+    : mCurrentSortColumn( 0 )
+    , mAscending( true )
 {
 }
 
diff --git a/src/core/composer/qgscomposermapgrid.h b/src/core/composer/qgscomposermapgrid.h
index f6ba718e81b..e0cb7cc001d 100644
--- a/src/core/composer/qgscomposermapgrid.h
+++ b/src/core/composer/qgscomposermapgrid.h
@@ -835,7 +835,12 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem
 
     struct GridExtension
     {
-      GridExtension() : top( 0.0 ), right( 0.0 ), bottom( 0.0 ), left( 0.0 ) {}
+      GridExtension()
+          : top( 0.0 )
+          , right( 0.0 )
+          , bottom( 0.0 )
+          , left( 0.0 )
+      {}
       double top;
       double right;
       double bottom;
diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
index 8858e19cd28..4f3dbfc7414 100644
--- a/src/core/composer/qgscomposermultiframe.cpp
+++ b/src/core/composer/qgscomposermultiframe.cpp
@@ -18,11 +18,11 @@
 #include "qgscomposition.h"
 #include <QtCore>
 
-QgsComposerMultiFrame::QgsComposerMultiFrame( QgsComposition* c, bool createUndoCommands ):
-    QgsComposerObject( c ),
-    mResizeMode( UseExistingFrames ),
-    mCreateUndoCommands( createUndoCommands ),
-    mIsRecalculatingSize( false )
+QgsComposerMultiFrame::QgsComposerMultiFrame( QgsComposition* c, bool createUndoCommands )
+    : QgsComposerObject( c )
+    , mResizeMode( UseExistingFrames )
+    , mCreateUndoCommands( createUndoCommands )
+    , mIsRecalculatingSize( false )
 {
   mComposition->addMultiFrame( this );
   connect( mComposition, SIGNAL( nPagesChanged() ), this, SLOT( handlePageChange() ) );
diff --git a/src/core/composer/qgscomposernodesitem.cpp b/src/core/composer/qgscomposernodesitem.cpp
index 18c15de62a6..d30395181c6 100644
--- a/src/core/composer/qgscomposernodesitem.cpp
+++ b/src/core/composer/qgscomposernodesitem.cpp
@@ -34,10 +34,10 @@ QgsComposerNodesItem::QgsComposerNodesItem( QString tagName,
 QgsComposerNodesItem::QgsComposerNodesItem( QString tagName,
     QPolygonF polygon,
     QgsComposition* c )
-    : QgsComposerItem( c ),
-    mTagName( tagName ),
-    mSelectedNode( -1 ),
-    mDrawNodes( false )
+    : QgsComposerItem( c )
+    , mTagName( tagName )
+    , mSelectedNode( -1 )
+    , mDrawNodes( false )
 {
   const QRectF boundingRect = polygon.boundingRect();
   setSceneRect( boundingRect );
diff --git a/src/core/composer/qgscomposershape.cpp b/src/core/composer/qgscomposershape.cpp
index 54e243129dd..f012920d743 100644
--- a/src/core/composer/qgscomposershape.cpp
+++ b/src/core/composer/qgscomposershape.cpp
@@ -22,12 +22,13 @@
 #include "qgscomposermodel.h"
 #include <QPainter>
 
-QgsComposerShape::QgsComposerShape( QgsComposition* composition ): QgsComposerItem( composition ),
-    mShape( Ellipse ),
-    mCornerRadius( 0 ),
-    mUseSymbolV2( false ), //default to not using SymbolV2 for shapes, to preserve 2.0 api
-    mShapeStyleSymbol( nullptr ),
-    mMaxSymbolBleed( 0 )
+QgsComposerShape::QgsComposerShape( QgsComposition* composition )
+    : QgsComposerItem( composition )
+    , mShape( Ellipse )
+    , mCornerRadius( 0 )
+    , mUseSymbolV2( false ) //default to not using SymbolV2 for shapes, to preserve 2.0 api
+    , mShapeStyleSymbol( nullptr )
+    , mMaxSymbolBleed( 0 )
 {
   setFrameEnabled( true );
   createDefaultShapeStyleSymbol();
@@ -40,13 +41,13 @@ QgsComposerShape::QgsComposerShape( QgsComposition* composition ): QgsComposerIt
   }
 }
 
-QgsComposerShape::QgsComposerShape( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition ):
-    QgsComposerItem( x, y, width, height, composition ),
-    mShape( Ellipse ),
-    mCornerRadius( 0 ),
-    mUseSymbolV2( false ), //default to not using SymbolV2 for shapes, to preserve 2.0 api
-    mShapeStyleSymbol( nullptr ),
-    mMaxSymbolBleed( 0 )
+QgsComposerShape::QgsComposerShape( qreal x, qreal y, qreal width, qreal height, QgsComposition* composition )
+    : QgsComposerItem( x, y, width, height, composition )
+    , mShape( Ellipse )
+    , mCornerRadius( 0 )
+    , mUseSymbolV2( false ) //default to not using SymbolV2 for shapes, to preserve 2.0 api
+    , mShapeStyleSymbol( nullptr )
+    , mMaxSymbolBleed( 0 )
 {
   setSceneRect( QRectF( x, y, width, height ) );
   setFrameEnabled( true );
diff --git a/src/core/composer/qgscomposertablecolumn.cpp b/src/core/composer/qgscomposertablecolumn.cpp
index 942c8f71b1e..cdd13346c51 100644
--- a/src/core/composer/qgscomposertablecolumn.cpp
+++ b/src/core/composer/qgscomposertablecolumn.cpp
@@ -17,14 +17,14 @@
 
 #include "qgscomposertablecolumn.h"
 
-QgsComposerTableColumn::QgsComposerTableColumn( const QString& heading ) :
-    mBackgroundColor( Qt::transparent ),
-    mHAlignment( Qt::AlignLeft ),
-    mVAlignment( Qt::AlignVCenter ),
-    mHeading( heading ),
-    mSortByRank( 0 ),
-    mSortOrder( Qt::AscendingOrder ),
-    mWidth( 0.0 )
+QgsComposerTableColumn::QgsComposerTableColumn( const QString& heading )
+    : mBackgroundColor( Qt::transparent )
+    , mHAlignment( Qt::AlignLeft )
+    , mVAlignment( Qt::AlignVCenter )
+    , mHeading( heading )
+    , mSortByRank( 0 )
+    , mSortOrder( Qt::AscendingOrder )
+    , mWidth( 0.0 )
 {
 
 }
diff --git a/src/core/geometry/qgsabstractgeometryv2.h b/src/core/geometry/qgsabstractgeometryv2.h
index 0e52e38242a..47c46b86381 100644
--- a/src/core/geometry/qgsabstractgeometryv2.h
+++ b/src/core/geometry/qgsabstractgeometryv2.h
@@ -381,7 +381,11 @@ struct CORE_EXPORT QgsVertexId
   };
 
   QgsVertexId( int _part = -1, int _ring = -1, int _vertex = -1, VertexType _type = SegmentVertex )
-      : part( _part ), ring( _ring ), vertex( _vertex ), type( _type ) {}
+      : part( _part )
+      , ring( _ring )
+      , vertex( _vertex )
+      , type( _type )
+  {}
 
   /** Returns true if the vertex id is valid
    */
diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygonv2.cpp
index 0393dbc0753..957b72f6579 100644
--- a/src/core/geometry/qgscurvepolygonv2.cpp
+++ b/src/core/geometry/qgscurvepolygonv2.cpp
@@ -36,7 +36,9 @@ QgsCurvePolygonV2::~QgsCurvePolygonV2()
   clear();
 }
 
-QgsCurvePolygonV2::QgsCurvePolygonV2( const QgsCurvePolygonV2& p ) : QgsSurfaceV2( p ), mExteriorRing( nullptr )
+QgsCurvePolygonV2::QgsCurvePolygonV2( const QgsCurvePolygonV2& p )
+    : QgsSurfaceV2( p )
+    , mExteriorRing( nullptr )
 {
   if ( p.mExteriorRing )
   {
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
index cab0f51ba53..58ffbe5ab2d 100644
--- a/src/core/geometry/qgsgeos.cpp
+++ b/src/core/geometry/qgsgeos.cpp
@@ -133,7 +133,10 @@ class GEOSGeomScopedPtr
 };
 
 QgsGeos::QgsGeos( const QgsAbstractGeometryV2* geometry, double precision )
-    : QgsGeometryEngine( geometry ), mGeos( nullptr ), mGeosPrepared( nullptr ), mPrecision( precision )
+    : QgsGeometryEngine( geometry )
+    , mGeos( nullptr )
+    , mGeosPrepared( nullptr )
+    , mPrecision( precision )
 {
   cacheGeos();
 }
diff --git a/src/core/geometry/qgswkbtypes.h b/src/core/geometry/qgswkbtypes.h
index 3957c71df39..0a959f79242 100644
--- a/src/core/geometry/qgswkbtypes.h
+++ b/src/core/geometry/qgswkbtypes.h
@@ -847,9 +847,16 @@ class CORE_EXPORT QgsWKBTypes
     struct wkbEntry
     {
       wkbEntry( const QString& name, bool isMultiType, Type multiType, Type singleType, Type flatType, GeometryType geometryType,
-                bool hasZ, bool hasM ):
-          mName( name ), mIsMultiType( isMultiType ), mMultiType( multiType ), mSingleType( singleType ), mFlatType( flatType ), mGeometryType( geometryType ),
-          mHasZ( hasZ ), mHasM( hasM ) {}
+                bool hasZ, bool hasM )
+          : mName( name )
+          , mIsMultiType( isMultiType )
+          , mMultiType( multiType )
+          , mSingleType( singleType )
+          , mFlatType( flatType )
+          , mGeometryType( geometryType )
+          , mHasZ( hasZ )
+          , mHasM( hasM )
+      {}
       QString mName;
       bool mIsMultiType;
       Type mMultiType;
diff --git a/src/core/pal/priorityqueue.cpp b/src/core/pal/priorityqueue.cpp
index f2680124f2e..2371c5ef5dc 100644
--- a/src/core/pal/priorityqueue.cpp
+++ b/src/core/pal/priorityqueue.cpp
@@ -45,7 +45,10 @@ bool bigger( double l, double r )
 }
 
 // O (size log size)
-PriorityQueue::PriorityQueue( int n, int maxId, bool min ) : size( 0 ), maxsize( n ), maxId( maxId )
+PriorityQueue::PriorityQueue( int n, int maxId, bool min )
+    : size( 0 )
+    , maxsize( n )
+    , maxId( maxId )
 {
   heap = new int[maxsize];
   p = new double[maxsize];
diff --git a/src/core/pal/rtree.hpp b/src/core/pal/rtree.hpp
index 1c2432842e6..168001afa27 100644
--- a/src/core/pal/rtree.hpp
+++ b/src/core/pal/rtree.hpp
@@ -128,7 +128,10 @@ namespace pal
 
           struct StackElement
           {
-            StackElement() : m_node( NULL ), m_branchIndex( 0 ) {}
+            StackElement()
+              : m_node( NULL )
+              , m_branchIndex( 0 )
+            {}
             Node* m_node;
             int m_branchIndex;
           };
diff --git a/src/core/qgseditformconfig.h b/src/core/qgseditformconfig.h
index abe6ff47308..65e8689f6bb 100644
--- a/src/core/qgseditformconfig.h
+++ b/src/core/qgseditformconfig.h
@@ -53,7 +53,10 @@ class CORE_EXPORT QgsAttributeEditorElement : public QObject
      * @param parent
      */
     QgsAttributeEditorElement( AttributeEditorType type, const QString& name, QObject *parent = nullptr )
-        : QObject( parent ), mType( type ), mName( name ) {}
+        : QObject( parent )
+        , mType( type )
+        , mName( name )
+    {}
 
     //! Destructor
     virtual ~QgsAttributeEditorElement() {}
@@ -194,7 +197,9 @@ class CORE_EXPORT QgsAttributeEditorField : public QgsAttributeEditorElement
      * @param parent The parent of this widget (used as container)
      */
     QgsAttributeEditorField( const QString& name, int idx, QObject *parent )
-        : QgsAttributeEditorElement( AeTypeField, name, parent ), mIdx( idx ) {}
+        : QgsAttributeEditorElement( AeTypeField, name, parent )
+        , mIdx( idx )
+    {}
 
     //! Destructor
     virtual ~QgsAttributeEditorField() {}
@@ -300,7 +305,9 @@ class CORE_EXPORT QgsEditFormConfig : public QObject
     {
       GroupData() {}
       GroupData( const QString& name, const QList<QString>& fields )
-          : mName( name ), mFields( fields ) {}
+          : mName( name )
+          , mFields( fields )
+      {}
       QString mName;
       QList<QString> mFields;
     };
@@ -309,7 +316,10 @@ class CORE_EXPORT QgsEditFormConfig : public QObject
     {
       TabData() {}
       TabData( const QString& name, const QList<QString>& fields, const QList<GroupData>& groups )
-          : mName( name ), mFields( fields ), mGroups( groups ) {}
+          : mName( name )
+          , mFields( fields )
+          , mGroups( groups )
+      {}
       QString mName;
       QList<QString> mFields;
       QList<GroupData> mGroups;
diff --git a/src/core/qgserror.h b/src/core/qgserror.h
index e0b9e8423f9..41ddd93fac7 100644
--- a/src/core/qgserror.h
+++ b/src/core/qgserror.h
@@ -36,7 +36,10 @@ class CORE_EXPORT QgsErrorMessage
       Html
     };
 
-    QgsErrorMessage() : mLine( 0 ), mFormat( Text ) {}
+    QgsErrorMessage()
+        : mLine( 0 )
+        , mFormat( Text )
+    {}
 
     /** Constructor.
      *  @param theMessage error message string
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
index f04159f8a0b..cb6eb2b880d 100644
--- a/src/core/qgsexpression.h
+++ b/src/core/qgsexpression.h
@@ -970,7 +970,10 @@ class CORE_EXPORT QgsExpression
         static const int HOUR = 60 * 60;
         static const int MINUTE = 60;
       public:
-        Interval( double seconds = 0 ) : mSeconds( seconds ), mValid( true ) { }
+        Interval( double seconds = 0 )
+            : mSeconds( seconds )
+            , mValid( true )
+        { }
 
         //! interval length in years
         double years() { return mSeconds / YEARS;}
@@ -1005,7 +1008,10 @@ class CORE_EXPORT QgsExpression
     class CORE_EXPORT NodeUnaryOperator : public Node
     {
       public:
-        NodeUnaryOperator( UnaryOperator op, Node* operand ) : mOp( op ), mOperand( operand ) {}
+        NodeUnaryOperator( UnaryOperator op, Node* operand )
+            : mOp( op )
+            , mOperand( operand )
+        {}
         ~NodeUnaryOperator() { delete mOperand; }
 
         UnaryOperator op() const { return mOp; }
@@ -1029,7 +1035,11 @@ class CORE_EXPORT QgsExpression
     class CORE_EXPORT NodeBinaryOperator : public Node
     {
       public:
-        NodeBinaryOperator( BinaryOperator op, Node* opLeft, Node* opRight ) : mOp( op ), mOpLeft( opLeft ), mOpRight( opRight ) {}
+        NodeBinaryOperator( BinaryOperator op, Node* opLeft, Node* opRight )
+            : mOp( op )
+            , mOpLeft( opLeft )
+            , mOpRight( opRight )
+        {}
         ~NodeBinaryOperator() { delete mOpLeft; delete mOpRight; }
 
         BinaryOperator op() const { return mOp; }
@@ -1063,7 +1073,11 @@ class CORE_EXPORT QgsExpression
     class CORE_EXPORT NodeInOperator : public Node
     {
       public:
-        NodeInOperator( Node* node, NodeList* list, bool notin = false ) : mNode( node ), mList( list ), mNotIn( notin ) {}
+        NodeInOperator( Node* node, NodeList* list, bool notin = false )
+            : mNode( node )
+            , mList( list )
+            , mNotIn( notin )
+        {}
         virtual ~NodeInOperator() { delete mNode; delete mList; }
 
         Node* node() const { return mNode; }
@@ -1226,7 +1240,9 @@ class CORE_EXPORT QgsExpression
     class CORE_EXPORT NodeLiteral : public Node
     {
       public:
-        NodeLiteral( const QVariant& value ) : mValue( value ) {}
+        NodeLiteral( const QVariant& value )
+            : mValue( value )
+        {}
 
         /** The value of the literal. */
         inline QVariant value() const { return mValue; }
@@ -1248,7 +1264,10 @@ class CORE_EXPORT QgsExpression
     class CORE_EXPORT NodeColumnRef : public Node
     {
       public:
-        NodeColumnRef( const QString& name ) : mName( name ), mIndex( -1 ) {}
+        NodeColumnRef( const QString& name )
+            : mName( name )
+            , mIndex( -1 )
+        {}
 
         /** The name of the column. */
         QString name() const { return mName; }
@@ -1272,7 +1291,10 @@ class CORE_EXPORT QgsExpression
     class CORE_EXPORT WhenThen
     {
       public:
-        WhenThen( Node* whenExp, Node* thenExp ) : mWhenExp( whenExp ), mThenExp( thenExp ) {}
+        WhenThen( Node* whenExp, Node* thenExp )
+            : mWhenExp( whenExp )
+            , mThenExp( thenExp )
+        {}
         ~WhenThen() { delete mWhenExp; delete mThenExp; }
 
         // protected:
@@ -1288,8 +1310,14 @@ class CORE_EXPORT QgsExpression
     class CORE_EXPORT NodeCondition : public Node
     {
       public:
-        NodeCondition( WhenThenList* conditions, Node* elseExp = nullptr ) : mConditions( *conditions ), mElseExp( elseExp ) { delete conditions; }
-        NodeCondition( const WhenThenList& conditions, Node* elseExp = nullptr ) : mConditions( conditions ), mElseExp( elseExp ) {}
+        NodeCondition( WhenThenList* conditions, Node* elseExp = nullptr )
+            : mConditions( *conditions )
+            , mElseExp( elseExp )
+        { delete conditions; }
+        NodeCondition( const WhenThenList& conditions, Node* elseExp = nullptr )
+            : mConditions( conditions )
+            , mElseExp( elseExp )
+        {}
         ~NodeCondition() { delete mElseExp; qDeleteAll( mConditions ); }
 
         virtual NodeType nodeType() const override { return ntCondition; }
diff --git a/src/core/qgsexpressioncontext.h b/src/core/qgsexpressioncontext.h
index 7c833eb8535..bc2e719719a 100644
--- a/src/core/qgsexpressioncontext.h
+++ b/src/core/qgsexpressioncontext.h
@@ -89,7 +89,11 @@ class CORE_EXPORT QgsExpressionContextScope
        * @param value intial variable value
        * @param readOnly true if variable should not be editable by users
        */
-      StaticVariable( const QString& name = QString(), const QVariant& value = QVariant(), bool readOnly = false ) : name( name ), value( value ), readOnly( readOnly ) {}
+      StaticVariable( const QString& name = QString(), const QVariant& value = QVariant(), bool readOnly = false )
+          : name( name )
+          , value( value )
+          , readOnly( readOnly )
+      {}
 
       /** Variable name */
       QString name;
diff --git a/src/core/qgsexpressionfieldbuffer.h b/src/core/qgsexpressionfieldbuffer.h
index 69feb960709..55436a98d12 100644
--- a/src/core/qgsexpressionfieldbuffer.h
+++ b/src/core/qgsexpressionfieldbuffer.h
@@ -36,7 +36,11 @@ class CORE_EXPORT QgsExpressionFieldBuffer
     typedef struct ExpressionField
     {
       ExpressionField() : cachedExpression( expression ) {}
-      ExpressionField( const QString& exp, const QgsField& fld ) : expression( exp ), cachedExpression( exp ), field( fld ) {}
+      ExpressionField( const QString& exp, const QgsField& fld )
+          : expression( exp )
+          , cachedExpression( exp )
+          , field( fld )
+      {}
 
       /**
        * @deprecated use cachedExpression instead
diff --git a/src/core/qgsfeatureiterator.h b/src/core/qgsfeatureiterator.h
index f2b3860cd71..c00768b0f86 100644
--- a/src/core/qgsfeatureiterator.h
+++ b/src/core/qgsfeatureiterator.h
@@ -189,7 +189,9 @@ class QgsAbstractFeatureIteratorFromSource : public QgsAbstractFeatureIterator
 {
   public:
     QgsAbstractFeatureIteratorFromSource( T* source, bool ownSource, const QgsFeatureRequest& request )
-        : QgsAbstractFeatureIterator( request ), mSource( source ), mOwnSource( ownSource )
+        : QgsAbstractFeatureIterator( request )
+        , mSource( source )
+        , mOwnSource( ownSource )
     {
       mSource->iteratorOpened( this );
     }
diff --git a/src/core/qgslayerdefinition.cpp b/src/core/qgslayerdefinition.cpp
index 330d68a60e6..14f349a4ee1 100644
--- a/src/core/qgslayerdefinition.cpp
+++ b/src/core/qgslayerdefinition.cpp
@@ -290,14 +290,16 @@ void QgsLayerDefinition::DependencySorter::init( const QDomDocument& doc )
   }
 }
 
-QgsLayerDefinition::DependencySorter::DependencySorter( const QDomDocument& doc ) :
-    mHasCycle( false ), mHasMissingDependency( false )
+QgsLayerDefinition::DependencySorter::DependencySorter( const QDomDocument& doc )
+    : mHasCycle( false )
+    , mHasMissingDependency( false )
 {
   init( doc );
 }
 
-QgsLayerDefinition::DependencySorter::DependencySorter( const QString& fileName ) :
-    mHasCycle( false ), mHasMissingDependency( false )
+QgsLayerDefinition::DependencySorter::DependencySorter( const QString& fileName )
+    : mHasCycle( false )
+    , mHasMissingDependency( false )
 {
   QDomDocument doc;
   QFile pFile( fileName );
diff --git a/src/core/qgslegendrenderer.h b/src/core/qgslegendrenderer.h
index f9894591ded..597c41b9f05 100644
--- a/src/core/qgslegendrenderer.h
+++ b/src/core/qgslegendrenderer.h
@@ -73,7 +73,10 @@ class CORE_EXPORT QgsLegendRenderer
     class Nucleon
     {
       public:
-        Nucleon() : item( nullptr ), labelXOffset( 0.0 ) {}
+        Nucleon()
+            : item( nullptr )
+            , labelXOffset( 0.0 )
+        {}
         QObject* item;
         // Symbol size size without any space around for symbol item
         QSizeF symbolSize;
diff --git a/src/core/qgslogger.h b/src/core/qgslogger.h
index 0cb33277e58..a78f3047135 100644
--- a/src/core/qgslogger.h
+++ b/src/core/qgslogger.h
@@ -114,7 +114,9 @@ class QgsScopeLogger
 {
   public:
     QgsScopeLogger( const char* file, const char* func, int line )
-        : _file( file ), _func( func ), _line( line )
+        : _file( file )
+        , _func( func )
+        , _line( line )
     {
       QgsLogger::debug( "Entering.", 1, _file, _func, _line );
     }
diff --git a/src/core/qgsmaphittest.cpp b/src/core/qgsmaphittest.cpp
index ef861650e15..26f932a7ac6 100644
--- a/src/core/qgsmaphittest.cpp
+++ b/src/core/qgsmaphittest.cpp
@@ -27,7 +27,9 @@
 #include "qgscrscache.h"
 
 QgsMapHitTest::QgsMapHitTest( const QgsMapSettings& settings, const QgsGeometry& polygon, const LayerFilterExpression& layerFilterExpression )
-    : mSettings( settings ), mLayerFilterExpression( layerFilterExpression ), mOnlyExpressions( false )
+    : mSettings( settings )
+    , mLayerFilterExpression( layerFilterExpression )
+    , mOnlyExpressions( false )
 {
   if ( !polygon.isEmpty() && polygon.type() == QGis::Polygon )
   {
@@ -36,7 +38,9 @@ QgsMapHitTest::QgsMapHitTest( const QgsMapSettings& settings, const QgsGeometry&
 }
 
 QgsMapHitTest::QgsMapHitTest( const QgsMapSettings& settings, const LayerFilterExpression& layerFilterExpression )
-    : mSettings( settings ), mLayerFilterExpression( layerFilterExpression ), mOnlyExpressions( true )
+    : mSettings( settings )
+    , mLayerFilterExpression( layerFilterExpression )
+    , mOnlyExpressions( true )
 {
 }
 
diff --git a/src/core/qgsmaplayerlegend.cpp b/src/core/qgsmaplayerlegend.cpp
index b0288a3b3bc..30008092e18 100644
--- a/src/core/qgsmaplayerlegend.cpp
+++ b/src/core/qgsmaplayerlegend.cpp
@@ -26,8 +26,8 @@
 #include "qgsdiagramrendererv2.h"
 
 
-QgsMapLayerLegend::QgsMapLayerLegend( QObject *parent ) :
-    QObject( parent )
+QgsMapLayerLegend::QgsMapLayerLegend( QObject *parent )
+    : QObject( parent )
 {
 }
 
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
index 53c680c5790..c0a780717e7 100644
--- a/src/core/qgsmaprenderer.h
+++ b/src/core/qgsmaprenderer.h
@@ -47,9 +47,33 @@ class CORE_EXPORT QgsLabelPosition
 {
   public:
     QgsLabelPosition( int id, double r, const QVector< QgsPoint >& corners, const QgsRectangle& rect, double w, double h, const QString& layer, const QString& labeltext, const QFont& labelfont, bool upside_down, bool diagram = false, bool pinned = false, const QString& providerId = QString() )
-        : featureId( id ), rotation( r ), cornerPoints( corners ), labelRect( rect ), width( w ), height( h ), layerID( layer ), labelText( labeltext ), labelFont( labelfont ), upsideDown( upside_down ), isDiagram( diagram ), isPinned( pinned ), providerID( providerId ) {}
+        : featureId( id )
+        , rotation( r )
+        , cornerPoints( corners )
+        , labelRect( rect )
+        , width( w )
+        , height( h )
+        , layerID( layer )
+        , labelText( labeltext )
+        , labelFont( labelfont )
+        , upsideDown( upside_down )
+        , isDiagram( diagram )
+        , isPinned( pinned )
+        , providerID( providerId )
+    {}
     QgsLabelPosition()
-        : featureId( -1 ), rotation( 0 ), labelRect( QgsRectangle() ), width( 0 ), height( 0 ), layerID( "" ), labelText( "" ), labelFont( QFont() ), upsideDown( false ), isDiagram( false ), isPinned( false ) {}
+        : featureId( -1 )
+        , rotation( 0 )
+        , labelRect( QgsRectangle() )
+        , width( 0 )
+        , height( 0 )
+        , layerID( "" )
+        , labelText( "" )
+        , labelFont( QFont() )
+        , upsideDown( false )
+        , isDiagram( false )
+        , isPinned( false )
+    {}
     int featureId;
     double rotation;
     QVector< QgsPoint > cornerPoints;
diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
index 04b83b2c656..2a2be978692 100644
--- a/src/core/qgsmaprendererjob.h
+++ b/src/core/qgsmaprendererjob.h
@@ -105,7 +105,10 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
 
     struct Error
     {
-      Error( const QString& lid, const QString& msg ) : layerID( lid ), message( msg ) {}
+      Error( const QString& lid, const QString& msg )
+          : layerID( lid )
+          , message( msg )
+      {}
 
       QString layerID;
       QString message;
diff --git a/src/core/qgsowsconnection.cpp b/src/core/qgsowsconnection.cpp
index 3f1e1015d43..a719d31439b 100644
--- a/src/core/qgsowsconnection.cpp
+++ b/src/core/qgsowsconnection.cpp
@@ -35,9 +35,9 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
-QgsOWSConnection::QgsOWSConnection( const QString & theService, const QString & theConnName ) :
-    mConnName( theConnName ),
-    mService( theService )
+QgsOWSConnection::QgsOWSConnection( const QString & theService, const QString & theConnName )
+    : mConnName( theConnName )
+    , mService( theService )
 {
   QgsDebugMsg( "theConnName = " + theConnName );
 
diff --git a/src/core/qgspluginlayer.cpp b/src/core/qgspluginlayer.cpp
index c4f576ddb84..26ed99271fb 100644
--- a/src/core/qgspluginlayer.cpp
+++ b/src/core/qgspluginlayer.cpp
@@ -18,7 +18,8 @@
 #include "qgsmaplayerrenderer.h"
 
 QgsPluginLayer::QgsPluginLayer( const QString& layerType, const QString& layerName )
-    : QgsMapLayer( PluginLayer, layerName ), mPluginLayerType( layerType )
+    : QgsMapLayer( PluginLayer, layerName )
+    , mPluginLayerType( layerType )
 {
   setLegend( QgsMapLayerLegend::defaultPluginLegend( this ) );
 }
diff --git a/src/core/qgspoint.h b/src/core/qgspoint.h
index 481c2bc5722..6e50a8dfa1f 100644
--- a/src/core/qgspoint.h
+++ b/src/core/qgspoint.h
@@ -118,7 +118,9 @@ class CORE_EXPORT QgsPoint
 {
   public:
     /// Default constructor
-    QgsPoint() : m_x( 0.0 ), m_y( 0.0 )
+    QgsPoint()
+        : m_x( 0.0 )
+        , m_y( 0.0 )
     {}
 
     /** Create a point from another point */
@@ -129,7 +131,8 @@ class CORE_EXPORT QgsPoint
      * @param y y coordinate
      */
     QgsPoint( double x, double y )
-        : m_x( x ), m_y( y )
+        : m_x( x )
+        , m_y( y )
     {}
 
     /** Create a point from a QPointF
@@ -137,7 +140,8 @@ class CORE_EXPORT QgsPoint
      * @note added in QGIS 2.7
      */
     QgsPoint( QPointF point )
-        : m_x( point.x() ), m_y( point.y() )
+        : m_x( point.x() )
+        , m_y( point.y() )
     {}
 
     /** Create a point from a QPoint
@@ -145,7 +149,8 @@ class CORE_EXPORT QgsPoint
      * @note added in QGIS 2.7
      */
     QgsPoint( QPoint point )
-        : m_x( point.x() ), m_y( point.y() )
+        : m_x( point.x() )
+        , m_y( point.y() )
     {}
 
     ~QgsPoint()
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
index f6c242ff72e..9b7894f9d35 100644
--- a/src/core/qgspointlocator.cpp
+++ b/src/core/qgspointlocator.cpp
@@ -63,7 +63,10 @@ static const double POINT_LOC_EPSILON = 1e-12;
 class QgsPointLocator_Stream : public IDataStream
 {
   public:
-    explicit QgsPointLocator_Stream( const QLinkedList<RTree::Data*>& dataList ) : mDataList( dataList ), mIt( mDataList ) { }
+    explicit QgsPointLocator_Stream( const QLinkedList<RTree::Data*>& dataList )
+        : mDataList( dataList )
+        , mIt( mDataList )
+    { }
     ~QgsPointLocator_Stream() { }
 
     virtual IData* getNext() override { return mIt.next(); }
@@ -88,7 +91,11 @@ class QgsPointLocator_VisitorNearestVertex : public IVisitor
 {
   public:
     QgsPointLocator_VisitorNearestVertex( QgsPointLocator* pl, QgsPointLocator::Match& m, const QgsPoint& srcPoint, QgsPointLocator::MatchFilter* filter = nullptr )
-        : mLocator( pl ), mBest( m ), mSrcPoint( srcPoint ), mFilter( filter ) {}
+        : mLocator( pl )
+        , mBest( m )
+        , mSrcPoint( srcPoint )
+        , mFilter( filter )
+    {}
 
     void visitNode( const INode& n ) override { Q_UNUSED( n ); }
     void visitData( std::vector<const IData*>& v ) override { Q_UNUSED( v ); }
@@ -128,7 +135,11 @@ class QgsPointLocator_VisitorNearestEdge : public IVisitor
 {
   public:
     QgsPointLocator_VisitorNearestEdge( QgsPointLocator* pl, QgsPointLocator::Match& m, const QgsPoint& srcPoint, QgsPointLocator::MatchFilter* filter = nullptr )
-        : mLocator( pl ), mBest( m ), mSrcPoint( srcPoint ), mFilter( filter ) {}
+        : mLocator( pl )
+        , mBest( m )
+        , mSrcPoint( srcPoint )
+        , mFilter( filter )
+    {}
 
     void visitNode( const INode& n ) override { Q_UNUSED( n ); }
     void visitData( std::vector<const IData*>& v ) override { Q_UNUSED( v ); }
@@ -174,7 +185,10 @@ class QgsPointLocator_VisitorArea : public IVisitor
   public:
     //! constructor
     QgsPointLocator_VisitorArea( QgsPointLocator* pl, const QgsPoint& origPt, QgsPointLocator::MatchList& list )
-        : mLocator( pl ), mList( list ), mGeomPt( QgsGeometry::fromPoint( origPt ) ) {}
+        : mLocator( pl )
+        , mList( list )
+        , mGeomPt( QgsGeometry::fromPoint( origPt ) )
+    {}
 
     ~QgsPointLocator_VisitorArea() { delete mGeomPt; }
 
@@ -508,7 +522,11 @@ class QgsPointLocator_VisitorEdgesInRect : public IVisitor
 {
   public:
     QgsPointLocator_VisitorEdgesInRect( QgsPointLocator* pl, QgsPointLocator::MatchList& lst, const QgsRectangle& srcRect, QgsPointLocator::MatchFilter* filter = nullptr )
-        : mLocator( pl ), mList( lst ), mSrcRect( srcRect ), mFilter( filter ) {}
+        : mLocator( pl )
+        , mList( lst )
+        , mSrcRect( srcRect )
+        , mFilter( filter )
+    {}
 
     void visitNode( const INode& n ) override { Q_UNUSED( n ); }
     void visitData( std::vector<const IData*>& v ) override { Q_UNUSED( v ); }
diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h
index 0edc0c6b3cd..875d188300d 100644
--- a/src/core/qgspointlocator.h
+++ b/src/core/qgspointlocator.h
@@ -97,11 +97,23 @@ class CORE_EXPORT QgsPointLocator : public QObject
 
     struct Match
     {
-      //! consruct invalid match
-      Match() : mType( Invalid ), mDist( 0 ), mPoint(), mLayer( nullptr ), mFid( 0 ), mVertexIndex( 0 ) {}
+      //! construct invalid match
+      Match()
+          : mType( Invalid )
+          , mDist( 0 )
+          , mPoint()
+          , mLayer( nullptr )
+          , mFid( 0 )
+          , mVertexIndex( 0 )
+      {}
 
       Match( Type t, QgsVectorLayer* vl, QgsFeatureId fid, double dist, const QgsPoint& pt, int vertexIndex = 0, QgsPoint* edgePoints = nullptr )
-          : mType( t ), mDist( dist ), mPoint( pt ), mLayer( vl ), mFid( fid ), mVertexIndex( vertexIndex )
+          : mType( t )
+          , mDist( dist )
+          , mPoint( pt )
+          , mLayer( vl )
+          , mFid( fid )
+          , mVertexIndex( vertexIndex )
       {
         if ( edgePoints )
         {
diff --git a/src/core/qgsprojectversion.h b/src/core/qgsprojectversion.h
index 98cc3f94519..7d923fa474c 100644
--- a/src/core/qgsprojectversion.h
+++ b/src/core/qgsprojectversion.h
@@ -32,7 +32,11 @@ class CORE_EXPORT QgsProjectVersion
 
   public:
 
-    QgsProjectVersion() : mMajor( 0 ), mMinor( 0 ), mSub( 0 ) {}
+    QgsProjectVersion()
+        : mMajor( 0 )
+        , mMinor( 0 )
+        , mSub( 0 )
+    {}
     ~QgsProjectVersion() {}
     QgsProjectVersion( int major, int minor, int sub, const QString& name = "" );
     QgsProjectVersion( const QString& string );
diff --git a/src/core/qgsrectangle.cpp b/src/core/qgsrectangle.cpp
index a2be1ef9d6f..4b4c5839f0b 100644
--- a/src/core/qgsrectangle.cpp
+++ b/src/core/qgsrectangle.cpp
@@ -30,7 +30,10 @@
 #include "qgslogger.h"
 
 QgsRectangle::QgsRectangle( double newxmin, double newymin, double newxmax, double newymax )
-    : xmin( newxmin ), ymin( newymin ), xmax( newxmax ), ymax( newymax )
+    : xmin( newxmin )
+    , ymin( newymin )
+    , xmax( newxmax )
+    , ymax( newymax )
 {
   normalize();
 }
diff --git a/src/core/qgsrulebasedlabeling.cpp b/src/core/qgsrulebasedlabeling.cpp
index 2183ed87bea..77353862b61 100644
--- a/src/core/qgsrulebasedlabeling.cpp
+++ b/src/core/qgsrulebasedlabeling.cpp
@@ -60,9 +60,12 @@ QList<QgsAbstractLabelProvider*> QgsRuleBasedLabelProvider::subProviders()
 ////////////////////
 
 QgsRuleBasedLabeling::Rule::Rule( QgsPalLayerSettings* settings, int scaleMinDenom, int scaleMaxDenom, const QString& filterExp, const QString& description, bool elseRule )
-    : mParent( nullptr ), mSettings( settings )
-    , mScaleMinDenom( scaleMinDenom ), mScaleMaxDenom( scaleMaxDenom )
-    , mFilterExp( filterExp ), mDescription( description )
+    : mParent( nullptr )
+    , mSettings( settings )
+    , mScaleMinDenom( scaleMinDenom )
+    , mScaleMaxDenom( scaleMaxDenom )
+    , mFilterExp( filterExp )
+    , mDescription( description )
     , mElseRule( elseRule )
     , mIsActive( true )
     , mFilter( nullptr )
diff --git a/src/core/qgsrunprocess.cpp b/src/core/qgsrunprocess.cpp
index 0cb5b198856..deeecbfe82f 100644
--- a/src/core/qgsrunprocess.cpp
+++ b/src/core/qgsrunprocess.cpp
@@ -27,7 +27,8 @@
 #include <QMessageBox>
 
 QgsRunProcess::QgsRunProcess( const QString& action, bool capture )
-    : mProcess( nullptr ), mOutput( nullptr )
+    : mProcess( nullptr )
+    , mOutput( nullptr )
 {
   // Make up a string from the command and arguments that we'll use
   // for display purposes
diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
index 88b6559c1f8..148ae17725e 100644
--- a/src/core/qgsscalecalculator.cpp
+++ b/src/core/qgsscalecalculator.cpp
@@ -22,7 +22,8 @@
 #include "qgsscalecalculator.h"
 
 QgsScaleCalculator::QgsScaleCalculator( double dpi, QGis::UnitType mapUnits )
-    : mDpi( dpi ), mMapUnits( mapUnits )
+    : mDpi( dpi )
+    , mMapUnits( mapUnits )
 {}
 
 void QgsScaleCalculator::setDpi( double dpi )
diff --git a/src/core/qgssnappingutils.h b/src/core/qgssnappingutils.h
index dd6bc26ff8b..df153eef1f8 100644
--- a/src/core/qgssnappingutils.h
+++ b/src/core/qgssnappingutils.h
@@ -105,7 +105,12 @@ class CORE_EXPORT QgsSnappingUtils : public QObject
      */
     struct LayerConfig
     {
-      LayerConfig( QgsVectorLayer* l, const QgsPointLocator::Types& t, double tol, QgsTolerance::UnitType u ) : layer( l ), type( t ), tolerance( tol ), unit( u ) {}
+      LayerConfig( QgsVectorLayer* l, const QgsPointLocator::Types& t, double tol, QgsTolerance::UnitType u )
+          : layer( l )
+          , type( t )
+          , tolerance( tol )
+          , unit( u )
+      {}
 
       bool operator==( const LayerConfig& other ) const
       {
diff --git a/src/core/qgstransaction.cpp b/src/core/qgstransaction.cpp
index fea3561ab6b..0806036bc6a 100644
--- a/src/core/qgstransaction.cpp
+++ b/src/core/qgstransaction.cpp
@@ -72,7 +72,8 @@ QgsTransaction* QgsTransaction::create( const QStringList& layerIds )
 
 
 QgsTransaction::QgsTransaction( const QString& connString )
-    : mConnString( connString ), mTransactionActive( false )
+    : mConnString( connString )
+    , mTransactionActive( false )
 {
 }
 
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
index a6012875bbc..c1a8ed06db8 100644
--- a/src/core/qgsvectordataprovider.h
+++ b/src/core/qgsvectordataprovider.h
@@ -332,8 +332,15 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
 
     struct NativeType
     {
-      NativeType( const QString& typeDesc, const QString& typeName, QVariant::Type type, int minLen = 0, int maxLen = 0, int minPrec = 0, int maxPrec = 0 ) :
-          mTypeDesc( typeDesc ), mTypeName( typeName ), mType( type ), mMinLen( minLen ), mMaxLen( maxLen ), mMinPrec( minPrec ), mMaxPrec( maxPrec ) {}
+      NativeType( const QString& typeDesc, const QString& typeName, QVariant::Type type, int minLen = 0, int maxLen = 0, int minPrec = 0, int maxPrec = 0 )
+          : mTypeDesc( typeDesc )
+          , mTypeName( typeName )
+          , mType( type )
+          , mMinLen( minLen )
+          , mMaxLen( maxLen )
+          , mMinPrec( minPrec )
+          , mMaxPrec( maxPrec )
+      {}
 
       QString mTypeDesc;
       QString mTypeName;
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
index de429645efd..0ec2902e059 100644
--- a/src/core/qgsvectorlayer.h
+++ b/src/core/qgsvectorlayer.h
@@ -414,7 +414,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
       Q_DECL_DEPRECATED RangeData() { mMin = QVariant( 0 ); mMax = QVariant( 5 ); mStep = QVariant( 1 );}
       //! @deprecated Use the editorWidgetV2() system instead
       Q_DECL_DEPRECATED RangeData( const QVariant& theMin, const QVariant& theMax, const QVariant& theStep )
-          : mMin( theMin ), mMax( theMax ), mStep( theStep ) {}
+          : mMin( theMin )
+          , mMax( theMax )
+          , mStep( theStep )
+      {}
 
       QVariant mMin;
       QVariant mMax;
@@ -423,7 +426,11 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
 
     struct ValueRelationData
     {
-      ValueRelationData() : mAllowNull( false ), mOrderByValue( false ), mAllowMulti( false ) {}
+      ValueRelationData()
+          : mAllowNull( false )
+          , mOrderByValue( false )
+          , mAllowMulti( false )
+      {}
       ValueRelationData( const QString& layer, const QString& key, const QString& value, bool allowNull, bool orderByValue,
                          bool allowMulti = false,
                          const QString& filterExpression = QString::null )
diff --git a/src/core/qgsvirtuallayerdefinition.cpp b/src/core/qgsvirtuallayerdefinition.cpp
index 569918ec40e..cd51ea96af9 100644
--- a/src/core/qgsvirtuallayerdefinition.cpp
+++ b/src/core/qgsvirtuallayerdefinition.cpp
@@ -22,10 +22,10 @@ email                : hugo dot mercier at oslandia dot com
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 
-QgsVirtualLayerDefinition::QgsVirtualLayerDefinition( const QString& filePath ) :
-    mFilePath( filePath ),
-    mGeometryWkbType( QgsWKBTypes::Unknown ),
-    mGeometrySrid( 0 )
+QgsVirtualLayerDefinition::QgsVirtualLayerDefinition( const QString& filePath )
+    : mFilePath( filePath )
+    , mGeometryWkbType( QgsWKBTypes::Unknown )
+    , mGeometrySrid( 0 )
 {
 }
 
diff --git a/src/core/qgsvirtuallayerdefinition.h b/src/core/qgsvirtuallayerdefinition.h
index a89e21c6a45..a1d9ff6c269 100644
--- a/src/core/qgsvirtuallayerdefinition.h
+++ b/src/core/qgsvirtuallayerdefinition.h
@@ -37,10 +37,17 @@ class CORE_EXPORT QgsVirtualLayerDefinition
     {
       public:
         //! Constructor variant to build a live layer reference
-        SourceLayer( const QString& name, const QString& ref ) : mName( name ), mRef( ref ) {}
+        SourceLayer( const QString& name, const QString& ref )
+            : mName( name )
+            , mRef( ref )
+        {}
         //! Constructor variant to build a layer with a provider and a source
         SourceLayer( const QString& name, const QString& source, const QString& provider, const QString& encoding )
-            : mName( name ), mSource( source ), mProvider( provider ), mEncoding( encoding ) {}
+            : mName( name )
+            , mSource( source )
+            , mProvider( provider )
+            , mEncoding( encoding )
+        {}
 
         //! Is it a live layer or not ?
         bool isReferenced() const { return !mRef.isEmpty(); }
diff --git a/src/core/raster/qgscolorrampshader.h b/src/core/raster/qgscolorrampshader.h
index ad551a23a5e..f9706f4bbf9 100644
--- a/src/core/raster/qgscolorrampshader.h
+++ b/src/core/raster/qgscolorrampshader.h
@@ -44,7 +44,11 @@ class CORE_EXPORT QgsColorRampShader : public QgsRasterShaderFunction
       //! default constructor
       ColorRampItem() : value( 0 ) {}
       //! convenience constructor
-      ColorRampItem( double val, const QColor& col, const QString& lbl = QString() ) : label( lbl ), value( val ), color( col ) {}
+      ColorRampItem( double val, const QColor& col, const QString& lbl = QString() )
+          : label( lbl )
+          , value( val )
+          , color( col )
+      {}
 
       QString label;
       double value;
diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
index af388d5aa6a..282fef481e7 100644
--- a/src/core/raster/qgsrasterfilewriter.cpp
+++ b/src/core/raster/qgsrasterfilewriter.cpp
@@ -26,12 +26,19 @@
 #include <QTextStream>
 #include <QMessageBox>
 
-QgsRasterFileWriter::QgsRasterFileWriter( const QString& outputUrl ):
-    mMode( Raw ), mOutputUrl( outputUrl ), mOutputProviderKey( "gdal" ), mOutputFormat( "GTiff" ),
-    mTiledMode( false ), mMaxTileWidth( 500 ), mMaxTileHeight( 500 ),
-    mBuildPyramidsFlag( QgsRaster::PyramidsFlagNo ),
-    mPyramidsFormat( QgsRaster::PyramidsGTiff ),
-    mProgressDialog( nullptr ), mPipe( nullptr ), mInput( nullptr )
+QgsRasterFileWriter::QgsRasterFileWriter( const QString& outputUrl )
+    : mMode( Raw )
+    , mOutputUrl( outputUrl )
+    , mOutputProviderKey( "gdal" )
+    , mOutputFormat( "GTiff" )
+    , mTiledMode( false )
+    , mMaxTileWidth( 500 )
+    , mMaxTileHeight( 500 )
+    , mBuildPyramidsFlag( QgsRaster::PyramidsFlagNo )
+    , mPyramidsFormat( QgsRaster::PyramidsGTiff )
+    , mProgressDialog( nullptr )
+    , mPipe( nullptr )
+    , mInput( nullptr )
 {
 
 }
diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp
index 271a645a392..c11772dc8cc 100644
--- a/src/core/symbology-ng/qgscptcityarchive.cpp
+++ b/src/core/symbology-ng/qgscptcityarchive.cpp
@@ -1295,7 +1295,8 @@ bool QgsCptCitySelectionItem::equal( const QgsCptCityDataItem *other )
 //-----------------------------------------------------------------------
 QgsCptCityAllRampsItem::QgsCptCityAllRampsItem( QgsCptCityDataItem* parent,
     const QString& name, const QVector<QgsCptCityDataItem*>& items )
-    : QgsCptCityCollectionItem( parent, name, QString() ), mItems( items )
+    : QgsCptCityCollectionItem( parent, name, QString() )
+    , mItems( items )
 {
   mType = AllRamps;
   mValid = true;
@@ -1328,7 +1329,9 @@ QVector<QgsCptCityDataItem*> QgsCptCityAllRampsItem::createChildren()
 
 QgsCptCityBrowserModel::QgsCptCityBrowserModel( QObject *parent,
     QgsCptCityArchive* archive, ViewType viewType )
-    : QAbstractItemModel( parent ), mArchive( archive ), mViewType( viewType )
+    : QAbstractItemModel( parent )
+    , mArchive( archive )
+    , mViewType( viewType )
 {
   Q_ASSERT( mArchive );
   QgsDebugMsg( "archiveName = " + archive->archiveName() + " viewType=" + static_cast< int >( viewType ) );
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
index 67c66e480d3..5ee1eff1809 100644
--- a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -947,18 +947,17 @@ QgsMapUnitScale QgsGradientFillSymbolLayerV2::mapUnitScale() const
 //QgsShapeburstFillSymbolLayer
 
 QgsShapeburstFillSymbolLayerV2::QgsShapeburstFillSymbolLayerV2( const QColor& color, const QColor& color2, ShapeburstColorType colorType,
-    int blurRadius, bool useWholeShape, double maxDistance ) :
-
-    mBlurRadius( blurRadius ),
-    mUseWholeShape( useWholeShape ),
-    mMaxDistance( maxDistance ),
-    mDistanceUnit( QgsSymbolV2::MM ),
-    mColorType( colorType ),
-    mColor2( color2 ),
-    mGradientRamp( nullptr ),
-    mTwoColorGradientRamp( nullptr ),
-    mIgnoreRings( false ),
-    mOffsetUnit( QgsSymbolV2::MM )
+    int blurRadius, bool useWholeShape, double maxDistance )
+    : mBlurRadius( blurRadius )
+    , mUseWholeShape( useWholeShape )
+    , mMaxDistance( maxDistance )
+    , mDistanceUnit( QgsSymbolV2::MM )
+    , mColorType( colorType )
+    , mColor2( color2 )
+    , mGradientRamp( nullptr )
+    , mTwoColorGradientRamp( nullptr )
+    , mIgnoreRings( false )
+    , mOffsetUnit( QgsSymbolV2::MM )
 {
   mColor = color;
 }
@@ -1734,10 +1733,11 @@ QSet<QString> QgsImageFillSymbolLayer::usedAttributes() const
 
 //QgsSVGFillSymbolLayer
 
-QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString& svgFilePath, double width, double angle ): QgsImageFillSymbolLayer(),
-    mPatternWidth( width ),
-    mPatternWidthUnit( QgsSymbolV2::MM ),
-    mSvgOutlineWidthUnit( QgsSymbolV2::MM )
+QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString& svgFilePath, double width, double angle )
+    : QgsImageFillSymbolLayer()
+    , mPatternWidth( width )
+    , mPatternWidthUnit( QgsSymbolV2::MM )
+    , mSvgOutlineWidthUnit( QgsSymbolV2::MM )
 {
   setSvgFilePath( svgFilePath );
   mOutlineWidth = 0.3;
@@ -1749,11 +1749,12 @@ QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QString& svgFilePath, double
   mSvgPattern = nullptr;
 }
 
-QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QByteArray& svgData, double width, double angle ): QgsImageFillSymbolLayer(),
-    mPatternWidth( width ),
-    mPatternWidthUnit( QgsSymbolV2::MM ),
-    mSvgData( svgData ),
-    mSvgOutlineWidthUnit( QgsSymbolV2::MM )
+QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QByteArray& svgData, double width, double angle )
+    : QgsImageFillSymbolLayer()
+    , mPatternWidth( width )
+    , mPatternWidthUnit( QgsSymbolV2::MM )
+    , mSvgData( svgData )
+    , mSvgOutlineWidthUnit( QgsSymbolV2::MM )
 {
   storeViewBox();
   mOutlineWidth = 0.3;
@@ -3026,9 +3027,17 @@ QgsSymbolLayerV2* QgsLinePatternFillSymbolLayer::createFromSld( QDomElement &ele
 
 ////////////////////////
 
-QgsPointPatternFillSymbolLayer::QgsPointPatternFillSymbolLayer(): QgsImageFillSymbolLayer(), mMarkerSymbol( nullptr ), mDistanceX( 15 ),
-    mDistanceXUnit( QgsSymbolV2::MM ), mDistanceY( 15 ), mDistanceYUnit( QgsSymbolV2::MM ), mDisplacementX( 0 ), mDisplacementXUnit( QgsSymbolV2::MM ),
-    mDisplacementY( 0 ), mDisplacementYUnit( QgsSymbolV2::MM )
+QgsPointPatternFillSymbolLayer::QgsPointPatternFillSymbolLayer()
+    : QgsImageFillSymbolLayer()
+    , mMarkerSymbol( nullptr )
+    , mDistanceX( 15 )
+    , mDistanceXUnit( QgsSymbolV2::MM )
+    , mDistanceY( 15 )
+    , mDistanceYUnit( QgsSymbolV2::MM )
+    , mDisplacementX( 0 )
+    , mDisplacementXUnit( QgsSymbolV2::MM )
+    , mDisplacementY( 0 )
+    , mDisplacementYUnit( QgsSymbolV2::MM )
 {
   mDistanceX = 15;
   mDistanceY = 15;
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
index 9cc3b707cf7..06f03662632 100644
--- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
+++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -176,20 +176,20 @@ void QgsRendererRangeV2::toSld( QDomDocument &doc, QDomElement &element, QgsStri
 int QgsRendererRangeV2LabelFormat::MaxPrecision = 15;
 int QgsRendererRangeV2LabelFormat::MinPrecision = -6;
 
-QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat():
-    mFormat( " %1 - %2 " ),
-    mPrecision( 4 ),
-    mTrimTrailingZeroes( false ),
-    mNumberScale( 1.0 ),
-    mNumberSuffix( "" ),
-    mReTrailingZeroes( "[.,]?0*$" ),
-    mReNegativeZero( "^\\-0(?:[.,]0*)?$" )
+QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat()
+    : mFormat( " %1 - %2 " )
+    , mPrecision( 4 )
+    , mTrimTrailingZeroes( false )
+    , mNumberScale( 1.0 )
+    , mNumberSuffix( "" )
+    , mReTrailingZeroes( "[.,]?0*$" )
+    , mReNegativeZero( "^\\-0(?:[.,]0*)?$" )
 {
 }
 
-QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat( const QString& format, int precision, bool trimTrailingZeroes ):
-    mReTrailingZeroes( "[.,]?0*$" ),
-    mReNegativeZero( "^\\-0(?:[.,]0*)?$" )
+QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat( const QString& format, int precision, bool trimTrailingZeroes )
+    : mReTrailingZeroes( "[.,]?0*$" )
+    , mReNegativeZero( "^\\-0(?:[.,]0*)?$" )
 {
   setFormat( format );
   setPrecision( precision );
diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.h b/src/core/symbology-ng/qgsinvertedpolygonrenderer.h
index 8a64326a358..bd7513f3bc4 100644
--- a/src/core/symbology-ng/qgsinvertedpolygonrenderer.h
+++ b/src/core/symbology-ng/qgsinvertedpolygonrenderer.h
@@ -180,8 +180,12 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2
       bool selected;
       bool drawMarkers;
       int layer;
-      FeatureDecoration( QgsFeature& a_feature, bool a_selected, bool a_drawMarkers, int a_layer ) :
-          feature( a_feature ), selected( a_selected ), drawMarkers( a_drawMarkers ), layer( a_layer ) {}
+      FeatureDecoration( QgsFeature& a_feature, bool a_selected, bool a_drawMarkers, int a_layer )
+          : feature( a_feature )
+          , selected( a_selected )
+          , drawMarkers( a_drawMarkers )
+          , layer( a_layer )
+      {}
     };
     QList<FeatureDecoration> mFeatureDecorations;
 
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
index 26b68436784..55660b2155e 100644
--- a/src/core/symbology-ng/qgslinesymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -655,7 +655,11 @@ double QgsSimpleLineSymbolLayerV2::dxfOffset( const QgsDxfExport& e, QgsSymbolV2
 class MyLine
 {
   public:
-    MyLine( QPointF p1, QPointF p2 ) : mVertical( false ), mIncreasing( false ), mT( 0.0 ), mLength( 0.0 )
+    MyLine( QPointF p1, QPointF p2 )
+        : mVertical( false )
+        , mIncreasing( false )
+        , mT( 0.0 )
+        , mLength( 0.0 )
     {
       if ( p1 == p2 )
         return; // invalid
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
index f34fd6c1ba7..fa454c3894a 100644
--- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -50,7 +50,10 @@ static void _fixQPictureDPI( QPainter* p )
 
 QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( const QString& name, const QColor& color, const QColor& borderColor, double size, double angle, QgsSymbolV2::ScaleMethod scaleMethod,
     Qt::PenJoinStyle penJoinStyle )
-    : mOutlineStyle( Qt::SolidLine ), mOutlineWidth( 0 ), mOutlineWidthUnit( QgsSymbolV2::MM ), mPenJoinStyle( penJoinStyle )
+    : mOutlineStyle( Qt::SolidLine )
+    , mOutlineWidth( 0 )
+    , mOutlineWidthUnit( QgsSymbolV2::MM )
+    , mPenJoinStyle( penJoinStyle )
 {
   mName = name;
   mColor = color;
diff --git a/src/core/symbology-ng/qgsrendererv2.h b/src/core/symbology-ng/qgsrendererv2.h
index 312cc5df03e..2ea72d28801 100644
--- a/src/core/symbology-ng/qgsrendererv2.h
+++ b/src/core/symbology-ng/qgsrendererv2.h
@@ -54,7 +54,10 @@ typedef QList< QPair<QString, QgsSymbolV2*> > QgsLegendSymbolList;
 class CORE_EXPORT QgsSymbolV2LevelItem
 {
   public:
-    QgsSymbolV2LevelItem( QgsSymbolV2* symbol, int layer ) : mSymbol( symbol ), mLayer( layer ) {}
+    QgsSymbolV2LevelItem( QgsSymbolV2* symbol, int layer )
+        : mSymbol( symbol )
+        , mLayer( layer )
+    {}
     QgsSymbolV2* symbol() { return mSymbol; }
     int layer() { return mLayer; }
   protected:
diff --git a/src/core/symbology-ng/qgsrendererv2registry.h b/src/core/symbology-ng/qgsrendererv2registry.h
index f39bc728744..5f03e58d9f6 100644
--- a/src/core/symbology-ng/qgsrendererv2registry.h
+++ b/src/core/symbology-ng/qgsrendererv2registry.h
@@ -37,7 +37,10 @@ class CORE_EXPORT QgsRendererV2AbstractMetadata
 {
   public:
     QgsRendererV2AbstractMetadata( const QString& name, const QString& visibleName, const QIcon& icon = QIcon() )
-        : mName( name ), mVisibleName( visibleName ), mIcon( icon ) {}
+        : mName( name )
+        , mVisibleName( visibleName )
+        , mIcon( icon )
+    {}
     virtual ~QgsRendererV2AbstractMetadata() {}
 
     QString name() const { return mName; }
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
index 8d26e8e7af8..a8176534dc7 100644
--- a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
+++ b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -822,7 +822,8 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE
 /////////////////////
 
 QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root )
-    : QgsFeatureRendererV2( "RuleRenderer" ), mRootRule( root )
+    : QgsFeatureRendererV2( "RuleRenderer" )
+    , mRootRule( root )
 {
 }
 
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h
index f60a40b5081..63684144438 100644
--- a/src/core/symbology-ng/qgsrulebasedrendererv2.h
+++ b/src/core/symbology-ng/qgsrulebasedrendererv2.h
@@ -41,7 +41,10 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
     // feature for rendering: QgsFeature and some flags
     struct FeatureToRender
     {
-      FeatureToRender( QgsFeature& _f, int _flags ) : feat( _f ), flags( _flags ) {}
+      FeatureToRender( QgsFeature& _f, int _flags )
+          : feat( _f )
+          , flags( _flags )
+      {}
       QgsFeature feat;
       int flags; // selected and/or draw markers
     };
@@ -50,7 +53,10 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
     // (both f, symbol are _not_ owned by this class)
     struct RenderJob
     {
-      RenderJob( FeatureToRender& _ftr, QgsSymbolV2* _s ) : ftr( _ftr ), symbol( _s ) {}
+      RenderJob( FeatureToRender& _ftr, QgsSymbolV2* _s )
+          : ftr( _ftr )
+          , symbol( _s )
+      {}
       FeatureToRender& ftr;
       QgsSymbolV2* symbol;
     };
diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.h b/src/core/symbology-ng/qgssymbollayerv2registry.h
index ad755002857..f28a37ffa68 100644
--- a/src/core/symbology-ng/qgssymbollayerv2registry.h
+++ b/src/core/symbology-ng/qgssymbollayerv2registry.h
@@ -31,7 +31,10 @@ class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata
 {
   public:
     QgsSymbolLayerV2AbstractMetadata( const QString& name, const QString& visibleName, QgsSymbolV2::SymbolType type )
-        : mName( name ), mVisibleName( visibleName ), mType( type ) {}
+        : mName( name )
+        , mVisibleName( visibleName )
+        , mType( type )
+    {}
 
     virtual ~QgsSymbolLayerV2AbstractMetadata() {}
 
diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
index c544d72704c..9040e767b2c 100644
--- a/src/core/symbology-ng/qgssymbolv2.cpp
+++ b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -1000,17 +1000,17 @@ QgsSymbolV2RenderContext* QgsSymbolV2::symbolRenderContext()
 
 
 QgsSymbolV2RenderContext::QgsSymbolV2RenderContext( QgsRenderContext& c, QgsSymbolV2::OutputUnit u, qreal alpha, bool selected, int renderHints, const QgsFeature* f, const QgsFields* fields, const QgsMapUnitScale& mapUnitScale )
-    : mRenderContext( c ),
-    mExpressionContextScope( nullptr ),
-    mOutputUnit( u ),
-    mMapUnitScale( mapUnitScale ),
-    mAlpha( alpha ),
-    mSelected( selected ),
-    mRenderHints( renderHints ),
-    mFeature( f ),
-    mFields( fields ),
-    mGeometryPartCount( 0 ),
-    mGeometryPartNum( 0 )
+    : mRenderContext( c )
+    , mExpressionContextScope( nullptr )
+    , mOutputUnit( u )
+    , mMapUnitScale( mapUnitScale )
+    , mAlpha( alpha )
+    , mSelected( selected )
+    , mRenderHints( renderHints )
+    , mFeature( f )
+    , mFields( fields )
+    , mGeometryPartCount( 0 )
+    , mGeometryPartNum( 0 )
 {
 }
 
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
index badba09c06d..6f744dfcd11 100644
--- a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
+++ b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -458,7 +458,8 @@ QgsStringMap QgsRandomColorsV2::properties() const
 ////////////
 
 QgsVectorColorBrewerColorRampV2::QgsVectorColorBrewerColorRampV2( const QString& schemeName, int colors )
-    : mSchemeName( schemeName ), mColors( colors )
+    : mSchemeName( schemeName )
+    , mColors( colors )
 {
   loadPalette();
 }
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.h b/src/core/symbology-ng/qgsvectorcolorrampv2.h
index 35bcfec0548..c55aba56185 100644
--- a/src/core/symbology-ng/qgsvectorcolorrampv2.h
+++ b/src/core/symbology-ng/qgsvectorcolorrampv2.h
@@ -72,7 +72,10 @@ class CORE_EXPORT QgsGradientStop
      * @param o positional offset for stop, between 0 and 1.0
      * @param c color for stop
      */
-    QgsGradientStop( double o, const QColor& c ) : offset( o ), color( c ) { }
+    QgsGradientStop( double o, const QColor& c )
+        : offset( o )
+        , color( c )
+    { }
 
     //! Relative positional offset, between 0 and 1
     double offset;
diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
index b1cc57a746e..105886885ca 100644
--- a/src/gui/attributetable/qgsdualview.h
+++ b/src/gui/attributetable/qgsdualview.h
@@ -289,8 +289,11 @@ class GUI_EXPORT QgsAttributeTableAction : public QAction
     Q_OBJECT
 
   public:
-    QgsAttributeTableAction( const QString &name, QgsDualView *dualView, int action, const QModelIndex &fieldIdx ) :
-        QAction( name, dualView ), mDualView( dualView ), mAction( action ), mFieldIdx( fieldIdx )
+    QgsAttributeTableAction( const QString &name, QgsDualView *dualView, int action, const QModelIndex &fieldIdx )
+        : QAction( name, dualView )
+        , mDualView( dualView )
+        , mAction( action )
+        , mFieldIdx( fieldIdx )
     {}
 
   public slots:
@@ -308,8 +311,11 @@ class GUI_EXPORT QgsAttributeTableMapLayerAction : public QAction
     Q_OBJECT
 
   public:
-    QgsAttributeTableMapLayerAction( const QString &name, QgsDualView *dualView, QgsMapLayerAction* action, const QModelIndex &fieldIdx ) :
-        QAction( name, dualView ), mDualView( dualView ), mAction( action ), mFieldIdx( fieldIdx )
+    QgsAttributeTableMapLayerAction( const QString &name, QgsDualView *dualView, QgsMapLayerAction* action, const QModelIndex &fieldIdx )
+        : QAction( name, dualView )
+        , mDualView( dualView )
+        , mAction( action )
+        , mFieldIdx( fieldIdx )
     {}
 
   public slots:
diff --git a/src/gui/editorwidgets/qgscheckboxconfigdlg.cpp b/src/gui/editorwidgets/qgscheckboxconfigdlg.cpp
index 5e70f5a0c93..1ed6d63db36 100644
--- a/src/gui/editorwidgets/qgscheckboxconfigdlg.cpp
+++ b/src/gui/editorwidgets/qgscheckboxconfigdlg.cpp
@@ -15,8 +15,8 @@
 
 #include "qgscheckboxconfigdlg.h"
 
-QgsCheckBoxConfigDlg::QgsCheckBoxConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget *parent ) :
-    QgsEditorConfigWidget( vl, fieldIdx, parent )
+QgsCheckBoxConfigDlg::QgsCheckBoxConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget *parent )
+    : QgsEditorConfigWidget( vl, fieldIdx, parent )
 {
   setupUi( this );
 }
diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
index 076d4591597..5282722e4ca 100644
--- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
@@ -18,8 +18,8 @@
 #include "qgscheckboxwidgetwrapper.h"
 #include "qgscheckboxconfigdlg.h"
 
-QgsCheckboxWidgetFactory::QgsCheckboxWidgetFactory( const QString& name ) :
-    QgsEditorWidgetFactory( name )
+QgsCheckboxWidgetFactory::QgsCheckboxWidgetFactory( const QString& name )
+    : QgsEditorWidgetFactory( name )
 {
 }
 
diff --git a/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp b/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
index 81948913039..3ec09d4be56 100644
--- a/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
+++ b/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
@@ -19,8 +19,8 @@
 
 #include <QSettings>
 
-QgsDateTimeEditFactory::QgsDateTimeEditFactory( const QString& name ) :
-    QgsEditorWidgetFactory( name )
+QgsDateTimeEditFactory::QgsDateTimeEditFactory( const QString& name )
+    : QgsEditorWidgetFactory( name )
 {
 }
 
diff --git a/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp b/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp
index 4cccf38fe99..cce5faae793 100644
--- a/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp
@@ -18,8 +18,8 @@
 #include "qgsfilenamewidgetwrapper.h"
 #include "qgsdummyconfigdlg.h"
 
-QgsFileNameWidgetFactory::QgsFileNameWidgetFactory( const QString& name ) :
-    QgsEditorWidgetFactory( name )
+QgsFileNameWidgetFactory::QgsFileNameWidgetFactory( const QString& name )
+    : QgsEditorWidgetFactory( name )
 {
 }
 
diff --git a/src/gui/editorwidgets/qgsuniquevaluesconfigdlg.cpp b/src/gui/editorwidgets/qgsuniquevaluesconfigdlg.cpp
index 3290be98e17..c16089428d2 100644
--- a/src/gui/editorwidgets/qgsuniquevaluesconfigdlg.cpp
+++ b/src/gui/editorwidgets/qgsuniquevaluesconfigdlg.cpp
@@ -15,8 +15,8 @@
 
 #include "qgsuniquevaluesconfigdlg.h"
 
-QgsUniqueValuesConfigDlg::QgsUniqueValuesConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget *parent ) :
-    QgsEditorConfigWidget( vl, fieldIdx, parent )
+QgsUniqueValuesConfigDlg::QgsUniqueValuesConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget *parent )
+    : QgsEditorConfigWidget( vl, fieldIdx, parent )
 {
   setupUi( this );
 }
diff --git a/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
index 825935c7da4..13546f07855 100644
--- a/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
+++ b/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
@@ -23,8 +23,8 @@
 #include <QSizePolicy>
 
 QgsValueMapSearchWidgetWrapper::QgsValueMapSearchWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* parent )
-    : QgsSearchWidgetWrapper( vl, fieldIdx, parent ),
-    mComboBox( nullptr )
+    : QgsSearchWidgetWrapper( vl, fieldIdx, parent )
+    , mComboBox( nullptr )
 {
 }
 
diff --git a/src/gui/layertree/qgscustomlayerorderwidget.cpp b/src/gui/layertree/qgscustomlayerorderwidget.cpp
index 3d94b15f4d7..9a6b3db2282 100644
--- a/src/gui/layertree/qgscustomlayerorderwidget.cpp
+++ b/src/gui/layertree/qgscustomlayerorderwidget.cpp
@@ -95,7 +95,8 @@ void QgsCustomLayerOrderWidget::modelUpdated()
 ///@cond PRIVATE
 
 CustomLayerOrderModel::CustomLayerOrderModel( QgsLayerTreeMapCanvasBridge* bridge, QObject* parent )
-    : QAbstractListModel( parent ), mBridge( bridge )
+    : QAbstractListModel( parent )
+    , mBridge( bridge )
 {
 }
 
diff --git a/src/gui/qgsbusyindicatordialog.cpp b/src/gui/qgsbusyindicatordialog.cpp
index 8d0b84cdcd6..b00ead9bf66 100644
--- a/src/gui/qgsbusyindicatordialog.cpp
+++ b/src/gui/qgsbusyindicatordialog.cpp
@@ -23,7 +23,9 @@
 #include <QProgressBar>
 
 QgsBusyIndicatorDialog::QgsBusyIndicatorDialog( const QString& message, QWidget* parent, const Qt::WindowFlags& fl )
-    : QDialog( parent, fl ), mMessage( QString( message ) ), mMsgLabel( nullptr )
+    : QDialog( parent, fl )
+    , mMessage( QString( message ) )
+    , mMsgLabel( nullptr )
 {
   setWindowTitle( tr( "QGIS" ) );
   setLayout( new QVBoxLayout() );
diff --git a/src/gui/qgscharacterselectdialog.cpp b/src/gui/qgscharacterselectdialog.cpp
index 63e2cb62106..f560fdfc6a8 100644
--- a/src/gui/qgscharacterselectdialog.cpp
+++ b/src/gui/qgscharacterselectdialog.cpp
@@ -19,7 +19,8 @@
 
 
 QgsCharacterSelectorDialog::QgsCharacterSelectorDialog( QWidget *parent, const Qt::WindowFlags& fl )
-    : QDialog( parent, fl ), mChar( QChar::Null )
+    : QDialog( parent, fl )
+    , mChar( QChar::Null )
 {
   setupUi( this );
   mCharWidget = new CharacterWidget( this );
diff --git a/src/gui/qgscollapsiblegroupbox.cpp b/src/gui/qgscollapsiblegroupbox.cpp
index 7a6f61aee5c..16a49b8b99a 100644
--- a/src/gui/qgscollapsiblegroupbox.cpp
+++ b/src/gui/qgscollapsiblegroupbox.cpp
@@ -476,14 +476,16 @@ void QgsCollapsibleGroupBoxBasic::collapseExpandFixes()
 // ----
 
 QgsCollapsibleGroupBox::QgsCollapsibleGroupBox( QWidget *parent, QSettings* settings )
-    : QgsCollapsibleGroupBoxBasic( parent ), mSettings( settings )
+    : QgsCollapsibleGroupBoxBasic( parent )
+    , mSettings( settings )
 {
   init();
 }
 
 QgsCollapsibleGroupBox::QgsCollapsibleGroupBox( const QString &title,
     QWidget *parent, QSettings* settings )
-    : QgsCollapsibleGroupBoxBasic( title, parent ), mSettings( settings )
+    : QgsCollapsibleGroupBoxBasic( title, parent )
+    , mSettings( settings )
 {
   init();
 }
diff --git a/src/gui/qgscollapsiblegroupbox.h b/src/gui/qgscollapsiblegroupbox.h
index 8568c193c85..fb0c73987e0 100644
--- a/src/gui/qgscollapsiblegroupbox.h
+++ b/src/gui/qgscollapsiblegroupbox.h
@@ -35,7 +35,10 @@ class GUI_EXPORT QgsGroupBoxCollapseButton : public QToolButton
 
   public:
     QgsGroupBoxCollapseButton( QWidget *parent = nullptr )
-        : QToolButton( parent ), mAltDown( false ), mShiftDown( false ) {}
+        : QToolButton( parent )
+        , mAltDown( false )
+        , mShiftDown( false )
+    {}
 
     ~QgsGroupBoxCollapseButton() {}
 
diff --git a/src/gui/qgscomposerruler.cpp b/src/gui/qgscomposerruler.cpp
index 5a333b99755..04225bf5b82 100644
--- a/src/gui/qgscomposerruler.cpp
+++ b/src/gui/qgscomposerruler.cpp
@@ -12,11 +12,12 @@ const unsigned int COUNT_VALID_MAGNITUDES = 5;
 const int QgsComposerRuler::validScaleMultiples[] = {1, 2, 5};
 const int QgsComposerRuler::validScaleMagnitudes[] = {1, 10, 100, 1000, 10000};
 
-QgsComposerRuler::QgsComposerRuler( QgsComposerRuler::Direction d ) : QWidget( nullptr ),
-    mDirection( d ),
-    mComposition( nullptr ),
-    mLineSnapItem( nullptr ),
-    mScaleMinPixelsWidth( 0 )
+QgsComposerRuler::QgsComposerRuler( QgsComposerRuler::Direction d )
+    : QWidget( nullptr )
+    , mDirection( d )
+    , mComposition( nullptr )
+    , mLineSnapItem( nullptr )
+    , mScaleMinPixelsWidth( 0 )
 {
   setMouseTracking( true );
 
diff --git a/src/gui/qgsdetaileditemdelegate.cpp b/src/gui/qgsdetaileditemdelegate.cpp
index ddc2a05f400..895fa92f6a0 100644
--- a/src/gui/qgsdetaileditemdelegate.cpp
+++ b/src/gui/qgsdetaileditemdelegate.cpp
@@ -25,10 +25,10 @@
 #include <QModelIndex>
 #include <QCheckBox>
 #include <QLinearGradient>
-QgsDetailedItemDelegate::QgsDetailedItemDelegate( QObject * parent ) :
-    QAbstractItemDelegate( parent ),
-    mpWidget( new QgsDetailedItemWidget() ),
-    mpCheckBox( new QCheckBox() )
+QgsDetailedItemDelegate::QgsDetailedItemDelegate( QObject * parent )
+    : QAbstractItemDelegate( parent )
+    , mpWidget( new QgsDetailedItemWidget() )
+    , mpCheckBox( new QCheckBox() )
 
 {
   //mpWidget->setFixedHeight(80);
diff --git a/src/gui/qgsdetaileditemwidget.cpp b/src/gui/qgsdetaileditemwidget.cpp
index 1306cedf875..0a9a51bf39f 100644
--- a/src/gui/qgsdetaileditemwidget.cpp
+++ b/src/gui/qgsdetaileditemwidget.cpp
@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 #include "qgsdetaileditemwidget.h"
-QgsDetailedItemWidget::QgsDetailedItemWidget( QWidget * parent ) :
-    QWidget( parent )
+QgsDetailedItemWidget::QgsDetailedItemWidget( QWidget * parent )
+    : QWidget( parent )
 
 {
   setupUi( this );
diff --git a/src/gui/qgsexpressionbuilderdialog.cpp b/src/gui/qgsexpressionbuilderdialog.cpp
index dce52512e9b..006735b15e5 100644
--- a/src/gui/qgsexpressionbuilderdialog.cpp
+++ b/src/gui/qgsexpressionbuilderdialog.cpp
@@ -17,7 +17,8 @@
 #include <QSettings>
 
 QgsExpressionBuilderDialog::QgsExpressionBuilderDialog( QgsVectorLayer* layer, const QString& startText, QWidget* parent, const QString& key, const QgsExpressionContext &context )
-    : QDialog( parent ), mRecentKey( key )
+    : QDialog( parent )
+    , mRecentKey( key )
 {
   setupUi( this );
 
diff --git a/src/gui/qgsfieldcombobox.cpp b/src/gui/qgsfieldcombobox.cpp
index e151c647166..ba7157d61b1 100644
--- a/src/gui/qgsfieldcombobox.cpp
+++ b/src/gui/qgsfieldcombobox.cpp
@@ -18,8 +18,8 @@
 #include "qgsmaplayer.h"
 #include "qgsvectorlayer.h"
 
-QgsFieldComboBox::QgsFieldComboBox( QWidget *parent ) :
-    QComboBox( parent )
+QgsFieldComboBox::QgsFieldComboBox( QWidget *parent )
+    : QComboBox( parent )
 {
   mFieldProxyModel = new QgsFieldProxyModel( this );
   setModel( mFieldProxyModel );
diff --git a/src/gui/qgsgroupwmsdatadialog.cpp b/src/gui/qgsgroupwmsdatadialog.cpp
index 18825ef137f..14d828f5568 100644
--- a/src/gui/qgsgroupwmsdatadialog.cpp
+++ b/src/gui/qgsgroupwmsdatadialog.cpp
@@ -17,8 +17,8 @@
 #include "qgsgroupwmsdatadialog.h"
 
 
-QgsGroupWMSDataDialog::QgsGroupWMSDataDialog( QWidget *parent, const Qt::WindowFlags& fl ) :
-    QDialog( parent, fl )
+QgsGroupWMSDataDialog::QgsGroupWMSDataDialog( QWidget *parent, const Qt::WindowFlags& fl )
+    : QDialog( parent, fl )
 {
   setupUi( this );
   // WMS Name validator
diff --git a/src/gui/qgslegendfilterbutton.cpp b/src/gui/qgslegendfilterbutton.cpp
index d2d388d3387..ed946ca6773 100644
--- a/src/gui/qgslegendfilterbutton.cpp
+++ b/src/gui/qgslegendfilterbutton.cpp
@@ -21,8 +21,8 @@
 #include <qgsapplication.h>
 #include <qgsexpressionbuilderdialog.h>
 
-QgsLegendFilterButton::QgsLegendFilterButton( QWidget* parent ) :
-    QToolButton( parent )
+QgsLegendFilterButton::QgsLegendFilterButton( QWidget* parent )
+    : QToolButton( parent )
     , mMenu( nullptr )
     , mLayer( nullptr )
 {
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
index 59f64919e53..1021fbcdbbd 100644
--- a/src/gui/qgsmapcanvas.cpp
+++ b/src/gui/qgsmapcanvas.cpp
@@ -72,7 +72,10 @@ email                : sherman at mrcc.com
 class QgsMapCanvas::CanvasProperties
 {
   public:
-    CanvasProperties() : mouseButtonDown( false ), panSelectorDown( false ) { }
+    CanvasProperties()
+        : mouseButtonDown( false )
+        , panSelectorDown( false )
+    { }
 
     //!Flag to indicate status of mouse button
     bool mouseButtonDown;
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
index 63898638f58..25785bdcc55 100644
--- a/src/gui/qgsmapcanvas.h
+++ b/src/gui/qgsmapcanvas.h
@@ -75,7 +75,10 @@ class GUI_EXPORT QgsMapCanvasLayer
 {
   public:
     QgsMapCanvasLayer( QgsMapLayer* layer, bool visible = true, bool isInOverview = false )
-        : mLayer( layer ), mVisible( visible ), mInOverview( isInOverview ) {}
+        : mLayer( layer )
+        , mVisible( visible )
+        , mInOverview( isInOverview )
+    {}
 
     void setVisible( bool visible ) { mVisible = visible; }
     void setInOverview( bool isInOverview ) { mInOverview = isInOverview; }
diff --git a/src/gui/qgsmaplayercombobox.cpp b/src/gui/qgsmaplayercombobox.cpp
index 220326ffb93..aefe425366b 100644
--- a/src/gui/qgsmaplayercombobox.cpp
+++ b/src/gui/qgsmaplayercombobox.cpp
@@ -17,8 +17,8 @@
 #include "qgsmaplayermodel.h"
 
 
-QgsMapLayerComboBox::QgsMapLayerComboBox( QWidget *parent ) :
-    QComboBox( parent )
+QgsMapLayerComboBox::QgsMapLayerComboBox( QWidget *parent )
+    : QComboBox( parent )
 {
   mProxyModel = new QgsMapLayerProxyModel( this );
   setModel( mProxyModel );
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
index 5f20ae3c250..c6ab2a7618c 100644
--- a/src/gui/qgsmessagebar.cpp
+++ b/src/gui/qgsmessagebar.cpp
@@ -31,7 +31,8 @@
 #include <QLabel>
 
 QgsMessageBar::QgsMessageBar( QWidget *parent )
-    : QFrame( parent ), mCurrentItem( nullptr )
+    : QFrame( parent )
+    , mCurrentItem( nullptr )
 {
   QPalette pal = palette();
   pal.setBrush( backgroundRole(), pal.window() );
diff --git a/src/gui/qgspixmaplabel.cpp b/src/gui/qgspixmaplabel.cpp
index c853e70e3fb..48abf299cbb 100644
--- a/src/gui/qgspixmaplabel.cpp
+++ b/src/gui/qgspixmaplabel.cpp
@@ -16,8 +16,8 @@
 #include "qgspixmaplabel.h"
 
 
-QgsPixmapLabel::QgsPixmapLabel( QWidget *parent ) :
-    QLabel( parent )
+QgsPixmapLabel::QgsPixmapLabel( QWidget *parent )
+    : QLabel( parent )
 {
   this->setMinimumSize( 1, 1 );
 }
diff --git a/src/gui/qgsprevieweffect.cpp b/src/gui/qgsprevieweffect.cpp
index 7cffbc15631..5f487af5c5a 100644
--- a/src/gui/qgsprevieweffect.cpp
+++ b/src/gui/qgsprevieweffect.cpp
@@ -19,9 +19,9 @@
 #include "qgsprevieweffect.h"
 
 
-QgsPreviewEffect::QgsPreviewEffect( QObject* parent ) :
-    QGraphicsEffect( parent ),
-    mMode( PreviewGrayscale )
+QgsPreviewEffect::QgsPreviewEffect( QObject* parent )
+    : QGraphicsEffect( parent )
+    , mMode( PreviewGrayscale )
 {
   //effect is disabled by default
   setEnabled( false );
diff --git a/src/gui/qgsprojectionselectionwidget.cpp b/src/gui/qgsprojectionselectionwidget.cpp
index 866cb2b30db..ed106a5e803 100644
--- a/src/gui/qgsprojectionselectionwidget.cpp
+++ b/src/gui/qgsprojectionselectionwidget.cpp
@@ -22,8 +22,8 @@
 #include "qgsproject.h"
 #include <QSettings>
 
-QgsProjectionSelectionWidget::QgsProjectionSelectionWidget( QWidget *parent ) :
-    QWidget( parent )
+QgsProjectionSelectionWidget::QgsProjectionSelectionWidget( QWidget *parent )
+    : QWidget( parent )
 {
   mDialog = new QgsGenericProjectionSelector( this );
 
diff --git a/src/gui/qgsrasterformatsaveoptionswidget.cpp b/src/gui/qgsrasterformatsaveoptionswidget.cpp
index 6f0a555ee83..1389ac7f949 100644
--- a/src/gui/qgsrasterformatsaveoptionswidget.cpp
+++ b/src/gui/qgsrasterformatsaveoptionswidget.cpp
@@ -33,8 +33,12 @@ QMap< QString, QStringList > QgsRasterFormatSaveOptionsWidget::mBuiltinProfiles;
 
 QgsRasterFormatSaveOptionsWidget::QgsRasterFormatSaveOptionsWidget( QWidget* parent, const QString& format,
     QgsRasterFormatSaveOptionsWidget::Type type, const QString& provider )
-    : QWidget( parent ), mFormat( format ), mProvider( provider ), mRasterLayer( nullptr )
-    , mRasterFileName( QString() ), mPyramids( false )
+    : QWidget( parent )
+    , mFormat( format )
+    , mProvider( provider )
+    , mRasterLayer( nullptr )
+    , mRasterFileName( QString() )
+    , mPyramids( false )
     , mPyramidsFormat( QgsRaster::PyramidsGTiff )
 
 {
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
index 779a23260d7..505423e1307 100644
--- a/src/gui/qgsrasterlayersaveasdialog.cpp
+++ b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -28,10 +28,12 @@
 QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterLayer* rasterLayer,
     QgsRasterDataProvider* sourceProvider, const QgsRectangle& currentExtent,
     const QgsCoordinateReferenceSystem& layerCrs, const QgsCoordinateReferenceSystem& currentCrs,
-    QWidget* parent, const Qt::WindowFlags& f ) :
-    QDialog( parent, f )
-    , mRasterLayer( rasterLayer ), mDataProvider( sourceProvider )
-    , mCurrentExtent( currentExtent ), mLayerCrs( layerCrs )
+    QWidget* parent, const Qt::WindowFlags& f )
+    : QDialog( parent, f )
+    , mRasterLayer( rasterLayer )
+    , mDataProvider( sourceProvider )
+    , mCurrentExtent( currentExtent )
+    , mLayerCrs( layerCrs )
     , mCurrentCrs( currentCrs )
     , mResolutionState( OriginalResolution )
 {
diff --git a/src/gui/qgsrasterpyramidsoptionswidget.cpp b/src/gui/qgsrasterpyramidsoptionswidget.cpp
index 0af4459b6d0..46abdeb27e0 100644
--- a/src/gui/qgsrasterpyramidsoptionswidget.cpp
+++ b/src/gui/qgsrasterpyramidsoptionswidget.cpp
@@ -29,7 +29,8 @@
 
 
 QgsRasterPyramidsOptionsWidget::QgsRasterPyramidsOptionsWidget( QWidget* parent, const QString& provider )
-    : QWidget( parent ), mProvider( provider )
+    : QWidget( parent )
+    , mProvider( provider )
 {
   setupUi( this );
 
diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
index b40011b6ed0..93fe61c3821 100644
--- a/src/gui/qgsscalecombobox.cpp
+++ b/src/gui/qgsscalecombobox.cpp
@@ -24,7 +24,10 @@
 #include <QSettings>
 #include <QLineEdit>
 
-QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent ), mScale( 1.0 ), mMinScale( 0.0 )
+QgsScaleComboBox::QgsScaleComboBox( QWidget* parent )
+    : QComboBox( parent )
+    , mScale( 1.0 )
+    , mMinScale( 0.0 )
 {
   updateScales();
 
@@ -247,4 +250,4 @@ void QgsScaleComboBox::setMinScale( double scale )
   {
     setScale( scale );
   }
-}
\ No newline at end of file
+}
diff --git a/src/gui/qgsscalevisibilitydialog.cpp b/src/gui/qgsscalevisibilitydialog.cpp
index 03e9a1b1265..403fe6b2abe 100644
--- a/src/gui/qgsscalevisibilitydialog.cpp
+++ b/src/gui/qgsscalevisibilitydialog.cpp
@@ -21,8 +21,8 @@
 
 
 
-QgsScaleVisibilityDialog::QgsScaleVisibilityDialog( QWidget *parent, const QString& title, QgsMapCanvas* mapCanvas ) :
-    QDialog( parent )
+QgsScaleVisibilityDialog::QgsScaleVisibilityDialog( QWidget *parent, const QString& title, QgsMapCanvas* mapCanvas )
+    : QDialog( parent )
 {
   if ( !title.isEmpty() )
   {
diff --git a/src/gui/qgssearchquerybuilder.cpp b/src/gui/qgssearchquerybuilder.cpp
index 975a6aa6d63..52fc96ebd52 100644
--- a/src/gui/qgssearchquerybuilder.cpp
+++ b/src/gui/qgssearchquerybuilder.cpp
@@ -32,7 +32,8 @@
 
 QgsSearchQueryBuilder::QgsSearchQueryBuilder( QgsVectorLayer* layer,
     QWidget *parent, const Qt::WindowFlags& fl )
-    : QDialog( parent, fl ), mLayer( layer )
+    : QDialog( parent, fl )
+    , mLayer( layer )
 {
   setupUi( this );
   setupListViews();
diff --git a/src/gui/qgssublayersdialog.cpp b/src/gui/qgssublayersdialog.cpp
index 5903320814d..19c5e78799f 100644
--- a/src/gui/qgssublayersdialog.cpp
+++ b/src/gui/qgssublayersdialog.cpp
@@ -24,7 +24,8 @@
 
 QgsSublayersDialog::QgsSublayersDialog( ProviderType providerType, const QString& name,
                                         QWidget* parent, const Qt::WindowFlags& fl )
-    : QDialog( parent, fl ), mName( name )
+    : QDialog( parent, fl )
+    , mName( name )
 {
   setupUi( this );
 
diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.cpp b/src/gui/symbology-ng/qgscolorrampcombobox.cpp
index 67b7dddeaab..17ea7687937 100644
--- a/src/gui/symbology-ng/qgscolorrampcombobox.cpp
+++ b/src/gui/symbology-ng/qgscolorrampcombobox.cpp
@@ -26,8 +26,11 @@
 
 QSize QgsColorRampComboBox::rampIconSize( 50, 16 );
 
-QgsColorRampComboBox::QgsColorRampComboBox( QWidget *parent ) :
-    QComboBox( parent ), mStyle( nullptr ), mSourceColorRamp( nullptr ), mShowGradientOnly( false )
+QgsColorRampComboBox::QgsColorRampComboBox( QWidget *parent )
+    : QComboBox( parent )
+    , mStyle( nullptr )
+    , mSourceColorRamp( nullptr )
+    , mShowGradientOnly( false )
 {
 }
 
diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
index d7d8c67b690..94b46399f65 100644
--- a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
@@ -691,7 +691,8 @@ void QgsCptCityColorRampV2Dialog::refreshModel( const QModelIndex& index )
 /// @cond PRIVATE
 
 TreeFilterProxyModel::TreeFilterProxyModel( QObject* parent, QgsCptCityBrowserModel* model )
-    : QSortFilterProxyModel( parent ), mModel( model )
+    : QSortFilterProxyModel( parent )
+    , mModel( model )
 {
   setSourceModel( mModel );
 }
diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp
index 95f6221f086..793d43e00a2 100644
--- a/src/gui/symbology-ng/qgsrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgsrendererv2widget.cpp
@@ -277,7 +277,8 @@ void QgsRendererV2Widget::applyChanges()
 #include "qgsfield.h"
 
 QgsRendererV2DataDefinedMenus::QgsRendererV2DataDefinedMenus( QMenu* menu, QgsVectorLayer* layer, const QString& rotationField, const QString& sizeScaleField, QgsSymbolV2::ScaleMethod scaleMethod )
-    : QObject( menu ), mLayer( layer )
+    : QObject( menu )
+    , mLayer( layer )
 {
   mRotationMenu = new QMenu( tr( "Rotation field" ) );
   mSizeScaleMenu = new QMenu( tr( "Size scale field" ) );
diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
index 60e1a4b21f1..5920c61db36 100644
--- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
@@ -590,7 +590,12 @@ void QgsRuleBasedRendererV2Widget::selectedRulesChanged()
 ///////////
 
 QgsRendererRulePropsDialog::QgsRendererRulePropsDialog( QgsRuleBasedRendererV2::Rule* rule, QgsVectorLayer* layer, QgsStyleV2* style, QWidget* parent , QgsMapCanvas* mapCanvas )
-    : QDialog( parent ), mRule( rule ), mLayer( layer ), mSymbolSelector( nullptr ), mSymbol( nullptr ), mMapCanvas( mapCanvas )
+    : QDialog( parent )
+    , mRule( rule )
+    , mLayer( layer )
+    , mSymbolSelector( nullptr )
+    , mSymbol( nullptr )
+    , mMapCanvas( mapCanvas )
 {
   setupUi( this );
 #ifdef Q_OS_MAC
diff --git a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp
index b6f7bb3b8a3..513162c5538 100644
--- a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp
+++ b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp
@@ -77,7 +77,8 @@ void QgsSmartGroupCondition::hideRemoveButton( bool hide )
 // Editor Dialog Functions  //
 // ------------------------ //
 QgsSmartGroupEditorDialog::QgsSmartGroupEditorDialog( QgsStyleV2* style, QWidget* parent )
-    : QDialog( parent ), mStyle( style )
+    : QDialog( parent )
+    , mStyle( style )
 {
   setupUi( this );
 
diff --git a/src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp b/src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp
index 3a9d82c2fe7..2874a9ff44d 100644
--- a/src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp
+++ b/src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp
@@ -22,8 +22,8 @@
 #include <QStandardItem>
 
 
-QgsStyleV2GroupSelectionDialog::QgsStyleV2GroupSelectionDialog( QgsStyleV2 *style, QWidget *parent ) :
-    QDialog( parent )
+QgsStyleV2GroupSelectionDialog::QgsStyleV2GroupSelectionDialog( QgsStyleV2 *style, QWidget *parent )
+    : QDialog( parent )
     , mStyle( style )
 {
   setupUi( this );
diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
index 09339a97b8b..d3d3e0a1ad5 100644
--- a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
+++ b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
@@ -41,7 +41,9 @@
 #include "qgslogger.h"
 
 QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent )
-    : QDialog( parent ), mStyle( style ), mModified( false )
+    : QDialog( parent )
+    , mStyle( style )
+    , mModified( false )
 {
   setupUi( this );
 #ifdef Q_OS_MAC
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.h b/src/gui/symbology-ng/qgssymbollayerv2widget.h
index 5671b5b3bed..2d7b962cee9 100644
--- a/src/gui/symbology-ng/qgssymbollayerv2widget.h
+++ b/src/gui/symbology-ng/qgssymbollayerv2widget.h
@@ -31,7 +31,12 @@ class GUI_EXPORT QgsSymbolLayerV2Widget : public QWidget
     Q_OBJECT
 
   public:
-    QgsSymbolLayerV2Widget( QWidget* parent, const QgsVectorLayer* vl = nullptr ) : QWidget( parent ), mVectorLayer( vl ), mPresetExpressionContext( nullptr ), mMapCanvas( nullptr ) {}
+    QgsSymbolLayerV2Widget( QWidget* parent, const QgsVectorLayer* vl = nullptr )
+        : QWidget( parent )
+        , mVectorLayer( vl )
+        , mPresetExpressionContext( nullptr )
+        , mMapCanvas( nullptr )
+    {}
     virtual ~QgsSymbolLayerV2Widget() {}
 
     virtual void setSymbolLayer( QgsSymbolLayerV2* layer ) = 0;
diff --git a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
index c8488258eee..c72cb54db60 100644
--- a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
+++ b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
@@ -28,7 +28,9 @@
 ////////////////
 
 QgsSymbolLevelsV2Dialog::QgsSymbolLevelsV2Dialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent )
-    : QDialog( parent ), mList( list ), mForceOrderingEnabled( false )
+    : QDialog( parent )
+    , mList( list )
+    , mForceOrderingEnabled( false )
 {
   setupUi( this );
 
diff --git a/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
index edea3d4cc4b..216ba431730 100644
--- a/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
@@ -32,7 +32,8 @@ static void updateColorButton( QAbstractButton* button, QColor color )
 
 
 QgsVectorColorBrewerColorRampV2Dialog::QgsVectorColorBrewerColorRampV2Dialog( QgsVectorColorBrewerColorRampV2* ramp, QWidget* parent )
-    : QDialog( parent ), mRamp( ramp )
+    : QDialog( parent )
+    , mRamp( ramp )
 {
 
   setupUi( this );
diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
index 343ab40d4d4..97e38a7ba7a 100644
--- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
@@ -28,7 +28,9 @@
 #include <QTextEdit>
 
 QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog( QgsVectorGradientColorRampV2* ramp, QWidget* parent )
-    : QDialog( parent ), mRamp( ramp ), mCurrentItem( nullptr )
+    : QDialog( parent )
+    , mRamp( ramp )
+    , mCurrentItem( nullptr )
 {
   setupUi( this );
 #ifdef Q_OS_MAC
diff --git a/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
index 3bd5001571c..d22b1618132 100644
--- a/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
@@ -21,7 +21,8 @@
 
 
 QgsVectorRandomColorRampV2Dialog::QgsVectorRandomColorRampV2Dialog( QgsVectorRandomColorRampV2* ramp, QWidget* parent )
-    : QDialog( parent ), mRamp( ramp )
+    : QDialog( parent )
+    , mRamp( ramp )
 {
   setupUi( this );
 
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.h b/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.h
index a9c5bdc43ec..dcf9717c94f 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.h
@@ -16,7 +16,9 @@ class QgsGeometryAngleCheck : public QgsGeometryCheck
 
   public:
     QgsGeometryAngleCheck( QgsFeaturePool* featurePool, double minAngle )
-        : QgsGeometryCheck( FeatureNodeCheck, featurePool ), mMinAngle( minAngle ) {}
+        : QgsGeometryCheck( FeatureNodeCheck, featurePool )
+        , mMinAngle( minAngle )
+    {}
     void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = nullptr, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
     void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
     const QStringList& getResolutionMethods() const override;
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h
index b7196495b4a..28596af4173 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h
@@ -18,7 +18,9 @@ class QgsGeometryAreaCheck : public QgsGeometryCheck
 
   public:
     QgsGeometryAreaCheck( QgsFeaturePool* featurePool, double threshold )
-        : QgsGeometryCheck( FeatureCheck, featurePool ), mThreshold( threshold ) {}
+        : QgsGeometryCheck( FeatureCheck, featurePool )
+        , mThreshold( threshold )
+    {}
     void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = nullptr, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
     void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
     const QStringList& getResolutionMethods() const override;
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp
index fed08b77c2f..27734f757b5 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp
+++ b/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp
@@ -53,13 +53,13 @@ QgsGeometryCheckError::QgsGeometryCheckError( const QgsGeometryCheck* check,
     const QgsPointV2& errorLocation,
     QgsVertexId vidx,
     const QVariant& value , ValueType valueType )
-    : mCheck( check ),
-    mFeatureId( featureId ),
-    mErrorLocation( errorLocation ),
-    mVidx( vidx ),
-    mValue( value ),
-    mValueType( valueType ),
-    mStatus( StatusPending )
+    : mCheck( check )
+    , mFeatureId( featureId )
+    , mErrorLocation( errorLocation )
+    , mVidx( vidx )
+    , mValue( value )
+    , mValueType( valueType )
+    , mStatus( StatusPending )
 {}
 
 QgsGeometryCheckError::~QgsGeometryCheckError()
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrycheck.h b/src/plugins/geometry_checker/checks/qgsgeometrycheck.h
index ee66cd2d325..7bd15b34dea 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometrycheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometrycheck.h
@@ -52,7 +52,10 @@ class QgsGeometryCheck : public QObject
     {
       Change() {}
       Change( ChangeWhat _what, ChangeType _type, QgsVertexId _vidx = QgsVertexId() )
-          : what( _what ), type( _type ), vidx( _vidx ) {}
+          : what( _what )
+          , type( _type )
+          , vidx( _vidx )
+      {}
       ChangeWhat what;
       ChangeType type;
       QgsVertexId vidx;
@@ -60,7 +63,10 @@ class QgsGeometryCheck : public QObject
 
     typedef QMap<QgsFeatureId, QList<Change> > Changes;
 
-    QgsGeometryCheck( CheckType checkType, QgsFeaturePool* featurePool ) : mCheckType( checkType ), mFeaturePool( featurePool ) {}
+    QgsGeometryCheck( CheckType checkType, QgsFeaturePool* featurePool )
+        : mCheckType( checkType )
+        , mFeaturePool( featurePool )
+    {}
     virtual ~QgsGeometryCheck() {}
     virtual void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList& messages, QAtomicInt* progressCounter = nullptr, const QgsFeatureIds& ids = QgsFeatureIds() ) const = 0;
     virtual void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const = 0;
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h b/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h
index 36879030579..42e3b040f7b 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h
@@ -18,7 +18,9 @@ class QgsGeometryContainedCheckError : public QgsGeometryCheckError
                                     const QgsPointV2& errorLocation,
                                     QgsFeatureId otherId
                                   )
-        : QgsGeometryCheckError( check, featureId, errorLocation, QgsVertexId(), otherId, ValueOther ), mOtherId( otherId ) { }
+        : QgsGeometryCheckError( check, featureId, errorLocation, QgsVertexId(), otherId, ValueOther )
+        , mOtherId( otherId )
+    { }
     QgsFeatureId otherId() const { return mOtherId; }
 
     bool isEqual( QgsGeometryCheckError* other ) const override
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.h b/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.h
index 2301045c120..31cbd4ce304 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.h
@@ -17,7 +17,9 @@ class QgsGeometryDuplicateCheckError : public QgsGeometryCheckError
                                     QgsFeatureId featureId,
                                     const QgsPointV2& errorLocation,
                                     const QList<QgsFeatureId>& duplicates )
-        : QgsGeometryCheckError( check, featureId, errorLocation, QgsVertexId(), duplicatesString( duplicates ) ), mDuplicates( duplicates ) { }
+        : QgsGeometryCheckError( check, featureId, errorLocation, QgsVertexId(), duplicatesString( duplicates ) )
+        , mDuplicates( duplicates )
+    { }
     const QList<QgsFeatureId>& duplicates() const { return mDuplicates; }
 
     bool isEqual( QgsGeometryCheckError* other ) const override
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h
index b029ae817e9..0850627859e 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h
@@ -78,7 +78,9 @@ class QgsGeometryGapCheck : public QgsGeometryCheck
 
   public:
     QgsGeometryGapCheck( QgsFeaturePool* featurePool, double threshold )
-        : QgsGeometryCheck( LayerCheck, featurePool ), mThreshold( threshold ) {}
+        : QgsGeometryCheck( LayerCheck, featurePool )
+        , mThreshold( threshold )
+    {}
     void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = nullptr, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
     void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
     const QStringList& getResolutionMethods() const override;
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.h b/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.h
index 6555104ed87..3ef12bffcdd 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.h
@@ -18,7 +18,9 @@ class QgsGeometryOverlapCheckError : public QgsGeometryCheckError
                                   const QgsPointV2& errorLocation,
                                   const QVariant& value,
                                   QgsFeatureId otherId )
-        : QgsGeometryCheckError( check, featureId, errorLocation, QgsVertexId(), value, ValueArea ), mOtherId( otherId ) { }
+        : QgsGeometryCheckError( check, featureId, errorLocation, QgsVertexId(), value, ValueArea )
+        , mOtherId( otherId )
+    { }
     QgsFeatureId otherId() const { return mOtherId; }
 
     bool isEqual( QgsGeometryCheckError* other ) const override
@@ -49,7 +51,9 @@ class QgsGeometryOverlapCheck : public QgsGeometryCheck
 
   public:
     QgsGeometryOverlapCheck( QgsFeaturePool* featurePool, double threshold )
-        : QgsGeometryCheck( FeatureCheck, featurePool ), mThreshold( threshold ) {}
+        : QgsGeometryCheck( FeatureCheck, featurePool )
+        , mThreshold( threshold )
+    {}
     void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = nullptr, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
     void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
     const QStringList& getResolutionMethods() const override;
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.h b/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.h
index 6f7cd081355..825e0414b7d 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.h
@@ -16,7 +16,9 @@ class QgsGeometrySegmentLengthCheck : public QgsGeometryCheck
 
   public:
     QgsGeometrySegmentLengthCheck( QgsFeaturePool* featurePool, double minLength )
-        : QgsGeometryCheck( FeatureNodeCheck, featurePool ), mMinLength( minLength ) {}
+        : QgsGeometryCheck( FeatureNodeCheck, featurePool )
+        , mMinLength( minLength )
+    {}
     void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = nullptr, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
     void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
     const QStringList& getResolutionMethods() const override;
diff --git a/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.h b/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.h
index 0a0aedceab2..1788fd4f7ae 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.h
@@ -19,7 +19,9 @@ class QgsGeometrySelfIntersectionCheckError : public QgsGeometryCheckError
                                            const QgsPointV2& errorLocation,
                                            QgsVertexId vidx,
                                            const QgsGeometryUtils::SelfIntersection& inter )
-        : QgsGeometryCheckError( check, featureId, errorLocation, vidx ), mInter( inter ) { }
+        : QgsGeometryCheckError( check, featureId, errorLocation, vidx )
+        , mInter( inter )
+    { }
     const QgsGeometryUtils::SelfIntersection& intersection() const { return mInter; }
     bool isEqual( QgsGeometryCheckError* other ) const override;
     bool handleChanges( const QgsGeometryCheck::Changes& changes ) override;
diff --git a/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.h b/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.h
index 48479fe2e6d..84bdf742a61 100644
--- a/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.h
+++ b/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.h
@@ -40,7 +40,9 @@ class QgsGeometryTypeCheck : public QgsGeometryCheck
 
   public:
     QgsGeometryTypeCheck( QgsFeaturePool* featurePool, int allowedTypes )
-        : QgsGeometryCheck( FeatureCheck, featurePool ), mAllowedTypes( allowedTypes ) {}
+        : QgsGeometryCheck( FeatureCheck, featurePool )
+        , mAllowedTypes( allowedTypes )
+    {}
     void collectErrors( QList<QgsGeometryCheckError*>& errors, QStringList &messages, QAtomicInt* progressCounter = nullptr, const QgsFeatureIds& ids = QgsFeatureIds() ) const override;
     void fixError( QgsGeometryCheckError* error, int method, int mergeAttributeIndex, Changes& changes ) const override;
     const QStringList& getResolutionMethods() const override;
diff --git a/src/plugins/geometry_checker/qgsgeometrychecker.cpp b/src/plugins/geometry_checker/qgsgeometrychecker.cpp
index 56e8fa77646..caea77c20b2 100644
--- a/src/plugins/geometry_checker/qgsgeometrychecker.cpp
+++ b/src/plugins/geometry_checker/qgsgeometrychecker.cpp
@@ -25,7 +25,9 @@
 
 
 QgsGeometryChecker::QgsGeometryChecker( const QList<QgsGeometryCheck*>& checks, QgsFeaturePool *featurePool )
-    : mChecks( checks ), mFeaturePool( featurePool ), mMergeAttributeIndex( -1 )
+    : mChecks( checks )
+    , mFeaturePool( featurePool )
+    , mMergeAttributeIndex( -1 )
 {
 }
 
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp
index 08d980978c6..bc31db7f4a1 100644
--- a/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp
+++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp
@@ -20,7 +20,9 @@
 #include "qgsmapcanvas.h"
 
 QgsGeometryCheckerFixSummaryDialog::QgsGeometryCheckerFixSummaryDialog( QgisInterface* iface, QgsVectorLayer* layer, const Statistics& stats, const QStringList &messages, QWidget *parent )
-    : QDialog( parent ), mIface( iface ), mLayer( layer )
+    : QDialog( parent )
+    , mIface( iface )
+    , mLayer( layer )
 {
   ui.setupUi( this );
 
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
index 5b5acf5d81e..1a395d9e5d0 100644
--- a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
+++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
@@ -38,7 +38,11 @@
 QString QgsGeometryCheckerResultTab::sSettingsGroup = "/geometry_checker/default_fix_methods/";
 
 QgsGeometryCheckerResultTab::QgsGeometryCheckerResultTab( QgisInterface* iface, QgsGeometryChecker* checker, QgsFeaturePool *featurePool, QTabWidget* tabWidget, QWidget* parent )
-    : QWidget( parent ), mTabWidget( tabWidget ), mIface( iface ), mChecker( checker ), mFeaturePool( featurePool )
+    : QWidget( parent )
+    , mTabWidget( tabWidget )
+    , mIface( iface )
+    , mChecker( checker )
+    , mFeaturePool( featurePool )
 {
   ui.setupUi( this );
   mErrorCount = 0;
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
index 56aaae637a2..c37cc86764b 100644
--- a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
+++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
@@ -39,7 +39,8 @@
 
 
 QgsGeometryCheckerSetupTab::QgsGeometryCheckerSetupTab( QgisInterface* iface , QWidget *parent )
-    : QWidget( parent ), mIface( iface )
+    : QWidget( parent )
+    , mIface( iface )
 
 {
   ui.setupUi( this );
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckfixdialog.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckfixdialog.cpp
index 4de50ee1c27..5e5e2e7fbca 100644
--- a/src/plugins/geometry_checker/ui/qgsgeometrycheckfixdialog.cpp
+++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckfixdialog.cpp
@@ -33,7 +33,10 @@
 QgsGeometryCheckerFixDialog::QgsGeometryCheckerFixDialog( QgsGeometryChecker *checker,
     const QList<QgsGeometryCheckError *> &errors,
     QgisInterface* iface, QWidget *parent )
-    : QDialog( parent ), mChecker( checker ), mErrors( errors ), mIface( iface )
+    : QDialog( parent )
+    , mChecker( checker )
+    , mErrors( errors )
+    , mIface( iface )
 {
   setWindowTitle( tr( "Fix errors" ) );
 
diff --git a/src/plugins/geometry_checker/utils/qgsfeaturepool.cpp b/src/plugins/geometry_checker/utils/qgsfeaturepool.cpp
index 86e1d7d8a5b..0d306db0f73 100644
--- a/src/plugins/geometry_checker/utils/qgsfeaturepool.cpp
+++ b/src/plugins/geometry_checker/utils/qgsfeaturepool.cpp
@@ -26,7 +26,9 @@
 #include <limits>
 
 QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, bool selectedOnly )
-    : mFeatureCache( sCacheSize ), mLayer( layer ), mSelectedOnly( selectedOnly )
+    : mFeatureCache( sCacheSize )
+    , mLayer( layer )
+    , mSelectedOnly( selectedOnly )
 {
   if ( selectedOnly )
   {
diff --git a/src/plugins/geometry_checker/utils/qgsfeaturepool.h b/src/plugins/geometry_checker/utils/qgsfeaturepool.h
index 829595f8e8d..d853cd4455c 100644
--- a/src/plugins/geometry_checker/utils/qgsfeaturepool.h
+++ b/src/plugins/geometry_checker/utils/qgsfeaturepool.h
@@ -45,7 +45,9 @@ class QgsFeaturePool
     struct MapEntry
     {
       MapEntry( QgsFeature* _feature, QLinkedList<QgsFeatureId>::iterator _ageIt )
-          : feature( _feature ), ageIt( _ageIt ) {}
+          : feature( _feature )
+          , ageIt( _ageIt )
+      {}
       QgsFeature* feature;
       QLinkedList<QgsFeatureId>::iterator ageIt;
     };
diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp b/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp
index 4430972b9a2..538f863b28c 100644
--- a/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp
+++ b/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp
@@ -25,7 +25,10 @@
 #include "qgssnapindex.h"
 
 QgsGeometrySnapper::QgsGeometrySnapper( QgsVectorLayer *adjustLayer, QgsVectorLayer *referenceLayer, bool selectedOnly, double snapToleranceMapUnits, const QgsMapSettings *mapSettings )
-    : mAdjustLayer( adjustLayer ), mReferenceLayer( referenceLayer ), mSnapToleranceMapUnits( snapToleranceMapUnits ), mMapSettings( mapSettings )
+    : mAdjustLayer( adjustLayer )
+    , mReferenceLayer( referenceLayer )
+    , mSnapToleranceMapUnits( snapToleranceMapUnits )
+    , mMapSettings( mapSettings )
 {
   if ( selectedOnly )
   {
diff --git a/src/plugins/geometry_snapper/qgssnapindex.cpp b/src/plugins/geometry_snapper/qgssnapindex.cpp
index ffd355c7e16..6cfe5cafd2f 100644
--- a/src/plugins/geometry_snapper/qgssnapindex.cpp
+++ b/src/plugins/geometry_snapper/qgssnapindex.cpp
@@ -19,7 +19,10 @@
 #include <qmath.h>
 #include <limits>
 
-QgsSnapIndex::PointSnapItem::PointSnapItem( const QgsSnapIndex::CoordIdx* _idx ) : SnapItem( QgsSnapIndex::SnapPoint ), idx( _idx ) {}
+QgsSnapIndex::PointSnapItem::PointSnapItem( const QgsSnapIndex::CoordIdx* _idx )
+    : SnapItem( QgsSnapIndex::SnapPoint )
+    , idx( _idx )
+{}
 
 QgsPointV2 QgsSnapIndex::PointSnapItem::getSnapPoint( const QgsPointV2 &/*p*/ ) const
 {
@@ -29,7 +32,10 @@ QgsPointV2 QgsSnapIndex::PointSnapItem::getSnapPoint( const QgsPointV2 &/*p*/ )
 ///////////////////////////////////////////////////////////////////////////////
 
 QgsSnapIndex::SegmentSnapItem::SegmentSnapItem( const QgsSnapIndex::CoordIdx* _idxFrom, const QgsSnapIndex::CoordIdx* _idxTo )
-    : SnapItem( QgsSnapIndex::SnapSegment ), idxFrom( _idxFrom ), idxTo( _idxTo ) {}
+    : SnapItem( QgsSnapIndex::SnapSegment )
+    , idxFrom( _idxFrom )
+    , idxTo( _idxTo )
+{}
 
 QgsPointV2 QgsSnapIndex::SegmentSnapItem::getSnapPoint( const QgsPointV2 &p ) const
 {
@@ -96,8 +102,11 @@ class Raytracer
     // See http://playtechs.blogspot.ch/2007/03/raytracing-on-grid.html
   public:
     Raytracer( float x0, float y0, float x1, float y1 )
-        : m_dx( qAbs( x1 - x0 ) ), m_dy( qAbs( y1 - y0 ) ),
-        m_x( qFloor( x0 ) ), m_y( qFloor( y0 ) ), m_n( 1 )
+        : m_dx( qAbs( x1 - x0 ) )
+        , m_dy( qAbs( y1 - y0 ) )
+        , m_x( qFloor( x0 ) )
+        , m_y( qFloor( y0 ) )
+        , m_n( 1 )
     {
       if ( m_dx == 0. )
       {
@@ -233,7 +242,9 @@ QList<QgsSnapIndex::SnapItem*> QgsSnapIndex::GridRow::getSnapItems( int colStart
 ///////////////////////////////////////////////////////////////////////////////
 
 QgsSnapIndex::QgsSnapIndex( const QgsPointV2& origin, double cellSize )
-    : mOrigin( origin ), mCellSize( cellSize ), mRowsStartIdx( 0 )
+    : mOrigin( origin )
+    , mCellSize( cellSize )
+    , mRowsStartIdx( 0 )
 {
 }
 
diff --git a/src/plugins/geometry_snapper/qgssnapindex.h b/src/plugins/geometry_snapper/qgssnapindex.h
index 180f7075f30..765d86439ae 100644
--- a/src/plugins/geometry_snapper/qgssnapindex.h
+++ b/src/plugins/geometry_snapper/qgssnapindex.h
@@ -26,7 +26,8 @@ class QgsSnapIndex
     struct CoordIdx
     {
       CoordIdx( const QgsAbstractGeometryV2* _geom, QgsVertexId _vidx )
-          : geom( _geom ), vidx( _vidx )
+          : geom( _geom )
+          , vidx( _vidx )
       {}
       QgsPointV2 point() const { return geom->vertexAt( vidx ); }
 
diff --git a/src/plugins/georeferencer/qgsgcpcanvasitem.cpp b/src/plugins/georeferencer/qgsgcpcanvasitem.cpp
index 2095c4b22e0..7a5ee3dd2a9 100644
--- a/src/plugins/georeferencer/qgsgcpcanvasitem.cpp
+++ b/src/plugins/georeferencer/qgsgcpcanvasitem.cpp
@@ -20,7 +20,8 @@
 #include "qgsrasterlayer.h"
 
 QgsGCPCanvasItem::QgsGCPCanvasItem( QgsMapCanvas* mapCanvas, const QgsGeorefDataPoint* dataPoint, bool isGCPSource )
-    : QgsMapCanvasItem( mapCanvas ), mDataPoint( dataPoint )
+    : QgsMapCanvasItem( mapCanvas )
+    , mDataPoint( dataPoint )
     , mPointBrush( Qt::red )
     , mLabelBrush( Qt::yellow )
     , mIsGCPSource( isGCPSource )
diff --git a/src/plugins/georeferencer/qgsgeorefconfigdialog.cpp b/src/plugins/georeferencer/qgsgeorefconfigdialog.cpp
index 7ac5db89894..ef5d3d5e44e 100644
--- a/src/plugins/georeferencer/qgsgeorefconfigdialog.cpp
+++ b/src/plugins/georeferencer/qgsgeorefconfigdialog.cpp
@@ -19,8 +19,8 @@
 #include "qgsgeorefconfigdialog.h"
 #include "qgis.h"
 
-QgsGeorefConfigDialog::QgsGeorefConfigDialog( QWidget *parent ) :
-    QDialog( parent )
+QgsGeorefConfigDialog::QgsGeorefConfigDialog( QWidget *parent )
+    : QDialog( parent )
 {
   setupUi( this );
 
diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp
index 8af66a631c9..5994da3ffea 100644
--- a/src/plugins/georeferencer/qgsgeoreftransform.cpp
+++ b/src/plugins/georeferencer/qgsgeoreftransform.cpp
@@ -487,7 +487,9 @@ int QgsHelmertGeorefTransform::helmert_transform( void *pTransformerArg, int bDs
   return true;
 }
 
-QgsGDALGeorefTransform::QgsGDALGeorefTransform( bool useTPS, unsigned int polynomialOrder ) : mPolynomialOrder( qMin( 3u, polynomialOrder ) ), mIsTPSTransform( useTPS )
+QgsGDALGeorefTransform::QgsGDALGeorefTransform( bool useTPS, unsigned int polynomialOrder )
+    : mPolynomialOrder( qMin( 3u, polynomialOrder ) )
+    , mIsTPSTransform( useTPS )
 {
   mGDALTransformer     = nullptr;
   mGDALTransformerArgs = nullptr;
diff --git a/src/plugins/gps_importer/qgsbabelformat.cpp b/src/plugins/gps_importer/qgsbabelformat.cpp
index 3493abebf7b..cfb17e133ca 100644
--- a/src/plugins/gps_importer/qgsbabelformat.cpp
+++ b/src/plugins/gps_importer/qgsbabelformat.cpp
@@ -22,10 +22,13 @@
 #include <QString>
 
 
-QgsBabelFormat::QgsBabelFormat( const QString& name ) :
-    mName( name ),
-    mSupportsImport( false ), mSupportsExport( false ),
-    mSupportsWaypoints( false ), mSupportsRoutes( false ), mSupportsTracks( false )
+QgsBabelFormat::QgsBabelFormat( const QString& name )
+    : mName( name )
+    , mSupportsImport( false )
+    , mSupportsExport( false )
+    , mSupportsWaypoints( false )
+    , mSupportsRoutes( false )
+    , mSupportsTracks( false )
 {
 }
 
diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
index 41675e0c43b..dd36e2b72e0 100644
--- a/src/plugins/grass/qgsgrassmapcalc.cpp
+++ b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -2062,8 +2062,8 @@ QgsGrassMapcalcFunction::~QgsGrassMapcalcFunction()
 /******************** CANVAS VIEW ******************************/
 
 QgsGrassMapcalcView::QgsGrassMapcalcView( QgsGrassMapcalc * mapcalc,
-    QWidget * parent, Qt::WindowFlags f ) :
-    QGraphicsView( parent )
+    QWidget * parent, Qt::WindowFlags f )
+    : QGraphicsView( parent )
 {
   Q_UNUSED( f );
   setAttribute( Qt::WA_StaticContents );
diff --git a/src/plugins/grass/qgsgrassmoduleparam.cpp b/src/plugins/grass/qgsgrassmoduleparam.cpp
index 28c39f84449..c24e182819f 100644
--- a/src/plugins/grass/qgsgrassmoduleparam.cpp
+++ b/src/plugins/grass/qgsgrassmoduleparam.cpp
@@ -1622,7 +1622,8 @@ QgsGrassModuleFile::~QgsGrassModuleFile()
 /***************************** QgsGrassModuleCheckBox *********************************/
 
 QgsGrassModuleCheckBox::QgsGrassModuleCheckBox( const QString & text, QWidget * parent )
-    : QCheckBox( text, parent ), mText( text )
+    : QCheckBox( text, parent )
+    , mText( text )
 {
   QgsDebugMsg( "entered" );
   adjustText();
diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
index 782e42ea385..5407d443833 100644
--- a/src/plugins/grass/qgsgrassnewmapset.cpp
+++ b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -60,9 +60,9 @@ bool QgsGrassNewMapset::mRunning = false;
 
 QgsGrassNewMapset::QgsGrassNewMapset( QgisInterface *iface,
                                       QgsGrassPlugin *plugin, QWidget * parent,
-                                      Qt::WindowFlags f ) :
-    QWizard( parent, f ),
-    QgsGrassNewMapsetBase()
+                                      Qt::WindowFlags f )
+    : QWizard( parent, f )
+    , QgsGrassNewMapsetBase()
 {
   QgsDebugMsg( "QgsGrassNewMapset()" );
 
diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp
index 2154ac9f203..d0c2b5efdc8 100644
--- a/src/plugins/grass/qgsgrasstools.cpp
+++ b/src/plugins/grass/qgsgrasstools.cpp
@@ -52,7 +52,8 @@ class QgsGrassToolsTreeFilterProxyModel : public QSortFilterProxyModel
 {
   public:
     explicit QgsGrassToolsTreeFilterProxyModel( QObject *parent )
-        : QSortFilterProxyModel( parent ), mModel( 0 )
+        : QSortFilterProxyModel( parent )
+        , mModel( 0 )
     {
       setDynamicSortFilter( true );
       mRegExp.setPatternSyntax( QRegExp::Wildcard );
diff --git a/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp b/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
index 694787f7422..569164caa93 100644
--- a/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
+++ b/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
@@ -33,7 +33,9 @@
 
 QgsOracleSelectGeoraster::QgsOracleSelectGeoraster( QWidget* parent,
     QgisInterface* iface,
-    Qt::WindowFlags fl ) : QDialog( parent, fl ), mIface( iface )
+    Qt::WindowFlags fl )
+    : QDialog( parent, fl )
+    , mIface( iface )
 {
   setupUi( this );
 
diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp
index 3b6ac1069d2..5b6c729791d 100644
--- a/src/plugins/roadgraph/shortestpathwidget.cpp
+++ b/src/plugins/roadgraph/shortestpathwidget.cpp
@@ -54,7 +54,9 @@
 
 //standard includes
 
-RgShortestPathWidget::RgShortestPathWidget( QWidget* theParent, RoadGraphPlugin *thePlugin )   : QDockWidget( theParent ), mPlugin( thePlugin )
+RgShortestPathWidget::RgShortestPathWidget( QWidget* theParent, RoadGraphPlugin *thePlugin )
+    : QDockWidget( theParent )
+    , mPlugin( thePlugin )
 {
   setWindowTitle( tr( "Shortest path" ) );
   setObjectName( "ShortestPathDock" );
diff --git a/src/plugins/roadgraph/units.cpp b/src/plugins/roadgraph/units.cpp
index 672c4593ea2..11168afd2b9 100644
--- a/src/plugins/roadgraph/units.cpp
+++ b/src/plugins/roadgraph/units.cpp
@@ -23,8 +23,9 @@ Unit::Unit()
   mMultipler = 1.0;
 }
 
-Unit::Unit( const QString& name, double multipler ) :
-    mName( name ), mMultipler( multipler )
+Unit::Unit( const QString& name, double multipler )
+    : mName( name )
+    , mMultipler( multipler )
 {
 }
 
@@ -50,14 +51,16 @@ Unit Unit::byName( const QString& name )
   return Unit();
 }
 
-SpeedUnit::SpeedUnit() :
-    mTimeUnit( "", 1 ), mDistanceUnit( "", 1 )
+SpeedUnit::SpeedUnit()
+    : mTimeUnit( "", 1 )
+    , mDistanceUnit( "", 1 )
 {
 
 }
 
-SpeedUnit::SpeedUnit( const Unit& distanceUnit, const Unit& timeUnit ) :
-    mTimeUnit( timeUnit ), mDistanceUnit( distanceUnit )
+SpeedUnit::SpeedUnit( const Unit& distanceUnit, const Unit& timeUnit )
+    : mTimeUnit( timeUnit )
+    , mDistanceUnit( distanceUnit )
 {
 }
 
diff --git a/src/plugins/topology/topolError.h b/src/plugins/topology/topolError.h
index d53b45e5cb1..f9118a9ff06 100644
--- a/src/plugins/topology/topolError.h
+++ b/src/plugins/topology/topolError.h
@@ -29,15 +29,19 @@ typedef bool ( TopolError::*fixFunction )();
 class FeatureLayer
 {
   public:
-    FeatureLayer() :
-        layer( nullptr ), feature( QgsFeature() ) {}
+    FeatureLayer()
+        : layer( nullptr )
+        , feature( QgsFeature() )
+    {}
     /**
      * Constructor
      * @param theLayer layer pointer
      * @param theFeature QgsFeature
      */
-    FeatureLayer( QgsVectorLayer* theLayer, const QgsFeature& theFeature ) :
-        layer( theLayer ), feature( theFeature ) {}
+    FeatureLayer( QgsVectorLayer* theLayer, const QgsFeature& theFeature )
+        : layer( theLayer )
+        , feature( theFeature )
+    {}
 
     QgsVectorLayer* layer;
     QgsFeature feature;
diff --git a/src/providers/db2/qgsdb2newconnection.cpp b/src/providers/db2/qgsdb2newconnection.cpp
index 4cbd59414be..dc6341f2699 100644
--- a/src/providers/db2/qgsdb2newconnection.cpp
+++ b/src/providers/db2/qgsdb2newconnection.cpp
@@ -32,7 +32,8 @@
 #include "qgscontexthelp.h"
 
 QgsDb2NewConnection::QgsDb2NewConnection( QWidget *parent, const QString& connName, Qt::WindowFlags fl )
-    : QDialog( parent, fl ), mOriginalConnName( connName )
+    : QDialog( parent, fl )
+    , mOriginalConnName( connName )
     , mAuthConfigSelect( nullptr )
 {
   setupUi( this );
diff --git a/src/providers/delimitedtext/qgsdelimitedtextfile.cpp b/src/providers/delimitedtext/qgsdelimitedtextfile.cpp
index 4af29bf833e..a68bc447d19 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextfile.cpp
+++ b/src/providers/delimitedtext/qgsdelimitedtextfile.cpp
@@ -30,30 +30,30 @@
 #include <QUrl>
 
 
-QgsDelimitedTextFile::QgsDelimitedTextFile( const QString& url ) :
-    mFileName( QString() ),
-    mEncoding( "UTF-8" ),
-    mFile( nullptr ),
-    mStream( nullptr ),
-    mUseWatcher( true ),
-    mWatcher( nullptr ),
-    mDefinitionValid( false ),
-    mUseHeader( true ),
-    mDiscardEmptyFields( false ),
-    mTrimFields( false ),
-    mSkipLines( 0 ),
-    mMaxFields( 0 ),
-    mMaxNameLength( 200 ), // Don't want field names to be too unweildy!
-    mAnchoredRegexp( false ),
-    mLineNumber( -1 ),
-    mRecordLineNumber( -1 ),
-    mRecordNumber( -1 ),
-    mHoldCurrentRecord( false ),
-    mMaxRecordNumber( -1 ),
-    mMaxFieldCount( 0 ),
-    mDefaultFieldName( "field_%1" ),
+QgsDelimitedTextFile::QgsDelimitedTextFile( const QString& url )
+    : mFileName( QString() )
+    , mEncoding( "UTF-8" )
+    , mFile( nullptr )
+    , mStream( nullptr )
+    , mUseWatcher( true )
+    , mWatcher( nullptr )
+    , mDefinitionValid( false )
+    , mUseHeader( true )
+    , mDiscardEmptyFields( false )
+    , mTrimFields( false )
+    , mSkipLines( 0 )
+    , mMaxFields( 0 )
+    , mMaxNameLength( 200 ) // Don't want field names to be too unweildy!
+    , mAnchoredRegexp( false )
+    , mLineNumber( -1 )
+    , mRecordLineNumber( -1 )
+    , mRecordNumber( -1 )
+    , mHoldCurrentRecord( false )
+    , mMaxRecordNumber( -1 )
+    , mMaxFieldCount( 0 )
+    , mDefaultFieldName( "field_%1" )
     // field_ is optional in following regexp to simplify QgsDelimitedTextFile::fieldNumber()
-    mDefaultFieldRegexp( "^(?:field_)?(\\d+)$", Qt::CaseInsensitive )
+    , mDefaultFieldRegexp( "^(?:field_)?(\\d+)$", Qt::CaseInsensitive )
 {
   // The default type is CSV
   setTypeCSV();
diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
index db9de73e34b..3127c8f348a 100644
--- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
+++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
@@ -33,13 +33,13 @@
 
 const int MAX_SAMPLE_LENGTH = 200;
 
-QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget * parent, Qt::WindowFlags fl, bool embedded ):
-    QDialog( parent, fl ),
-    mFile( new QgsDelimitedTextFile() ),
-    mExampleRowCount( 20 ),
-    mBadRowCount( 0 ),
-    mPluginKey( "/Plugin-DelimitedText" ),
-    mLastFileType( "" )
+QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget * parent, Qt::WindowFlags fl, bool embedded )
+    : QDialog( parent, fl )
+    , mFile( new QgsDelimitedTextFile() )
+    , mExampleRowCount( 20 )
+    , mBadRowCount( 0 )
+    , mPluginKey( "/Plugin-DelimitedText" )
+    , mLastFileType( "" )
 {
 
   setupUi( this );
diff --git a/src/providers/gpx/gpsdata.h b/src/providers/gpx/gpsdata.h
index e79cfacfa34..ab25712b9b5 100644
--- a/src/providers/gpx/gpsdata.h
+++ b/src/providers/gpx/gpsdata.h
@@ -256,7 +256,13 @@ class QgsGPSData
 class QgsGPXHandler
 {
   public:
-    explicit QgsGPXHandler( QgsGPSData& data ) : mData( data ), mObj( nullptr ), mString( nullptr ), mDouble( nullptr ), mInt( nullptr ) { }
+    explicit QgsGPXHandler( QgsGPSData& data )
+        : mData( data )
+        , mObj( nullptr )
+        , mString( nullptr )
+        , mDouble( nullptr )
+        , mInt( nullptr )
+    { }
 
     /** This function is called when expat encounters a new start element in
         the XML stream. */
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
index 929e8da7a23..91ba1397970 100644
--- a/src/providers/grass/qgsgrass.cpp
+++ b/src/providers/grass/qgsgrass.cpp
@@ -87,8 +87,8 @@ extern "C"
 #define GRASS_UNLOCK sMutex.unlock();
 
 QgsGrassObject::QgsGrassObject( const QString& gisdbase, const QString& location,
-                                const QString& mapset, const QString& name, Type type ) :
-    mGisdbase( gisdbase )
+                                const QString& mapset, const QString& name, Type type )
+    : mGisdbase( gisdbase )
     , mLocation( location )
     , mMapset( mapset )
     , mName( name )
diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp
index d117c749b93..f47288fe6e7 100644
--- a/src/providers/grass/qgsgrassprovidermodule.cpp
+++ b/src/providers/grass/qgsgrassprovidermodule.cpp
@@ -988,8 +988,8 @@ bool QgsGrassObjectItem::equal( const QgsDataItem *other )
 
 //----------------------- QgsGrassVectorItem ------------------------------
 
-QgsGrassVectorItem::QgsGrassVectorItem( QgsDataItem* parent, QgsGrassObject grassObject, QString path, QString labelName, bool valid ) :
-    QgsDataCollectionItem( parent, labelName.isEmpty() ? grassObject.name() : labelName, path )
+QgsGrassVectorItem::QgsGrassVectorItem( QgsDataItem* parent, QgsGrassObject grassObject, QString path, QString labelName, bool valid )
+    : QgsDataCollectionItem( parent, labelName.isEmpty() ? grassObject.name() : labelName, path )
     , QgsGrassObjectItemBase( grassObject )
     , mValid( valid )
     , mActions( 0 )
diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp
index f0738be2fcb..a3ec18decb9 100644
--- a/src/providers/mssql/qgsmssqlnewconnection.cpp
+++ b/src/providers/mssql/qgsmssqlnewconnection.cpp
@@ -27,7 +27,8 @@
 #include "qgscontexthelp.h"
 
 QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& connName, Qt::WindowFlags fl )
-    : QDialog( parent, fl ), mOriginalConnName( connName )
+    : QDialog( parent, fl )
+    , mOriginalConnName( connName )
 {
   setupUi( this );
 
diff --git a/src/providers/ogr/qgsogrconnpool.h b/src/providers/ogr/qgsogrconnpool.h
index 5d28f78f2ac..28b8c4e3d24 100644
--- a/src/providers/ogr/qgsogrconnpool.h
+++ b/src/providers/ogr/qgsogrconnpool.h
@@ -62,7 +62,10 @@ class QgsOgrConnPoolGroup : public QObject, public QgsConnectionPoolGroup<QgsOgr
     Q_OBJECT
 
   public:
-    explicit QgsOgrConnPoolGroup( QString name ) : QgsConnectionPoolGroup<QgsOgrConn*>( name ), mRefCount( 0 ) { initTimer( this ); }
+    explicit QgsOgrConnPoolGroup( QString name )
+        : QgsConnectionPoolGroup<QgsOgrConn*>( name )
+        , mRefCount( 0 )
+    { initTimer( this ); }
     void ref() { ++mRefCount; }
     bool unref()
     {
diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp
index 4f7f2c88c6f..1be3177fb8c 100644
--- a/src/providers/postgres/qgspgnewconnection.cpp
+++ b/src/providers/postgres/qgspgnewconnection.cpp
@@ -26,7 +26,8 @@
 #include "qgspostgresconn.h"
 
 QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString& connName, Qt::WindowFlags fl )
-    : QDialog( parent, fl ), mOriginalConnName( connName )
+    : QDialog( parent, fl )
+    , mOriginalConnName( connName )
     , mAuthConfigSelect( nullptr )
 {
   setupUi( this );
diff --git a/src/providers/postgres/qgspostgrestransaction.cpp b/src/providers/postgres/qgspostgrestransaction.cpp
index 4c2b612d18e..750cb751446 100644
--- a/src/providers/postgres/qgspostgrestransaction.cpp
+++ b/src/providers/postgres/qgspostgrestransaction.cpp
@@ -21,7 +21,8 @@
 #include "qgis.h"
 
 QgsPostgresTransaction::QgsPostgresTransaction( const QString &connString )
-    : QgsTransaction( connString ), mConn( nullptr )
+    : QgsTransaction( connString )
+    , mConn( nullptr )
 {
 
 }
diff --git a/src/providers/spatialite/qgsspatialiteconnection.h b/src/providers/spatialite/qgsspatialiteconnection.h
index 489fee092e6..be6f55a938b 100644
--- a/src/providers/spatialite/qgsspatialiteconnection.h
+++ b/src/providers/spatialite/qgsspatialiteconnection.h
@@ -41,7 +41,10 @@ class QgsSpatiaLiteConnection : public QObject
     typedef struct TableEntry
     {
       TableEntry( const QString& _tableName, const QString& _column, const QString& _type )
-          : tableName( _tableName ), column( _column ), type( _type ) {}
+          : tableName( _tableName )
+          , column( _column )
+          , type( _type )
+      {}
       QString tableName;
       QString column;
       QString type;
@@ -131,7 +134,10 @@ class QgsSqliteHandle
     //
   public:
     QgsSqliteHandle( sqlite3 * handle, const QString& dbPath, bool shared )
-        : ref( shared ? 1 : -1 ), sqlite_handle( handle ), mDbPath( dbPath ), mIsValid( true )
+        : ref( shared ? 1 : -1 )
+        , sqlite_handle( handle )
+        , mDbPath( dbPath )
+        , mIsValid( true )
     {
     }
 
diff --git a/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp b/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp
index 3c708251405..714c0ff0309 100644
--- a/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp
+++ b/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp
@@ -238,8 +238,8 @@ bool QgsVirtualLayerFeatureIterator::fetchFeature( QgsFeature& feature )
   return true;
 }
 
-QgsVirtualLayerFeatureSource::QgsVirtualLayerFeatureSource( const QgsVirtualLayerProvider* p ) :
-    mProvider( p )
+QgsVirtualLayerFeatureSource::QgsVirtualLayerFeatureSource( const QgsVirtualLayerProvider* p )
+    : mProvider( p )
 {
 }
 
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.h b/src/providers/virtual/qgsvirtuallayerprovider.h
index bc8a87c3320..1b1e030a282 100644
--- a/src/providers/virtual/qgsvirtuallayerprovider.h
+++ b/src/providers/virtual/qgsvirtuallayerprovider.h
@@ -103,9 +103,17 @@ class QgsVirtualLayerProvider: public QgsVectorDataProvider
     struct SourceLayer
     {
       SourceLayer(): layer( nullptr ) {}
-      SourceLayer( QgsVectorLayer *l, const QString& n = "" ) : layer( l ), name( n ) {}
-      SourceLayer( const QString& p, const QString& s, const QString& n, const QString& e = "UTF-8" ) :
-          layer( nullptr ), name( n ), source( s ), provider( p ), encoding( e ) {}
+      SourceLayer( QgsVectorLayer *l, const QString& n = "" )
+          : layer( l )
+          , name( n )
+      {}
+      SourceLayer( const QString& p, const QString& s, const QString& n, const QString& e = "UTF-8" )
+          : layer( nullptr )
+          , name( n )
+          , source( s )
+          , provider( p )
+          , encoding( e )
+      {}
       // non-null if it refers to a live layer
       QgsVectorLayer* layer;
       QString name;
diff --git a/src/providers/virtual/qgsvirtuallayerqueryparser.h b/src/providers/virtual/qgsvirtuallayerqueryparser.h
index 8d35f80c86b..d2c3da8e481 100644
--- a/src/providers/virtual/qgsvirtuallayerqueryparser.h
+++ b/src/providers/virtual/qgsvirtuallayerqueryparser.h
@@ -38,13 +38,21 @@ namespace QgsVirtualLayerQueryParser
   {
     public:
       ColumnDef()
-          : mType( QVariant::Invalid ), mWkbType( QgsWKBTypes::Unknown ), mSrid( -1 )
+          : mType( QVariant::Invalid )
+          , mWkbType( QgsWKBTypes::Unknown )
+          , mSrid( -1 )
       {}
       ColumnDef( const QString& name, QgsWKBTypes::Type aWkbType, long aSrid )
-          : mName( name ), mType( QVariant::UserType ), mWkbType( aWkbType ), mSrid( aSrid )
+          : mName( name )
+          , mType( QVariant::UserType )
+          , mWkbType( aWkbType )
+          , mSrid( aSrid )
       {}
       ColumnDef( const QString& name, QVariant::Type aType )
-          : mName( name ), mType( aType ), mWkbType( QgsWKBTypes::NoGeometry ), mSrid( -1 )
+          : mName( name )
+          , mType( aType )
+          , mWkbType( QgsWKBTypes::NoGeometry )
+          , mSrid( -1 )
       {}
 
       QString name() const { return mName; }
diff --git a/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp b/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
index 8bcc0f44f70..e2e45f333e3 100644
--- a/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
+++ b/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
@@ -87,7 +87,9 @@ void QgsScopedSqlite::close_()
 
 namespace Sqlite
 {
-  Query::Query( sqlite3* db, const QString& q ) : db_( db ), nBind_( 1 )
+  Query::Query( sqlite3* db, const QString& q )
+      : db_( db )
+      , nBind_( 1 )
   {
     QByteArray ba( q.toLocal8Bit() );
     int r = sqlite3_prepare_v2( db, ba.constData(), ba.size(), &stmt_, nullptr );
diff --git a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
index 468a15528d8..c77c919f0d2 100644
--- a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
+++ b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
@@ -256,7 +256,10 @@ struct VTableCursor
   QgsFeatureIterator mIterator;
   bool mEof;
 
-  VTableCursor( VTable *vtab ) : mVtab( vtab ), mEof( true ) {}
+  VTableCursor( VTable *vtab )
+      : mVtab( vtab )
+      , mEof( true )
+  {}
 
   void filter( const QgsFeatureRequest& request )
   {
diff --git a/src/providers/wcs/qgswcscapabilities.h b/src/providers/wcs/qgswcscapabilities.h
index c13687eec30..d5ad6bc13a1 100644
--- a/src/providers/wcs/qgswcscapabilities.h
+++ b/src/providers/wcs/qgswcscapabilities.h
@@ -37,7 +37,14 @@ class QNetworkReply;
 /** CoverageSummary structure */
 struct QgsWcsCoverageSummary
 {
-  QgsWcsCoverageSummary() : orderId( 0 ), valid( false ), described( false ), width( 0 ), height( 0 ), hasSize( false ) { }
+  QgsWcsCoverageSummary()
+      : orderId( 0 )
+      , valid( false )
+      , described( false )
+      , width( 0 )
+      , height( 0 )
+      , hasSize( false )
+  { }
 
   int           orderId;
   QString       identifier;
diff --git a/src/providers/wfs/qgswfsdescribefeaturetype.cpp b/src/providers/wfs/qgswfsdescribefeaturetype.cpp
index 42456a3ede6..06ced8f7480 100644
--- a/src/providers/wfs/qgswfsdescribefeaturetype.cpp
+++ b/src/providers/wfs/qgswfsdescribefeaturetype.cpp
@@ -15,8 +15,8 @@
 
 #include "qgswfsdescribefeaturetype.h"
 
-QgsWFSDescribeFeatureType::QgsWFSDescribeFeatureType( const QString& theUri ) :
-    QgsWFSRequest( theUri )
+QgsWFSDescribeFeatureType::QgsWFSDescribeFeatureType( const QString& theUri )
+    : QgsWFSRequest( theUri )
 {
 }
 
diff --git a/src/providers/wms/qgswmscapabilities.h b/src/providers/wms/qgswmscapabilities.h
index c0273a95420..1278ae2dcff 100644
--- a/src/providers/wms/qgswmscapabilities.h
+++ b/src/providers/wms/qgswmscapabilities.h
@@ -428,7 +428,10 @@ enum QgsWmsDpiMode
 
 struct QgsWmsParserSettings
 {
-  QgsWmsParserSettings( bool ignAxis = false, bool invAxis = false ) : ignoreAxisOrientation( ignAxis ), invertAxisOrientation( invAxis ) {}
+  QgsWmsParserSettings( bool ignAxis = false, bool invAxis = false )
+      : ignoreAxisOrientation( ignAxis )
+      , invertAxisOrientation( invAxis )
+  {}
   bool ignoreAxisOrientation;
   bool invertAxisOrientation;
 };
@@ -436,7 +439,11 @@ struct QgsWmsParserSettings
 struct QgsWmsAuthorization
 {
   QgsWmsAuthorization( const QString& userName = QString(), const QString& password = QString(), const QString& referer = QString(), const QString& authcfg = QString() )
-      : mUserName( userName ), mPassword( password ), mReferer( referer ), mAuthCfg( authcfg ) {}
+      : mUserName( userName )
+      , mPassword( password )
+      , mReferer( referer )
+      , mAuthCfg( authcfg )
+  {}
 
   bool setAuthorization( QNetworkRequest &request ) const
   {
diff --git a/src/providers/wms/qgswmsconnection.cpp b/src/providers/wms/qgswmsconnection.cpp
index 89fb5607b8b..fa910768482 100644
--- a/src/providers/wms/qgswmsconnection.cpp
+++ b/src/providers/wms/qgswmsconnection.cpp
@@ -36,8 +36,8 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 
-QgsWMSConnection::QgsWMSConnection( const QString& theConnName ) :
-    mConnName( theConnName )
+QgsWMSConnection::QgsWMSConnection( const QString& theConnName )
+    : mConnName( theConnName )
 {
   QgsDebugMsg( "theConnName = " + theConnName );
 
diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
index 7e2bed23d04..c85c3a6bb9c 100644
--- a/src/providers/wms/qgswmsprovider.h
+++ b/src/providers/wms/qgswmsprovider.h
@@ -600,7 +600,11 @@ class QgsWmsTiledImageDownloadHandler : public QObject
 
     struct TileRequest
     {
-      TileRequest( const QUrl& u, const QRectF& r, int i ) : url( u ), rect( r ), index( i ) {}
+      TileRequest( const QUrl& u, const QRectF& r, int i )
+          : url( u )
+          , rect( r )
+          , index( i )
+      {}
       QUrl url;
       QRectF rect;
       int index;
@@ -649,7 +653,11 @@ class QgsWmsStatistics
   public:
     struct Stat
     {
-      Stat() : errors( 0 ), cacheHits( 0 ), cacheMisses( 0 ) {}
+      Stat()
+          : errors( 0 )
+          , cacheHits( 0 )
+          , cacheMisses( 0 )
+      {}
       int errors;
       int cacheHits;
       int cacheMisses;
diff --git a/src/server/qgsserverinterfaceimpl.cpp b/src/server/qgsserverinterfaceimpl.cpp
index f3cd90fbee3..88935c070fa 100644
--- a/src/server/qgsserverinterfaceimpl.cpp
+++ b/src/server/qgsserverinterfaceimpl.cpp
@@ -21,8 +21,8 @@
 
 
 /** Constructor */
-QgsServerInterfaceImpl::QgsServerInterfaceImpl( QgsCapabilitiesCache* capCache ) :
-    mCapabilitiesCache( capCache )
+QgsServerInterfaceImpl::QgsServerInterfaceImpl( QgsCapabilitiesCache* capCache )
+    : mCapabilitiesCache( capCache )
 {
   mRequestHandler = nullptr;
   mAccessControls = new QgsAccessControl();
diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp
index c1d4b55723c..25d33e37eac 100644
--- a/tests/src/core/testqgslegendrenderer.cpp
+++ b/tests/src/core/testqgslegendrenderer.cpp
@@ -97,7 +97,11 @@ class TestQgsLegendRenderer : public QObject
 
   public:
     TestQgsLegendRenderer()
-        : mRoot( 0 ), mVL1( 0 ), mVL2( 0 ), mVL3( 0 ), mRL( 0 )
+        : mRoot( 0 )
+        , mVL1( 0 )
+        , mVL2( 0 )
+        , mVL3( 0 )
+        , mRL( 0 )
     {}
 
   private slots:
diff --git a/tests/src/core/testqgsmaplayer.cpp b/tests/src/core/testqgsmaplayer.cpp
index 9bda757edec..a80088c09df 100644
--- a/tests/src/core/testqgsmaplayer.cpp
+++ b/tests/src/core/testqgsmaplayer.cpp
@@ -31,7 +31,10 @@ class TestSignalReceiver : public QObject
     Q_OBJECT
 
   public:
-    TestSignalReceiver() : QObject( 0 ), blendMode( QPainter::CompositionMode_SourceOver ) {}
+    TestSignalReceiver()
+        : QObject( 0 )
+        , blendMode( QPainter::CompositionMode_SourceOver )
+    {}
     QPainter::CompositionMode blendMode;
   public slots:
     void onBlendModeChanged( const QPainter::CompositionMode blendMode )
diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp
index 0693b27dc63..93b8a48e0a1 100644
--- a/tests/src/core/testqgspainteffect.cpp
+++ b/tests/src/core/testqgspainteffect.cpp
@@ -48,7 +48,10 @@
 class DummyPaintEffect : public QgsPaintEffect
 {
   public:
-    DummyPaintEffect( const QString& prop1, const QString& prop2 ) : mProp1( prop1 ), mProp2( prop2 ) {}
+    DummyPaintEffect( const QString& prop1, const QString& prop2 )
+        : mProp1( prop1 )
+        , mProp2( prop2 )
+    {}
     virtual ~DummyPaintEffect() {}
     virtual QString type() const override { return "Dummy"; }
     virtual QgsPaintEffect* clone() const override { return new DummyPaintEffect( mProp1, mProp2 ); }
diff --git a/tests/src/core/testqgspointlocator.cpp b/tests/src/core/testqgspointlocator.cpp
index cb7e8056b44..a945d461d01 100644
--- a/tests/src/core/testqgspointlocator.cpp
+++ b/tests/src/core/testqgspointlocator.cpp
@@ -36,7 +36,10 @@ struct FilterExcludePoint : public QgsPointLocator::MatchFilter
 
 struct FilterExcludeEdge : public QgsPointLocator::MatchFilter
 {
-  FilterExcludeEdge( const QgsPoint& p1, const QgsPoint& p2 ) : mP1( p1 ), mP2( p2 ) {}
+  FilterExcludeEdge( const QgsPoint& p1, const QgsPoint& p2 )
+      : mP1( p1 )
+      , mP2( p2 )
+  {}
 
   bool acceptMatch( const QgsPointLocator::Match& match )
   {
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp
index 199df3e6615..7de0e2936d0 100644
--- a/tests/src/core/testqgsrasterlayer.cpp
+++ b/tests/src/core/testqgsrasterlayer.cpp
@@ -112,8 +112,9 @@ class TestSignalReceiver : public QObject
     Q_OBJECT
 
   public:
-    TestSignalReceiver() : QObject( nullptr ),
-        rendererChanged( false )
+    TestSignalReceiver()
+        : QObject( nullptr )
+        , rendererChanged( false )
     {}
     bool rendererChanged;
   public slots:
diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp
index 08c5a6a75bd..5d287b28d9e 100644
--- a/tests/src/providers/grass/testqgsgrassprovider.cpp
+++ b/tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -78,8 +78,18 @@ class TestQgsGrassCommand
       RedoAll
     };
 
-    TestQgsGrassCommand() : command( AddFeature ), verify( true ), fid( 0 ), geometry( 0 ) {}
-    TestQgsGrassCommand( Command c ) : command( c ), verify( true ), fid( 0 ), geometry( 0 ) {}
+    TestQgsGrassCommand()
+        : command( AddFeature )
+        , verify( true )
+        , fid( 0 )
+        , geometry( 0 )
+    {}
+    TestQgsGrassCommand( Command c )
+        : command( c )
+        , verify( true )
+        , fid( 0 )
+        , geometry( 0 )
+    {}
 
     QString toString() const;
     Command command;