Skip to content

Commit 86a56b6

Browse files
jef-njef-n
committed
indentation update
1 parent 8a1953b commit 86a56b6

7 files changed

+49
-49
lines changed

‎src/core/composer/qgscomposerhtml.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ void QgsComposerHtml::setUrl( const QUrl& url )
5858
qApp->processEvents();
5959
}
6060

61-
if ( frameCount() < 1) return;
61+
if ( frameCount() < 1 ) return;
6262
//QSize contentsSize = mWebPage->mainFrame()->contentsSize();
6363

64-
QRectF contentRect = this->mFrameItems.at(0)->boundingRect();
64+
QRectF contentRect = this->mFrameItems.at( 0 )->boundingRect();
6565
//there is going to be a little rounding error converting from float to int
66-
QSize contentsSize = QSize( (int)(contentRect.width() * mHtmlUnitsToMM),
67-
(int)(contentRect.height() * mHtmlUnitsToMM));
66+
QSize contentsSize = QSize(( int )( contentRect.width() * mHtmlUnitsToMM ),
67+
( int )( contentRect.height() * mHtmlUnitsToMM ) );
6868
mWebPage->setViewportSize( contentsSize );
6969

7070
//suppress scroll bars always
71-
mWebPage->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
72-
mWebPage->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
71+
mWebPage->mainFrame()->setScrollBarPolicy( Qt::Horizontal, Qt::ScrollBarAlwaysOff );
72+
mWebPage->mainFrame()->setScrollBarPolicy( Qt::Vertical, Qt::ScrollBarAlwaysOff );
7373

7474
mSize.setWidth( contentsSize.width() / mHtmlUnitsToMM );
7575
mSize.setHeight( contentsSize.height() / mHtmlUnitsToMM );

‎src/core/composer/qgslegendmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void QgsLegendModel::setLayerSet( const QStringList& layerIds )
119119

120120
QStandardItem* QgsLegendModel::addGroup( QString text, int position )
121121
{
122-
if( text.isNull() )
122+
if ( text.isNull() )
123123
text = tr( "Group" );
124124

125125
QgsComposerGroupItem* groupItem = new QgsComposerGroupItem( text );

‎src/core/qgscoordinatereferencesystem.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,8 @@ void QgsCoordinateReferenceSystem::setProj4String( QString theProj4String )
902902
{
903903
char *oldlocale = setlocale( LC_NUMERIC, NULL );
904904
/* the next setlocale() invalides the return of previous setlocale() */
905-
if (oldlocale != NULL)
906-
oldlocale = strdup(oldlocale);
905+
if ( oldlocale )
906+
oldlocale = strdup( oldlocale );
907907

908908
setlocale( LC_NUMERIC, "C" );
909909
OSRDestroySpatialReference( mCRS );
@@ -919,7 +919,7 @@ void QgsCoordinateReferenceSystem::setProj4String( QString theProj4String )
919919
#endif
920920

921921
setlocale( LC_NUMERIC, oldlocale );
922-
free(oldlocale);
922+
free( oldlocale );
923923
}
924924
void QgsCoordinateReferenceSystem::setGeographicFlag( bool theGeoFlag )
925925
{

‎src/core/qgscoordinatetransform.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@ void QgsCoordinateTransform::transformInPlace( double& x, double& y, double& z,
319319
}
320320

321321
void QgsCoordinateTransform::transformInPlace(
322-
QVector<double>& x, QVector<double>& y, QVector<double>& z,
323-
TransformDirection direction ) const
322+
QVector<double>& x, QVector<double>& y, QVector<double>& z,
323+
TransformDirection direction ) const
324324
{
325325
if ( mShortCircuit || !mInitialisedFlag )
326326
return;
@@ -373,8 +373,8 @@ void QgsCoordinateTransform::transformInPlace( float& x, float& y, float& z,
373373
}
374374

375375
void QgsCoordinateTransform::transformInPlace(
376-
QVector<float>& x, QVector<float>& y, QVector<float>& z,
377-
TransformDirection direction ) const
376+
QVector<float>& x, QVector<float>& y, QVector<float>& z,
377+
TransformDirection direction ) const
378378
{
379379
if ( mShortCircuit || !mInitialisedFlag )
380380
return;

‎src/core/qgsgeometry.cpp

+24-24
Original file line numberDiff line numberDiff line change
@@ -3946,10 +3946,10 @@ QString QgsGeometry::exportToWkt()
39463946
{
39473947
mWkt += "POINT(";
39483948
x = ( double * )( mGeometry + 5 );
3949-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
3949+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
39503950
mWkt += " ";
39513951
y = ( double * )( mGeometry + 5 + sizeof( double ) );
3952-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
3952+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
39533953
mWkt += ")";
39543954
return mWkt;
39553955
}
@@ -3975,11 +3975,11 @@ QString QgsGeometry::exportToWkt()
39753975
mWkt += ", ";
39763976
}
39773977
x = ( double * ) ptr;
3978-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
3978+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
39793979
mWkt += " ";
39803980
ptr += sizeof( double );
39813981
y = ( double * ) ptr;
3982-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
3982+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
39833983
ptr += sizeof( double );
39843984
if ( hasZValue )
39853985
{
@@ -4030,11 +4030,11 @@ QString QgsGeometry::exportToWkt()
40304030
mWkt += ",";
40314031
}
40324032
x = ( double * ) ptr;
4033-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4033+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
40344034
mWkt += " ";
40354035
ptr += sizeof( double );
40364036
y = ( double * ) ptr;
4037-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4037+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
40384038
ptr += sizeof( double );
40394039
if ( hasZValue )
40404040
{
@@ -4068,11 +4068,11 @@ QString QgsGeometry::exportToWkt()
40684068
mWkt += ", ";
40694069
}
40704070
x = ( double * )( ptr );
4071-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4071+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
40724072
mWkt += " ";
40734073
ptr += sizeof( double );
40744074
y = ( double * )( ptr );
4075-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4075+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
40764076
ptr += sizeof( double );
40774077
if ( hasZValue )
40784078
{
@@ -4112,11 +4112,11 @@ QString QgsGeometry::exportToWkt()
41124112
mWkt += ", ";
41134113
}
41144114
x = ( double * ) ptr;
4115-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4115+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
41164116
ptr += sizeof( double );
41174117
mWkt += " ";
41184118
y = ( double * ) ptr;
4119-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4119+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
41204120
ptr += sizeof( double );
41214121
if ( hasZValue )
41224122
{
@@ -4168,11 +4168,11 @@ QString QgsGeometry::exportToWkt()
41684168
mWkt += ",";
41694169
}
41704170
x = ( double * ) ptr;
4171-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4171+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
41724172
ptr += sizeof( double );
41734173
mWkt += " ";
41744174
y = ( double * ) ptr;
4175-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4175+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
41764176
ptr += sizeof( double );
41774177
if ( hasZValue )
41784178
{
@@ -4226,10 +4226,10 @@ QString QgsGeometry::exportToGeoJSON()
42264226
{
42274227
mWkt += "{ \"type\": \"Point\", \"coordinates\": [";
42284228
x = ( double * )( mGeometry + 5 );
4229-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4229+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
42304230
mWkt += ", ";
42314231
y = ( double * )( mGeometry + 5 + sizeof( double ) );
4232-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4232+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
42334233
mWkt += "] }";
42344234
return mWkt;
42354235
}
@@ -4256,11 +4256,11 @@ QString QgsGeometry::exportToGeoJSON()
42564256
}
42574257
mWkt += "[";
42584258
x = ( double * ) ptr;
4259-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4259+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
42604260
mWkt += ", ";
42614261
ptr += sizeof( double );
42624262
y = ( double * ) ptr;
4263-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4263+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
42644264
ptr += sizeof( double );
42654265
if ( hasZValue )
42664266
{
@@ -4313,11 +4313,11 @@ QString QgsGeometry::exportToGeoJSON()
43134313
}
43144314
mWkt += "[";
43154315
x = ( double * ) ptr;
4316-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4316+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
43174317
mWkt += ", ";
43184318
ptr += sizeof( double );
43194319
y = ( double * ) ptr;
4320-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4320+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
43214321
ptr += sizeof( double );
43224322
if ( hasZValue )
43234323
{
@@ -4353,11 +4353,11 @@ QString QgsGeometry::exportToGeoJSON()
43534353
}
43544354
mWkt += "[";
43554355
x = ( double * )( ptr );
4356-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4356+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
43574357
mWkt += ", ";
43584358
ptr += sizeof( double );
43594359
y = ( double * )( ptr );
4360-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4360+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
43614361
ptr += sizeof( double );
43624362
if ( hasZValue )
43634363
{
@@ -4399,11 +4399,11 @@ QString QgsGeometry::exportToGeoJSON()
43994399
}
44004400
mWkt += "[";
44014401
x = ( double * ) ptr;
4402-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4402+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
44034403
ptr += sizeof( double );
44044404
mWkt += ", ";
44054405
y = ( double * ) ptr;
4406-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4406+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
44074407
ptr += sizeof( double );
44084408
if ( hasZValue )
44094409
{
@@ -4457,11 +4457,11 @@ QString QgsGeometry::exportToGeoJSON()
44574457
}
44584458
mWkt += "[";
44594459
x = ( double * ) ptr;
4460-
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4460+
mWkt += QString::number( *x, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
44614461
ptr += sizeof( double );
44624462
mWkt += ", ";
44634463
y = ( double * ) ptr;
4464-
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
4464+
mWkt += QString::number( *y, 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
44654465
ptr += sizeof( double );
44664466
if ( hasZValue )
44674467
{

‎src/mapserver/qgswfsserver.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,10 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
442442
if ( bboxOk )
443443
searchRect.set( minx, miny, maxx, maxy );
444444
else
445-
searchRect.set( searchRect.xMinimum()-0.000001
446-
, searchRect.yMinimum()-0.000001
447-
, searchRect.xMaximum()+0.000001
448-
, searchRect.yMaximum()+0.000001 );
445+
searchRect.set( searchRect.xMinimum() - 0.000001
446+
, searchRect.yMinimum() - 0.000001
447+
, searchRect.xMaximum() + 0.000001
448+
, searchRect.yMaximum() + 0.000001 );
449449
QgsCoordinateReferenceSystem layerCrs = layer->crs();
450450

451451
startGetFeature( request, format, layerCrs, &searchRect );
@@ -516,7 +516,7 @@ void QgsWFSServer::startGetFeature( QgsRequestHandler& request, const QString& f
516516
if ( format == "GeoJSON" )
517517
{
518518
fcString = "{\"type\": \"FeatureCollection\",\n";
519-
fcString += " \"bbox\": [ " + QString::number( rect->xMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( rect->yMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( rect->xMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( rect->yMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + "],\n";
519+
fcString += " \"bbox\": [ " + QString::number( rect->xMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( rect->yMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( rect->xMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( rect->yMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + "],\n";
520520
fcString += " \"features\": [\n";
521521
result = fcString.toUtf8();
522522
request.startGetFeatureResponse( &result, format );
@@ -696,7 +696,7 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, QgsCoordinateRefer
696696
{
697697
QgsRectangle box = geom->boundingBox();
698698

699-
fStr += " \"bbox\": [ " + QString::number( box.xMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( box.yMinimum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( box.xMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + ", " + QString::number( box.yMaximum(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") ) + "],\n";
699+
fStr += " \"bbox\": [ " + QString::number( box.xMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( box.yMinimum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( box.xMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + ", " + QString::number( box.yMaximum(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) ) + "],\n";
700700

701701
fStr += " \"geometry\": ";
702702
fStr += geom->exportToGeoJSON();
@@ -1025,9 +1025,9 @@ QDomElement QgsWFSServer::createCoordinateElem( const QVector<QgsPoint> points,
10251025
{
10261026
coordString += " ";
10271027
}
1028-
coordString += QString::number( pointIt->x(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
1028+
coordString += QString::number( pointIt->x(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
10291029
coordString += ",";
1030-
coordString += QString::number( pointIt->y(), 'f', 6 ).remove( QRegExp("[0]{1,5}$") );
1030+
coordString += QString::number( pointIt->y(), 'f', 6 ).remove( QRegExp( "[0]{1,5}$" ) );
10311031
}
10321032

10331033
QDomText coordText = doc.createTextNode( coordString );

‎src/providers/gdal/qgsgdalprovider.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ QString QgsGdalProvider::buildPyramids( QList<QgsRasterPyramid> const & theRaste
13771377
}
13781378

13791379
// are we using Erdas Imagine external overviews?
1380-
char* myConfigUseRRD = strdup(CPLGetConfigOption( "USE_RRD", "NO" ));
1380+
char* myConfigUseRRD = strdup( CPLGetConfigOption( "USE_RRD", "NO" ) );
13811381
if ( theFormat == PyramidsErdas )
13821382
CPLSetConfigOption( "USE_RRD", "YES" );
13831383
else
@@ -1471,7 +1471,7 @@ QString QgsGdalProvider::buildPyramids( QList<QgsRasterPyramid> const & theRaste
14711471
//emit drawingProgress( 0, 0 );
14721472
// restore former USE_RRD config (Erdas)
14731473
CPLSetConfigOption( "USE_RRD", myConfigUseRRD );
1474-
free(myConfigUseRRD);
1474+
free( myConfigUseRRD );
14751475
return "FAILED_NOT_SUPPORTED";
14761476
}
14771477
else
@@ -1488,7 +1488,7 @@ QString QgsGdalProvider::buildPyramids( QList<QgsRasterPyramid> const & theRaste
14881488

14891489
// restore former USE_RRD config (Erdas)
14901490
CPLSetConfigOption( "USE_RRD", myConfigUseRRD );
1491-
free(myConfigUseRRD);
1491+
free( myConfigUseRRD );
14921492

14931493
QgsDebugMsg( "Pyramid overviews built" );
14941494

0 commit comments

Comments
 (0)