Skip to content

Commit af4a86f

Browse files
jef-njef-n
committed
indentation update
1 parent b87ccac commit af4a86f

File tree

14 files changed

+66
-64
lines changed

14 files changed

+66
-64
lines changed

‎python/plugins/sextante/algs/QGISAlgorithmProvider.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def __init__(self):
133133
AutoincrementalField(), Explode(), FieldsPyculator(), EquivalentNumField(),
134134
PointsLayerFromTable(), StatisticsByCategories(), Polygonize(),
135135
# ------ raster ------
136-
#CreateConstantRaster(),
136+
#CreateConstantRaster(),
137137
RasterLayerStatistics()
138138
# ------ graphics ------
139139
#VectorLayerHistogram(), VectorLayerScatterplot(), RasterLayerHistogram(),

‎src/app/composer/qgscomposerlegendwidget.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -685,12 +685,12 @@ void QgsComposerLegendWidget::on_mRemoveToolButton_clicked()
685685
}
686686

687687
QList<QPersistentModelIndex> indexes;
688-
foreach(const QModelIndex &index, selectionModel->selectedIndexes())
689-
indexes << index;
688+
foreach ( const QModelIndex &index, selectionModel->selectedIndexes() )
689+
indexes << index;
690690

691-
foreach(const QPersistentModelIndex index, indexes)
691+
foreach ( const QPersistentModelIndex index, indexes )
692692
{
693-
itemModel->removeRow( index.row(), index.parent() );
693+
itemModel->removeRow( index.row(), index.parent() );
694694
}
695695

696696
mLegend->adjustBoxSize();

‎src/app/qgsrasterlayerproperties.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,12 +736,12 @@ void QgsRasterLayerProperties::sync()
736736
mLayerAttributionLineEdit->setText( mRasterLayer->attribution() );
737737
mLayerAttributionUrlLineEdit->setText( mRasterLayer->attributionUrl() );
738738
mLayerMetadataUrlLineEdit->setText( mRasterLayer->metadataUrl() );
739-
mLayerMetadataUrlTypeComboBox->setCurrentIndex(
739+
mLayerMetadataUrlTypeComboBox->setCurrentIndex(
740740
mLayerMetadataUrlTypeComboBox->findText(
741741
mRasterLayer->metadataUrlType()
742742
)
743743
);
744-
mLayerMetadataUrlFormatComboBox->setCurrentIndex(
744+
mLayerMetadataUrlFormatComboBox->setCurrentIndex(
745745
mLayerMetadataUrlFormatComboBox->findText(
746746
mRasterLayer->metadataUrlFormat()
747747
)

‎src/app/qgsvectorlayerproperties.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,15 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
233233
mLayerAttributionLineEdit->setText( layer->attribution() );
234234
mLayerAttributionUrlLineEdit->setText( layer->attributionUrl() );
235235
mLayerMetadataUrlLineEdit->setText( layer->metadataUrl() );
236-
mLayerMetadataUrlTypeComboBox->setCurrentIndex(
237-
mLayerMetadataUrlTypeComboBox->findText(
238-
layer->metadataUrlType()
239-
)
236+
mLayerMetadataUrlTypeComboBox->setCurrentIndex(
237+
mLayerMetadataUrlTypeComboBox->findText(
238+
layer->metadataUrlType()
239+
)
240240
);
241-
mLayerMetadataUrlFormatComboBox->setCurrentIndex(
242-
mLayerMetadataUrlFormatComboBox->findText(
243-
layer->metadataUrlFormat()
244-
)
241+
mLayerMetadataUrlFormatComboBox->setCurrentIndex(
242+
mLayerMetadataUrlFormatComboBox->findText(
243+
layer->metadataUrlFormat()
244+
)
245245
);
246246
}
247247

‎src/core/qgslogger.h‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class QFile;
3232
}
3333
#define QgsDebugCall QgsScopeLogger _qgsScopeLogger(__FILE__, __FUNCTION__, __LINE__)
3434
#else
35-
#define QgsDebugCall
35+
#define QgsDebugCall
3636
#define QgsDebugMsg(str)
3737
#define QgsDebugMsgLevel(str, level)
3838
#endif
@@ -132,20 +132,22 @@ class CORE_EXPORT QgsLogger
132132
static int sPrefixLength;
133133
};
134134

135-
class QgsScopeLogger {
136-
public:
137-
QgsScopeLogger(const char* file, const char* func, int line)
138-
: _file(file), _func(func), _line(line)
139-
{
140-
QgsLogger::debug("Entering.", 1, _file, _func, _line);
141-
}
142-
~QgsScopeLogger() {
143-
QgsLogger::debug("Leaving.", 1, _file, _func, _line);
144-
}
145-
private:
146-
const char *_file;
147-
const char *_func;
148-
int _line;
135+
class QgsScopeLogger
136+
{
137+
public:
138+
QgsScopeLogger( const char* file, const char* func, int line )
139+
: _file( file ), _func( func ), _line( line )
140+
{
141+
QgsLogger::debug( "Entering.", 1, _file, _func, _line );
142+
}
143+
~QgsScopeLogger()
144+
{
145+
QgsLogger::debug( "Leaving.", 1, _file, _func, _line );
146+
}
147+
private:
148+
const char *_file;
149+
const char *_func;
150+
int _line;
149151
};
150152

151153
#endif

‎src/core/raster/qgsrasterlayer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1490,7 +1490,7 @@ bool QgsRasterLayer::readXml( const QDomNode& layer_node )
14901490
bool res = readSymbology( layer_node, theError );
14911491

14921492
// old wms settings we need to correct
1493-
if ( res && mProviderKey == "wms" && (!renderer() || renderer()->type() != "singlebandcolordata") )
1493+
if ( res && mProviderKey == "wms" && ( !renderer() || renderer()->type() != "singlebandcolordata" ) )
14941494
{
14951495
setRendererForDrawingStyle( SingleBandColorDataStyle );
14961496
}

‎src/mapserver/qgsprojectparser.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ void QgsProjectParser::owsGeneralAndResourceList( QDomElement& parentElement, QD
245245
{
246246
// set parentElement id
247247
QFileInfo projectFileInfo( mProjectPath );
248-
parentElement.setAttribute( "id", "ows-context-"+projectFileInfo.baseName() );
248+
parentElement.setAttribute( "id", "ows-context-" + projectFileInfo.baseName() );
249249
// OWSContext General element
250250
QDomElement serviceElem = doc.createElement( "Service" );
251251

@@ -343,11 +343,11 @@ void QgsProjectParser::owsGeneralAndResourceList( QDomElement& parentElement, QD
343343
combinedBBox.invert();
344344
}
345345
QDomElement lowerCornerElem = doc.createElement( "ows:LowerCorner" );
346-
QDomText lowerCornerText = doc.createTextNode( QString::number( combinedBBox.xMinimum() ) +" "+ QString::number( combinedBBox.yMinimum() ));
346+
QDomText lowerCornerText = doc.createTextNode( QString::number( combinedBBox.xMinimum() ) + " " + QString::number( combinedBBox.yMinimum() ) );
347347
lowerCornerElem.appendChild( lowerCornerText );
348348
bboxElem.appendChild( lowerCornerElem );
349349
QDomElement upperCornerElem = doc.createElement( "ows:upperCorner" );
350-
QDomText upperCornerText = doc.createTextNode( QString::number( combinedBBox.xMaximum() ) +" "+ QString::number( combinedBBox.yMaximum() ));
350+
QDomText upperCornerText = doc.createTextNode( QString::number( combinedBBox.xMaximum() ) + " " + QString::number( combinedBBox.yMaximum() ) );
351351
upperCornerElem.appendChild( upperCornerText );
352352
bboxElem.appendChild( upperCornerElem );
353353
generalElem.appendChild( bboxElem );
@@ -854,13 +854,13 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
854854
}
855855

856856
void QgsProjectParser::addOWSLayers( QDomDocument &doc,
857-
QDomElement &parentElem,
858-
const QDomElement &legendElem,
859-
const QMap<QString, QgsMapLayer *> &layerMap,
860-
const QStringList &nonIdentifiableLayers,
861-
const QString& strHref,
862-
QgsRectangle& combinedBBox,
863-
QString strGroup) const
857+
QDomElement &parentElem,
858+
const QDomElement &legendElem,
859+
const QMap<QString, QgsMapLayer *> &layerMap,
860+
const QStringList &nonIdentifiableLayers,
861+
const QString& strHref,
862+
QgsRectangle& combinedBBox,
863+
QString strGroup ) const
864864
{
865865
const QgsCoordinateReferenceSystem& projectCrs = projectCRS();
866866
QDomNodeList legendChildren = legendElem.childNodes();
@@ -882,7 +882,7 @@ void QgsProjectParser::addOWSLayers( QDomDocument &doc,
882882
}
883883
else
884884
{
885-
group = strGroup +"/"+ name;
885+
group = strGroup + "/" + name;
886886
}
887887

888888
if ( currentChildElem.attribute( "embedded" ) == "1" )
@@ -955,7 +955,7 @@ void QgsProjectParser::addOWSLayers( QDomDocument &doc,
955955
{
956956
layerElem.setAttribute( "queryable", "true" );
957957
}
958-
958+
959959
// is the layer visible ?
960960
if ( currentChildElem.firstChildElement().firstChildElement().attribute( "visible" ) == "1" )
961961
{
@@ -966,7 +966,7 @@ void QgsProjectParser::addOWSLayers( QDomDocument &doc,
966966
layerElem.setAttribute( "hidden", "true" );
967967
}
968968

969-
if (!strGroup.isEmpty() )
969+
if ( !strGroup.isEmpty() )
970970
{
971971
layerElem.setAttribute( "group", strGroup );
972972
}

‎src/mapserver/qgswfsserver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ QDomDocument QgsWFSServer::getCapabilities()
117117
getCapabilitiesElement.appendChild( dcpTypeElement );
118118
QDomElement httpElement = doc.createElement( "HTTP"/*wfs:HTTP*/ );
119119
dcpTypeElement.appendChild( httpElement );
120-
120+
121121
//Prepare url
122122
QString hrefString = mConfigParser->wfsServiceUrl();
123123
if ( hrefString.isEmpty() )

‎src/mapserver/qgswmsserver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ QDomDocument QgsWMSServer::getContext()
264264
owsContextElem.setAttribute( "xmlns:kml", "http://www.opengis.net/kml/2.2" );
265265
owsContextElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
266266
owsContextElem.setAttribute( "xmlns:ns9", "http://www.w3.org/2005/Atom" );
267-
owsContextElem.setAttribute( "xmlns:xal", "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0");
267+
owsContextElem.setAttribute( "xmlns:xal", "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0" );
268268
owsContextElem.setAttribute( "xmlns:ins", "http://www.inspire.org" );
269269
owsContextElem.setAttribute( "version", "0.3.1" );
270270
doc.appendChild( owsContextElem );

‎src/providers/delimitedtext/qgsdelimitedtextfile.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ bool QgsDelimitedTextFile::open()
101101
delete mFile;
102102
mFile = 0;
103103
}
104-
if( mFile )
104+
if ( mFile )
105105
{
106106
mStream = new QTextStream( mFile );
107107
if ( ! mEncoding.isEmpty() )
@@ -505,7 +505,7 @@ int QgsDelimitedTextFile::fieldIndex( QString name )
505505

506506
bool QgsDelimitedTextFile::setNextRecordId( long nextRecordId )
507507
{
508-
if( ! mFile ) return false;
508+
if ( ! mFile ) return false;
509509
mHoldCurrentRecord = nextRecordId == mRecordLineNumber;
510510
if ( mHoldCurrentRecord ) return true;
511511
return setNextLineNumber( nextRecordId );

0 commit comments

Comments
 (0)