Standardise format of initializer lists

This commit is contained in:
Nyall Dawson 2016-05-03 09:38:04 +10:00
parent cad3a5aecc
commit ccebd83aa4
199 changed files with 1002 additions and 459 deletions

View File

@ -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 )
{
}

View File

@ -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 )
{
}

View File

@ -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 )
{
}

View File

@ -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
{
}

View File

@ -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();
}

View File

@ -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 );

View File

@ -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; }

View File

@ -22,7 +22,8 @@ QString QgsOSMDownload::queryFromRect( const QgsRectangle& rect )
QgsOSMDownload::QgsOSMDownload()
: mServiceUrl( defaultServiceUrl() ), mReply( nullptr )
: mServiceUrl( defaultServiceUrl() )
, mReply( nullptr )
{
}

View File

@ -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 )
{
}

View File

@ -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 )
{
}

View File

@ -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;
};

View File

@ -30,7 +30,8 @@
#include "qgsosmdownload.h"
QgsOSMDownloadDialog::QgsOSMDownloadDialog( QWidget* parent )
: QDialog( parent ), mDownload( new QgsOSMDownload )
: QDialog( parent )
, mDownload( new QgsOSMDownload )
{
setupUi( this );

View File

@ -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 );

View File

@ -23,7 +23,8 @@
#include "qgsosmimport.h"
QgsOSMImportDialog::QgsOSMImportDialog( QWidget* parent )
: QDialog( parent ), mImport( new QgsOSMXmlImport )
: QDialog( parent )
, mImport( new QgsOSMXmlImport )
{
setupUi( this );

View File

@ -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;

View File

@ -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 )

View File

@ -29,7 +29,8 @@
#include <QSettings>
QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget* parent )
: QDialog( parent ), mGettingShortcut( false )
: QDialog( parent )
, mGettingShortcut( false )
{
setupUi( this );

View File

@ -24,7 +24,8 @@
#include <QPushButton>
QgsDecorationCopyrightDialog::QgsDecorationCopyrightDialog( QgsDecorationCopyright& deco, QWidget* parent )
: QDialog( parent ), mDeco( deco )
: QDialog( parent )
, mDeco( deco )
{
setupUi( this );

View File

@ -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 );

View File

@ -22,7 +22,8 @@
#include <QPushButton>
QgsDecorationNorthArrowDialog::QgsDecorationNorthArrowDialog( QgsDecorationNorthArrow& deco, QWidget* parent )
: QDialog( parent ), mDeco( deco )
: QDialog( parent )
, mDeco( deco )
{
setupUi( this );

View File

@ -21,7 +21,8 @@
#include <QPushButton>
QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar& deco, int units, QWidget* parent )
: QDialog( parent ), mDeco( deco )
: QDialog( parent )
, mDeco( deco )
{
setupUi( this );

View File

@ -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 );

View File

@ -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" ) );

View File

@ -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:

View File

@ -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 );

View File

@ -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 )
{
}

View File

@ -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 )
{
}

View File

@ -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;

View File

@ -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 );

View File

@ -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 );

View File

@ -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 )
{
}

View File

@ -52,7 +52,8 @@ QgsPluginRegistry *QgsPluginRegistry::instance()
}
QgsPluginRegistry::QgsPluginRegistry()
: mPythonUtils( nullptr ), mQgisInterface( nullptr )
: mPythonUtils( nullptr )
, mQgisInterface( nullptr )
{
// constructor does nothing
}

View File

@ -1,8 +1,8 @@
#include "qgsrelationadddlg.h"
#include "qgsvectorlayer.h"
QgsRelationAddDlg::QgsRelationAddDlg( QWidget *parent ) :
QDialog( parent )
QgsRelationAddDlg::QgsRelationAddDlg( QWidget *parent )
: QDialog( parent )
{
setupUi( this );

View File

@ -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 );
}

View File

@ -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 )
{

View File

@ -25,7 +25,8 @@
//QgsComposerAttributeTableCompare
QgsComposerAttributeTableCompare::QgsComposerAttributeTableCompare()
: mCurrentSortColumn( 0 ), mAscending( true )
: mCurrentSortColumn( 0 )
, mAscending( true )
{
}

View File

@ -30,7 +30,8 @@
//QgsComposerAttributeTableCompareV2
QgsComposerAttributeTableCompareV2::QgsComposerAttributeTableCompareV2()
: mCurrentSortColumn( 0 ), mAscending( true )
: mCurrentSortColumn( 0 )
, mAscending( true )
{
}

View File

@ -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;

View File

@ -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() ) );

View File

@ -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 );

View File

@ -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 );

View File

@ -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 )
{
}

View File

@ -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
*/

View File

@ -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 )
{

View File

@ -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();
}

View File

@ -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;

View File

@ -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];

View File

@ -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;
};

View File

@ -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;

View File

@ -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

View File

@ -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; }

View File

@ -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;

View File

@ -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

View File

@ -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 );
}

View File

@ -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 );

View File

@ -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;

View File

@ -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 );
}

View File

@ -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 )
{
}

View File

@ -26,8 +26,8 @@
#include "qgsdiagramrendererv2.h"
QgsMapLayerLegend::QgsMapLayerLegend( QObject *parent ) :
QObject( parent )
QgsMapLayerLegend::QgsMapLayerLegend( QObject *parent )
: QObject( parent )
{
}

View File

@ -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;

View File

@ -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;

View File

@ -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 );

View File

@ -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 ) );
}

View File

@ -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()

View File

@ -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 ); }

View File

@ -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 )
{

View File

@ -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 );

View File

@ -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();
}

View File

@ -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 )

View File

@ -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

View File

@ -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 )

View File

@ -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
{

View File

@ -72,7 +72,8 @@ QgsTransaction* QgsTransaction::create( const QStringList& layerIds )
QgsTransaction::QgsTransaction( const QString& connString )
: mConnString( connString ), mTransactionActive( false )
: mConnString( connString )
, mTransactionActive( false )
{
}

View File

@ -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;

View File

@ -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 )

View File

@ -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 )
{
}

View File

@ -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(); }

View File

@ -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;

View File

@ -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 )
{
}

View File

@ -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 ) );

View File

@ -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;

View File

@ -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 );

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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:

View File

@ -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; }

View File

@ -822,7 +822,8 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE
/////////////////////
QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root )
: QgsFeatureRendererV2( "RuleRenderer" ), mRootRule( root )
: QgsFeatureRendererV2( "RuleRenderer" )
, mRootRule( root )
{
}

View File

@ -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;
};

View File

@ -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() {}

View File

@ -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 )
{
}

View File

@ -458,7 +458,8 @@ QgsStringMap QgsRandomColorsV2::properties() const
////////////
QgsVectorColorBrewerColorRampV2::QgsVectorColorBrewerColorRampV2( const QString& schemeName, int colors )
: mSchemeName( schemeName ), mColors( colors )
: mSchemeName( schemeName )
, mColors( colors )
{
loadPalette();
}

View File

@ -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;

View File

@ -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:

View File

@ -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 );
}

View File

@ -18,8 +18,8 @@
#include "qgscheckboxwidgetwrapper.h"
#include "qgscheckboxconfigdlg.h"
QgsCheckboxWidgetFactory::QgsCheckboxWidgetFactory( const QString& name ) :
QgsEditorWidgetFactory( name )
QgsCheckboxWidgetFactory::QgsCheckboxWidgetFactory( const QString& name )
: QgsEditorWidgetFactory( name )
{
}

View File

@ -19,8 +19,8 @@
#include <QSettings>
QgsDateTimeEditFactory::QgsDateTimeEditFactory( const QString& name ) :
QgsEditorWidgetFactory( name )
QgsDateTimeEditFactory::QgsDateTimeEditFactory( const QString& name )
: QgsEditorWidgetFactory( name )
{
}

View File

@ -18,8 +18,8 @@
#include "qgsfilenamewidgetwrapper.h"
#include "qgsdummyconfigdlg.h"
QgsFileNameWidgetFactory::QgsFileNameWidgetFactory( const QString& name ) :
QgsEditorWidgetFactory( name )
QgsFileNameWidgetFactory::QgsFileNameWidgetFactory( const QString& name )
: QgsEditorWidgetFactory( name )
{
}

View File

@ -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 );
}

View File

@ -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 )
{
}

Some files were not shown because too many files have changed in this diff Show More