Skip to content

Commit 0b6da7e

Browse files
jef-njef-n
committedAug 14, 2012
indentation update
·
ltr-3_40Before-merge-new_vector_api
1 parent f6dbc22 commit 0b6da7e

20 files changed

+203
-203
lines changed
 

‎src/app/qgslabelinggui.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,8 @@ void QgsLabelingGui::changePreviewBackground()
479479

480480
mPreviewBackgroundBtn->setColor( color );
481481
scrollArea_mPreview->widget()->setStyleSheet( QString( "background: rgb(%1, %2, %3);" ).arg( QString::number( color.red() ),
482-
QString::number( color.green() ),
483-
QString::number( color.blue() ) ) );
482+
QString::number( color.green() ),
483+
QString::number( color.blue() ) ) );
484484
}
485485

486486
void QgsLabelingGui::changeTextColor()
@@ -546,12 +546,12 @@ void QgsLabelingGui::updatePreview()
546546
lblFontPreview->setFont( previewFont );
547547

548548
QColor prevColor = btnTextColor->color();
549-
prevColor.setAlphaF( ( 100.0 - (double)(mFontTranspSpinBox->value()) ) / 100.0 );
549+
prevColor.setAlphaF(( 100.0 - ( double )( mFontTranspSpinBox->value() ) ) / 100.0 );
550550
lblFontPreview->setTextColor( prevColor );
551551
if ( chkBuffer->isChecked() )
552552
{
553553
QColor buffColor = btnBufferColor->color();
554-
buffColor.setAlphaF( ( 100.0 - (double)(mBufferTranspSpinBox->value()) ) / 100.0 );
554+
buffColor.setAlphaF(( 100.0 - ( double )( mBufferTranspSpinBox->value() ) ) / 100.0 );
555555
lblFontPreview->setBuffer( spinBufferSize->value(), buffColor );
556556
}
557557
else

‎src/app/qgslabelinggui.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
5353
void on_mFontSizeSpinBox_valueChanged( double d );
5454
void on_mFontSizeUnitComboBox_currentIndexChanged( int index );
5555
void on_mFontTranspSpinBox_valueChanged( int i );
56-
void on_mFontWordSpacingSpinBox_valueChanged(double spacing );
57-
void on_mFontLetterSpacingSpinBox_valueChanged(double spacing );
56+
void on_mFontWordSpacingSpinBox_valueChanged( double spacing );
57+
void on_mFontLetterSpacingSpinBox_valueChanged( double spacing );
5858
void on_mBufferTranspSpinBox_valueChanged( int i );
5959
void on_mXCoordinateComboBox_currentIndexChanged( const QString & text );
6060
void on_mYCoordinateComboBox_currentIndexChanged( const QString & text );

‎src/app/qgslabelpropertydialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ void QgsLabelPropertyDialog::on_mMinScaleSpinBox_valueChanged( int i )
248248
insertChangedValue( QgsPalLayerSettings::MinScale, i );
249249
}
250250

251-
void QgsLabelPropertyDialog::on_mMaxScaleSpinBox_valueChanged(int i )
251+
void QgsLabelPropertyDialog::on_mMaxScaleSpinBox_valueChanged( int i )
252252
{
253253
insertChangedValue( QgsPalLayerSettings::MaxScale, i );
254254
}

‎src/app/qgslabelpropertydialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog
3838

3939
private slots:
4040
void on_mShowLabelChkbx_toggled( bool chkd );
41-
void on_mMinScaleSpinBox_valueChanged(int i );
41+
void on_mMinScaleSpinBox_valueChanged( int i );
4242
void on_mMaxScaleSpinBox_valueChanged( int i );
4343
void on_mLabelDistanceSpinBox_valueChanged( double d );
4444
void on_mXCoordSpinBox_valueChanged( double d );

‎src/core/composer/qgsaddremovemultiframecommand.cpp

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222

2323
QgsAddRemoveMultiFrameCommand::QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent ):
24-
QUndoCommand( text, parent ), mMultiFrame( multiFrame ), mComposition( c ), mState(s), mFirstRun( true )
24+
QUndoCommand( text, parent ), mMultiFrame( multiFrame ), mComposition( c ), mState( s ), mFirstRun( true )
2525
{
2626
}
2727

@@ -31,56 +31,56 @@ QgsAddRemoveMultiFrameCommand::QgsAddRemoveMultiFrameCommand(): mMultiFrame( 0 )
3131

3232
QgsAddRemoveMultiFrameCommand::~QgsAddRemoveMultiFrameCommand()
3333
{
34-
if( mState == Removed )
35-
{
36-
delete mMultiFrame;
37-
}
34+
if ( mState == Removed )
35+
{
36+
delete mMultiFrame;
37+
}
3838
}
3939

4040
void QgsAddRemoveMultiFrameCommand::redo()
4141
{
42-
if( checkFirstRun() )
43-
{
44-
return;
45-
}
46-
switchState();
42+
if ( checkFirstRun() )
43+
{
44+
return;
45+
}
46+
switchState();
4747
}
4848

4949
void QgsAddRemoveMultiFrameCommand::undo()
5050
{
51-
if( checkFirstRun() )
52-
{
53-
return;
54-
}
55-
switchState();
51+
if ( checkFirstRun() )
52+
{
53+
return;
54+
}
55+
switchState();
5656
}
5757

5858
void QgsAddRemoveMultiFrameCommand::switchState()
5959
{
60-
if( mComposition )
60+
if ( mComposition )
61+
{
62+
if ( mState == Added )
63+
{
64+
mComposition->removeMultiFrame( mMultiFrame );
65+
mState = Removed;
66+
}
67+
else
6168
{
62-
if( mState == Added )
63-
{
64-
mComposition->removeMultiFrame( mMultiFrame );
65-
mState = Removed;
66-
}
67-
else
68-
{
69-
mComposition->addMultiFrame( mMultiFrame );
70-
mState = Added;
71-
}
69+
mComposition->addMultiFrame( mMultiFrame );
70+
mState = Added;
7271
}
72+
}
7373
}
7474

7575
bool QgsAddRemoveMultiFrameCommand::checkFirstRun()
7676
{
77-
if( mFirstRun )
78-
{
79-
mFirstRun = false;
80-
return true;
81-
}
82-
else
83-
{
84-
return false;
85-
}
77+
if ( mFirstRun )
78+
{
79+
mFirstRun = false;
80+
return true;
81+
}
82+
else
83+
{
84+
return false;
85+
}
8686
}

‎src/core/composer/qgsaddremovemultiframecommand.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ class QgsComposition;
2525

2626
class CORE_EXPORT QgsAddRemoveMultiFrameCommand: public QUndoCommand
2727
{
28-
public:
28+
public:
2929

3030
enum State
3131
{
3232
Added = 0,
3333
Removed
3434
};
3535

36-
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent = 0 );
37-
~QgsAddRemoveMultiFrameCommand();
38-
void redo();
39-
void undo();
36+
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent = 0 );
37+
~QgsAddRemoveMultiFrameCommand();
38+
void redo();
39+
void undo();
4040

41-
private:
42-
QgsAddRemoveMultiFrameCommand();
41+
private:
42+
QgsAddRemoveMultiFrameCommand();
4343

44-
//changes between added / removed state
45-
void switchState();
46-
bool checkFirstRun();
44+
//changes between added / removed state
45+
void switchState();
46+
bool checkFirstRun();
4747

48-
QgsComposerMultiFrame* mMultiFrame;
49-
QgsComposition* mComposition;
50-
State mState;
51-
bool mFirstRun;
48+
QgsComposerMultiFrame* mMultiFrame;
49+
QgsComposition* mComposition;
50+
State mState;
51+
bool mFirstRun;
5252
};
5353

5454
#endif // QGSADDREMOVEMULTIFRAMECOMMAND_H

‎src/core/composer/qgscomposerframe.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
#include "qgscomposermultiframe.h"
1818

1919
QgsComposerFrame::QgsComposerFrame( QgsComposition* c, QgsComposerMultiFrame* mf, qreal x, qreal y, qreal width, qreal height )
20-
: QgsComposerItem( x, y, width, height, c )
21-
, mMultiFrame( mf )
20+
: QgsComposerItem( x, y, width, height, c )
21+
, mMultiFrame( mf )
2222
{
2323
}
2424

2525
QgsComposerFrame::QgsComposerFrame()
26-
: QgsComposerItem( 0, 0, 0, 0, 0 )
27-
, mMultiFrame( 0 )
26+
: QgsComposerItem( 0, 0, 0, 0, 0 )
27+
, mMultiFrame( 0 )
2828
{
2929
}
3030

‎src/core/qgscoordinatereferencesystem.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,11 +1592,11 @@ bool QgsCoordinateReferenceSystem::loadIDs( QHash<int, QString> &wkts )
15921592
continue;
15931593

15941594
// some CRS are known to fail (see http://trac.osgeo.org/gdal/ticket/2900)
1595-
if( epsg==2218 || epsg==2221 || epsg==2296 || epsg==2297 || epsg==2298 || epsg==2299 || epsg==2300 || epsg==2301 || epsg==2302 ||
1596-
epsg==2303 || epsg==2304 || epsg==2305 || epsg==2306 || epsg==2307 || epsg==2963 || epsg==2985 || epsg==2986 || epsg==3052 ||
1597-
epsg==3053 || epsg==3139 || epsg==3144 || epsg==3145 || epsg==3173 || epsg==3295 || epsg==3993 || epsg==4087 || epsg==4088 ||
1598-
epsg==5017 || epsg==5221 || epsg==5224 || epsg==5225 || epsg==5514 || epsg==5515 || epsg==5516 || epsg==5819 || epsg==5820 ||
1599-
epsg==5821 || epsg==32600 || epsg==32663 || epsg==32700 )
1595+
if ( epsg == 2218 || epsg == 2221 || epsg == 2296 || epsg == 2297 || epsg == 2298 || epsg == 2299 || epsg == 2300 || epsg == 2301 || epsg == 2302 ||
1596+
epsg == 2303 || epsg == 2304 || epsg == 2305 || epsg == 2306 || epsg == 2307 || epsg == 2963 || epsg == 2985 || epsg == 2986 || epsg == 3052 ||
1597+
epsg == 3053 || epsg == 3139 || epsg == 3144 || epsg == 3145 || epsg == 3173 || epsg == 3295 || epsg == 3993 || epsg == 4087 || epsg == 4088 ||
1598+
epsg == 5017 || epsg == 5221 || epsg == 5224 || epsg == 5225 || epsg == 5514 || epsg == 5515 || epsg == 5516 || epsg == 5819 || epsg == 5820 ||
1599+
epsg == 5821 || epsg == 32600 || epsg == 32663 || epsg == 32700 )
16001600
continue;
16011601

16021602
if ( OSRImportFromEPSG( crs, epsg ) != OGRERR_NONE )

‎src/core/qgspallabeling.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer, QgsFeature& f
508508
bool conversionOk;
509509
int minScale = minScaleValue.toInt( &conversionOk );
510510
// TODO: occasional floating point issues?
511-
if ( conversionOk && int( context.rendererScale() ) < minScale )
511+
if ( conversionOk && int( context.rendererScale() ) < minScale )
512512
{
513513
return;
514514
}
@@ -1266,7 +1266,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
12661266
fontTransp = ft;
12671267
}
12681268
}
1269-
fontColor.setAlphaF( ( 100.0 - (double)(fontTransp) ) / 100.0 );
1269+
fontColor.setAlphaF(( 100.0 - ( double )( fontTransp ) ) / 100.0 );
12701270

12711271
//font bold
12721272
QVariant dataDefinedBold = palGeometry->dataDefinedValues().value( QgsPalLayerSettings::Bold );
@@ -1326,7 +1326,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
13261326
bufferTransp = bt;
13271327
}
13281328
}
1329-
bufferColor.setAlphaF( ( 100.0 - (double)(bufferTransp) ) / 100.0 );
1329+
bufferColor.setAlphaF(( 100.0 - ( double )( bufferTransp ) ) / 100.0 );
13301330

13311331
if ( lyr.bufferSize != 0 )
13321332
drawLabel( *it, painter, fontForLabel, fontColor, xform, bufferSize, bufferColor, true );

‎src/core/symbology-ng/qgsmarkersymbollayerv2.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,12 +806,12 @@ QStringList QgsSvgMarkerSymbolLayerV2::listSvgFilesAt( QString directory )
806806
for ( int i = 0; i < svgPaths.size(); i++ )
807807
{
808808
QDir dir( svgPaths[i] );
809-
foreach( QString item, dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot ) )
809+
foreach ( QString item, dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot ) )
810810
{
811811
svgPaths.insert( i + 1, dir.path() + "/" + item );
812812
}
813813

814-
foreach( QString item, dir.entryList( QStringList( "*.svg" ), QDir::Files ) )
814+
foreach ( QString item, dir.entryList( QStringList( "*.svg" ), QDir::Files ) )
815815
{
816816
list.append( dir.path() + "/" + item );
817817
}

0 commit comments

Comments
 (0)
Please sign in to comment.