Skip to content

Commit f17755c

Browse files
committed
indentation update
1 parent 519830e commit f17755c

10 files changed

+23
-23
lines changed

python/core/qgsdataitemproviderregistry.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class QgsDataItemProviderRegistry
77
public:
88
//! Returns the instance pointer, creating the object on the first call
99
static QgsDataItemProviderRegistry * instance();
10-
10+
1111
~QgsDataItemProviderRegistry();
1212

1313
//! Get list of available providers

python/core/qgsgeometry.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ class QgsGeometry
341341

342342
/** Returns a simplified version of this geometry using a specified tolerance value */
343343
QgsGeometry* simplify( double tolerance ) /Factory/;
344-
344+
345345
/**Smooths a geometry by rounding off corners using the Chaikin algorithm. This operation
346346
* roughly doubles the number of vertices in a geometry.
347347
* @param iterations number of smoothing iterations to run. More iterations results
@@ -506,7 +506,7 @@ class QgsGeometry
506506
* @note added in QGIS 2.9
507507
*/
508508
static bool compare( const QgsPolygon& p1, const QgsPolygon& p2, double epsilon = 4 * DBL_EPSILON );
509-
509+
510510
/** Compares two multipolygons for equality within a specified tolerance.
511511
* @param p1 first multipolygon
512512
* @param p2 second multipolygon

python/gui/qgsmaplayercombobox.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class QgsMapLayerComboBox : QComboBox
2121

2222
//! currently used filter on list layers
2323
QgsMapLayerProxyModel::Filters filters() const;
24-
24+
2525
//! except a list of layers not to be listed
2626
void setExceptedLayerList( QList<QgsMapLayer*> layerList );
2727

python/gui/qgsmaplayerproxymodel.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class QgsMapLayerProxyModel : QSortFilterProxyModel
4242
*/
4343
QgsMapLayerProxyModel* setFilters( Filters filters );
4444
const Filters& filters() const;
45-
45+
4646
//! offer the possibility to except some layers to be listed
4747
void setExceptedLayerList( QList<QgsMapLayer*> exceptList );
4848
QList<QgsMapLayer*> exceptedLayerList();

python/plugins/processing/algs/gdal/gdaltindex.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def defineCharacteristics(self):
5656

5757
def processAlgorithm(self, progress):
5858
fieldName = str(self.getParameterValue(self.FIELD_NAME))
59-
59+
6060
arguments = []
6161
if len(fieldName) > 0:
6262
arguments.append('-tileindex')

src/gui/qgsmaplayerproxymodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ QgsMapLayerProxyModel *QgsMapLayerProxyModel::setFilters( Filters filters )
3838
return this;
3939
}
4040

41-
void QgsMapLayerProxyModel::setExceptedLayerList(QList<QgsMapLayer*> exceptList)
41+
void QgsMapLayerProxyModel::setExceptedLayerList( QList<QgsMapLayer*> exceptList )
4242
{
4343
mExceptList = exceptList;
4444
invalidateFilter();

src/gui/qgsscalewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ QgsScaleWidget::QgsScaleWidget( QWidget *parent )
3232
layout->addWidget( mScaleComboBox );
3333

3434
mCurrentScaleButton = new QToolButton( this );
35-
mCurrentScaleButton->setToolTip( tr("Set to current canvas scale") );
35+
mCurrentScaleButton->setToolTip( tr( "Set to current canvas scale" ) );
3636
mCurrentScaleButton->setIcon( QgsApplication::getThemeIcon( "/mActionMapIdentification.svg" ) );
3737
layout->addWidget( mCurrentScaleButton );
3838
mCurrentScaleButton->hide();

src/providers/postgres/qgspostgresfeatureiterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause )
322322
if ( mSource->mForce2d )
323323
{
324324
geom = QString( "%1(%2)" )
325-
// Force_2D before 2.0
325+
// Force_2D before 2.0
326326
.arg( mConn->majorVersion() < 2 ? "force_2d"
327327
// ST_Force2D since 2.1.0
328328
: mConn->majorVersion() > 2 || mConn->minorVersion() > 0 ? "st_force2d"

src/server/qgswmsserver.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -1417,11 +1417,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
14171417
}
14181418
else
14191419
{
1420-
infoPoint = new QgsPoint();
1421-
if( !infoPointToMapCoordinates( i, j, infoPoint, mMapRenderer ) )
1422-
{
1423-
return 5;
1424-
}
1420+
infoPoint = new QgsPoint();
1421+
if ( !infoPointToMapCoordinates( i, j, infoPoint, mMapRenderer ) )
1422+
{
1423+
return 5;
1424+
}
14251425
}
14261426

14271427
//get the layer registered in QgsMapLayerRegistry and apply possible filters
@@ -1552,9 +1552,9 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
15521552
QgsRasterLayer* rasterLayer = dynamic_cast<QgsRasterLayer*>( currentLayer );
15531553
if ( rasterLayer )
15541554
{
1555-
if( !infoPoint )
1555+
if ( !infoPoint )
15561556
{
1557-
continue;
1557+
continue;
15581558
}
15591559
QgsPoint layerInfoPoint = mMapRenderer->mapToLayerCoordinates( currentLayer, *infoPoint );
15601560
if ( featureInfoFromRasterLayer( rasterLayer, &layerInfoPoint, result, layerElement, version, infoFormat ) != 0 )

tests/src/core/testqgsmaprotation.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ void TestQgsMapRotation::initTestCase()
101101
mapLayers << mLinesLayer;
102102

103103
// Register all layers with the registry
104-
QgsMapLayerRegistry::instance()->addMapLayers(mapLayers);
104+
QgsMapLayerRegistry::instance()->addMapLayers( mapLayers );
105105

106106
// This is needed to correctly set rotation center,
107107
// the actual size doesn't matter as QgsRenderChecker will
108108
// re-set it to the size of the expected image
109-
mMapSettings.setOutputSize( QSize(256,256) );
109+
mMapSettings.setOutputSize( QSize( 256, 256 ) );
110110

111111
mReport += "<h1>Map Rotation Tests</h1>\n";
112112
}
@@ -150,7 +150,7 @@ void TestQgsMapRotation::pointsLayer()
150150
bool success = false;
151151
mPointsLayer->loadNamedStyle( qml, success );
152152
QVERIFY( success );
153-
mMapSettings.setExtent( QgsRectangle(-105.5,37,-97.5,45) );
153+
mMapSettings.setExtent( QgsRectangle( -105.5, 37, -97.5, 45 ) );
154154
mMapSettings.setRotation( -60 );
155155
QVERIFY( render( "svgpoints-60" ) );
156156

@@ -159,7 +159,7 @@ void TestQgsMapRotation::pointsLayer()
159159
success = false;
160160
mPointsLayer->loadNamedStyle( qml, success );
161161
QVERIFY( success );
162-
mMapSettings.setExtent( QgsRectangle(-116,33,-107,42) );
162+
mMapSettings.setExtent( QgsRectangle( -116, 33, -107, 42 ) );
163163
mMapSettings.setRotation( 90 );
164164
QVERIFY( render( "svgpoints-datadefined+90" ) );
165165

@@ -170,7 +170,7 @@ void TestQgsMapRotation::pointsLayer()
170170
success = false;
171171
mPointsLayer->loadNamedStyle( qml, success );
172172
QVERIFY( success );
173-
mMapSettings.setExtent( QgsRectangle(-116,33,-107,42) );
173+
mMapSettings.setExtent( QgsRectangle( -116, 33, -107, 42 ) );
174174
mMapSettings.setRotation( 90 );
175175
QVERIFY( render( "simplepoints-datadefined+90" ) );
176176

@@ -179,7 +179,7 @@ void TestQgsMapRotation::pointsLayer()
179179
success = false;
180180
mPointsLayer->loadNamedStyle( qml, success );
181181
QVERIFY( success );
182-
mMapSettings.setExtent( QgsRectangle(-108,26,-100,34) );
182+
mMapSettings.setExtent( QgsRectangle( -108, 26, -100, 34 ) );
183183
mMapSettings.setRotation( 30 );
184184
QVERIFY( render( "simplepoints+30" ) );
185185

@@ -207,7 +207,7 @@ bool TestQgsMapRotation::render( QString theTestType )
207207
{
208208
mReport += "<h2>" + theTestType + "</h2>\n";
209209
QgsRenderChecker checker;
210-
checker.setControlPathPrefix("maprotation");
210+
checker.setControlPathPrefix( "maprotation" );
211211
checker.setControlName( "expected_" + theTestType );
212212
checker.setMapSettings( mMapSettings );
213213
bool result = checker.runTest( theTestType );

0 commit comments

Comments
 (0)