Skip to content
Permalink
Browse files

indentation update

  • Loading branch information
jef-n committed Aug 16, 2015
1 parent 831983f commit 624f16cc2cc0c85adbab71ee020137742b9a4c4d
@@ -38,7 +38,7 @@ public:
* @param hide set to true to hide the coverage layer
* @see hideCoverage
*/
void setHideCoverage( bool hide );
void setHideCoverage( bool hide );

/** Returns the filename expression used for generating output filenames for each
* atlas page.
@@ -77,7 +77,7 @@ public:
* @see coverageLayer
*/
void setCoverageLayer( QgsVectorLayer* layer );

/** Returns the expression used for calculating the page name.
* @returns expression string, or field name from coverage layer
* @see setPageNameExpression
@@ -221,9 +221,9 @@ public:

/** Recalculates the bounds of an atlas driven map */
void prepareMap( QgsComposerMap* map );

//Deprecated methods

/** Returns the map used by the atlas
* @deprecated Use QgsComposerMap::atlasDriven() instead
*/
@@ -233,7 +233,7 @@ public:
* @deprecated Use QgsComposerMap::setAtlasDriven( true ) instead
*/
void setComposerMap( QgsComposerMap* map ) /Deprecated/;

/** Returns whether the atlas map uses a fixed scale
* @deprecated since 2.4 Use QgsComposerMap::atlasScalingMode() instead
*/
@@ -253,7 +253,7 @@ public:
* @deprecated Use QgsComposerMap::setAtlasMargin( double ) instead
*/
void setMargin( float margin ) /Deprecated/;

int sortKeyAttributeIndex() const /Deprecated/;
void setSortKeyAttributeIndex( int idx ) /Deprecated/;

@@ -94,7 +94,7 @@ class QgsComposerObject : QObject
* @note this method was added in version 2.5
*/
void setDataDefinedProperty( const DataDefinedProperty property, const bool active, const bool useExpression, const QString &expression, const QString &field );

/** Set a custom property for the object.
* @param key property key. If a property with the same key already exists it will be overwritten.
* @param value property value
@@ -131,7 +131,7 @@ class QgsComposerObject : QObject
* @see removeCustomProperty()
* @note added in QGIS 2.12
*/
QStringList customProperties() const;
QStringList customProperties() const;

public slots:

@@ -75,6 +75,9 @@ for f in "$@"; do
;;

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

@@ -71,13 +71,7 @@ for f in $MODIFIED; do
continue
;;

*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip)
if [ -x "$f" ]; then
chmod a-x "$f"
fi
;;

*.py)
*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H|*.sip|*.py)
;;

*)
@@ -123,7 +123,7 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent *e )
{
markerSymbol = static_cast< QgsMarkerSymbolV2* >( s );
QString rotationField = ( markerSymbol->dataDefinedAngle().isActive() && !markerSymbol->dataDefinedAngle().useExpression() ) ?
markerSymbol->dataDefinedAngle().field() : QString();
markerSymbol->dataDefinedAngle().field() : QString();
if ( !rotationField.isEmpty() )
{
int fieldIndex = mActiveLayer->fields().indexFromName( rotationField );
@@ -138,11 +138,11 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent *e )
QgsSymbolV2* s = renderer->originalSymbolForFeature( pointFeature );
if ( s && s->type() == QgsSymbolV2::Marker )
{
markerSymbol = static_cast< QgsMarkerSymbolV2* >( s );
QString rotationField = ( markerSymbol->dataDefinedAngle().isActive() && !markerSymbol->dataDefinedAngle().useExpression() ) ?
markerSymbol->dataDefinedAngle().field() : QString();
if ( !rotationField.isEmpty() )
mCurrentRotationAttributes << mActiveLayer->fields().indexFromName( rotationField );
markerSymbol = static_cast< QgsMarkerSymbolV2* >( s );
QString rotationField = ( markerSymbol->dataDefinedAngle().isActive() && !markerSymbol->dataDefinedAngle().useExpression() ) ?
markerSymbol->dataDefinedAngle().field() : QString();
if ( !rotationField.isEmpty() )
mCurrentRotationAttributes << mActiveLayer->fields().indexFromName( rotationField );
}
}

@@ -119,7 +119,7 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeat

if ( mProviderRequest.filterType() == QgsFeatureRequest::FilterExpression )
{
Q_FOREACH( const QString& field, mProviderRequest.filterExpression()->referencedColumns() )
Q_FOREACH ( const QString& field, mProviderRequest.filterExpression()->referencedColumns() )
{
int idx = source->mFields.fieldNameIndex( field );

@@ -110,7 +110,7 @@ QgsGrassModuleStandardOptions::QgsGrassModuleStandardOptions(

QProcess process( this );

QProcessEnvironment environment = QgsGrassModule::processEnvironment(mDirect);
QProcessEnvironment environment = QgsGrassModule::processEnvironment( mDirect );
process.setProcessEnvironment( environment );
process.start( cmd, arguments );

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

foreach( QgsGrassModuleItem* item, mItems )
foreach ( QgsGrassModuleItem* item, mItems )
{
mErrors << item->errors();
}
@@ -115,7 +115,7 @@ class QgsPythonUtilsImpl : public QgsPythonUtils
protected:

/* functions that do the initialization work */

//! initialize Python context
void init();

0 comments on commit 624f16c

Please sign in to comment.
You can’t perform that action at this time.