Skip to content

Commit 46abade

Browse files
jef-njef-n
committedFeb 20, 2014
indentation update
·
ltr-3_40archive/master_2
1 parent eac2877 commit 46abade

13 files changed

+35
-35
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9474,7 +9474,7 @@ void QgisApp::namAuthenticationRequired( QNetworkReply *reply, QAuthenticator *a
94749474
if ( !ok )
94759475
return;
94769476

9477-
if( reply->isFinished() )
9477+
if ( reply->isFinished() )
94789478
return;
94799479

94809480
auth->setUser( username );

‎src/app/qgsfieldcalculator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void QgsFieldCalculator::accept()
178178

179179
bool newField = !mUpdateExistingGroupBox->isChecked();
180180
QVariant emptyAttribute;
181-
if( newField )
181+
if ( newField )
182182
emptyAttribute = QVariant( mVectorLayer->pendingFields()[mAttributeId].type() );
183183

184184
QgsFeatureIterator fit = mVectorLayer->getFeatures( QgsFeatureRequest().setFlags( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) );

‎src/app/qgsfieldsproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ void QgsFieldsProperties::on_pbnSelectEditForm_clicked()
782782
return;
783783

784784
QFileInfo fi( uifilename );
785-
myQSettings.setValue ( "style/lastUIDir", fi.path() );
785+
myQSettings.setValue( "style/lastUIDir", fi.path() );
786786
leEditForm->setText( uifilename );
787787
}
788788

‎src/core/qgscoordinatereferencesystem.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,7 @@ bool QgsCoordinateReferenceSystem::saveAsUserCRS( QString name )
14671467

14681468
QString mySql;
14691469

1470-
QString proj4String=mProj4;
1470+
QString proj4String = mProj4;
14711471
if ( proj4String.isEmpty() )
14721472
{
14731473
proj4String = toProj4();

‎src/core/qgsgeometry.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,7 +2530,7 @@ int QgsGeometry::addPart( const QList<QgsPoint> &points, QGis::GeometryType geom
25302530

25312531
int QgsGeometry::addPart( QgsGeometry *newPart )
25322532
{
2533-
if( !newPart )
2533+
if ( !newPart )
25342534
return 4;
25352535

25362536
const GEOSGeometry * geosPart = newPart->asGeos();
@@ -3329,7 +3329,7 @@ bool QgsGeometry::intersects( const QgsRectangle& r ) const
33293329

33303330
bool QgsGeometry::intersects( const QgsGeometry* geometry ) const
33313331
{
3332-
if( !geometry )
3332+
if ( !geometry )
33333333
return false;
33343334

33353335
try // geos might throw exception on error
@@ -3391,7 +3391,7 @@ bool QgsGeometry::geosRelOp(
33913391
const QgsGeometry *a,
33923392
const QgsGeometry *b )
33933393
{
3394-
if( !a || !b )
3394+
if ( !a || !b )
33953395
return false;
33963396

33973397
try // geos might throw exception on error

‎src/core/qgsnetworkaccessmanager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ QNetworkReply *QgsNetworkAccessManager::createRequest( QNetworkAccessManager::Op
139139
QNetworkRequest *pReq(( QNetworkRequest * ) &req ); // hack user agent
140140

141141
QString userAgent = s.value( "/qgis/networkAndProxy/userAgent", "Mozilla/5.0" ).toString();
142-
if( !userAgent.isEmpty() )
142+
if ( !userAgent.isEmpty() )
143143
userAgent += " ";
144144
userAgent += QString( "QGIS/%1" ).arg( QGis::QGIS_VERSION );
145145
pReq->setRawHeader( "User-Agent", userAgent.toUtf8() );
@@ -189,7 +189,7 @@ void QgsNetworkAccessManager::abortRequest()
189189

190190
QgsMessageLog::logMessage( tr( "Network request %1 timed out" ).arg( reply->url().toString() ), tr( "Network" ) );
191191

192-
if( reply->isRunning() )
192+
if ( reply->isRunning() )
193193
reply->close();
194194
}
195195

‎src/core/qgsvectorlayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,8 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
699699
mRendererV2->startRender( rendererContext, this );
700700

701701
QgsFeatureRequest featureRequest = QgsFeatureRequest()
702-
.setFilterRect( rendererContext.extent() )
703-
.setSubsetOfAttributes( attributes );
702+
.setFilterRect( rendererContext.extent() )
703+
.setSubsetOfAttributes( attributes );
704704

705705
// enable the simplification of the geometries (Using the current map2pixel context) before send it to renderer engine.
706706
if ( simplifyDrawingCanbeApplied( rendererContext, QgsVectorLayer::GeometrySimplification ) )

‎src/core/qgsvectorlayerfeatureiterator.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayer* la
3434
if ( request.filterType() == QgsFeatureRequest::FilterFid )
3535
{
3636
// only copy relevant parts
37-
if( L->editBuffer()->addedFeatures().contains( request.filterFid() ) )
38-
mAddedFeatures.insert( request.filterFid(), L->editBuffer()->addedFeatures()[ request.filterFid() ] );
37+
if ( L->editBuffer()->addedFeatures().contains( request.filterFid() ) )
38+
mAddedFeatures.insert( request.filterFid(), L->editBuffer()->addedFeatures()[ request.filterFid()] );
3939

40-
if( L->editBuffer()->changedGeometries().contains( request.filterFid() ) )
41-
mChangedGeometries.insert( request.filterFid(), L->editBuffer()->changedGeometries()[ request.filterFid() ] );
40+
if ( L->editBuffer()->changedGeometries().contains( request.filterFid() ) )
41+
mChangedGeometries.insert( request.filterFid(), L->editBuffer()->changedGeometries()[ request.filterFid()] );
4242

43-
if( L->editBuffer()->deletedFeatureIds().contains( request.filterFid() ) )
43+
if ( L->editBuffer()->deletedFeatureIds().contains( request.filterFid() ) )
4444
mDeletedFeatureIds.insert( request.filterFid() );
4545

46-
if( L->editBuffer()->changedAttributeValues().contains( request.filterFid() ) )
47-
mChangedAttributeValues.insert( request.filterFid(), L->editBuffer()->changedAttributeValues()[ request.filterFid() ] );
46+
if ( L->editBuffer()->changedAttributeValues().contains( request.filterFid() ) )
47+
mChangedAttributeValues.insert( request.filterFid(), L->editBuffer()->changedAttributeValues()[ request.filterFid()] );
4848

49-
if( L->editBuffer()->changedAttributeValues().contains( request.filterFid() ) )
49+
if ( L->editBuffer()->changedAttributeValues().contains( request.filterFid() ) )
5050
mChangedFeaturesRequest.setFilterFids( QgsFeatureIds() << request.filterFid() );
5151
}
5252
else

‎src/providers/mssql/qgsmssqlsourceselect.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -756,19 +756,19 @@ void QgsMssqlGeomColumnTypeThread::run()
756756
{
757757
QString table;
758758
table = QString( "%1[%2]" )
759-
.arg( layerProperty.schemaName.isEmpty() ? "" : QString("[%1].").arg( layerProperty.schemaName ))
759+
.arg( layerProperty.schemaName.isEmpty() ? "" : QString( "[%1]." ).arg( layerProperty.schemaName ) )
760760
.arg( layerProperty.tableName );
761761

762-
QString query = QString("SELECT %3"
763-
" UPPER([%1].STGeometryType()),"
764-
" [%1].STSrid"
765-
" FROM %2"
766-
" WHERE [%1] IS NOT NULL %4"
767-
" GROUP BY [%1].STGeometryType(), [%1].STSrid")
768-
.arg( layerProperty.geometryColName )
769-
.arg( table )
770-
.arg( mUseEstimatedMetadata ? "TOP 1" : "" )
771-
.arg( layerProperty.sql.isEmpty() ? "" : QString( " AND %1" ).arg( layerProperty.sql ) );
762+
QString query = QString( "SELECT %3"
763+
" UPPER([%1].STGeometryType()),"
764+
" [%1].STSrid"
765+
" FROM %2"
766+
" WHERE [%1] IS NOT NULL %4"
767+
" GROUP BY [%1].STGeometryType(), [%1].STSrid" )
768+
.arg( layerProperty.geometryColName )
769+
.arg( table )
770+
.arg( mUseEstimatedMetadata ? "TOP 1" : "" )
771+
.arg( layerProperty.sql.isEmpty() ? "" : QString( " AND %1" ).arg( layerProperty.sql ) );
772772

773773
// issue the sql query
774774
QSqlDatabase db = QSqlDatabase::database( mConnectionName );

‎src/providers/mssql/qgsmssqlsourceselect.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class QgsMssqlSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase
158158
bool mEmbeddedMode;
159159

160160
// queue another query for the thread
161-
void addSearchGeometryColumn(QString connectionName, QgsMssqlLayerProperty layerProperty , bool estimateMetadata);
161+
void addSearchGeometryColumn( QString connectionName, QgsMssqlLayerProperty layerProperty , bool estimateMetadata );
162162

163163
// Set the position of the database connection list to the last
164164
// used one.

‎src/providers/oracle/qgsoracleconn.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ QString QgsOracleConn::quotedValue( const QVariant &value, QVariant::Type type )
280280
QDateTime datetime( value.toDateTime() );
281281
if ( datetime.isValid() )
282282
return QString( "TO_DATE('%1','YYYY-MM-DD HH24:MI:SS')" ).arg( datetime.toString( "yyyy-MM-dd hh:mm:ss" ) );
283-
break;
283+
break;
284284
}
285285

286286
case QVariant::Date:
@@ -300,7 +300,7 @@ QString QgsOracleConn::quotedValue( const QVariant &value, QVariant::Type type )
300300
}
301301

302302
default:
303-
break;
303+
break;
304304
}
305305
}
306306

‎src/providers/wfs/qgswfsfeatureiterator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ bool QgsWFSFeatureIterator::fetchFeature( QgsFeature& f )
7272

7373
for ( ;; )
7474
{
75-
if( mFeatureIterator == mSelectedFeatures.constEnd() )
75+
if ( mFeatureIterator == mSelectedFeatures.constEnd() )
7676
return false;
7777

7878
QMap<QgsFeatureId, QgsFeature* >::iterator it = mProvider->mFeatures.find( *mFeatureIterator );

‎tests/src/providers/testqgswcsprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void TestQgsWcsProvider::read( )
9797
QStringList versions;
9898

9999
// TODO: 1.1 test disabled for now beacuse it was failing, UMN Mapserver is giving
100-
// 1x1 pixel response if GRIDORIGIN coordinate has a negative value, but it has to be
100+
// 1x1 pixel response if GRIDORIGIN coordinate has a negative value, but it has to be
101101
// verified if the problem is really on Mapserver side
102102
//versions << "1.0" << "1.1";
103103
versions << "1.0";

0 commit comments

Comments
 (0)
Please sign in to comment.