Skip to content

Commit 98e8ba4

Browse files
committed
indentation update
1 parent 62ebf88 commit 98e8ba4

36 files changed

+397
-384
lines changed

src/app/composer/qgsatlascompositionwidget.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "qgscomposermap.h"
2424

2525
QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsComposition* c ):
26-
QWidget( parent ), mComposition( c )
26+
QWidget( parent ), mComposition( c )
2727
{
2828
setupUi( this );
2929

@@ -34,34 +34,34 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsCompos
3434
for ( QMap<QString, QgsMapLayer*>::const_iterator it = layers.begin(); it != layers.end(); ++it )
3535
{
3636
// Only consider vector layers
37-
if ( dynamic_cast<QgsVectorLayer*>(it.value()) )
37+
if ( dynamic_cast<QgsVectorLayer*>( it.value() ) )
3838
{
39-
mAtlasCoverageLayerComboBox->insertItem( idx++, it.value()->name(), /* userdata */ qVariantFromValue( (void*)it.value() ) );
39+
mAtlasCoverageLayerComboBox->insertItem( idx++, it.value()->name(), /* userdata */ qVariantFromValue(( void* )it.value() ) );
4040
}
4141
}
42-
42+
4343
// Connect to addition / removal of layers
4444
QgsMapLayerRegistry* layerRegistry = QgsMapLayerRegistry::instance();
4545
if ( layerRegistry )
4646
{
4747
connect( layerRegistry, SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( onLayerRemoved( QString ) ) );
4848
connect( layerRegistry, SIGNAL( layerWasAdded( QgsMapLayer* ) ), this, SLOT( onLayerAdded( QgsMapLayer* ) ) );
4949
}
50-
50+
5151
// update the composer map combo box
5252
// populate the map list
5353
mComposerMapComboBox->clear();
5454
QList<const QgsComposerMap*> availableMaps = mComposition->composerMapItems();
5555
QList<const QgsComposerMap*>::const_iterator mapItemIt = availableMaps.constBegin();
5656
for ( ; mapItemIt != availableMaps.constEnd(); ++mapItemIt )
5757
{
58-
mComposerMapComboBox->addItem( tr( "Map %1" ).arg(( *mapItemIt )->id() ), qVariantFromValue( (void*)*mapItemIt ) );
58+
mComposerMapComboBox->addItem( tr( "Map %1" ).arg(( *mapItemIt )->id() ), qVariantFromValue(( void* )*mapItemIt ) );
5959
}
60-
60+
6161
// Connect to addition / removal of maps
6262
connect( mComposition, SIGNAL( composerMapAdded( QgsComposerMap* ) ), this, SLOT( onComposerMapAdded( QgsComposerMap* ) ) );
6363
connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( onItemRemoved( QgsComposerItem* ) ) );
64-
64+
6565
// connect to updates
6666
connect( &mComposition->atlasComposition(), SIGNAL( parameterChanged() ), this, SLOT( updateGuiElements() ) );
6767

@@ -84,7 +84,7 @@ void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
8484
{
8585
atlasMap->setEnabled( false );
8686
mAtlasFrame->setEnabled( false );
87-
}
87+
}
8888
}
8989

9090
void QgsAtlasCompositionWidget::onLayerRemoved( QString layerName )
@@ -113,7 +113,7 @@ void QgsAtlasCompositionWidget::onLayerAdded( QgsMapLayer* map )
113113
QgsVectorLayer* vectorLayer = dynamic_cast<QgsVectorLayer*>( map );
114114
if ( vectorLayer )
115115
{
116-
mAtlasCoverageLayerComboBox->addItem( map->name(), qVariantFromValue( (void*)map ) );
116+
mAtlasCoverageLayerComboBox->addItem( map->name(), qVariantFromValue(( void* )map ) );
117117
}
118118
if ( mAtlasCoverageLayerComboBox->count() == 1 )
119119
{
@@ -124,7 +124,7 @@ void QgsAtlasCompositionWidget::onLayerAdded( QgsMapLayer* map )
124124
void QgsAtlasCompositionWidget::onComposerMapAdded( QgsComposerMap* map )
125125
{
126126
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
127-
mComposerMapComboBox->addItem( tr( "Map %1" ).arg( map->id() ), qVariantFromValue( (void*)map ) );
127+
mComposerMapComboBox->addItem( tr( "Map %1" ).arg( map->id() ), qVariantFromValue(( void* )map ) );
128128
if ( mComposerMapComboBox->count() == 1 )
129129
{
130130
atlasMap->setComposerMap( map );
@@ -137,7 +137,7 @@ void QgsAtlasCompositionWidget::onItemRemoved( QgsComposerItem* item )
137137
QgsComposerMap* map = dynamic_cast<QgsComposerMap*>( item );
138138
if ( map )
139139
{
140-
int idx = mComposerMapComboBox->findData( qVariantFromValue( (void*)map ) );
140+
int idx = mComposerMapComboBox->findData( qVariantFromValue(( void* )map ) );
141141
if ( idx != -1 )
142142
{
143143
mComposerMapComboBox->removeItem( idx );
@@ -162,7 +162,7 @@ void QgsAtlasCompositionWidget::on_mAtlasCoverageLayerComboBox_currentIndexChang
162162
}
163163
else
164164
{
165-
QgsVectorLayer* layer = reinterpret_cast<QgsVectorLayer*>(mAtlasCoverageLayerComboBox->itemData( index ).value<void*>());
165+
QgsVectorLayer* layer = reinterpret_cast<QgsVectorLayer*>( mAtlasCoverageLayerComboBox->itemData( index ).value<void*>() );
166166
atlasMap->setCoverageLayer( layer );
167167
}
168168
}
@@ -180,7 +180,7 @@ void QgsAtlasCompositionWidget::on_mComposerMapComboBox_currentIndexChanged( int
180180
}
181181
else
182182
{
183-
QgsComposerMap* map = reinterpret_cast<QgsComposerMap*>(mComposerMapComboBox->itemData( index ).value<void*>());
183+
QgsComposerMap* map = reinterpret_cast<QgsComposerMap*>( mComposerMapComboBox->itemData( index ).value<void*>() );
184184
atlasMap->setComposerMap( map );
185185
}
186186
}
@@ -203,7 +203,7 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
203203
{
204204
return;
205205
}
206-
206+
207207
QgsExpressionBuilderDialog exprDlg( atlasMap->coverageLayer(), mAtlasFilenamePatternEdit->text(), this );
208208
exprDlg.setWindowTitle( tr( "Expression based filename" ) );
209209
if ( exprDlg.exec() == QDialog::Accepted )
@@ -268,19 +268,19 @@ void QgsAtlasCompositionWidget::updateGuiElements()
268268
{
269269
mUseAtlasCheckBox->setCheckState( Qt::Unchecked );
270270
}
271-
272-
int idx = mAtlasCoverageLayerComboBox->findData( qVariantFromValue( (void*)atlasMap->coverageLayer() ));
271+
272+
int idx = mAtlasCoverageLayerComboBox->findData( qVariantFromValue(( void* )atlasMap->coverageLayer() ) );
273273
if ( idx != -1 )
274274
{
275275
mAtlasCoverageLayerComboBox->setCurrentIndex( idx );
276276
}
277-
idx = mComposerMapComboBox->findData( qVariantFromValue( (void*)atlasMap->composerMap() ));
277+
idx = mComposerMapComboBox->findData( qVariantFromValue(( void* )atlasMap->composerMap() ) );
278278
if ( idx != -1 )
279279
{
280280
mComposerMapComboBox->setCurrentIndex( idx );
281281
}
282-
283-
mAtlasMarginSpinBox->setValue( static_cast<int>(atlasMap->margin() * 100) );
282+
283+
mAtlasMarginSpinBox->setValue( static_cast<int>( atlasMap->margin() * 100 ) );
284284
mAtlasFilenamePatternEdit->setText( atlasMap->filenamePattern() );
285285
mAtlasFixedScaleCheckBox->setCheckState( atlasMap->fixedScale() ? Qt::Checked : Qt::Unchecked );
286286
mAtlasHideCoverageCheckBox->setCheckState( atlasMap->hideCoverage() ? Qt::Checked : Qt::Unchecked );
@@ -290,5 +290,5 @@ void QgsAtlasCompositionWidget::updateGuiElements()
290290
void QgsAtlasCompositionWidget::blockAllSignals( bool b )
291291
{
292292
mUseAtlasCheckBox->blockSignals( b );
293-
mAtlasFrame->blockSignals( b );
293+
mAtlasFrame->blockSignals( b );
294294
}

src/app/composer/qgsatlascompositionwidget.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ class QgsComposerItem;
2525
* Input widget for QgsAtlasComposition
2626
*/
2727
class QgsAtlasCompositionWidget:
28-
public QWidget,
29-
private Ui::QgsAtlasCompositionWidgetBase
28+
public QWidget,
29+
private Ui::QgsAtlasCompositionWidgetBase
3030
{
3131
Q_OBJECT
32-
public:
32+
public:
3333
QgsAtlasCompositionWidget( QWidget* parent, QgsComposition* c );
3434
~QgsAtlasCompositionWidget();
35-
36-
public slots:
35+
36+
public slots:
3737
void on_mUseAtlasCheckBox_stateChanged( int state );
3838
void on_mComposerMapComboBox_currentIndexChanged( int index );
3939
void on_mAtlasCoverageLayerComboBox_currentIndexChanged( int index );
@@ -42,17 +42,17 @@ public slots:
4242
void on_mAtlasHideCoverageCheckBox_stateChanged( int state );
4343
void on_mAtlasFixedScaleCheckBox_stateChanged( int state );
4444
void on_mAtlasSingleFileCheckBox_stateChanged( int state );
45-
46-
private slots:
45+
46+
private slots:
4747
void onLayerRemoved( QString );
4848
void onLayerAdded( QgsMapLayer* );
4949
void onComposerMapAdded( QgsComposerMap* );
5050
void onItemRemoved( QgsComposerItem* );
5151

5252
void updateGuiElements();
53-
54-
private:
53+
54+
private:
5555
QgsComposition* mComposition;
56-
56+
5757
void blockAllSignals( bool b );
5858
};

0 commit comments

Comments
 (0)