Skip to content

Commit c2761d3

Browse files
jef-njef-n
committedDec 27, 2011
indentation update
1 parent 317193e commit c2761d3

18 files changed

+68
-68
lines changed
 

‎src/analysis/interpolation/ParametricLine.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,62 +27,62 @@ void ParametricLine::calcFirstDer( float t, Vector3D* v )
2727
{
2828
Q_UNUSED( t );
2929
Q_UNUSED( v );
30-
QgsDebugMsg( "warning, derive a class from ParametricLine");
30+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
3131
}
3232

3333
void ParametricLine::calcSecDer( float t, Vector3D* v )
3434
{
3535
Q_UNUSED( t );
3636
Q_UNUSED( v );
37-
QgsDebugMsg( "warning, derive a class from ParametricLine");
37+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
3838
}
3939

4040
void ParametricLine::calcPoint( float t, Point3D *p )
4141
{
4242
Q_UNUSED( t );
4343
Q_UNUSED( p );
44-
QgsDebugMsg( "warning, derive a class from ParametricLine");
44+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
4545
}
4646

4747
ParametricLine* ParametricLine::getParent() const
4848
{
49-
QgsDebugMsg( "warning, derive a class from ParametricLine");
49+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
5050
return 0;
5151
}
5252

5353
void ParametricLine::remove( int i )
5454
{
5555
Q_UNUSED( i );
56-
QgsDebugMsg( "warning, derive a class from ParametricLine");
56+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
5757
}
5858

5959
void ParametricLine::setControlPoly( QVector<Point3D*>* cp )
6060
{
6161
Q_UNUSED( cp );
62-
QgsDebugMsg( "warning, derive a class from ParametricLine");
62+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
6363
}
6464

6565
void ParametricLine::setParent( ParametricLine* paral )
6666
{
6767
Q_UNUSED( paral );
68-
QgsDebugMsg( "warning, derive a class from ParametricLine");
68+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
6969
}
7070

7171
int ParametricLine::getDegree() const
7272
{
73-
QgsDebugMsg( "warning, derive a class from ParametricLine");
73+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
7474
return mDegree;
7575
}
7676

7777
const Point3D* ParametricLine::getControlPoint( int number ) const
7878
{
7979
Q_UNUSED( number );
80-
QgsDebugMsg( "warning, derive a class from ParametricLine");
80+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
8181
return 0;
8282
}
8383

8484
const QVector<Point3D*>* ParametricLine::getControlPoly() const
8585
{
86-
QgsDebugMsg( "warning, derive a class from ParametricLine");
86+
QgsDebugMsg( "warning, derive a class from ParametricLine" );
8787
return 0;
8888
}

‎src/app/legend/qgslegend.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,10 @@ void QgsLegend::removeLayer( QString layerId )
256256

257257
if ( ll && ll->layer() && ll->layer()->id() == layerId )
258258
{
259-
if( !ll->isVisible() )
260-
{
259+
if ( !ll->isVisible() )
260+
{
261261
invLayerRemoved = true;
262-
}
262+
}
263263
removeItem( ll );
264264
delete ll;
265265
break;
@@ -269,7 +269,7 @@ void QgsLegend::removeLayer( QString layerId )
269269
updateMapCanvasLayerSet();
270270
adjustIconSize();
271271

272-
if( invLayerRemoved )
272+
if ( invLayerRemoved )
273273
emit invisibleLayerRemoved();
274274
}
275275

‎src/app/qgslabelinggui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
125125
chkLineAbove->setChecked( lyr.placementFlags & QgsPalLayerSettings::AboveLine );
126126
chkLineBelow->setChecked( lyr.placementFlags & QgsPalLayerSettings::BelowLine );
127127
chkLineOn->setChecked( lyr.placementFlags & QgsPalLayerSettings::OnLine );
128-
if ( ! ( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )
128+
if ( !( lyr.placementFlags & QgsPalLayerSettings::MapOrientation ) )
129129
chkLineOrientationDependent->setChecked( true );
130130
}
131131

@@ -519,7 +519,7 @@ void QgsLabelingGui::updateUi()
519519
spinDecimals->setEnabled( chkFormattedNumbers->isChecked() );
520520

521521
bool offline = chkLineAbove->isChecked() || chkLineBelow->isChecked();
522-
offlineOptions->setEnabled ( offline );
522+
offlineOptions->setEnabled( offline );
523523
}
524524

525525
void QgsLabelingGui::changeBufferColor()

‎src/core/composer/qgscomposermap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
8585
@param extent map extent
8686
@param size size in scene coordinates
8787
@param dpi scene dpi
88-
@param forceWidthScale force wysiwyg line widths / marker sizes
89-
*/
88+
@param forceWidthScale force wysiwyg line widths / marker sizes
89+
*/
9090
void draw( QPainter *painter, const QgsRectangle& extent, const QSizeF& size, double dpi, double* forceWidthScale = 0 );
9191

9292
/** \brief Reimplementation of QCanvasItem::paint - draw on canvas */

‎src/core/qgsapplication.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -505,14 +505,14 @@ void QgsApplication::exitQgis()
505505
QString QgsApplication::showSettings()
506506
{
507507
QString myState = tr( "Application state:\n"
508-
"Prefix:\t\t%1\n"
509-
"Plugin Path:\t\t%2\n"
510-
"Package Data Path:\t%3\n"
511-
"Active Theme Name:\t%4\n"
512-
"Active Theme Path:\t%5\n"
513-
"Default Theme Path:\t%6\n"
514-
"SVG Search Paths:\t%7\n"
515-
"User DB Path:\t%8\n" )
508+
"Prefix:\t\t%1\n"
509+
"Plugin Path:\t\t%2\n"
510+
"Package Data Path:\t%3\n"
511+
"Active Theme Name:\t%4\n"
512+
"Active Theme Path:\t%5\n"
513+
"Default Theme Path:\t%6\n"
514+
"SVG Search Paths:\t%7\n"
515+
"User DB Path:\t%8\n" )
516516
.arg( mPrefixPath )
517517
.arg( mPluginPath )
518518
.arg( mPkgDataPath )

‎src/core/qgsapplication.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class CORE_EXPORT QgsApplication: public QApplication
3434
virtual ~QgsApplication();
3535

3636
/** This method initialises paths etc for QGIS. Called by the ctor or call it manually
37-
when your app does not extend the QApplication class.
38-
@note you will probably want to call initQgis too to load the providers in
37+
when your app does not extend the QApplication class.
38+
@note you will probably want to call initQgis too to load the providers in
3939
the above case.
4040
*/
4141
static void init( QString customConfigPath = QString() );

‎src/core/qgscoordinatetransform.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -392,20 +392,20 @@ void QgsCoordinateTransform::transformInPlace( std::vector<float>& x,
392392
std::vector<double> xd( x.size() );
393393
std::vector<double> yd( y.size() );
394394
std::vector<double> zd( z.size() );
395-
for( int i = 0; i < vectorSize; ++i )
395+
for ( int i = 0; i < vectorSize; ++i )
396396
{
397-
xd[i] = x[i];
398-
yd[i] = y[i];
399-
zd[i] = z[i];
397+
xd[i] = x[i];
398+
yd[i] = y[i];
399+
zd[i] = z[i];
400400
}
401401
transformCoords( x.size(), &xd[0], &yd[0], &zd[0], direction );
402402

403403
//copy back
404-
for( int i = 0; i < vectorSize; ++i )
404+
for ( int i = 0; i < vectorSize; ++i )
405405
{
406-
x[i] = xd[i];
407-
y[i] = yd[i];
408-
z[i] = zd[i];
406+
x[i] = xd[i];
407+
y[i] = yd[i];
408+
z[i] = zd[i];
409409
}
410410
}
411411
catch ( QgsCsException &cse )

‎src/core/qgsmaptopixel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CORE_EXPORT QgsMapToPixel
7676
#ifdef ANDROID
7777
void transformInPlace( float& x, float& y ) const;
7878
void transformInPlace( std::vector<float>& x,
79-
std::vector<float>& y ) const;
79+
std::vector<float>& y ) const;
8080
#endif
8181

8282
QgsPoint toMapCoordinates( int x, int y ) const;

‎src/core/qgsmessagelog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
class QgsMessageLogConsole;
2222

23-
void (*QgsMessageLog::gmLogger)( QString message, QString tag, int level ) = 0;
23+
void ( *QgsMessageLog::gmLogger )( QString message, QString tag, int level ) = 0;
2424

25-
void QgsMessageLog::setLogger( void (*f)( QString message, QString tag, int level ) )
25+
void QgsMessageLog::setLogger( void ( *f )( QString message, QString tag, int level ) )
2626
{
2727
gmLogger = f;
2828
}
@@ -31,7 +31,7 @@ void QgsMessageLog::logMessage( QString message, QString tag, int level )
3131
{
3232
QgsDebugMsg( QString( "%1 %2[%3] %4" ).arg( QDateTime::currentDateTime().toString( Qt::ISODate ) ).arg( tag ).arg( level ).arg( message ) );
3333

34-
if( !gmLogger )
34+
if ( !gmLogger )
3535
QgsMessageLogConsole::logger( message, tag, level );
3636
else
3737
gmLogger( message, tag, level );

‎src/core/qgsmessagelog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ class CORE_EXPORT QgsMessageLog
3737
static void logMessage( QString message, QString tag = QString::null, int level = 0 );
3838

3939
//! set log message
40-
static void setLogger( void (*logger)( QString message, QString tag, int level ) );
40+
static void setLogger( void ( *logger )( QString message, QString tag, int level ) );
4141

4242
private:
4343
//! function
44-
static void (*gmLogger)( QString message, QString tag, int level );
44+
static void ( *gmLogger )( QString message, QString tag, int level );
4545
};
4646

4747

‎src/core/raster/qgsrasterlayer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
397397
/** \brief Accessor for transparent band name mapping */
398398
QString transparentBandName() const { return mTransparencyBandName; }
399399

400-
/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
400+
/** \brief [ data provider interface ] Does this layer use a provider for setting/retrieving data?
401401
* @deprecated in 2.0
402402
*/
403403
Q_DECL_DEPRECATED bool usesProvider();
@@ -548,12 +548,12 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
548548
/** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
549549
QPixmap paletteAsPixmap( int theBandNumber = 1 );
550550

551-
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
551+
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
552552
* @note added in 2.0
553553
*/
554554
QString providerType() const;
555555

556-
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
556+
/** \brief [ data provider interface ] Which provider is being used for this Raster Layer?
557557
* @deprecated use providerType()
558558
*/
559559
Q_DECL_DEPRECATED QString providerKey() const { return providerType(); }

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ unsigned char* QgsFeatureRendererV2::_getLineString( QPolygonF& pts, QgsRenderCo
5454

5555
bool hasZValue = ( wkbType == QGis::WKBLineString25D );
5656
double x, y;
57-
#ifdef ANDROID
58-
qreal z;
59-
#else
60-
double z;
61-
#endif //ANDROID
57+
#ifdef ANDROID
58+
qreal z;
59+
#else
60+
double z;
61+
#endif //ANDROID
6262
const QgsCoordinateTransform* ct = context.coordinateTransform();
6363
const QgsMapToPixel& mtp = context.mapToPixel();
6464

@@ -120,11 +120,11 @@ unsigned char* QgsFeatureRendererV2::_getPolygon( QPolygonF& pts, QList<QPolygon
120120

121121
const QgsCoordinateTransform* ct = context.coordinateTransform();
122122
const QgsMapToPixel& mtp = context.mapToPixel();
123-
#ifdef ANDROID
124-
qreal z = 0; // dummy variable for coordiante transform
125-
#else
126-
double z = 0; // dummy variable for coordiante transform
127-
#endif
123+
#ifdef ANDROID
124+
qreal z = 0; // dummy variable for coordiante transform
125+
#else
126+
double z = 0; // dummy variable for coordiante transform
127+
#endif
128128
const QgsRectangle& e = context.extent();
129129
double cw = e.width() / 10; double ch = e.height() / 10;
130130
QgsRectangle clipRect( e.xMinimum() - cw, e.yMinimum() - ch, e.xMaximum() + cw, e.yMaximum() + ch );

‎src/gui/attributetable/qgsattributetablememorymodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void QgsAttributeTableMemoryModel::loadLayer()
4949

5050
mLayer->select( mLayer->pendingAllAttributesList(), rect, false );
5151

52-
if( behaviour != 1 )
52+
if ( behaviour != 1 )
5353
mFeatureMap.reserve( mLayer->pendingFeatureCount() + 50 );
5454
else
5555
mFeatureMap.reserve( mLayer->selectedFeatureCount() );
@@ -59,7 +59,7 @@ void QgsAttributeTableMemoryModel::loadLayer()
5959
QgsFeature f;
6060
while ( mLayer->nextFeature( f ) )
6161
{
62-
if( behaviour == 1 && !mLayer->selectedFeaturesIds().contains( f.id() ) )
62+
if ( behaviour == 1 && !mLayer->selectedFeaturesIds().contains( f.id() ) )
6363
continue;
6464

6565
mIdRowMap.insert( f.id(), n );

‎src/gui/qgsattributeeditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ bool QgsAttributeEditor::setValue( QWidget *editor, QgsVectorLayer *vl, int idx,
765765
case QgsVectorLayer::Calendar:
766766
{
767767
QLineEdit* le = qobject_cast<QLineEdit*>( editor );
768-
if( !le )
768+
if ( !le )
769769
{
770770
le = editor->findChild<QLineEdit *>();
771771
}

‎src/gui/qgsdetaileditemdelegate.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ int QgsDetailedItemDelegate::height( const QStyleOptionViewItem & theOption,
293293
myHeight += myCategoryMetrics.height() + verticalSpacing();
294294
// if category should be wrapped use this code
295295
//~ myList = wordWrap( theData.category(),
296-
//~ myCategoryMetrics,
297-
//~ theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
296+
//~ myCategoryMetrics,
297+
//~ theOption.rect.width() - ( mpCheckBox->width() + horizontalSpacing() ) );
298298
//~ myHeight += ( myList.count() + 1 ) * ( myCategoryMetrics.height() - verticalSpacing() );
299299
return myHeight;
300300
}

‎src/gui/qgsmapcanvas.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ QgsMapCanvas::QgsMapCanvas( QWidget * parent, const char *name )
8787
//disable the update that leads to the resize crash
8888
if ( viewport() )
8989
{
90-
#ifndef ANDROID
91-
viewport()->setAttribute( Qt::WA_PaintOnScreen, true );
92-
#endif //ANDROID
90+
#ifndef ANDROID
91+
viewport()->setAttribute( Qt::WA_PaintOnScreen, true );
92+
#endif //ANDROID
9393
}
9494

9595
mScene = new QGraphicsScene();

‎src/gui/qgsprojectionselector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class GUI_EXPORT QgsProjectionSelector: public QWidget, private Ui::QgsProjectio
115115
void setOgcWmsCrsFilter( QSet<QString> crsFilter );
116116
void on_lstRecent_currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * );
117117
void on_cbxHideDeprecated_stateChanged();
118-
void on_leSearch_textChanged(const QString &);
118+
void on_leSearch_textChanged( const QString & );
119119

120120
protected:
121121
/** Used to ensure the projection list view is actually populated */

‎src/plugins/gps_importer/qgsgpsdevicedialog.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#include <QSettings>
1818

1919

20-
QgsGPSDeviceDialog::QgsGPSDeviceDialog( std::map<QString,
21-
QgsGPSDevice*>& devices )
22-
: QDialog( 0, QgisGui::ModalDialogFlags )
23-
, mDevices( devices )
20+
QgsGPSDeviceDialog::QgsGPSDeviceDialog( std::map < QString,
21+
QgsGPSDevice* > & devices )
22+
: QDialog( 0, QgisGui::ModalDialogFlags )
23+
, mDevices( devices )
2424
{
2525
setupUi( this );
2626
setAttribute( Qt::WA_DeleteOnClose );

0 commit comments

Comments
 (0)