sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

indentation update [ci skip]

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-11-30 10:26:17 +01:00
parent 4d4fa44605
commit e48a6f642f
19 changed files with 74 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/qgsattributetabledialog.cpp
View File

@ -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 );

2
src/app/qgsattributetabledialog.h
View File

@ -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();

2
src/app/qgsguivectorlayertools.h
View File

@ -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;

2
src/core/qgis.h
View File

@ -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 ) )()
{

6
src/core/qgsmultirenderchecker.cpp
View File

@ -51,7 +51,7 @@ bool QgsMultiRenderChecker::runTest( const QString& theTestName, unsigned int th
QVector<QgsDartMeasurement> 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." );

4
src/gui/attributetable/qgsdualview.cpp
View File

@ -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() + "\", '<NULL>')" );
}
@ -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" )
{

13
src/gui/qgsexpressionbuilderwidget.cpp
View File

@ -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();
}

2
src/gui/qgsrelationeditorwidget.cpp
View File

@ -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 )

12
src/gui/qgsvectorlayertools.h
View File

@ -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;
};

4
src/gui/symbology-ng/qgsbrushstylecombobox.cpp
View File

@ -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 );
}

4
src/gui/symbology-ng/qgspenstylecombobox.cpp
View File

@ -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 );
}