Skip to content

Commit da69e0f

Browse files
jef-njef-n
committed
indentation update
1 parent b91cbee commit da69e0f

25 files changed

+171
-133
lines changed

‎src/app/ogr/qgsnewogrconnection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#endif
3333

3434
QgsNewOgrConnection::QgsNewOgrConnection( QWidget *parent, const QString& connType, const QString& connName, Qt::WindowFlags fl )
35-
: QDialog( parent, fl ),
36-
mOriginalConnName( connName )
35+
: QDialog( parent, fl )
36+
, mOriginalConnName( connName )
3737
{
3838
setupUi( this );
3939

‎src/core/composer/qgscomposition.cpp

+28-28
Original file line numberDiff line numberDiff line change
@@ -147,34 +147,34 @@ void QgsComposition::init()
147147

148148
/*
149149
QgsComposition::QgsComposition()
150-
: QGraphicsScene( 0 ),
151-
mMapRenderer( 0 ),
152-
mPlotStyle( QgsComposition::Preview ),
153-
mPageWidth( 297 ),
154-
mPageHeight( 210 ),
155-
mSpaceBetweenPages( 10 ),
156-
mPageStyleSymbol( 0 ),
157-
mPrintAsRaster( false ),
158-
mGenerateWorldFile( false ),
159-
mWorldFileMap( 0 ),
160-
mUseAdvancedEffects( true ),
161-
mSnapToGrid( false ),
162-
mGridVisible( false ),
163-
mSnapGridResolution( 0 ),
164-
mSnapGridTolerance( 0 ),
165-
mSnapGridOffsetX( 0 ),
166-
mSnapGridOffsetY( 0 ),
167-
mAlignmentSnap( true ),
168-
mGuidesVisible( true ),
169-
mSmartGuides( true ),
170-
mAlignmentSnapTolerance( 0 ),
171-
mSelectionHandles( 0 ),
172-
mActiveItemCommand( 0 ),
173-
mActiveMultiFrameCommand( 0 ),
174-
mAtlasComposition( this ),
175-
mAtlasMode( QgsComposition::AtlasOff ),
176-
mPreventCursorChange( false ),
177-
mItemsModel( 0 )
150+
: QGraphicsScene( 0 )
151+
, mMapRenderer( 0 )
152+
, mPlotStyle( QgsComposition::Preview )
153+
, mPageWidth( 297 )
154+
, mPageHeight( 210 )
155+
, mSpaceBetweenPages( 10 )
156+
, mPageStyleSymbol( 0 )
157+
, mPrintAsRaster( false )
158+
, mGenerateWorldFile( false )
159+
, mWorldFileMap( 0 )
160+
, mUseAdvancedEffects( true )
161+
, mSnapToGrid( false )
162+
, mGridVisible( false )
163+
, mSnapGridResolution( 0 )
164+
, mSnapGridTolerance( 0 )
165+
, mSnapGridOffsetX( 0 )
166+
, mSnapGridOffsetY( 0 )
167+
, mAlignmentSnap( true )
168+
, mGuidesVisible( true )
169+
, mSmartGuides( true )
170+
, mAlignmentSnapTolerance( 0 )
171+
, mSelectionHandles( 0 )
172+
, mActiveItemCommand( 0 )
173+
, mActiveMultiFrameCommand( 0 )
174+
, mAtlasComposition( this )
175+
, mAtlasMode( QgsComposition::AtlasOff )
176+
, mPreventCursorChange( false )
177+
, mItemsModel( 0 )
178178
{
179179
//load default composition settings
180180
loadDefaults();

‎src/core/gps/qgsqtlocationconnection.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
#include <QtCore/QPointer>
2424

2525
#if defined(HAVE_QT_MOBILITY_LOCATION )
26-
#include <QtLocation/QGeoPositionInfoSource>
27-
#include <QtLocation/QGeoSatelliteInfo>
28-
#include <QtLocation/QGeoSatelliteInfoSource>
26+
#include <QtLocation/QGeoPositionInfoSource>
27+
#include <QtLocation/QGeoSatelliteInfo>
28+
#include <QtLocation/QGeoSatelliteInfoSource>
2929

30-
QTM_USE_NAMESPACE
30+
QTM_USE_NAMESPACE
3131
#else // Using QtPositioning
32-
#include <QtPositioning/QGeoPositionInfoSource>
33-
#include <QtPositioning/QGeoSatelliteInfo>
34-
#include <QtPositioning/QGeoSatelliteInfoSource>
32+
#include <QtPositioning/QGeoPositionInfoSource>
33+
#include <QtPositioning/QGeoSatelliteInfo>
34+
#include <QtPositioning/QGeoSatelliteInfoSource>
3535
#endif
3636

3737
class CORE_EXPORT QgsQtLocationConnection: public QgsGPSConnection

‎src/core/pal/labelposition.cpp

+13-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,19 @@
5555
namespace pal
5656
{
5757
LabelPosition::LabelPosition( int id, double x1, double y1, double w, double h, double alpha, double cost, FeaturePart *feature, bool isReversed, Quadrant quadrant )
58-
: id( id ), cost( cost ), feature( feature ), probFeat( 0 ), nbOverlap( 0 ), alpha( alpha ), w( w ), h( h ), nextPart( NULL ), partId( -1 ), reversed( isReversed ), upsideDown( false ),
59-
quadrant( quadrant )
58+
: id( id )
59+
, cost( cost )
60+
, feature( feature )
61+
, probFeat( 0 )
62+
, nbOverlap( 0 )
63+
, alpha( alpha )
64+
, w( w )
65+
, h( h )
66+
, nextPart( NULL )
67+
, partId( -1 )
68+
, reversed( isReversed )
69+
, upsideDown( false )
70+
, quadrant( quadrant )
6071
{
6172

6273
// alpha take his value bw 0 and 2*pi rad

‎src/core/pal/layer.cpp

+14-5
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,20 @@ namespace pal
5959
{
6060

6161
Layer::Layer( const char *lyrName, double min_scale, double max_scale, Arrangement arrangement, Units label_unit, double defaultPriority, bool obstacle, bool active, bool toLabel, Pal *pal, bool displayAll )
62-
: pal( pal ), obstacle( obstacle ), active( active ),
63-
toLabel( toLabel ), displayAll( displayAll ), centroidInside( false ), label_unit( label_unit ),
64-
min_scale( min_scale ), max_scale( max_scale ),
65-
arrangement( arrangement ), arrangementFlags( 0 ), mode( LabelPerFeature ), mergeLines( false ),
66-
upsidedownLabels( Upright )
62+
: pal( pal )
63+
, obstacle( obstacle )
64+
, active( active )
65+
, toLabel( toLabel )
66+
, displayAll( displayAll )
67+
, centroidInside( false )
68+
, label_unit( label_unit )
69+
, min_scale( min_scale )
70+
, max_scale( max_scale )
71+
, arrangement( arrangement )
72+
, arrangementFlags( 0 )
73+
, mode( LabelPerFeature )
74+
, mergeLines( false )
75+
, upsidedownLabels( Upright )
6776
{
6877

6978
this->name = new char[strlen( lyrName ) +1];

‎src/core/qgslabel.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
#endif
4646

4747
QgsLabel::QgsLabel( const QgsFields & fields )
48-
: mMinScale( 0 ),
49-
mMaxScale( 100000000 ),
50-
mScaleBasedVisibility( false )
48+
: mMinScale( 0 )
49+
, mMaxScale( 100000000 )
50+
, mScaleBasedVisibility( false )
5151
{
5252
mFields = fields;
5353
mLabelFieldIdx.resize( LabelFieldCount );

‎src/core/qgsogcutils.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1946,12 +1946,12 @@ QDomElement QgsOgcUtils::expressionUnaryOperatorToOgcFilter( const QgsExpression
19461946
// operand expression already created a Literal node:
19471947
// take the literal value, prepend - and remove old literal node
19481948
uoElem.appendChild( doc.createTextNode( "-" + operandElem.text() ) );
1949-
doc.removeChild(operandElem);
1949+
doc.removeChild( operandElem );
19501950
}
19511951
else
19521952
{
1953-
errorMessage = QString( "This use of unary operator not implemented yet" );
1954-
return QDomElement();
1953+
errorMessage = QString( "This use of unary operator not implemented yet" );
1954+
return QDomElement();
19551955
}
19561956
break;
19571957
case QgsExpression::uoNot:

‎src/core/qgsprovidercountcalcevent.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "qgis.h"
2121

2222
QgsProviderCountCalcEvent::QgsProviderCountCalcEvent( long featuresCounted )
23-
: QEvent( static_cast<QEvent::Type>( QGis::ProviderCountCalcEvent ) ),
24-
n( featuresCounted )
23+
: QEvent( static_cast<QEvent::Type>( QGis::ProviderCountCalcEvent ) )
24+
, n( featuresCounted )
2525
{
2626
// NO-OP
2727
}

‎src/core/qgsproviderextentcalcevent.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "qgis.h"
2121

2222
QgsProviderExtentCalcEvent::QgsProviderExtentCalcEvent( QgsRectangle* layerExtent )
23-
: QEvent( static_cast<QEvent::Type>( QGis::ProviderExtentCalcEvent ) ),
24-
le( layerExtent )
23+
: QEvent( static_cast<QEvent::Type>( QGis::ProviderExtentCalcEvent ) )
24+
, le( layerExtent )
2525
{
2626
// NO-OP
2727
}

‎src/core/qgsprovidermetadata.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
QgsProviderMetadata::QgsProviderMetadata( QString const & _key,
2424
QString const & _description,
2525
QString const & _library )
26-
: key_( _key ),
27-
description_( _description ),
28-
library_( _library )
26+
: key_( _key )
27+
, description_( _description )
28+
, library_( _library )
2929
{}
3030

3131
QString const & QgsProviderMetadata::key() const

‎src/core/qgsrendercontext.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
#include "qgsmapsettings.h"
2222

2323
QgsRenderContext::QgsRenderContext()
24-
: mPainter( 0 ),
25-
mCoordTransform( 0 ),
26-
mDrawEditingInformation( true ),
27-
mForceVectorOutput( false ),
28-
mUseAdvancedEffects( true ),
29-
mRenderingStopped( false ),
30-
mScaleFactor( 1.0 ),
31-
mRasterScaleFactor( 1.0 ),
32-
mRendererScale( 1.0 ),
33-
mLabelingEngine( NULL ),
34-
mShowSelection( true ),
35-
mUseRenderingOptimization( true )
24+
: mPainter( 0 )
25+
, mCoordTransform( 0 )
26+
, mDrawEditingInformation( true )
27+
, mForceVectorOutput( false )
28+
, mUseAdvancedEffects( true )
29+
, mRenderingStopped( false )
30+
, mScaleFactor( 1.0 )
31+
, mRasterScaleFactor( 1.0 )
32+
, mRendererScale( 1.0 )
33+
, mLabelingEngine( NULL )
34+
, mShowSelection( true )
35+
, mUseRenderingOptimization( true )
3636
{
3737
mVectorSimplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification );
3838
}

‎src/core/raster/qgsbrightnesscontrastfilter.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include <QDomElement>
2424

2525
QgsBrightnessContrastFilter::QgsBrightnessContrastFilter( QgsRasterInterface* input )
26-
: QgsRasterInterface( input ),
27-
mBrightness( 0 ),
28-
mContrast( 0 )
26+
: QgsRasterInterface( input )
27+
, mBrightness( 0 )
28+
, mContrast( 0 )
2929
{
3030
}
3131

‎src/core/raster/qgshuesaturationfilter.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323

2424

2525
QgsHueSaturationFilter::QgsHueSaturationFilter( QgsRasterInterface* input )
26-
: QgsRasterInterface( input ),
27-
mSaturation( 0 ),
28-
mSaturationScale( 1 ),
29-
mGrayscaleMode( QgsHueSaturationFilter::GrayscaleOff ),
30-
mColorizeOn( false ),
31-
mColorizeColor( QColor::fromRgb( 255, 128, 128 ) ),
32-
mColorizeH( 0 ),
33-
mColorizeS( 50 ),
34-
mColorizeStrength( 100 )
26+
: QgsRasterInterface( input )
27+
, mSaturation( 0 )
28+
, mSaturationScale( 1 )
29+
, mGrayscaleMode( QgsHueSaturationFilter::GrayscaleOff )
30+
, mColorizeOn( false )
31+
, mColorizeColor( QColor::fromRgb( 255, 128, 128 ) )
32+
, mColorizeH( 0 )
33+
, mColorizeS( 50 )
34+
, mColorizeStrength( 100 )
3535
{
3636
}
3737

‎src/core/raster/qgsrasterresamplefilter.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
#include <QPainter>
3434

3535
QgsRasterResampleFilter::QgsRasterResampleFilter( QgsRasterInterface* input )
36-
: QgsRasterInterface( input ),
37-
mZoomedInResampler( 0 ), mZoomedOutResampler( 0 ),
38-
mMaxOversampling( 2.0 )
36+
: QgsRasterInterface( input )
37+
, mZoomedInResampler( 0 )
38+
, mZoomedOutResampler( 0 )
39+
, mMaxOversampling( 2.0 )
3940
{
4041
}
4142

‎src/core/symbology-ng/qgscptcityarchive.cpp

+13-8
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ QMap< QString, QgsCptCityArchive* > QgsCptCityArchive::archiveRegistry() { retur
4343
QMap< QString, QMap< QString, QString > > QgsCptCityArchive::mCopyingInfoMap;
4444

4545
QgsCptCityArchive::QgsCptCityArchive( QString archiveName, QString baseDir )
46-
: mArchiveName( archiveName ), mBaseDir( baseDir )
46+
: mArchiveName( archiveName )
47+
, mBaseDir( baseDir )
4748
{
4849
QgsDebugMsg( "archiveName = " + archiveName + " baseDir = " + baseDir );
4950

@@ -496,8 +497,9 @@ void QgsCptCityArchive::clearArchives()
496497
QgsCptCityDataItem::QgsCptCityDataItem( QgsCptCityDataItem::Type type, QgsCptCityDataItem* parent,
497498
QString name, QString path )
498499
// Do not pass parent to QObject, Qt would delete this when parent is deleted
499-
: QObject(), mType( type ), mParent( parent ), mPopulated( false ),
500-
mName( name ), mPath( path ), mValid( true )
500+
: QObject()
501+
, mType( type ), mParent( parent ), mPopulated( false )
502+
, mName( name ), mPath( path ), mValid( true )
501503
{
502504
}
503505

@@ -709,8 +711,9 @@ bool QgsCptCityDataItem::equal( const QgsCptCityDataItem *other )
709711

710712
QgsCptCityColorRampItem::QgsCptCityColorRampItem( QgsCptCityDataItem* parent,
711713
QString name, QString path, QString variantName, bool initialize )
712-
: QgsCptCityDataItem( ColorRamp, parent, name, path ),
713-
mInitialised( false ), mRamp( path, variantName, false )
714+
: QgsCptCityDataItem( ColorRamp, parent, name, path )
715+
, mInitialised( false )
716+
, mRamp( path, variantName, false )
714717
{
715718
// QgsDebugMsg( "name= " + name + " path= " + path );
716719
mPopulated = true;
@@ -720,8 +723,9 @@ QgsCptCityColorRampItem::QgsCptCityColorRampItem( QgsCptCityDataItem* parent,
720723

721724
QgsCptCityColorRampItem::QgsCptCityColorRampItem( QgsCptCityDataItem* parent,
722725
QString name, QString path, QStringList variantList, bool initialize )
723-
: QgsCptCityDataItem( ColorRamp, parent, name, path ),
724-
mInitialised( false ), mRamp( path, variantList, QString(), false )
726+
: QgsCptCityDataItem( ColorRamp, parent, name, path )
727+
, mInitialised( false )
728+
, mRamp( path, variantList, QString(), false )
725729
{
726730
// QgsDebugMsg( "name= " + name + " path= " + path );
727731
mPopulated = true;
@@ -836,7 +840,8 @@ QIcon QgsCptCityColorRampItem::icon( const QSize& size )
836840
// ---------------------------------------------------------------------
837841
QgsCptCityCollectionItem::QgsCptCityCollectionItem( QgsCptCityDataItem* parent,
838842
QString name, QString path )
839-
: QgsCptCityDataItem( Collection, parent, name, path ), mPopulatedRamps( false )
843+
: QgsCptCityDataItem( Collection, parent, name, path )
844+
, mPopulatedRamps( false )
840845
{
841846
}
842847

‎src/core/symbology-ng/qgsmarkersymbollayerv2.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -495,10 +495,10 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
495495
double angle = mAngle;
496496
if ( hasDataDefinedProperty( "angle" ) )
497497
{
498-
angle = evaluateDataDefinedProperty("angle", context.feature() ).toDouble();
498+
angle = evaluateDataDefinedProperty( "angle", context.feature() ).toDouble();
499499
}
500500

501-
bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation || hasDataDefinedProperty("angle");
501+
bool hasDataDefinedRotation = context.renderHints() & QgsSymbolV2::DataDefinedRotation || hasDataDefinedProperty( "angle" );
502502
if ( hasDataDefinedRotation )
503503
{
504504
// For non-point markers, "dataDefinedRotation" means following the
@@ -523,9 +523,9 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
523523

524524
//data defined shape?
525525
bool createdNewPath = false;
526-
if ( hasDataDefinedProperty("name") )
526+
if ( hasDataDefinedProperty( "name" ) )
527527
{
528-
QString name = evaluateDataDefinedProperty("name", context.feature() ).toString();
528+
QString name = evaluateDataDefinedProperty( "name", context.feature() ).toString();
529529
if ( !prepareShape( name ) ) // drawing as a polygon
530530
{
531531
preparePath( name ); // drawing as a painter path

0 commit comments

Comments
 (0)