Skip to content

Commit dd53fda

Browse files
jef-njef-n
committed
indentation update
1 parent 04388f7 commit dd53fda

16 files changed

+57
-55
lines changed

‎python/core/qgsexpression.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ class QgsExpression
195195
{
196196
public:
197197
Function( const QString& fnname, int params, const QString& group, const QString& helpText = QString(), bool usesGeometry = false, QStringList referencedColumns = QStringList(), bool lazyEval = false );
198-
198+
199199
virtual ~Function();
200-
200+
201201
/** The name of the function. */
202202
QString name();
203203
/** The number of parameters this function takes. */

‎src/app/qgisappstylesheet.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ QMap<QString, QVariant> QgisAppStyleSheet::defaultOptions()
9393
settings.endGroup(); // "qgis/stylesheet"
9494

9595
opts.insert( "iconSize", settings.value( "/IconSize", QGIS_ICON_SIZE ) );
96-
96+
9797
return opts;
9898
}
9999

@@ -181,18 +181,18 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap<QString, QVariant>& opts )
181181
{
182182
iconSize -= 16;
183183
}
184-
else if ( iconSize == 32 )
184+
else if ( iconSize == 32 )
185185
{
186186
iconSize = 24;
187187
}
188188
else
189189
{
190190
iconSize = 16;
191191
}
192-
192+
193193
QgsDebugMsg( QString( "iconSize: %1" ).arg( iconSize ) );
194194
ss += QString( "QDockWidget QToolButton { icon-size: %1px; }" ).arg( iconSize );
195-
195+
196196
QgsDebugMsg( QString( "Stylesheet built: %1" ).arg( ss ) );
197197

198198
emit appStyleSheetChanged( ss );

‎src/app/qgsattributetabledialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
161161
void updateButtonStatus( QString fieldName, bool isValid );
162162

163163
/* replace the search widget with a new one */
164-
void replaceSearchWidget(QWidget* oldw, QWidget* neww);
164+
void replaceSearchWidget( QWidget* oldw, QWidget* neww );
165165

166166
signals:
167167
/**

‎src/app/qgsoptions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ void QgsOptions::on_pbnTemplateFolderReset_pressed()
925925
void QgsOptions::iconSizeChanged( const QString &iconSize )
926926
{
927927
QgisApp::instance()->setIconSizes( iconSize.toInt() );
928-
928+
929929
mStyleSheetNewOpts.insert( "iconSize", QVariant( iconSize.toInt() ) );
930930
mStyleSheetBuilder->buildStyleSheet( mStyleSheetNewOpts );
931931
}

‎src/core/composer/qgscomposermap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@ void QgsComposerMap::storeCurrentLayerSet()
15301530
}
15311531

15321532

1533-
void QgsComposerMap::setLayerStyleOverrides(const QMap<QString, QString>& overrides)
1533+
void QgsComposerMap::setLayerStyleOverrides( const QMap<QString, QString>& overrides )
15341534
{
15351535
if ( overrides == mLayerStyleOverrides )
15361536
return;

‎src/core/qgsexpression.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,10 @@ class CORE_EXPORT QgsExpression
542542

543543
virtual QStringList referencedColumns() const override { QStringList lst( mNode->referencedColumns() ); foreach ( Node* n, mList->list() ) lst.append( n->referencedColumns() ); return lst; }
544544
virtual bool needsGeometry() const override { bool needs = false; foreach ( Node* n, mList->list() ) needs |= n->needsGeometry(); return needs; }
545-
virtual void accept( Visitor& v ) const override { v.visit( *this ); }
545+
virtual void accept( Visitor& v ) const override { v.visit( *this ); }
546546

547-
protected:
548-
Node* mNode;
547+
protected:
548+
Node* mNode;
549549
NodeList* mList;
550550
bool mNotIn;
551551
};

‎src/core/qgsvectorlayer.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2185,7 +2185,7 @@ bool QgsVectorLayer::deleteAttributes( QList<int> attrs )
21852185

21862186
qSort( attrs.begin(), attrs.end(), qGreater<int>() );
21872187

2188-
Q_FOREACH( int attr, attrs )
2188+
Q_FOREACH ( int attr, attrs )
21892189
{
21902190
if ( deleteAttribute( attr ) )
21912191
{
@@ -2955,7 +2955,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
29552955
if ( mEditBuffer )
29562956
{
29572957
QSet<QString> vals;
2958-
Q_FOREACH( const QVariant& v, uniqueValues )
2958+
Q_FOREACH ( const QVariant& v, uniqueValues )
29592959
{
29602960
vals << v.toString();
29612961
}
@@ -3763,7 +3763,7 @@ void QgsVectorLayer::invalidateSymbolCountedFlag()
37633763

37643764
void QgsVectorLayer::onRelationsLoaded()
37653765
{
3766-
Q_FOREACH( QgsAttributeEditorElement* elem, mAttributeEditorElements )
3766+
Q_FOREACH ( QgsAttributeEditorElement* elem, mAttributeEditorElements )
37673767
{
37683768
if ( elem->type() == QgsAttributeEditorElement::AeTypeContainer )
37693769
{
@@ -3772,7 +3772,7 @@ void QgsVectorLayer::onRelationsLoaded()
37723772
continue;
37733773

37743774
QList<QgsAttributeEditorElement*> relations = cont->findElements( QgsAttributeEditorElement::AeTypeRelation );
3775-
Q_FOREACH( QgsAttributeEditorElement* relElem, relations )
3775+
Q_FOREACH ( QgsAttributeEditorElement* relElem, relations )
37763776
{
37773777
QgsAttributeEditorRelation* rel = dynamic_cast< QgsAttributeEditorRelation* >( relElem );
37783778
if ( !rel )
@@ -3841,7 +3841,7 @@ QDomElement QgsAttributeEditorContainer::toDomElement( QDomDocument& doc ) const
38413841
QDomElement elem = doc.createElement( "attributeEditorContainer" );
38423842
elem.setAttribute( "name", mName );
38433843

3844-
Q_FOREACH( QgsAttributeEditorElement* child, mChildren )
3844+
Q_FOREACH ( QgsAttributeEditorElement* child, mChildren )
38453845
{
38463846
elem.appendChild( child->toDomElement( doc ) );
38473847
}
@@ -3857,7 +3857,7 @@ QList<QgsAttributeEditorElement*> QgsAttributeEditorContainer::findElements( Qgs
38573857
{
38583858
QList<QgsAttributeEditorElement*> results;
38593859

3860-
Q_FOREACH( QgsAttributeEditorElement* elem, mChildren )
3860+
Q_FOREACH ( QgsAttributeEditorElement* elem, mChildren )
38613861
{
38623862
if ( elem->type() == type )
38633863
{

‎src/gui/attributetable/qgsdualview.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ void QgsDualView::columnBoxInit()
120120
// ... If there are primary key(s) defined
121121
QStringList pkFields;
122122

123-
Q_FOREACH( int attr, pkAttrs )
123+
Q_FOREACH ( int attr, pkAttrs )
124124
{
125125
pkFields.append( "COALESCE(\"" + fields[attr].name() + "\", '<NULL>')" );
126126
}
@@ -151,7 +151,7 @@ void QgsDualView::columnBoxInit()
151151
mFeatureListPreviewButton->addAction( mActionExpressionPreview );
152152
mFeatureListPreviewButton->addAction( mActionPreviewColumnsMenu );
153153

154-
Q_FOREACH( const QgsField& field, fields )
154+
Q_FOREACH ( const QgsField& field, fields )
155155
{
156156
int fieldIndex = mLayerCache->layer()->fieldNameIndex( field.name() );
157157
if ( fieldIndex == -1 )

‎src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.cpp

+13-11
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,33 @@ QgsDefaultSearchWidgetWrapper::QgsDefaultSearchWidgetWrapper( QgsVectorLayer* vl
2929

3030
QVariant QgsDefaultSearchWidgetWrapper::value()
3131
{
32-
return mLineEdit->text();
32+
return mLineEdit->text();
3333
}
3434

3535
QWidget* QgsDefaultSearchWidgetWrapper::createWidget( QWidget* parent )
3636
{
37-
return new QgsFilterLineEdit( parent );
37+
return new QgsFilterLineEdit( parent );
3838
}
3939

4040
void QgsDefaultSearchWidgetWrapper::initWidget( QWidget* widget )
4141
{
42-
mLineEdit = qobject_cast<QgsFilterLineEdit*>( widget );
43-
mLineEdit->setSizePolicy(QSizePolicy ::Expanding , QSizePolicy ::Fixed );
44-
connect( widget, SIGNAL( textChanged( QString ) ), this, SLOT( valueChanged( QString ) ) );
42+
mLineEdit = qobject_cast<QgsFilterLineEdit*>( widget );
43+
mLineEdit->setSizePolicy( QSizePolicy ::Expanding , QSizePolicy ::Fixed );
44+
connect( widget, SIGNAL( textChanged( QString ) ), this, SLOT( valueChanged( QString ) ) );
4545
}
4646

4747
void QgsDefaultSearchWidgetWrapper::setValue( const QVariant& value )
4848
{
49-
mLineEdit->setText( value.toString() ); //FIXME no null check :(
49+
mLineEdit->setText( value.toString() ); //FIXME no null check :(
5050
}
5151

5252
void QgsDefaultSearchWidgetWrapper::setEnabled( bool enabled )
5353
{
54-
mLineEdit->setReadOnly( !enabled );
55-
//if ( enabled )
56-
//mLineEdit->setPalette( mWritablePalette );
57-
//else
58-
//mLineEdit->setPalette( mReadOnlyPalette );
54+
mLineEdit->setReadOnly( !enabled );
55+
#if 0
56+
if ( enabled )
57+
mLineEdit->setPalette( mWritablePalette );
58+
else
59+
mLineEdit->setPalette( mReadOnlyPalette );
60+
#endif
5961
}

‎src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
***************************************************************************/
1515

1616
#ifndef QGSDEFAULTSEARCHWIDGETWRAPPER_H
17-
#define QGSDEFAULTSEARCHWIDGETWRAPPER_H
17+
#define QGSDEFAULTSEARCHWIDGETWRAPPER_H
1818

1919
#include "qgseditorwidgetwrapper.h"
2020
#include <qgsfilterlineedit.h>
2121

2222

2323
/**
24-
* Wraps a search widget. Default form is just a QgsLineFilterEdit
24+
* Wraps a search widget. Default form is just a QgsLineFilterEdit
2525
*
2626
*/
2727

‎src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ QgsEditorWidgetFactory::~QgsEditorWidgetFactory()
3434
*/
3535
QgsEditorWidgetWrapper* QgsEditorWidgetFactory::createSearchWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const
3636
{
37-
return new QgsDefaultSearchWidgetWrapper(vl, fieldIdx, 0, parent);
37+
return new QgsDefaultSearchWidgetWrapper( vl, fieldIdx, 0, parent );
3838
}
3939

4040
QString QgsEditorWidgetFactory::name()

‎src/gui/editorwidgets/core/qgseditorwidgetregistry.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
8484
const QgsAttributeEditorContext& context = QgsAttributeEditorContext() );
8585

8686
QgsEditorWidgetWrapper* createSearchWidget( const QString& widgetId,
87-
QgsVectorLayer* vl,
88-
int fieldIdx,
89-
const QgsEditorWidgetConfig& config,
90-
QWidget* parent,
91-
const QgsAttributeEditorContext& context = QgsAttributeEditorContext() );
87+
QgsVectorLayer* vl,
88+
int fieldIdx,
89+
const QgsEditorWidgetConfig& config,
90+
QWidget* parent,
91+
const QgsAttributeEditorContext& context = QgsAttributeEditorContext() );
9292

9393
/**
9494
* Creates a configuration widget

‎src/gui/editorwidgets/qgsvaluerelationwidgetfactory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ QgsEditorWidgetWrapper* QgsValueRelationWidgetFactory::create( QgsVectorLayer* v
3333
return new QgsValueRelationWidgetWrapper( vl, fieldIdx, editor, parent );
3434
}
3535

36-
QgsEditorWidgetWrapper *QgsValueRelationWidgetFactory::createSearchWidget(QgsVectorLayer *vl, int fieldIdx, QWidget *parent) const
36+
QgsEditorWidgetWrapper *QgsValueRelationWidgetFactory::createSearchWidget( QgsVectorLayer *vl, int fieldIdx, QWidget *parent ) const
3737
{
3838
return new QgsValueRelationWidgetWrapper( vl, fieldIdx, 0, parent );
3939
}

‎src/gui/symbology-ng/qgssizescalewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ItemDelegate : public QItemDelegate
4040
QSize sizeHint( const QStyleOptionViewItem& /*option*/, const QModelIndex & index ) const override
4141
{
4242
return mModel->item( index.row() )->icon().actualSize( QSize( 512, 512 ) );
43-
}
43+
}
4444

4545
private:
4646
QStandardItemModel* mModel;

‎src/providers/grass/qgsgrassoptions.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@
1818
#include "qgsgrassoptions.h"
1919
#include "ui_qgsgrassoptionsbase.h"
2020

21-
QgsGrassOptions::QgsGrassOptions(QWidget *parent)
22-
: QDialog(parent)
23-
, QgsGrassOptionsBase()
24-
, mImportSettingsPath("/GRASS/browser/import")
21+
QgsGrassOptions::QgsGrassOptions( QWidget *parent )
22+
: QDialog( parent )
23+
, QgsGrassOptionsBase()
24+
, mImportSettingsPath( "/GRASS/browser/import" )
2525
{
26-
setupUi(this);
26+
setupUi( this );
2727

2828
connect( this, SIGNAL( accepted() ), this, SLOT( saveOptions() ) );
2929

3030
QSettings settings;
3131

32-
QgsRasterProjector::Precision crsTransform = (QgsRasterProjector::Precision) settings.value( mImportSettingsPath + "/crsTransform", QgsRasterProjector::Approximate).toInt();
33-
mCrsTransformationComboBox->addItem ( QgsRasterProjector::precisionLabel(QgsRasterProjector::Approximate), QgsRasterProjector::Approximate);
34-
mCrsTransformationComboBox->addItem ( QgsRasterProjector::precisionLabel(QgsRasterProjector::Exact), QgsRasterProjector::Exact);
35-
mCrsTransformationComboBox->setCurrentIndex ( mCrsTransformationComboBox->findData(crsTransform) );
32+
QgsRasterProjector::Precision crsTransform = ( QgsRasterProjector::Precision ) settings.value( mImportSettingsPath + "/crsTransform", QgsRasterProjector::Approximate ).toInt();
33+
mCrsTransformationComboBox->addItem( QgsRasterProjector::precisionLabel( QgsRasterProjector::Approximate ), QgsRasterProjector::Approximate );
34+
mCrsTransformationComboBox->addItem( QgsRasterProjector::precisionLabel( QgsRasterProjector::Exact ), QgsRasterProjector::Exact );
35+
mCrsTransformationComboBox->setCurrentIndex( mCrsTransformationComboBox->findData( crsTransform ) );
3636

37-
mImportExternalCheckBox->setChecked( settings.value(mImportSettingsPath + "/external", true).toBool() );
37+
mImportExternalCheckBox->setChecked( settings.value( mImportSettingsPath + "/external", true ).toBool() );
3838
}
3939

4040
QgsGrassOptions::~QgsGrassOptions()
@@ -46,7 +46,7 @@ void QgsGrassOptions::saveOptions()
4646
QSettings settings;
4747

4848
settings.setValue( mImportSettingsPath + "/crsTransform",
49-
mCrsTransformationComboBox->itemData( mCrsTransformationComboBox->currentIndex() ).toInt() );
49+
mCrsTransformationComboBox->itemData( mCrsTransformationComboBox->currentIndex() ).toInt() );
5050

5151
settings.setValue( mImportSettingsPath + "/external", mImportExternalCheckBox->isChecked() );
5252
}

‎src/providers/grass/qgsgrassoptions.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
class GRASS_LIB_EXPORT QgsGrassOptions : public QDialog, private Ui::QgsGrassOptionsBase
2424
{
25-
Q_OBJECT
26-
25+
Q_OBJECT
26+
2727
public:
28-
explicit QgsGrassOptions(QWidget *parent = 0);
28+
explicit QgsGrassOptions( QWidget *parent = 0 );
2929
~QgsGrassOptions();
3030

3131
private slots:

0 commit comments

Comments
 (0)