Skip to content

Commit

Permalink
indentation update
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Aug 25, 2014
1 parent 88b13e8 commit 2f4a565
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 34 deletions.
40 changes: 20 additions & 20 deletions src/app/qgsprojectproperties.cpp
Expand Up @@ -405,9 +405,9 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa

smPublied->setMapping( cbp, j );
connect( cbp, SIGNAL( stateChanged( int ) ), smPublied, SLOT( map() ) );

QSpinBox* psb = new QSpinBox();
psb->setValue( QgsProject::instance()->readNumEntry( "WFSLayersPrecision", "/"+currentLayer->id(), 8 ) );
psb->setValue( QgsProject::instance()->readNumEntry( "WFSLayersPrecision", "/" + currentLayer->id(), 8 ) );
twWFSLayers->setCellWidget( j, 2, psb );

QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( currentLayer );
Expand Down Expand Up @@ -755,7 +755,7 @@ void QgsProjectProperties::apply()
}

// WMS GetFeatureInfo geometry precision (decimal places)
QgsProject::instance()->writeEntry( "WMSPrecision", "/", mWMSPrecisionSpinBox->text());
QgsProject::instance()->writeEntry( "WMSPrecision", "/", mWMSPrecisionSpinBox->text() );

if ( grpWMSExt->isChecked() )
{
Expand Down Expand Up @@ -870,25 +870,25 @@ void QgsProjectProperties::apply()
if ( cb && cb->isChecked() )
{
wfsLayerList << id;

QSpinBox* sb = qobject_cast<QSpinBox *>( twWFSLayers->cellWidget( i, 2 ) );
QgsProject::instance()->writeEntry( "WFSLayersPrecision", "/"+id, sb->value() );
QgsProject::instance()->writeEntry( "WFSLayersPrecision", "/" + id, sb->value() );

cb = qobject_cast<QCheckBox *>( twWFSLayers->cellWidget( i, 3 ) );
if ( cb && cb->isChecked() )
{
wfstUpdateLayerList << id;
}
cb = qobject_cast<QCheckBox *>( twWFSLayers->cellWidget( i, 4 ) );
if ( cb && cb->isChecked() )
{
wfstInsertLayerList << id;
}
cb = qobject_cast<QCheckBox *>( twWFSLayers->cellWidget( i, 5 ) );
if ( cb && cb->isChecked() )
{
wfstDeleteLayerList << id;
}
if ( cb && cb->isChecked() )
{
wfstUpdateLayerList << id;
}
cb = qobject_cast<QCheckBox *>( twWFSLayers->cellWidget( i, 4 ) );
if ( cb && cb->isChecked() )
{
wfstInsertLayerList << id;
}
cb = qobject_cast<QCheckBox *>( twWFSLayers->cellWidget( i, 5 ) );
if ( cb && cb->isChecked() )
{
wfstDeleteLayerList << id;
}
}
}
QgsProject::instance()->writeEntry( "WFSLayers", "/", wfsLayerList );
Expand Down
6 changes: 3 additions & 3 deletions src/core/pal/feature.cpp
Expand Up @@ -384,9 +384,9 @@ namespace pal

#if 0
double distlabel = unit_convert( this->distlabel,
pal::PIXEL,
layer->pal->map_unit,
dpi, scale, delta_width );
pal::PIXEL,
layer->pal->map_unit,
dpi, scale, delta_width );
#endif

double lx, ly; /* label pos */
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsgenericprojectionselector.h
Expand Up @@ -70,7 +70,7 @@ class GUI_EXPORT QgsGenericProjectionSelector : public QDialog, private Ui::QgsG
void setSelectedAuthId( QString authId );

void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

/**
* \brief filters this dialog by the given CRSs
*
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmaptoolidentify.cpp
Expand Up @@ -279,7 +279,7 @@ bool QgsMapToolIdentify::identifyVectorLayer( QList<IdentifyResult> *results, Qg
return false;
}

QApplication::setOverrideCursor(Qt::WaitCursor);
QApplication::setOverrideCursor( Qt::WaitCursor );

QMap< QString, QString > commonDerivedAttributes;

Expand Down
6 changes: 3 additions & 3 deletions src/mapserver/qgswfsprojectparser.cpp
Expand Up @@ -462,7 +462,7 @@ int QgsWFSProjectParser::wfsLayerPrecision( const QString& aLayerId ) const
QStringList wfsLayersId = mProjectParser.wfsLayers();
if ( !wfsLayersId.contains( aLayerId ) )
{
return -1;
return -1;
}
int prec = 8;
QDomElement propertiesElem = mProjectParser.propertiesElem();
Expand All @@ -471,12 +471,12 @@ int QgsWFSProjectParser::wfsLayerPrecision( const QString& aLayerId ) const
QDomElement wfsPrecElem = propertiesElem.firstChildElement( "WFSLayersPrecision" );
if ( !wfsPrecElem.isNull() )
{
QDomElement wfsLayerPrecElem = wfsPrecElem.firstChildElement( aLayerId );
QDomElement wfsLayerPrecElem = wfsPrecElem.firstChildElement( aLayerId );
if ( !wfsLayerPrecElem.isNull() )
{
QString precStr = wfsLayerPrecElem.text();
prec = precStr.toInt();
}
}
}
}
return prec;
Expand Down
4 changes: 2 additions & 2 deletions src/mapserver/qgswfsserver.cpp
Expand Up @@ -437,7 +437,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format

//excluded attributes for this layer
const QSet<QString>& layerExcludedAttributes = layer->excludeAttributesWFS();

//get layer precision
layerPrec = mConfigParser->wfsLayerPrecision( layer->id() );

Expand Down Expand Up @@ -778,7 +778,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format

//excluded attributes for this layer
const QSet<QString>& layerExcludedAttributes = layer->excludeAttributesWFS();

//get layer precision
int layerPrec = mConfigParser->wfsLayerPrecision( layer->id() );

Expand Down
7 changes: 4 additions & 3 deletions src/mapserver/qgswmsserver.cpp
Expand Up @@ -2242,7 +2242,7 @@ QMap<QString, QString> QgsWMSServer::applyRequestedLayerFilters( const QStringLi
continue;
}

QgsRectangle layerExtent = mMapRenderer->layerToMapCoordinates(mapLayer, mapLayer->extent());
QgsRectangle layerExtent = mMapRenderer->layerToMapCoordinates( mapLayer, mapLayer->extent() );
if ( filterExtent.isEmpty() )
{
filterExtent = layerExtent;
Expand Down Expand Up @@ -3021,7 +3021,7 @@ int QgsWMSServer::getImageQuality( ) const
return imageQuality;
}

int QgsWMSServer::getWMSPrecision( int defaultValue = 8) const
int QgsWMSServer::getWMSPrecision( int defaultValue = 8 ) const
{
// First taken from QGIS project
int WMSPrecision = mConfigParser->WMSPrecision();
Expand All @@ -3037,7 +3037,8 @@ int QgsWMSServer::getWMSPrecision( int defaultValue = 8) const
WMSPrecision = WMSPrecisionParameter;
}
}
if ( WMSPrecision == -1 ){
if ( WMSPrecision == -1 )
{
WMSPrecision = defaultValue;
}
return WMSPrecision;
Expand Down
2 changes: 1 addition & 1 deletion src/mapserver/qgswmsserver.h
Expand Up @@ -260,7 +260,7 @@ class QgsWMSServer: public QgsOWSServer
int getImageQuality() const;

/** Return precision to use for GetFeatureInfo request */
int getWMSPrecision(int defaultValue ) const;
int getWMSPrecision( int defaultValue ) const;
};

#endif

0 comments on commit 2f4a565

Please sign in to comment.