Skip to content

Commit dccf8c9

Browse files
3nids3nids
committedMar 3, 2017
run astyle on src/app
1 parent e7079ee commit dccf8c9

File tree

367 files changed

+6408
-6406
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+6408
-6406
lines changed
 

‎src/app/composer/qgsatlascompositionwidget.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
#include "qgscomposermap.h"
2626
#include "qgsvectorlayer.h"
2727

28-
QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsComposition* c ):
29-
QWidget( parent ), mComposition( c )
28+
QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget *parent, QgsComposition *c ):
29+
QWidget( parent ), mComposition( c )
3030
{
3131
setupUi( this );
3232

3333
mAtlasCoverageLayerComboBox->setFilters( QgsMapLayerProxyModel::VectorLayer );
3434

3535
connect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, mAtlasSortFeatureKeyComboBox, &QgsFieldComboBox::setLayer );
3636
connect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, mPageNameWidget, &QgsFieldExpressionWidget::setLayer );
37-
connect( mAtlasCoverageLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), this, SLOT( changeCoverageLayer( QgsMapLayer* ) ) );
37+
connect( mAtlasCoverageLayerComboBox, SIGNAL( layerChanged( QgsMapLayer * ) ), this, SLOT( changeCoverageLayer( QgsMapLayer * ) ) );
3838
connect( mAtlasSortFeatureKeyComboBox, SIGNAL( fieldChanged( QString ) ), this, SLOT( changesSortFeatureField( QString ) ) );
3939
connect( mPageNameWidget, SIGNAL( fieldChanged( QString, bool ) ), this, SLOT( pageNameExpressionChanged( QString, bool ) ) );
4040

@@ -56,7 +56,7 @@ QgsAtlasCompositionWidget::~QgsAtlasCompositionWidget()
5656

5757
void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
5858
{
59-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
59+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
6060
if ( state == Qt::Checked )
6161
{
6262
atlasMap->setEnabled( true );
@@ -73,13 +73,13 @@ void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
7373

7474
void QgsAtlasCompositionWidget::changeCoverageLayer( QgsMapLayer *layer )
7575
{
76-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
76+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
7777
if ( !atlasMap )
7878
{
7979
return;
8080
}
8181

82-
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );
82+
QgsVectorLayer *vl = dynamic_cast<QgsVectorLayer *>( layer );
8383

8484
if ( !vl )
8585
{
@@ -94,7 +94,7 @@ void QgsAtlasCompositionWidget::changeCoverageLayer( QgsMapLayer *layer )
9494

9595
void QgsAtlasCompositionWidget::on_mAtlasFilenamePatternEdit_editingFinished()
9696
{
97-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
97+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
9898
if ( !atlasMap )
9999
{
100100
return;
@@ -114,7 +114,7 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenamePatternEdit_editingFinished()
114114

115115
void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
116116
{
117-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
117+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
118118
if ( !atlasMap || !atlasMap->coverageLayer() )
119119
{
120120
return;
@@ -147,7 +147,7 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
147147

148148
void QgsAtlasCompositionWidget::on_mAtlasHideCoverageCheckBox_stateChanged( int state )
149149
{
150-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
150+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
151151
if ( !atlasMap )
152152
{
153153
return;
@@ -157,7 +157,7 @@ void QgsAtlasCompositionWidget::on_mAtlasHideCoverageCheckBox_stateChanged( int
157157

158158
void QgsAtlasCompositionWidget::on_mAtlasSingleFileCheckBox_stateChanged( int state )
159159
{
160-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
160+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
161161
if ( !atlasMap )
162162
{
163163
return;
@@ -177,7 +177,7 @@ void QgsAtlasCompositionWidget::on_mAtlasSingleFileCheckBox_stateChanged( int st
177177

178178
void QgsAtlasCompositionWidget::on_mAtlasSortFeatureCheckBox_stateChanged( int state )
179179
{
180-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
180+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
181181
if ( !atlasMap )
182182
{
183183
return;
@@ -206,7 +206,7 @@ void QgsAtlasCompositionWidget::updateAtlasFeatures()
206206
}
207207

208208
//update atlas features
209-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
209+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
210210
if ( !atlasMap )
211211
{
212212
return;
@@ -226,9 +226,9 @@ void QgsAtlasCompositionWidget::updateAtlasFeatures()
226226
}
227227
}
228228

229-
void QgsAtlasCompositionWidget::changesSortFeatureField( const QString& fieldName )
229+
void QgsAtlasCompositionWidget::changesSortFeatureField( const QString &fieldName )
230230
{
231-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
231+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
232232
if ( !atlasMap )
233233
{
234234
return;
@@ -239,7 +239,7 @@ void QgsAtlasCompositionWidget::changesSortFeatureField( const QString& fieldNam
239239

240240
void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int state )
241241
{
242-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
242+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
243243
if ( !atlasMap )
244244
{
245245
return;
@@ -259,10 +259,10 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int
259259
updateAtlasFeatures();
260260
}
261261

262-
void QgsAtlasCompositionWidget::pageNameExpressionChanged( const QString&, bool valid )
262+
void QgsAtlasCompositionWidget::pageNameExpressionChanged( const QString &, bool valid )
263263
{
264264
QString expression = mPageNameWidget->asExpression();
265-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
265+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
266266
if ( !atlasMap || ( !valid && !expression.isEmpty() ) )
267267
{
268268
return;
@@ -273,7 +273,7 @@ void QgsAtlasCompositionWidget::pageNameExpressionChanged( const QString&, bool
273273

274274
void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_editingFinished()
275275
{
276-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
276+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
277277
if ( !atlasMap )
278278
{
279279
return;
@@ -285,8 +285,8 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_editingFinished()
285285

286286
void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterButton_clicked()
287287
{
288-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
289-
QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( mAtlasCoverageLayerComboBox->currentLayer() );
288+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
289+
QgsVectorLayer *vl = dynamic_cast<QgsVectorLayer *>( mAtlasCoverageLayerComboBox->currentLayer() );
290290

291291
if ( !atlasMap || !vl )
292292
{
@@ -315,7 +315,7 @@ void QgsAtlasCompositionWidget::on_mAtlasSortFeatureDirectionButton_clicked()
315315
at = ( at == Qt::UpArrow ) ? Qt::DownArrow : Qt::UpArrow;
316316
mAtlasSortFeatureDirectionButton->setArrowType( at );
317317

318-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
318+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
319319
if ( !atlasMap )
320320
{
321321
return;
@@ -328,7 +328,7 @@ void QgsAtlasCompositionWidget::on_mAtlasSortFeatureDirectionButton_clicked()
328328
void QgsAtlasCompositionWidget::updateGuiElements()
329329
{
330330
blockAllSignals( true );
331-
QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
331+
QgsAtlasComposition *atlasMap = &mComposition->atlasComposition();
332332

333333
mUseAtlasCheckBox->setCheckState( atlasMap->enabled() ? Qt::Checked : Qt::Unchecked );
334334
mConfigurationGroup->setEnabled( atlasMap->enabled() );

‎src/app/composer/qgsatlascompositionwidget.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,37 @@ 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
3232
public:
33-
QgsAtlasCompositionWidget( QWidget* parent, QgsComposition* c );
33+
QgsAtlasCompositionWidget( QWidget *parent, QgsComposition *c );
3434
~QgsAtlasCompositionWidget();
3535

3636
public slots:
3737
void on_mUseAtlasCheckBox_stateChanged( int state );
38-
void changeCoverageLayer( QgsMapLayer* layer );
38+
void changeCoverageLayer( QgsMapLayer *layer );
3939
void on_mAtlasFilenamePatternEdit_editingFinished();
4040
void on_mAtlasFilenameExpressionButton_clicked();
4141
void on_mAtlasHideCoverageCheckBox_stateChanged( int state );
4242
void on_mAtlasSingleFileCheckBox_stateChanged( int state );
4343

4444
void on_mAtlasSortFeatureCheckBox_stateChanged( int state );
45-
void changesSortFeatureField( const QString& fieldName );
45+
void changesSortFeatureField( const QString &fieldName );
4646
void on_mAtlasSortFeatureDirectionButton_clicked();
4747
void on_mAtlasFeatureFilterEdit_editingFinished();
4848
void on_mAtlasFeatureFilterButton_clicked();
4949
void on_mAtlasFeatureFilterCheckBox_stateChanged( int state );
50-
void pageNameExpressionChanged( const QString& expression, bool valid );
50+
void pageNameExpressionChanged( const QString &expression, bool valid );
5151

5252
private slots:
5353
void updateGuiElements();
5454

5555
void updateAtlasFeatures();
5656

5757
private:
58-
QgsComposition* mComposition = nullptr;
58+
QgsComposition *mComposition = nullptr;
5959

6060
void blockAllSignals( bool b );
6161
void checkLayerType( QgsVectorLayer *layer );

0 commit comments

Comments
 (0)