Skip to content

Commit 624f16c

Browse files
jef-njef-n
committedAug 16, 2015
indentation update
·
ltr-3_40archive/master_2
1 parent 831983f commit 624f16c

File tree

8 files changed

+23
-26
lines changed

8 files changed

+23
-26
lines changed
 

‎python/core/composer/qgsatlascomposition.sip

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public:
3838
* @param hide set to true to hide the coverage layer
3939
* @see hideCoverage
4040
*/
41-
void setHideCoverage( bool hide );
41+
void setHideCoverage( bool hide );
4242

4343
/** Returns the filename expression used for generating output filenames for each
4444
* atlas page.
@@ -77,7 +77,7 @@ public:
7777
* @see coverageLayer
7878
*/
7979
void setCoverageLayer( QgsVectorLayer* layer );
80-
80+
8181
/** Returns the expression used for calculating the page name.
8282
* @returns expression string, or field name from coverage layer
8383
* @see setPageNameExpression
@@ -221,9 +221,9 @@ public:
221221

222222
/** Recalculates the bounds of an atlas driven map */
223223
void prepareMap( QgsComposerMap* map );
224-
224+
225225
//Deprecated methods
226-
226+
227227
/** Returns the map used by the atlas
228228
* @deprecated Use QgsComposerMap::atlasDriven() instead
229229
*/
@@ -233,7 +233,7 @@ public:
233233
* @deprecated Use QgsComposerMap::setAtlasDriven( true ) instead
234234
*/
235235
void setComposerMap( QgsComposerMap* map ) /Deprecated/;
236-
236+
237237
/** Returns whether the atlas map uses a fixed scale
238238
* @deprecated since 2.4 Use QgsComposerMap::atlasScalingMode() instead
239239
*/
@@ -253,7 +253,7 @@ public:
253253
* @deprecated Use QgsComposerMap::setAtlasMargin( double ) instead
254254
*/
255255
void setMargin( float margin ) /Deprecated/;
256-
256+
257257
int sortKeyAttributeIndex() const /Deprecated/;
258258
void setSortKeyAttributeIndex( int idx ) /Deprecated/;
259259

‎python/core/composer/qgscomposerobject.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class QgsComposerObject : QObject
9494
* @note this method was added in version 2.5
9595
*/
9696
void setDataDefinedProperty( const DataDefinedProperty property, const bool active, const bool useExpression, const QString &expression, const QString &field );
97-
97+
9898
/** Set a custom property for the object.
9999
* @param key property key. If a property with the same key already exists it will be overwritten.
100100
* @param value property value
@@ -131,7 +131,7 @@ class QgsComposerObject : QObject
131131
* @see removeCustomProperty()
132132
* @note added in QGIS 2.12
133133
*/
134-
QStringList customProperties() const;
134+
QStringList customProperties() const;
135135

136136
public slots:
137137

‎scripts/astyle.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ for f in "$@"; do
7575
;;
7676

7777
*.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.hpp)
78+
if [ -x "$f" ]; then
79+
chmod a-x "$f"
80+
fi
7881
cmd=astyleit
7982
;;
8083

‎scripts/prepare-commit.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,7 @@ for f in $MODIFIED; do
7171
continue
7272
;;
7373

74-
*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip)
75-
if [ -x "$f" ]; then
76-
chmod a-x "$f"
77-
fi
78-
;;
79-
80-
*.py)
74+
*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py)
8175
;;
8276

8377
*)

‎src/app/qgsmaptoolrotatepointsymbols.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent *e )
123123
{
124124
markerSymbol = static_cast< QgsMarkerSymbolV2* >( s );
125125
QString rotationField = ( markerSymbol->dataDefinedAngle().isActive() && !markerSymbol->dataDefinedAngle().useExpression() ) ?
126-
markerSymbol->dataDefinedAngle().field() : QString();
126+
markerSymbol->dataDefinedAngle().field() : QString();
127127
if ( !rotationField.isEmpty() )
128128
{
129129
int fieldIndex = mActiveLayer->fields().indexFromName( rotationField );
@@ -138,11 +138,11 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent *e )
138138
QgsSymbolV2* s = renderer->originalSymbolForFeature( pointFeature );
139139
if ( s && s->type() == QgsSymbolV2::Marker )
140140
{
141-
markerSymbol = static_cast< QgsMarkerSymbolV2* >( s );
142-
QString rotationField = ( markerSymbol->dataDefinedAngle().isActive() && !markerSymbol->dataDefinedAngle().useExpression() ) ?
143-
markerSymbol->dataDefinedAngle().field() : QString();
144-
if ( !rotationField.isEmpty() )
145-
mCurrentRotationAttributes << mActiveLayer->fields().indexFromName( rotationField );
141+
markerSymbol = static_cast< QgsMarkerSymbolV2* >( s );
142+
QString rotationField = ( markerSymbol->dataDefinedAngle().isActive() && !markerSymbol->dataDefinedAngle().useExpression() ) ?
143+
markerSymbol->dataDefinedAngle().field() : QString();
144+
if ( !rotationField.isEmpty() )
145+
mCurrentRotationAttributes << mActiveLayer->fields().indexFromName( rotationField );
146146
}
147147
}
148148

‎src/core/qgsvectorlayerfeatureiterator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeat
119119

120120
if ( mProviderRequest.filterType() == QgsFeatureRequest::FilterExpression )
121121
{
122-
Q_FOREACH( const QString& field, mProviderRequest.filterExpression()->referencedColumns() )
122+
Q_FOREACH ( const QString& field, mProviderRequest.filterExpression()->referencedColumns() )
123123
{
124124
int idx = source->mFields.fieldNameIndex( field );
125125

‎src/plugins/grass/qgsgrassmoduleoptions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
110110

111111
QProcess process( this );
112112

113-
QProcessEnvironment environment = QgsGrassModule::processEnvironment(mDirect);
113+
QProcessEnvironment environment = QgsGrassModule::processEnvironment( mDirect );
114114
process.setProcessEnvironment( environment );
115115
process.start( cmd, arguments );
116116

@@ -128,7 +128,7 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
128128
QString msg = tr( "Cannot start module %1" ).arg( mXName )
129129
+ "<br>" + pathVariable + "=" + environment.value( pathVariable )
130130
+ "<br>PATH=" + getenv( "PATH" )
131-
+ "<br>" + tr("command") + QString(": %1 %2<br>%3<br>%4" )
131+
+ "<br>" + tr( "command" ) + QString( ": %1 %2<br>%3<br>%4" )
132132
.arg( cmd ).arg( arguments.join( " " ) )
133133
.arg( process.readAllStandardOutput().constData() )
134134
.arg( process.readAllStandardError().constData() );
@@ -406,7 +406,7 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(
406406
if ( layout )
407407
layout->addStretch();
408408

409-
foreach( QgsGrassModuleItem* item, mItems )
409+
foreach ( QgsGrassModuleItem* item, mItems )
410410
{
411411
mErrors << item->errors();
412412
}

‎src/python/qgspythonutilsimpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class QgsPythonUtilsImpl : public QgsPythonUtils
115115
protected:
116116

117117
/* functions that do the initialization work */
118-
118+
119119
//! initialize Python context
120120
void init();
121121

0 commit comments

Comments
 (0)
Please sign in to comment.