Standardise format of initializer lists

qgis · May 2, 2016 · ccebd83 · ccebd83
1 parent cad3a5a
commit ccebd83
Show file tree

Hide file tree

Showing 199 changed files with 1,002 additions and 459 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 )
 {
 
 }