From e48a6f642f16c64779f28c4f382bb1c2cf52e5f2 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sun, 30 Nov 2014 10:26:17 +0100 Subject: [PATCH] indentation update [ci skip] --- .../core/symbology-ng/qgsheatmaprenderer.sip | 4 +-- python/core/symbology-ng/qgssymbolv2.sip | 2 +- .../symbology-ng/qgsheatmaprendererwidget.sip | 2 +- .../plugins/processing/algs/gdal/buildvrt.py | 2 +- .../processing/algs/gdal/ogr2ogrtopostgis.py | 36 +++++++++---------- .../algs/gdal/ogr2ogrtopostgislist.py | 34 +++++++++--------- python/plugins/processing/core/Processing.py | 6 ++-- python/plugins/processing/script/snippets.py | 4 +-- src/app/qgsattributetabledialog.cpp | 6 ++-- src/app/qgsattributetabledialog.h | 2 +- src/app/qgsguivectorlayertools.h | 2 +- src/core/qgis.h | 2 +- src/core/qgsmultirenderchecker.cpp | 6 ++-- src/gui/attributetable/qgsdualview.cpp | 4 +-- src/gui/qgsexpressionbuilderwidget.cpp | 13 +++---- src/gui/qgsrelationeditorwidget.cpp | 2 +- src/gui/qgsvectorlayertools.h | 12 +++---- .../symbology-ng/qgsbrushstylecombobox.cpp | 4 +-- src/gui/symbology-ng/qgspenstylecombobox.cpp | 4 +-- 19 files changed, 74 insertions(+), 73 deletions(-) diff --git a/python/core/symbology-ng/qgsheatmaprenderer.sip b/python/core/symbology-ng/qgsheatmaprenderer.sip index ad1ea10ed4b..e4928501eb2 100644 --- a/python/core/symbology-ng/qgsheatmaprenderer.sip +++ b/python/core/symbology-ng/qgsheatmaprenderer.sip @@ -37,7 +37,7 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2 * @see colorRamp */ void setColorRamp( QgsVectorColorRampV2* ramp /Transfer/ ); - + /**Returns whether the ramp is inverted * @returns true if color ramp is inverted * @see setInvertRamp @@ -121,7 +121,7 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2 * @see renderQuality */ void setRenderQuality( const int quality ); - + /**Returns the expression used for weighting points when generating the heatmap. * @returns point weight expression. If empty, all points are equally weighted. * @see setWeightExpression diff --git a/python/core/symbology-ng/qgssymbolv2.sip b/python/core/symbology-ng/qgssymbolv2.sip index dd86a4fd031..29e4a4f38c7 100644 --- a/python/core/symbology-ng/qgssymbolv2.sip +++ b/python/core/symbology-ng/qgssymbolv2.sip @@ -54,7 +54,7 @@ class QgsSymbolV2 SymbolType type() const; // symbol layers handling - + /**Returns list of symbol layers contained in the symbol. * @returns symbol layers list * @note added in QGIS 2.7 diff --git a/python/gui/symbology-ng/qgsheatmaprendererwidget.sip b/python/gui/symbology-ng/qgsheatmaprendererwidget.sip index a719f5a9af4..4459dc1dc5d 100644 --- a/python/gui/symbology-ng/qgsheatmaprendererwidget.sip +++ b/python/gui/symbology-ng/qgsheatmaprendererwidget.sip @@ -17,7 +17,7 @@ class QgsHeatmapRendererWidget : QgsRendererV2Widget * @param renderer the mask renderer (will take ownership) */ QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); - + /** @returns the current feature renderer */ virtual QgsFeatureRendererV2* renderer(); }; diff --git a/python/plugins/processing/algs/gdal/buildvrt.py b/python/plugins/processing/algs/gdal/buildvrt.py index 8adda8893f0..279065e3e8c 100644 --- a/python/plugins/processing/algs/gdal/buildvrt.py +++ b/python/plugins/processing/algs/gdal/buildvrt.py @@ -42,7 +42,7 @@ class buildvrt(GdalAlgorithm): RESOLUTION = 'RESOLUTION' SEPARATE = 'SEPARATE' PROJ_DIFFERENCE = 'PROJ_DIFFERENCE' - + RESOLUTION_OPTIONS = ['average', 'highest', 'lowest'] def defineCharacteristics(self): diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py index 788f765aeaa..5dccaa534f0 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py @@ -73,9 +73,9 @@ class Ogr2OgrToPostGis(OgrAlgorithm): ADDFIELDS = 'ADDFIELDS' LAUNDER = 'LAUNDER' INDEX = 'INDEX' - SKIPFAILURES = 'SKIPFAILURES' + SKIPFAILURES = 'SKIPFAILURES' OPTIONS = 'OPTIONS' - + def defineCharacteristics(self): self.name = 'Import Vector into PostGIS database (new connection)' self.group = '[OGR] Miscellaneous' @@ -89,7 +89,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm): self.addParameter(ParameterString(self.HOST, 'Host', 'localhost', optional=False)) self.addParameter(ParameterString(self.PORT, 'Port', - '5432', optional=False)) + '5432', optional=False)) self.addParameter(ParameterString(self.USER, 'Username', '', optional=False)) self.addParameter(ParameterString(self.DBNAME, 'Database Name', @@ -114,15 +114,15 @@ class Ogr2OgrToPostGis(OgrAlgorithm): self.addParameter(ParameterBoolean(self.CLIP, 'Clip the input layer using the above (rectangle) extent', False)) self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")', - '', optional=True)) + '', optional=True)) self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)', '', optional=True)) self.addParameter(ParameterBoolean(self.OVERWRITE, - 'Overwrite existing table?', True)) + 'Overwrite existing table?', True)) self.addParameter(ParameterBoolean(self.APPEND, - 'Append to existing table?', False)) + 'Append to existing table?', False)) self.addParameter(ParameterBoolean(self.ADDFIELDS, - 'Append and add new fields to existing table?', False)) + 'Append and add new fields to existing table?', False)) self.addParameter(ParameterBoolean(self.LAUNDER, 'Do not launder columns/table name/s?', False)) self.addParameter(ParameterBoolean(self.INDEX, @@ -142,9 +142,9 @@ class Ogr2OgrToPostGis(OgrAlgorithm): user = unicode(self.getParameterValue(self.USER)) dbname = unicode(self.getParameterValue(self.DBNAME)) password = unicode(self.getParameterValue(self.PASSWORD)) - schema = unicode(self.getParameterValue(self.SCHEMA)) + schema = unicode(self.getParameterValue(self.SCHEMA)) schemastring = "-lco SCHEMA="+schema - table = unicode(self.getParameterValue(self.TABLE)) + table = unicode(self.getParameterValue(self.TABLE)) pk = unicode(self.getParameterValue(self.PK)) pkstring = "-lco FID="+pk geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN)) @@ -152,13 +152,13 @@ class Ogr2OgrToPostGis(OgrAlgorithm): dim = self.DIMLIST[self.getParameterValue(self.DIM)] dimstring = "-lco DIM="+dim simplify = unicode(self.getParameterValue(self.SIMPLIFY)) - segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) + segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) spat = self.getParameterValue(self.SPAT) ogrspat = self.ogrConnectionString(spat) - clip = self.getParameterValue(self.CLIP) + clip = self.getParameterValue(self.CLIP) where = unicode(self.getParameterValue(self.WHERE)) wherestring = "-where '"+where+"'" - gt = unicode(self.getParameterValue(self.GT)) + gt = unicode(self.getParameterValue(self.GT)) overwrite = self.getParameterValue(self.OVERWRITE) append = self.getParameterValue(self.APPEND) addfields = self.getParameterValue(self.ADDFIELDS) @@ -171,7 +171,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm): arguments = [] arguments.append('-progress') - arguments.append('--config PG_USE_COPY YES') + arguments.append('--config PG_USE_COPY YES') arguments.append('-f') arguments.append('PostgreSQL') arguments.append('PG:"host=') @@ -185,7 +185,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm): arguments.append('password=') arguments.append(password) arguments.append('"') - arguments.append(dimstring) + arguments.append(dimstring) arguments.append(ogrLayer) if index: arguments.append(indexstring) @@ -208,13 +208,13 @@ class Ogr2OgrToPostGis(OgrAlgorithm): arguments.append(pkstring) if len(table) > 0: arguments.append('-nln') - arguments.append(table) + arguments.append(table) if len(ssrs) > 0: arguments.append('-s_srs') - arguments.append(ssrs) + arguments.append(ssrs) if len(tsrs) > 0: arguments.append('-t_srs') - arguments.append(tsrs) + arguments.append(tsrs) if len(spat) > 0: regionCoords = ogrspat.split(',') arguments.append('-spat') @@ -227,7 +227,7 @@ class Ogr2OgrToPostGis(OgrAlgorithm): if skipfailures: arguments.append('-skipfailures') if where: - arguments.append(wherestring) + arguments.append(wherestring) if len(simplify) > 0: arguments.append('-simplify') arguments.append(simplify) diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py index 5f68e1c9499..0d209d7738d 100644 --- a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py +++ b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py @@ -76,14 +76,14 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): ADDFIELDS = 'ADDFIELDS' LAUNDER = 'LAUNDER' INDEX = 'INDEX' - SKIPFAILURES = 'SKIPFAILURES' + SKIPFAILURES = 'SKIPFAILURES' OPTIONS = 'OPTIONS' def dbConnectionNames(self): settings = QSettings() settings.beginGroup('/PostgreSQL/connections/') return settings.childGroups() - + def defineCharacteristics(self): self.name = 'Import Vector into PostGIS database (available connections)' self.group = '[OGR] Miscellaneous' @@ -115,15 +115,15 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): self.addParameter(ParameterBoolean(self.CLIP, 'Clip the input layer using the above (rectangle) extent', False)) self.addParameter(ParameterString(self.WHERE, 'Select features using a SQL "WHERE" statement (Ex: column="value")', - '', optional=True)) + '', optional=True)) self.addParameter(ParameterString(self.GT, 'Group "n" features per transaction (Default: 20000)', '', optional=True)) self.addParameter(ParameterBoolean(self.OVERWRITE, - 'Overwrite existing table?', True)) + 'Overwrite existing table?', True)) self.addParameter(ParameterBoolean(self.APPEND, - 'Append to existing table?', False)) + 'Append to existing table?', False)) self.addParameter(ParameterBoolean(self.ADDFIELDS, - 'Append and add new fields to existing table?', False)) + 'Append and add new fields to existing table?', False)) self.addParameter(ParameterBoolean(self.LAUNDER, 'Do not launder columns/table name/s?', False)) self.addParameter(ParameterBoolean(self.INDEX, @@ -146,9 +146,9 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): ogrLayer = self.ogrConnectionString(inLayer) ssrs = unicode(self.getParameterValue(self.S_SRS)) tsrs = unicode(self.getParameterValue(self.T_SRS)) - schema = unicode(self.getParameterValue(self.SCHEMA)) + schema = unicode(self.getParameterValue(self.SCHEMA)) schemastring = "-lco SCHEMA="+schema - table = unicode(self.getParameterValue(self.TABLE)) + table = unicode(self.getParameterValue(self.TABLE)) pk = unicode(self.getParameterValue(self.PK)) pkstring = "-lco FID="+pk geocolumn = unicode(self.getParameterValue(self.GEOCOLUMN)) @@ -156,13 +156,13 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): dim = self.DIMLIST[self.getParameterValue(self.DIM)] dimstring = "-lco DIM="+dim simplify = unicode(self.getParameterValue(self.SIMPLIFY)) - segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) + segmentize = unicode(self.getParameterValue(self.SEGMENTIZE)) spat = self.getParameterValue(self.SPAT) ogrspat = self.ogrConnectionString(spat) - clip = self.getParameterValue(self.CLIP) + clip = self.getParameterValue(self.CLIP) where = unicode(self.getParameterValue(self.WHERE)) wherestring = "-where '"+where+"'" - gt = unicode(self.getParameterValue(self.GT)) + gt = unicode(self.getParameterValue(self.GT)) overwrite = self.getParameterValue(self.OVERWRITE) append = self.getParameterValue(self.APPEND) addfields = self.getParameterValue(self.ADDFIELDS) @@ -175,7 +175,7 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): arguments = [] arguments.append('-progress') - arguments.append('--config PG_USE_COPY YES') + arguments.append('--config PG_USE_COPY YES') arguments.append('-f') arguments.append('PostgreSQL') arguments.append('PG:"host=') @@ -189,7 +189,7 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): arguments.append('password=') arguments.append(password) arguments.append('"') - arguments.append(dimstring) + arguments.append(dimstring) arguments.append(ogrLayer) if index: arguments.append(indexstring) @@ -212,13 +212,13 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): arguments.append(pkstring) if len(table) > 0: arguments.append('-nln') - arguments.append(table) + arguments.append(table) if len(ssrs) > 0: arguments.append('-s_srs') - arguments.append(ssrs) + arguments.append(ssrs) if len(tsrs) > 0: arguments.append('-t_srs') - arguments.append(tsrs) + arguments.append(tsrs) if len(spat) > 0: regionCoords = ogrspat.split(',') arguments.append('-spat') @@ -231,7 +231,7 @@ class Ogr2OgrToPostGisList(OgrAlgorithm): if skipfailures: arguments.append('-skipfailures') if where: - arguments.append(wherestring) + arguments.append(wherestring) if len(simplify) > 0: arguments.append('-simplify') arguments.append(simplify) diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py index bc9c8a99ab5..2e9c38a4148 100644 --- a/python/plugins/processing/core/Processing.py +++ b/python/plugins/processing/core/Processing.py @@ -151,10 +151,10 @@ class Processing: ProcessingConfig.readSettings() RenderingStyles.loadStyles() Processing.loadFromProviders() - + # Inform registered listeners that all providers' algorithms have been loaded Processing.fireAlgsListHasChanged() - + @staticmethod def updateAlgsList(): """Call this method when there has been any change that @@ -185,7 +185,7 @@ class Processing: called for all registered listeners. """ Processing.listeners.append(listener) - + @staticmethod def removeAlgListListener(listener): try: diff --git a/python/plugins/processing/script/snippets.py b/python/plugins/processing/script/snippets.py index df639acd01e..ab6507a04dd 100644 --- a/python/plugins/processing/script/snippets.py +++ b/python/plugins/processing/script/snippets.py @@ -1,4 +1,4 @@ -##Iterate over the features of a layer. +##Iterate over the features of a layer. feats = processing.features(layer) n = len(feats) for i, feat in enumerate(feats): @@ -9,7 +9,7 @@ for i, feat in enumerate(feats): fields = processing.fields(layer) # int, float and bool can be used as well as types fields.append(('NEW_FIELD', str)) -writer = processing.VectorWriter(output_file, None, fields, +writer = processing.VectorWriter(output_file, None, fields, processing.geomtype(layer), layer.crs()) ##Create a new table diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp index 32d6c926086..4d7e672fb3d 100644 --- a/src/app/qgsattributetabledialog.cpp +++ b/src/app/qgsattributetabledialog.cpp @@ -307,13 +307,13 @@ void QgsAttributeTableDialog::updateFieldFromExpression() bool filtered = mMainView->filterMode() != QgsAttributeTableFilterModel::ShowAll; QgsFeatureIds filteredIds = filtered ? mMainView->filteredFeatures() : QgsFeatureIds(); - this->runFieldCalculation(mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds); + this->runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds ); } void QgsAttributeTableDialog::updateFieldFromExpressionSelected() { QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds(); - this->runFieldCalculation(mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds); + this->runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->currentField(), filteredIds ); } void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds ) @@ -345,7 +345,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin { if ( !filteredIds.isEmpty() && !filteredIds.contains( feature.id() ) ) { - continue; + continue; } exp.setCurrentRowNumber( rownum ); diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h index 49ed2033880..62bd3963ed6 100644 --- a/src/app/qgsattributetabledialog.h +++ b/src/app/qgsattributetabledialog.h @@ -185,7 +185,7 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib */ void columnBoxInit(); - void runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds = QgsFeatureIds()); + void runFieldCalculation( QgsVectorLayer* layer, QString fieldName, QString expression, QgsFeatureIds filteredIds = QgsFeatureIds() ); void updateFieldFromExpression(); void updateFieldFromExpressionSelected(); diff --git a/src/app/qgsguivectorlayertools.h b/src/app/qgsguivectorlayertools.h index c7ac4368d63..7f8ec1471d7 100644 --- a/src/app/qgsguivectorlayertools.h +++ b/src/app/qgsguivectorlayertools.h @@ -67,7 +67,7 @@ class QgsGuiVectorLayerTools : public QgsVectorLayerTools, public QObject * @param layer The layer to commit * @return True if successful */ - bool saveEdits( QgsVectorLayer* layer) const; + bool saveEdits( QgsVectorLayer* layer ) const; private: void commitError( QgsVectorLayer* vlayer ) const; diff --git a/src/core/qgis.h b/src/core/qgis.h index 722ed30c726..cc5a9b7607a 100644 --- a/src/core/qgis.h +++ b/src/core/qgis.h @@ -296,7 +296,7 @@ class CORE_EXPORT QGis // It's assumed that this works on all systems supporting // QLibrary #if QT_VERSION >= 0x050000 - #define cast_to_fptr(f) f +#define cast_to_fptr(f) f #else inline void ( *cast_to_fptr( void *p ) )() { diff --git a/src/core/qgsmultirenderchecker.cpp b/src/core/qgsmultirenderchecker.cpp index e49ffe2a31f..c36e11093cf 100644 --- a/src/core/qgsmultirenderchecker.cpp +++ b/src/core/qgsmultirenderchecker.cpp @@ -51,7 +51,7 @@ bool QgsMultiRenderChecker::runTest( const QString& theTestName, unsigned int th QVector dartMeasurements; - Q_FOREACH( const QString& suffix, subDirs ) + Q_FOREACH ( const QString& suffix, subDirs ) { qDebug() << "Checking subdir " << suffix; bool result; @@ -83,8 +83,8 @@ bool QgsMultiRenderChecker::runTest( const QString& theTestName, unsigned int th if ( !successful ) { - Q_FOREACH( const QgsDartMeasurement& measurement, dartMeasurements ) - measurement.send(); + Q_FOREACH ( const QgsDartMeasurement& measurement, dartMeasurements ) + measurement.send(); QgsDartMeasurement msg( "Image not accepted by test", QgsDartMeasurement::Text, "This may be caused because the test is supposed to fail or rendering inconsistencies." "If this is a rendering inconsistency, please add another control image folder, add an anomaly image or increase the color tolerance." ); diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp index 9b98b01d006..16e41a5e233 100644 --- a/src/gui/attributetable/qgsdualview.cpp +++ b/src/gui/attributetable/qgsdualview.cpp @@ -121,7 +121,7 @@ void QgsDualView::columnBoxInit() // ... If there are primary key(s) defined QStringList pkFields; - Q_FOREACH( int attr, pkAttrs ) + Q_FOREACH ( int attr, pkAttrs ) { pkFields.append( "COALESCE(\"" + fields[attr].name() + "\", '')" ); } @@ -152,7 +152,7 @@ void QgsDualView::columnBoxInit() mFeatureListPreviewButton->addAction( mActionExpressionPreview ); mFeatureListPreviewButton->addAction( mActionPreviewColumnsMenu ); - Q_FOREACH( const QgsField& field, fields ) + Q_FOREACH ( const QgsField& field, fields ) { if ( mLayerCache->layer()->editorWidgetV2( mLayerCache->layer()->fieldNameIndex( field.name() ) ) != "Hidden" ) { diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp index 1b2fdfb2fbb..679fc573bbf 100644 --- a/src/gui/qgsexpressionbuilderwidget.cpp +++ b/src/gui/qgsexpressionbuilderwidget.cpp @@ -115,9 +115,9 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent ) txtExpressionString->setFoldingVisible( false ); customFunctionBotton->setVisible( QgsPythonRunner::isValid() ); txtPython->setVisible( false ); - txtPython->setText("@qgsfunction(args=-1, group='Custom')\n" - "def func(values, feature, parent):\n" - " return str(values)"); + txtPython->setText( "@qgsfunction(args=-1, group='Custom')\n" + "def func(values, feature, parent):\n" + " return str(values)" ); } @@ -298,9 +298,10 @@ void QgsExpressionBuilderWidget::setGeomCalculator( const QgsDistanceArea & da ) QString QgsExpressionBuilderWidget::expressionText() { - if ( QgsPythonRunner::isValid() ) { - QString pythontext = txtPython->text(); - QgsPythonRunner::run( pythontext ); + if ( QgsPythonRunner::isValid() ) + { + QString pythontext = txtPython->text(); + QgsPythonRunner::run( pythontext ); } return txtExpressionString->text(); } diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp index dc32bfc72bc..966b7968d1d 100644 --- a/src/gui/qgsrelationeditorwidget.cpp +++ b/src/gui/qgsrelationeditorwidget.cpp @@ -267,7 +267,7 @@ void QgsRelationEditorWidget::toggleEditing( bool state ) void QgsRelationEditorWidget::saveEdits() { - mEditorContext.vectorLayerTools()->saveEdits(mRelation.referencingLayer() ); + mEditorContext.vectorLayerTools()->saveEdits( mRelation.referencingLayer() ); } void QgsRelationEditorWidget::onCollapsedStateChanged( bool collapsed ) diff --git a/src/gui/qgsvectorlayertools.h b/src/gui/qgsvectorlayertools.h index 4d838664087..d24158329bc 100644 --- a/src/gui/qgsvectorlayertools.h +++ b/src/gui/qgsvectorlayertools.h @@ -71,12 +71,12 @@ class GUI_EXPORT QgsVectorLayerTools */ virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0; - /** - * Should be called, when the features should be commited but the editing session is not ended. - * - * @param layer The layer to commit - * @return True if successful - */ + /** + * Should be called, when the features should be commited but the editing session is not ended. + * + * @param layer The layer to commit + * @return True if successful + */ virtual bool saveEdits( QgsVectorLayer* layer ) const = 0; }; diff --git a/src/gui/symbology-ng/qgsbrushstylecombobox.cpp b/src/gui/symbology-ng/qgsbrushstylecombobox.cpp index 94649900b24..aa89f941035 100644 --- a/src/gui/symbology-ng/qgsbrushstylecombobox.cpp +++ b/src/gui/symbology-ng/qgsbrushstylecombobox.cpp @@ -48,7 +48,7 @@ QgsBrushStyleComboBox::QgsBrushStyleComboBox( QWidget* parent ) { Qt::BrushStyle style = styles.at( i ).first; QString name = styles.at( i ).second; - addItem( iconForBrush( style ), name, QVariant( (int)style ) ); + addItem( iconForBrush( style ), name, QVariant(( int )style ) ); } setCurrentIndex( 1 ); @@ -63,7 +63,7 @@ Qt::BrushStyle QgsBrushStyleComboBox::brushStyle() const void QgsBrushStyleComboBox::setBrushStyle( Qt::BrushStyle style ) { - int idx = findData( QVariant( (int)style ) ); + int idx = findData( QVariant(( int )style ) ); setCurrentIndex( idx == -1 ? 0 : idx ); } diff --git a/src/gui/symbology-ng/qgspenstylecombobox.cpp b/src/gui/symbology-ng/qgspenstylecombobox.cpp index 21920f84e54..9f5d3c77179 100644 --- a/src/gui/symbology-ng/qgspenstylecombobox.cpp +++ b/src/gui/symbology-ng/qgspenstylecombobox.cpp @@ -40,7 +40,7 @@ QgsPenStyleComboBox::QgsPenStyleComboBox( QWidget* parent ) { Qt::PenStyle style = styles.at( i ).first; QString name = styles.at( i ).second; - addItem( iconForPen( style ), name, QVariant( (int) style ) ); + addItem( iconForPen( style ), name, QVariant(( int ) style ) ); } } @@ -51,7 +51,7 @@ Qt::PenStyle QgsPenStyleComboBox::penStyle() const void QgsPenStyleComboBox::setPenStyle( Qt::PenStyle style ) { - int idx = findData( QVariant( (int) style ) ); + int idx = findData( QVariant(( int ) style ) ); setCurrentIndex( idx == -1 ? 0 : idx ); }