Skip to content
Permalink
Browse files

indentation update

  • Loading branch information
jef-n committed Feb 20, 2014
1 parent eac2877 commit 46abadef5a04daf022c8c029fd1d6c78d2ec0c8f
@@ -9474,7 +9474,7 @@ void QgisApp::namAuthenticationRequired( QNetworkReply *reply, QAuthenticator *a
if ( !ok )
return;

if( reply->isFinished() )
if ( reply->isFinished() )
return;

auth->setUser( username );
@@ -178,7 +178,7 @@ void QgsFieldCalculator::accept()

bool newField = !mUpdateExistingGroupBox->isChecked();
QVariant emptyAttribute;
if( newField )
if ( newField )
emptyAttribute = QVariant( mVectorLayer->pendingFields()[mAttributeId].type() );

QgsFeatureIterator fit = mVectorLayer->getFeatures( QgsFeatureRequest().setFlags( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) );
@@ -782,7 +782,7 @@ void QgsFieldsProperties::on_pbnSelectEditForm_clicked()
return;

QFileInfo fi( uifilename );
myQSettings.setValue ( "style/lastUIDir", fi.path() );
myQSettings.setValue( "style/lastUIDir", fi.path() );
leEditForm->setText( uifilename );
}

@@ -1467,7 +1467,7 @@ bool QgsCoordinateReferenceSystem::saveAsUserCRS( QString name )

QString mySql;

QString proj4String=mProj4;
QString proj4String = mProj4;
if ( proj4String.isEmpty() )
{
proj4String = toProj4();
@@ -2530,7 +2530,7 @@ int QgsGeometry::addPart( const QList<QgsPoint> &points, QGis::GeometryType geom

int QgsGeometry::addPart( QgsGeometry *newPart )
{
if( !newPart )
if ( !newPart )
return 4;

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

bool QgsGeometry::intersects( const QgsGeometry* geometry ) const
{
if( !geometry )
if ( !geometry )
return false;

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

try // geos might throw exception on error
@@ -139,7 +139,7 @@ QNetworkReply *QgsNetworkAccessManager::createRequest( QNetworkAccessManager::Op
QNetworkRequest *pReq(( QNetworkRequest * ) &req ); // hack user agent

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

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

if( reply->isRunning() )
if ( reply->isRunning() )
reply->close();
}

@@ -699,8 +699,8 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
mRendererV2->startRender( rendererContext, this );

QgsFeatureRequest featureRequest = QgsFeatureRequest()
.setFilterRect( rendererContext.extent() )
.setSubsetOfAttributes( attributes );
.setFilterRect( rendererContext.extent() )
.setSubsetOfAttributes( attributes );

// enable the simplification of the geometries (Using the current map2pixel context) before send it to renderer engine.
if ( simplifyDrawingCanbeApplied( rendererContext, QgsVectorLayer::GeometrySimplification ) )
@@ -34,19 +34,19 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayer* la
if ( request.filterType() == QgsFeatureRequest::FilterFid )
{
// only copy relevant parts
if( L->editBuffer()->addedFeatures().contains( request.filterFid() ) )
mAddedFeatures.insert( request.filterFid(), L->editBuffer()->addedFeatures()[ request.filterFid() ] );
if ( L->editBuffer()->addedFeatures().contains( request.filterFid() ) )
mAddedFeatures.insert( request.filterFid(), L->editBuffer()->addedFeatures()[ request.filterFid()] );

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

if( L->editBuffer()->deletedFeatureIds().contains( request.filterFid() ) )
if ( L->editBuffer()->deletedFeatureIds().contains( request.filterFid() ) )
mDeletedFeatureIds.insert( request.filterFid() );

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

if( L->editBuffer()->changedAttributeValues().contains( request.filterFid() ) )
if ( L->editBuffer()->changedAttributeValues().contains( request.filterFid() ) )
mChangedFeaturesRequest.setFilterFids( QgsFeatureIds() << request.filterFid() );
}
else
@@ -756,19 +756,19 @@ void QgsMssqlGeomColumnTypeThread::run()
{
QString table;
table = QString( "%1[%2]" )
.arg( layerProperty.schemaName.isEmpty() ? "" : QString("[%1].").arg( layerProperty.schemaName ))
.arg( layerProperty.schemaName.isEmpty() ? "" : QString( "[%1]." ).arg( layerProperty.schemaName ) )
.arg( layerProperty.tableName );

QString query = QString("SELECT %3"
" UPPER([%1].STGeometryType()),"
" [%1].STSrid"
" FROM %2"
" WHERE [%1] IS NOT NULL %4"
" GROUP BY [%1].STGeometryType(), [%1].STSrid")
.arg( layerProperty.geometryColName )
.arg( table )
.arg( mUseEstimatedMetadata ? "TOP 1" : "" )
.arg( layerProperty.sql.isEmpty() ? "" : QString( " AND %1" ).arg( layerProperty.sql ) );
QString query = QString( "SELECT %3"
" UPPER([%1].STGeometryType()),"
" [%1].STSrid"
" FROM %2"
" WHERE [%1] IS NOT NULL %4"
" GROUP BY [%1].STGeometryType(), [%1].STSrid" )
.arg( layerProperty.geometryColName )
.arg( table )
.arg( mUseEstimatedMetadata ? "TOP 1" : "" )
.arg( layerProperty.sql.isEmpty() ? "" : QString( " AND %1" ).arg( layerProperty.sql ) );

// issue the sql query
QSqlDatabase db = QSqlDatabase::database( mConnectionName );
@@ -158,7 +158,7 @@ class QgsMssqlSourceSelect : public QDialog, private Ui::QgsDbSourceSelectBase
bool mEmbeddedMode;

// queue another query for the thread
void addSearchGeometryColumn(QString connectionName, QgsMssqlLayerProperty layerProperty , bool estimateMetadata);
void addSearchGeometryColumn( QString connectionName, QgsMssqlLayerProperty layerProperty , bool estimateMetadata );

// Set the position of the database connection list to the last
// used one.
@@ -280,7 +280,7 @@ QString QgsOracleConn::quotedValue( const QVariant &value, QVariant::Type type )
QDateTime datetime( value.toDateTime() );
if ( datetime.isValid() )
return QString( "TO_DATE('%1','YYYY-MM-DD HH24:MI:SS')" ).arg( datetime.toString( "yyyy-MM-dd hh:mm:ss" ) );
break;
break;
}

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

default:
break;
break;
}
}

@@ -72,7 +72,7 @@ bool QgsWFSFeatureIterator::fetchFeature( QgsFeature& f )

for ( ;; )
{
if( mFeatureIterator == mSelectedFeatures.constEnd() )
if ( mFeatureIterator == mSelectedFeatures.constEnd() )
return false;

QMap<QgsFeatureId, QgsFeature* >::iterator it = mProvider->mFeatures.find( *mFeatureIterator );
@@ -97,7 +97,7 @@ void TestQgsWcsProvider::read( )
QStringList versions;

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

0 comments on commit 46abade

Please sign in to comment.
You can’t perform that action at this time.