sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

indentation update

Browse Source
This commit is contained in:
Juergen E. Fischer 2013-11-24 16:31:00 +01:00
parent 843504ed78
commit f665ddc81d
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/composer/qgscomposer.cpp
View File

@ -664,7 +664,7 @@ void QgsComposer::showItemOptions( QgsComposerItem* item )
void QgsComposer::on_mActionOptions_triggered()
{
mQgis->showOptionsDialog( this, QString("mOptionsPageComposer") );
mQgis->showOptionsDialog( this, QString( "mOptionsPageComposer" ) );
}
QgsMapCanvas *QgsComposer::mapCanvas( void )

8
src/core/composer/qgsatlascomposition.cpp
View File

@ -42,7 +42,7 @@ QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition ) :
QgsExpression::setSpecialColumn( "$numpages", QVariant(( int )1 ) );
QgsExpression::setSpecialColumn( "$numfeatures", QVariant(( int )0 ) );
QgsExpression::setSpecialColumn( "$atlasfeatureid", QVariant(( int )0 ) );
QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue(QgsGeometry()));
QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue( QgsGeometry() ) );
}
QgsAtlasComposition::~QgsAtlasComposition()
@ -58,9 +58,9 @@ void QgsAtlasComposition::setCoverageLayer( QgsVectorLayer* layer )
// Grab the first feature so that user can use it to test the style in rules.
QgsFeature fet;
layer->getFeatures().nextFeature(fet);
layer->getFeatures().nextFeature( fet );
QgsExpression::setSpecialColumn( "$atlasfeatureid", fet.id() );
QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue(*fet.geometry()));
QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue( *fet.geometry() ) );
}
//
@ -234,7 +234,7 @@ void QgsAtlasComposition::prepareForFeature( int featureI )
// retrieve the next feature, based on its id
mCoverageLayer->getFeatures( QgsFeatureRequest().setFilterFid( mFeatureIds[ featureI ] ) ).nextFeature( mCurrentFeature );
QgsExpression::setSpecialColumn( "$atlasfeatureid", mCurrentFeature.id() );
QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue(*mCurrentFeature.geometry()));
QgsExpression::setSpecialColumn( "$atlasgeometry", QVariant::fromValue( *mCurrentFeature.geometry() ) );
if ( !mSingleFile && mFilenamePattern.size() > 0 )
{

2
src/core/qgsvectorlayercache.cpp
View File

@ -76,7 +76,7 @@ void QgsVectorLayerCache::setFullCache( bool fullCache )
setCacheSize( mLayer->featureCount() + 100 );
// Initialize the cache...
QgsFeatureIterator it ( new QgsCachedFeatureWriterIterator( this, QgsFeatureRequest()
QgsFeatureIterator it( new QgsCachedFeatureWriterIterator( this, QgsFeatureRequest()
.setSubsetOfAttributes( mCachedAttributes )
.setFlags( !mCacheGeometry ? QgsFeatureRequest::NoGeometry : QgsFeatureRequest::Flags( 0 ) ) ) );

2
src/core/symbology-ng/qgsrendererv2registry.cpp
View File

@ -88,7 +88,7 @@ QgsRendererV2AbstractMetadata* QgsRendererV2Registry::rendererMetadata( QString
return mRenderers.value( rendererName );
}
QgsRendererV2Metadata::~QgsRendererV2Metadata(){}
QgsRendererV2Metadata::~QgsRendererV2Metadata() {}
QStringList QgsRendererV2Registry::renderersList()
{

2
src/plugins/globe/globe_plugin_dialog.cpp
View File

@ -38,7 +38,7 @@
#include <osg/DisplaySettings>
//constructor
QgsGlobePluginDialog::QgsGlobePluginDialog(QWidget* parent, GlobePlugin* globe, Qt::WFlags fl )
QgsGlobePluginDialog::QgsGlobePluginDialog( QWidget* parent, GlobePlugin* globe, Qt::WFlags fl )
: QDialog( parent, fl )
, mGlobe( globe )
{

2
src/providers/postgres/qgspostgresprovider.cpp
View File

@ -2409,7 +2409,7 @@ QgsRectangle QgsPostgresProvider::extent()
{
sql = QString( "SELECT %1(%2,%3,%4)" )
.arg( mConnectionRO->majorVersion() < 2 ? "estimated_extent" :
(mConnectionRO->majorVersion() == 2 && mConnectionRO->minorVersion() < 1 ? "st_estimated_extent" : "st_estimatedextent" ) )
( mConnectionRO->majorVersion() == 2 && mConnectionRO->minorVersion() < 1 ? "st_estimated_extent" : "st_estimatedextent" ) )
.arg( quotedValue( mSchemaName ) )
.arg( quotedValue( mTableName ) )
.arg( quotedValue( mGeometryColumn ) );