Skip to content

Commit bf814c2

Browse files
jef-njef-n
committedJan 18, 2014
indentation update
·
ltr-3_40archive/master_2
1 parent ea48687 commit bf814c2

14 files changed

+596
-603
lines changed
 

‎src/core/composer/qgscomposershape.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem
6868
/**Returns the radius for rounded rectangle corners*/
6969
double cornerRadius() const { return mCornerRadius; };
7070

71-
/**Sets the QgsFillSymbolV2 used to draw the shape. Must also call setUseSymbolV2( true ) to
71+
/**Sets the QgsFillSymbolV2 used to draw the shape. Must also call setUseSymbolV2( true ) to
7272
* enable drawing with a symbol.
7373
* Note: added in version 2.1*/
7474
void setShapeStyleSymbol( QgsFillSymbolV2* symbol );

‎src/core/diagram/qgspiediagram.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ QSizeF QgsPieDiagram::diagramSize( const QgsFeature& feature, const QgsRenderCon
3838
if ( is.classificationAttributeIsExpression )
3939
{
4040
QgsExpression* expression = getExpression( is.classificationAttributeExpression, feature.fields() );
41-
attrVal = expression->evaluate( feature );
41+
attrVal = expression->evaluate( feature );
4242
}
4343
else
4444
{

‎src/core/dxf/qgsdxfpallabeling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void QgsDxfPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext&
9191

9292
for ( int i = 0; i < textList.size(); ++i )
9393
{
94-
mDxfExport->writeText( layerName, textList.at( i ), QgsPoint( label->getX(), label->getY() + ( textList.size() -1 - i ) * textHeight ), textAscent, angle, mDxfExport->closestColorMatch( tmpLyr.textColor.rgb() ) );
94+
mDxfExport->writeText( layerName, textList.at( i ), QgsPoint( label->getX(), label->getY() + ( textList.size() - 1 - i ) * textHeight ), textAscent, angle, mDxfExport->closestColorMatch( tmpLyr.textColor.rgb() ) );
9595
}
9696
}
9797
}

‎src/core/qgis.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ QString QGis::tr( QGis::UnitType unit )
114114

115115
double QGis::fromUnitToUnitFactor( QGis::UnitType fromUnit, QGis::UnitType toUnit )
116116
{
117-
#define DEGREE_TO_METER 111319.49079327358
118-
#define FEET_TO_METER 0.3048
119-
#define NMILE_TO_METER 1852.0
117+
#define DEGREE_TO_METER 111319.49079327358
118+
#define FEET_TO_METER 0.3048
119+
#define NMILE_TO_METER 1852.0
120120

121121
// Unify degree units
122-
if ( fromUnit == QGis::DecimalDegrees || fromUnit == QGis::DegreesMinutesSeconds || fromUnit == QGis::DegreesDecimalMinutes )
122+
if ( fromUnit == QGis::DecimalDegrees || fromUnit == QGis::DegreesMinutesSeconds || fromUnit == QGis::DegreesDecimalMinutes )
123123
fromUnit = QGis::Degrees;
124-
if ( toUnit == QGis::DecimalDegrees || toUnit == QGis::DegreesMinutesSeconds || toUnit == QGis::DegreesDecimalMinutes )
124+
if ( toUnit == QGis::DecimalDegrees || toUnit == QGis::DegreesMinutesSeconds || toUnit == QGis::DegreesDecimalMinutes )
125125
toUnit = QGis::Degrees;
126126

127127
// Calculate the conversion factor between the specified units

‎src/core/qgscoordinatereferencesystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ bool QgsCoordinateReferenceSystem::axisInverted() const
408408
OSRGetAxis( mCRS, OSRIsGeographic( mCRS ) ? "GEOGCS" : "PROJCS", 0, &orientation );
409409

410410
// If axis orientation is unknown, try again with OSRImportFromEPSGA for EPSG crs
411-
if( orientation == OAO_Other && mAuthId.startsWith( "EPSG:", Qt::CaseInsensitive ) )
411+
if ( orientation == OAO_Other && mAuthId.startsWith( "EPSG:", Qt::CaseInsensitive ) )
412412
{
413413
OGRSpatialReferenceH crs = OSRNewSpatialReference( NULL );
414414

‎src/core/qgssimplifymethod.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---------------------
44
begin : December 2013
55
copyright : (C) 2013 by Matthias Kuhn / Alvaro Huarte
6-
email :
6+
email :
77
***************************************************************************
88
* *
99
* This program is free software; you can redistribute it and/or modify *
@@ -19,9 +19,9 @@
1919
#include "qgsmaptopixelgeometrysimplifier.h"
2020

2121
QgsSimplifyMethod::QgsSimplifyMethod()
22-
: mMethodType( QgsSimplifyMethod::NoSimplification )
23-
, mTolerance( 1 )
24-
, mForceLocalOptimization( true )
22+
: mMethodType( QgsSimplifyMethod::NoSimplification )
23+
, mTolerance( 1 )
24+
, mForceLocalOptimization( true )
2525
{
2626
}
2727

@@ -30,7 +30,7 @@ QgsSimplifyMethod::QgsSimplifyMethod( const QgsSimplifyMethod &rh )
3030
operator=( rh );
3131
}
3232

33-
QgsSimplifyMethod& QgsSimplifyMethod::operator=( const QgsSimplifyMethod &rh )
33+
QgsSimplifyMethod& QgsSimplifyMethod::operator=( const QgsSimplifyMethod & rh )
3434
{
3535
mMethodType = rh.mMethodType;
3636
mTolerance = rh.mTolerance;
@@ -53,7 +53,7 @@ void QgsSimplifyMethod::setForceLocalOptimization( bool localOptimization )
5353
{
5454
mForceLocalOptimization = localOptimization;
5555
}
56-
56+
5757
double QgsSimplifyMethod::toleranceForDouglasPeuckerAlgorithms() const
5858
{
5959
//TODO: define more precise value, now, it is experimental but conservative
@@ -70,8 +70,7 @@ QgsAbstractGeometrySimplifier* QgsSimplifyMethod::createGeometrySimplifier( cons
7070
int simplifyFlags = QgsMapToPixelSimplifier::SimplifyGeometry | QgsMapToPixelSimplifier::SimplifyEnvelope;
7171
return new QgsMapToPixelSimplifier( simplifyFlags, simplifyMethod.tolerance() );
7272
}
73-
else
74-
if ( methodType == QgsSimplifyMethod::PreserveTopology )
73+
else if ( methodType == QgsSimplifyMethod::PreserveTopology )
7574
{
7675
return new QgsTopologyPreservingSimplifier( simplifyMethod.tolerance() );
7776
}

‎src/core/qgssimplifymethod.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---------------------
44
begin : December 2013
55
copyright : (C) 2013 by Matthias Kuhn / Alvaro Huarte
6-
email :
6+
email :
77
***************************************************************************
88
* *
99
* This program is free software; you can redistribute it and/or modify *

‎src/core/qgsvectorlayerfeatureiterator.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,7 @@ bool QgsVectorLayerFeatureIterator::providerCanSimplify( QgsSimplifyMethod::Meth
475475
{
476476
return ( capabilities & QgsVectorDataProvider::SimplifyGeometries );
477477
}
478-
else
479-
if ( methodType == QgsSimplifyMethod::PreserveTopology )
478+
else if ( methodType == QgsSimplifyMethod::PreserveTopology )
480479
{
481480
return ( capabilities & QgsVectorDataProvider::SimplifyGeometriesWithTopologicalValidation );
482481
}

‎src/core/qgsvectorsimplifymethod.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "qgsvectorlayer.h"
1919

2020
QgsVectorSimplifyMethod::QgsVectorSimplifyMethod()
21-
: mSimplifyHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorLayer::FullSimplification : QgsVectorLayer::GeometrySimplification )
22-
, mThreshold( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD )
23-
, mLocalOptimization( true )
21+
: mSimplifyHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorLayer::FullSimplification : QgsVectorLayer::GeometrySimplification )
22+
, mThreshold( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD )
23+
, mLocalOptimization( true )
2424
{
2525
}
2626

@@ -29,7 +29,7 @@ QgsVectorSimplifyMethod::QgsVectorSimplifyMethod( const QgsVectorSimplifyMethod
2929
operator=( rh );
3030
}
3131

32-
QgsVectorSimplifyMethod& QgsVectorSimplifyMethod::operator=( const QgsVectorSimplifyMethod &rh )
32+
QgsVectorSimplifyMethod& QgsVectorSimplifyMethod::operator=( const QgsVectorSimplifyMethod & rh )
3333
{
3434
mSimplifyHints = rh.mSimplifyHints;
3535
mThreshold = rh.mThreshold;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,8 +1921,8 @@ bool QgsSymbolLayerV2Utils::externalMarkerFromSld( QDomElement &element,
19211921
return true;
19221922
}
19231923

1924-
void QgsSymbolLayerV2Utils::wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
1925-
QString name, QColor color, QColor borderColor,
1924+
void QgsSymbolLayerV2Utils::wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
1925+
QString name, QColor color, QColor borderColor,
19261926
double borderWidth, double size )
19271927
{
19281928
wellKnownMarkerToSld( doc, element, name, color, borderColor, Qt::SolidLine, borderWidth, size );
@@ -1964,8 +1964,8 @@ void QgsSymbolLayerV2Utils::wellKnownMarkerToSld( QDomDocument &doc, QDomElement
19641964
}
19651965
}
19661966

1967-
bool QgsSymbolLayerV2Utils::wellKnownMarkerFromSld( QDomElement &element,
1968-
QString &name, QColor &color, QColor &borderColor,
1967+
bool QgsSymbolLayerV2Utils::wellKnownMarkerFromSld( QDomElement &element,
1968+
QString &name, QColor &color, QColor &borderColor,
19691969
double &borderWidth, double &size )
19701970
{
19711971
Qt::PenStyle borderStyle;

‎src/core/symbology-ng/qgssymbollayerv2utils.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
151151

152152
/** @deprecated Use wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element, QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle, double borderWidth, double size ) instead */
153153
Q_DECL_DEPRECATED static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
154-
QString name, QColor color, QColor borderColor = QColor(),
155-
double borderWidth = -1, double size = -1 );
154+
QString name, QColor color, QColor borderColor = QColor(),
155+
double borderWidth = -1, double size = -1 );
156156
static void wellKnownMarkerToSld( QDomDocument &doc, QDomElement &element,
157157
QString name, QColor color, QColor borderColor, Qt::PenStyle borderStyle,
158158
double borderWidth = -1, double size = -1 );
159159
/** @deprecated Use wellKnownMarkerFromSld( QDomElement &element, QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle, double &borderWidth, double &size ) instead */
160160
Q_DECL_DEPRECATED static bool wellKnownMarkerFromSld( QDomElement &element,
161-
QString &name, QColor &color, QColor &borderColor,
162-
double &borderWidth, double &size );
161+
QString &name, QColor &color, QColor &borderColor,
162+
double &borderWidth, double &size );
163163
static bool wellKnownMarkerFromSld( QDomElement &element,
164164
QString &name, QColor &color, QColor &borderColor, Qt::PenStyle &borderStyle,
165165
double &borderWidth, double &size );

‎src/providers/postgres/qgspostgresfeatureiterator.cpp

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -301,17 +301,13 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause )
301301

302302
if ( mFetchGeometry && !simplifyMethod.forceLocalOptimization() && simplifyMethod.methodType() != QgsSimplifyMethod::NoSimplification && QGis::flatType( QGis::singleType( P->geometryType() ) ) != QGis::WKBPoint )
303303
{
304-
QString simplifyFunctionName = simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering
305-
?
306-
( P->mConnectionRO->majorVersion() < 2 ? "simplify" : "st_simplify" )
307-
:
308-
( P->mConnectionRO->majorVersion() < 2 ? "simplifypreservetopology" : "st_simplifypreservetopology" );
309-
310-
double tolerance = simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering
311-
?
312-
simplifyMethod.toleranceForDouglasPeuckerAlgorithms()
313-
:
314-
simplifyMethod.tolerance();
304+
QString simplifyFunctionName = simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering
305+
? ( P->mConnectionRO->majorVersion() < 2 ? "simplify" : "st_simplify" )
306+
: ( P->mConnectionRO->majorVersion() < 2 ? "simplifypreservetopology" : "st_simplifypreservetopology" );
307+
308+
double tolerance = simplifyMethod.methodType() == QgsSimplifyMethod::OptimizeForRendering
309+
? simplifyMethod.toleranceForDouglasPeuckerAlgorithms()
310+
: simplifyMethod.tolerance();
315311

316312
query += QString( "%1(%5(%2%3,%6),'%4')" )
317313
.arg( P->mConnectionRO->majorVersion() < 2 ? "asbinary" : "st_asbinary" )
@@ -322,8 +318,7 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause )
322318
.arg( tolerance );
323319
delim = ",";
324320
}
325-
else
326-
if ( mFetchGeometry )
321+
else if ( mFetchGeometry )
327322
{
328323
query += QString( "%1(%2%3,'%4')" )
329324
.arg( P->mConnectionRO->majorVersion() < 2 ? "asbinary" : "st_asbinary" )

‎src/ui/qgsdualviewbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
33
<class>QgsDualViewBase</class>
44
<widget class="QStackedWidget" name="QgsDualViewBase">

‎src/ui/qgsexpressionbuilder.ui

Lines changed: 557 additions & 557 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.