From e8b954537ed30853e63a7fb824dca5030450c900 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sun, 25 Aug 2013 10:45:52 +0200 Subject: [PATCH] indentation update --- python/plugins/db_manager/layer_preview.py | 2 +- .../exampleprovider/ExampleAlgorithm.py | 2 +- .../ExampleAlgorithmProvider.py | 2 +- .../processing/gui/ProcessingToolbox.py | 2 +- .../plugins/processing/saga/SagaAlgorithm.py | 6 ++--- .../saga/ext/supervisedclassification.py | 6 ++--- src/app/qgisapp.cpp | 24 +++++++++---------- src/app/qgsabout.cpp | 4 ++-- src/app/qgsmaptooladdfeature.cpp | 2 +- src/app/qgsmaptooladdpart.cpp | 2 +- src/app/qgsmaptooladdring.cpp | 4 ++-- src/app/qgsmaptooledit.h | 2 +- src/app/qgsmaptoollabel.cpp | 6 ++--- src/app/qgsmaptoolmovefeature.cpp | 2 +- src/app/qgsmaptoolreshape.cpp | 2 +- src/app/qgsmaptoolrotatefeature.cpp | 2 +- src/app/qgsmaptoolrotatelabel.cpp | 2 +- src/app/qgsmaptoolsimplify.cpp | 2 +- src/app/qgsoptions.cpp | 2 +- src/core/qgsmaprenderer.cpp | 4 ++-- src/core/qgspallabeling.cpp | 2 +- src/gui/qgsattributedialog.cpp | 4 ++-- src/gui/qgsmessagebaritem.cpp | 2 +- src/plugins/roadgraph/shortestpathwidget.cpp | 4 ++-- src/plugins/topology/checkDock.cpp | 6 ++--- .../qgsdelimitedtextprovider.cpp | 10 ++++---- src/providers/grass/qgsgrass.cpp | 2 +- 27 files changed, 55 insertions(+), 55 deletions(-) diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py index c09140919d5..d7d3f487f85 100644 --- a/python/plugins/db_manager/layer_preview.py +++ b/python/plugins/db_manager/layer_preview.py @@ -76,7 +76,7 @@ class LayerPreview(QgsMapCanvas): if self.item is not None: ## skip exception on RuntimeError fixes #6892 try: - self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty) + self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty) except RuntimeError: pass self.item = None diff --git a/python/plugins/processing/exampleprovider/ExampleAlgorithm.py b/python/plugins/processing/exampleprovider/ExampleAlgorithm.py index 1c44de8c414..bc2911ff8d2 100644 --- a/python/plugins/processing/exampleprovider/ExampleAlgorithm.py +++ b/python/plugins/processing/exampleprovider/ExampleAlgorithm.py @@ -43,7 +43,7 @@ class ExampleAlgorithm(GeoAlgorithm): a new one just with just those features of the input layer that are selected. - It is meant to be used as an example of how to create your own + It is meant to be used as an example of how to create your own algorithms and explain methods and variables used to do it. An algorithm like this will be available in all elements, and there is not need for additional work. diff --git a/python/plugins/processing/exampleprovider/ExampleAlgorithmProvider.py b/python/plugins/processing/exampleprovider/ExampleAlgorithmProvider.py index afbb6df2072..3dcb83d9128 100644 --- a/python/plugins/processing/exampleprovider/ExampleAlgorithmProvider.py +++ b/python/plugins/processing/exampleprovider/ExampleAlgorithmProvider.py @@ -80,7 +80,7 @@ class ExampleAlgorithmProvider(AlgorithmProvider): def _loadAlgorithms(self): '''Here we fill the list of algorithms in self.algs. This method is called whenever the list of algorithms should be updated. - If the list of algorithms can change + If the list of algorithms can change (for instance, if it contains algorithms from user-defined scripts and a new script might have been added), you should create the list again here. diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py index 41bf5e634cb..b1e2c5d8aac 100644 --- a/python/plugins/processing/gui/ProcessingToolbox.py +++ b/python/plugins/processing/gui/ProcessingToolbox.py @@ -63,7 +63,7 @@ class ProcessingToolbox(QDockWidget, Ui_ProcessingToolbox): else: self.modeComboBox.setCurrentIndex(1) self.modeComboBox.currentIndexChanged.connect(self.modeHasChanged) - + self.searchBox.textChanged.connect(self.fillTree) self.algorithmTree.customContextMenuRequested.connect(self.showPopupMenu) self.algorithmTree.doubleClicked.connect(self.executeAlgorithm) diff --git a/python/plugins/processing/saga/SagaAlgorithm.py b/python/plugins/processing/saga/SagaAlgorithm.py index fba0193b223..4decf7f3a2a 100644 --- a/python/plugins/processing/saga/SagaAlgorithm.py +++ b/python/plugins/processing/saga/SagaAlgorithm.py @@ -181,7 +181,7 @@ class SagaAlgorithm(GeoAlgorithm): raise GeoAlgorithmExecutionException("SAGA folder is not configured.\nPlease configure it before running SAGA algorithms.") commands = list() self.exportedLayers = {} - + self.preProcessInputs() #1: Export rasters to sgrd and vectors to shp @@ -309,7 +309,7 @@ class SagaAlgorithm(GeoAlgorithm): else: commands.append("libio_gdal 1 -GRIDS \"" + filename2 + "\" -FORMAT 1 -TYPE 0 -FILE \"" + filename + "\""); - + #4 Run SAGA commands = self.editCommands(commands) SagaUtils.createSagaBatchJobFileFromSagaCommands(commands) @@ -332,7 +332,7 @@ class SagaAlgorithm(GeoAlgorithm): if hasattr(module, 'preProcessInputs'): func = getattr(module,'preProcessInputs') func(self) - + def editCommands(self, commands): name = self.commandLineName()[len('saga:'):] try: diff --git a/python/plugins/processing/saga/ext/supervisedclassification.py b/python/plugins/processing/saga/ext/supervisedclassification.py index f89cfd6786a..040308dc911 100644 --- a/python/plugins/processing/saga/ext/supervisedclassification.py +++ b/python/plugins/processing/saga/ext/supervisedclassification.py @@ -25,8 +25,8 @@ __revision__ = '$Format:%H$' from processing.tests.TestData import table -def editCommands(commands): +def editCommands(commands): commands[-3] = commands[-3] + " -STATS " + table() - return commands - + return commands + diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index c7d10d59d09..ab42e4940d9 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -6192,24 +6192,24 @@ void QgisApp::duplicateLayers( QList lyrList ) if ( unSppType.isEmpty() && dupLayer && !dupLayer->isValid() ) { msgBars.append( new QgsMessageBarItem( - tr( "Duplicate layer: " ), - tr( "%1 (duplication resulted in invalid layer)" ).arg( selectedLyr->name() ) , - QgsMessageBar::WARNING, - 0, - mInfoBar ) ); + tr( "Duplicate layer: " ), + tr( "%1 (duplication resulted in invalid layer)" ).arg( selectedLyr->name() ) , + QgsMessageBar::WARNING, + 0, + mInfoBar ) ); continue; } if ( !unSppType.isEmpty() || !dupLayer ) { msgBars.append( new QgsMessageBarItem( - tr( "Duplicate layer: " ), - tr( "%1 (%2 type unsupported)" ) - .arg( selectedLyr->name() ) - .arg( !unSppType.isEmpty() ? QString( "'" ) + unSppType + "' " : "" ), - QgsMessageBar::WARNING, - 0, - mInfoBar ) ); + tr( "Duplicate layer: " ), + tr( "%1 (%2 type unsupported)" ) + .arg( selectedLyr->name() ) + .arg( !unSppType.isEmpty() ? QString( "'" ) + unSppType + "' " : "" ), + QgsMessageBar::WARNING, + 0, + mInfoBar ) ); continue; } diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp index 2d3b451d79b..1ec947d75c3 100644 --- a/src/app/qgsabout.cpp +++ b/src/app/qgsabout.cpp @@ -201,8 +201,8 @@ void QgsAbout::setLicence() #endif if ( licenceFile.open( QIODevice::ReadOnly ) ) { - QString content = licenceFile.readAll(); - txtLicense->setText(content); + QString content = licenceFile.readAll(); + txtLicense->setText( content ); } } diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp index 9e134b7bfe2..89e95d63cd3 100644 --- a/src/app/qgsmaptooladdfeature.cpp +++ b/src/app/qgsmaptooladdfeature.cpp @@ -174,7 +174,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e ) { //problem with coordinate transformation QMessageBox::information( 0, tr( "Coordinate transform error" ), - tr( "Cannot transform the point to the layers coordinate system" ) ); + tr( "Cannot transform the point to the layers coordinate system" ) ); return; } diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp index 8b28eec9ba3..12eda925c4e 100644 --- a/src/app/qgsmaptooladdpart.cpp +++ b/src/app/qgsmaptooladdpart.cpp @@ -92,7 +92,7 @@ void QgsMapToolAddPart::canvasReleaseEvent( QMouseEvent * e ) //add point to list and to rubber band if ( e->button() == Qt::LeftButton ) { - int error = addVertex( e->pos() ); + int error = addVertex( e->pos() ); if ( error == 1 ) { QgsDebugMsg( "current layer is not a vector layer" ); diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp index fcc5ed33551..fe1b4247b34 100644 --- a/src/app/qgsmaptooladdring.cpp +++ b/src/app/qgsmaptooladdring.cpp @@ -61,8 +61,8 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e ) { //problem with coordinate transformation QMessageBox::information( 0, tr( "Coordinate transform error" ), - tr( "Cannot transform the point to the layers coordinate system" ) ); - return; + tr( "Cannot transform the point to the layers coordinate system" ) ); + return; } startCapturing(); diff --git a/src/app/qgsmaptooledit.h b/src/app/qgsmaptooledit.h index 0f4c6e5cec5..d9ce048cd0a 100644 --- a/src/app/qgsmaptooledit.h +++ b/src/app/qgsmaptooledit.h @@ -56,7 +56,7 @@ class QgsMapToolEdit: public QgsMapTool * @param geometryType * @param alternativeBand if true, rubber band will be set with more transparency and a dash pattern. defaut is false. */ - QgsRubberBand* createRubberBand(QGis::GeometryType geometryType = QGis::Line , bool alternativeBand = false ); + QgsRubberBand* createRubberBand( QGis::GeometryType geometryType = QGis::Line , bool alternativeBand = false ); /**Returns the current vector layer of the map canvas or 0*/ QgsVectorLayer* currentVectorLayer(); diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp index 89f60d44f83..7f70b26029c 100644 --- a/src/app/qgsmaptoollabel.cpp +++ b/src/app/qgsmaptoollabel.cpp @@ -67,7 +67,7 @@ void QgsMapToolLabel::createRubberBands( ) mLabelRubberBand->addPoint( QgsPoint( rect.xMaximum(), rect.yMaximum() ) ); mLabelRubberBand->addPoint( QgsPoint( rect.xMaximum(), rect.yMinimum() ) ); mLabelRubberBand->addPoint( QgsPoint( rect.xMinimum(), rect.yMinimum() ) ); - mLabelRubberBand->setColor( QColor(0,255,0, 65) ); + mLabelRubberBand->setColor( QColor( 0, 255, 0, 65 ) ); mLabelRubberBand->setWidth( 3 ); mLabelRubberBand->show(); @@ -82,7 +82,7 @@ void QgsMapToolLabel::createRubberBands( ) if ( geom ) { mFeatureRubberBand = new QgsRubberBand( mCanvas, geom->type() ); - mFeatureRubberBand->setColor( QColor(255, 0, 0, 65) ); + mFeatureRubberBand->setColor( QColor( 255, 0, 0, 65 ) ); mFeatureRubberBand->setToGeometry( geom, vlayer ); mFeatureRubberBand->show(); } @@ -103,7 +103,7 @@ void QgsMapToolLabel::createRubberBands( ) QgsGeometry* pointGeom = QgsGeometry::fromPoint( fixPoint ); mFixPointRubberBand = new QgsRubberBand( mCanvas, QGis::Line ); - mFixPointRubberBand->setColor( QColor(0, 0, 255, 65) ); + mFixPointRubberBand->setColor( QColor( 0, 0, 255, 65 ) ); mFixPointRubberBand->setToGeometry( pointGeom, vlayer ); mFixPointRubberBand->show(); delete pointGeom; diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp index 981480769dc..a7c41f04597 100644 --- a/src/app/qgsmaptoolmovefeature.cpp +++ b/src/app/qgsmaptoolmovefeature.cpp @@ -127,7 +127,7 @@ void QgsMapToolMoveFeature::canvasPressEvent( QMouseEvent * e ) } mStartPointMapCoords = toMapCoordinates( e->pos() ); - mRubberBand->setColor( QColor(255, 0, 0, 65) ); + mRubberBand->setColor( QColor( 255, 0, 0, 65 ) ); mRubberBand->setWidth( 2 ); mRubberBand->show(); diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp index 50c5070905b..13e0009e023 100644 --- a/src/app/qgsmaptoolreshape.cpp +++ b/src/app/qgsmaptoolreshape.cpp @@ -60,7 +60,7 @@ void QgsMapToolReshape::canvasReleaseEvent( QMouseEvent * e ) { //problem with coordinate transformation QMessageBox::information( 0, tr( "Coordinate transform error" ), - tr( "Cannot transform the point to the layers coordinate system" ) ); + tr( "Cannot transform the point to the layers coordinate system" ) ); return; } diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp index fdf0afb8618..f6536f8d0f1 100644 --- a/src/app/qgsmaptoolrotatefeature.cpp +++ b/src/app/qgsmaptoolrotatefeature.cpp @@ -169,7 +169,7 @@ void QgsMapToolRotateFeature::canvasPressEvent( QMouseEvent * e ) } } - mRubberBand->setColor( QColor(255, 0, 0, 65) ); + mRubberBand->setColor( QColor( 255, 0, 0, 65 ) ); mRubberBand->setWidth( 2 ); mRubberBand->show(); diff --git a/src/app/qgsmaptoolrotatelabel.cpp b/src/app/qgsmaptoolrotatelabel.cpp index 1195b2b7271..6714ea9c644 100644 --- a/src/app/qgsmaptoolrotatelabel.cpp +++ b/src/app/qgsmaptoolrotatelabel.cpp @@ -198,7 +198,7 @@ QgsRubberBand* QgsMapToolRotateLabel::createRotationPreviewBox() } mRotationPreviewBox = new QgsRubberBand( mCanvas, QGis::Line ); - mRotationPreviewBox->setColor( QColor(0, 0, 255, 65)); + mRotationPreviewBox->setColor( QColor( 0, 0, 255, 65 ) ); mRotationPreviewBox->setWidth( 3 ); setRotationPreviewBox( mCurrentRotation - mStartRotation ); return mRotationPreviewBox; diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp index 02939b14bb3..01ad7610e4c 100644 --- a/src/app/qgsmaptoolsimplify.cpp +++ b/src/app/qgsmaptoolsimplify.cpp @@ -299,7 +299,7 @@ void QgsMapToolSimplify::canvasPressEvent( QMouseEvent * e ) mRubberBand = new QgsRubberBand( mCanvas ); mRubberBand->setToGeometry( mSelectedFeature.geometry(), 0 ); - mRubberBand->setColor( QColor(255, 0, 0, 65) ); + mRubberBand->setColor( QColor( 255, 0, 0, 65 ) ); mRubberBand->setWidth( 2 ); mRubberBand->show(); //calculate boudaries for slidebar diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index 56a8305e640..aa400b14f72 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -640,7 +640,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) : myBlue = settings.value( "/qgis/digitizing/line_color_blue", 0 ).toInt(); myAlpha = settings.value( "/qgis/digitizing/line_color_alpha", 200 ).toInt(); mLineColorToolButton->setColor( QColor( myRed, myGreen, myBlue, myAlpha ) ); - mLineColorToolButton->setColorDialogOptions(QColorDialog::ShowAlphaChannel); + mLineColorToolButton->setColorDialogOptions( QColorDialog::ShowAlphaChannel ); //default snap mode mDefaultSnapModeComboBox->insertItem( 0, tr( "To vertex" ), "to vertex" ); diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp index a05650a78f6..3a748dd1c03 100644 --- a/src/core/qgsmaprenderer.cpp +++ b/src/core/qgsmaprenderer.cpp @@ -465,7 +465,7 @@ void QgsMapRenderer::render( QPainter* painter, double* forceWidthScale ) mRenderContext.painter()->device()->height(), QImage::Format_ARGB32 ); if ( mypImage->isNull() ) { - QgsDebugMsg( "insufficient memory for image " + QString::number(mRenderContext.painter()->device()->width()) + "x" + QString::number(mRenderContext.painter()->device()->height()) ); + QgsDebugMsg( "insufficient memory for image " + QString::number( mRenderContext.painter()->device()->width() ) + "x" + QString::number( mRenderContext.painter()->device()->height() ) ); emit drawError( ml ); painter->end(); // drawError is not caught by anyone, so we end painting to notify caller return; @@ -510,7 +510,7 @@ void QgsMapRenderer::render( QPainter* painter, double* forceWidthScale ) mRenderContext.painter()->device()->height(), QImage::Format_ARGB32 ); if ( mypFlattenedImage->isNull() ) { - QgsDebugMsg( "insufficient memory for image " + QString::number(mRenderContext.painter()->device()->width()) + "x" + QString::number(mRenderContext.painter()->device()->height()) ); + QgsDebugMsg( "insufficient memory for image " + QString::number( mRenderContext.painter()->device()->width() ) + "x" + QString::number( mRenderContext.painter()->device()->height() ) ); emit drawError( ml ); painter->end(); // drawError is not caught by anyone, so we end painting to notify caller return; diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp index a13e975d896..ef8a27a917e 100644 --- a/src/core/qgspallabeling.cpp +++ b/src/core/qgspallabeling.cpp @@ -3858,7 +3858,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context ) } //layer names - QString layerName = QString::fromUtf8( ( *it )->getLayerName() ); + QString layerName = QString::fromUtf8(( *it )->getLayerName() ); if ( palGeometry->isDiagram() ) { //render diagram diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp index 440784b4865..2ed233ce6a1 100644 --- a/src/gui/qgsattributedialog.cpp +++ b/src/gui/qgsattributedialog.cpp @@ -552,8 +552,8 @@ void QgsAttributeDialog::dialogDestroyed() if ( !mReturnvarname.isEmpty() ) { - QString expr = QString( "if locals().has_key('%1'): del %1\n" ).arg( mReturnvarname ); - QgsPythonRunner::run( expr ); + QString expr = QString( "if locals().has_key('%1'): del %1\n" ).arg( mReturnvarname ); + QgsPythonRunner::run( expr ); } mDialog = NULL; diff --git a/src/gui/qgsmessagebaritem.cpp b/src/gui/qgsmessagebaritem.cpp index 1c62c9f97e2..38b737c9e7f 100644 --- a/src/gui/qgsmessagebaritem.cpp +++ b/src/gui/qgsmessagebaritem.cpp @@ -36,7 +36,7 @@ QgsMessageBarItem::QgsMessageBarItem( const QString &text, QgsMessageBar::Messag writeContent(); } -QgsMessageBarItem::QgsMessageBarItem(const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration , QWidget *parent ) : +QgsMessageBarItem::QgsMessageBarItem( const QString &title, const QString &text, QgsMessageBar::MessageLevel level, int duration , QWidget *parent ) : QWidget( parent ) , mTitle( title ) , mText( text ) diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp index 2bf08aa077b..ea2eb90efa8 100644 --- a/src/plugins/roadgraph/shortestpathwidget.cpp +++ b/src/plugins/roadgraph/shortestpathwidget.cpp @@ -153,11 +153,11 @@ RgShortestPathWidget::RgShortestPathWidget( QWidget* theParent, RoadGraphPlugin connect( mClear, SIGNAL( clicked( bool ) ), this, SLOT( clear() ) ); mrbFrontPoint = new QgsRubberBand( mPlugin->iface()->mapCanvas(), QGis::Polygon ); - mrbFrontPoint->setColor( QColor(0, 255, 0, 65) ); + mrbFrontPoint->setColor( QColor( 0, 255, 0, 65 ) ); mrbFrontPoint->setWidth( 2 ); mrbBackPoint = new QgsRubberBand( mPlugin->iface()->mapCanvas(), QGis::Polygon ); - mrbBackPoint->setColor( QColor(255, 0, 0, 65) ); + mrbBackPoint->setColor( QColor( 255, 0, 0, 65 ) ); mrbBackPoint->setWidth( 2 ); mrbPath = new QgsRubberBand( mPlugin->iface()->mapCanvas(), QGis::Line ); diff --git a/src/plugins/topology/checkDock.cpp b/src/plugins/topology/checkDock.cpp index 859dda0f1b6..f93254d2eab 100644 --- a/src/plugins/topology/checkDock.cpp +++ b/src/plugins/topology/checkDock.cpp @@ -71,9 +71,9 @@ checkDock::checkDock( QgisInterface* qIface, QWidget* parent ) mRBFeature2 = new QgsRubberBand( canvas ); mRBConflict = new QgsRubberBand( canvas ); - mRBFeature1->setColor( QColor(0, 0, 255, 65) ); - mRBFeature2->setColor( QColor(0, 255, 0, 65) ); - mRBConflict->setColor( QColor(255, 0, 0, 65) ); + mRBFeature1->setColor( QColor( 0, 0, 255, 65 ) ); + mRBFeature2->setColor( QColor( 0, 255, 0, 65 ) ); + mRBConflict->setColor( QColor( 255, 0, 0, 65 ) ); mRBFeature1->setWidth( 5 ); mRBFeature2->setWidth( 5 ); diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp index 17bb2b7e97c..2cc8296601a 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp @@ -870,7 +870,7 @@ QgsFeatureIterator QgsDelimitedTextProvider::getFeatures( const QgsFeatureReques { // If the file has become invalid, rescan to check that it is still invalid. // - if ( (mLayerValid && ! mValid) || mRescanRequired ) rescanFile(); + if (( mLayerValid && ! mValid ) || mRescanRequired ) rescanFile(); return QgsFeatureIterator( new QgsDelimitedTextFeatureIterator( this, request ) ); } @@ -1055,7 +1055,7 @@ void QgsDelimitedTextProvider::setUriParameter( QString parameter, QString value void QgsDelimitedTextProvider::onFileUpdated() { - if( ! mRescanRequired ) + if ( ! mRescanRequired ) { QStringList messages; messages.append( tr( "The file has been updated by another application - reloading" ) ); @@ -1091,7 +1091,7 @@ bool QgsDelimitedTextProvider::nextFeature( QgsFeature& feature, QgsDelimitedTex // feature. feature.setValid( false ); - if( ! mValid ) break; + if ( ! mValid ) break; QgsDelimitedTextFile::Status status = file->nextRecord( tokens ); if ( status == QgsDelimitedTextFile::RecordEOF ) break; @@ -1261,7 +1261,7 @@ void QgsDelimitedTextProvider::fetchAttribute( QgsFeature& feature, int fieldIdx // Return the extent of the layer QgsRectangle QgsDelimitedTextProvider::extent() { - if( mRescanRequired ) rescanFile(); + if ( mRescanRequired ) rescanFile(); return mExtent; } @@ -1278,7 +1278,7 @@ QGis::WkbType QgsDelimitedTextProvider::geometryType() const */ long QgsDelimitedTextProvider::featureCount() const { - if( mRescanRequired ) const_cast(this)->rescanFile(); + if ( mRescanRequired ) const_cast( this )->rescanFile(); return mNumberFeatures; } diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp index 0c16898f07a..4fe4b174a0e 100644 --- a/src/providers/grass/qgsgrass.cpp +++ b/src/providers/grass/qgsgrass.cpp @@ -144,7 +144,7 @@ void GRASS_LIB_EXPORT QgsGrass::init( void ) QgsDebugMsg( QString( "GRASS gisBase = %1" ).arg( gisBase ) ); #elif defined(Q_OS_MACX) // check for bundled GRASS, fall back to configured path - gisBase = QCoreApplication::applicationDirPath().append("/grass") ; + gisBase = QCoreApplication::applicationDirPath().append( "/grass" ) ; if ( !isValidGrassBaseDir( gisBase ) ) { gisBase = GRASS_BASE;