Skip to content

Commit d79268c

Browse files
committed
indentation update
1 parent 213a22b commit d79268c

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

python/core/qgspallabeling.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
742742
bool isStoredWithProject() const /Deprecated/;
743743
//! @deprecated since 2.4 - settings are always stored in project
744744
void setStoredWithProject( bool store ) /Deprecated/;
745-
745+
746746
/** Prepares a geometry for registration with PAL. Handles reprojection, rotation, clipping, etc.
747747
* @param geometry geometry to prepare
748748
* @param context render context
@@ -787,7 +787,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
787787
const QMap< QgsPalLayerSettings::DataDefinedProperties, QVariant >& ddValues );
788788

789789
void deleteTemporaryData();
790-
790+
791791
/** Checks whether a geometry exceeds the minimum required size for a geometry to be labeled.
792792
* @param context render context
793793
* @param geom geometry

src/plugins/grass/qgsgrassedit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class QgsGrassEditLayer : public QgsMapCanvasItem
7171
virtual QRectF boundingRect() const override
7272
{
7373
return QRectF( 0, 0, mMapCanvas->width(), mMapCanvas->height() );
74-
}
74+
}
7575

7676
virtual void updatePosition() override
7777
{

tests/src/providers/grass/testqgsgrassprovider.cpp

+17-17
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ class TestQgsGrassProvider: public QObject
5050

5151
void vectorLayers();
5252
private:
53-
void reportRow(QString message);
53+
void reportRow( QString message );
5454
QString mGisdbase;
5555
QString mLocation;
5656
QString mReport;
5757
};
5858

5959

60-
void TestQgsGrassProvider::reportRow(QString message)
60+
void TestQgsGrassProvider::reportRow( QString message )
6161
{
62-
mReport += message + "<br>";
62+
mReport += message + "<br>";
6363
}
6464

6565
//runs before all tests
@@ -75,7 +75,7 @@ void TestQgsGrassProvider::initTestCase()
7575
//QgsApplication::initQgis();
7676
QString mySettings = QgsApplication::showSettings();
7777
mySettings = mySettings.replace( "\n", "<br />" );
78-
mReport += QString("<h1>GRASS %1 provider tests</h1>\n").arg( GRASS_BUILD_VERSION );
78+
mReport += QString( "<h1>GRASS %1 provider tests</h1>\n" ).arg( GRASS_BUILD_VERSION );
7979
mReport += "<p>" + mySettings + "</p>";
8080

8181
QgsGrass::init();
@@ -106,40 +106,40 @@ void TestQgsGrassProvider::cleanupTestCase()
106106

107107
void TestQgsGrassProvider::vectorLayers()
108108
{
109-
QString mapset = QString("test%1").arg( GRASS_BUILD_VERSION );
109+
QString mapset = QString( "test%1" ).arg( GRASS_BUILD_VERSION );
110110
QString mapName = "test";
111111
QStringList expectedLayers;
112112
expectedLayers << "1_point" << "2_line" << "3_polygon";
113113

114-
reportRow("");
115-
reportRow("QgsGrass::vectorLayers test");
116-
reportRow("mapset: " + mapset);
117-
reportRow("mapName: " + mapName);
118-
reportRow("expectedLayers: " + expectedLayers.join(", "));
114+
reportRow( "" );
115+
reportRow( "QgsGrass::vectorLayers test" );
116+
reportRow( "mapset: " + mapset );
117+
reportRow( "mapName: " + mapName );
118+
reportRow( "expectedLayers: " + expectedLayers.join( ", " ) );
119119

120120
bool ok = true;
121121
G_TRY
122122
{
123-
QStringList layers = QgsGrass::vectorLayers(mGisdbase, mLocation, mapset, mapName);
124-
reportRow("layers:" + layers.join(", "));
123+
QStringList layers = QgsGrass::vectorLayers( mGisdbase, mLocation, mapset, mapName );
124+
reportRow( "layers:" + layers.join( ", " ) );
125125

126-
foreach( QString expectedLayer, expectedLayers)
126+
foreach ( QString expectedLayer, expectedLayers )
127127
{
128-
if ( !layers.contains(expectedLayer) )
128+
if ( !layers.contains( expectedLayer ) )
129129
{
130130
ok = false;
131-
reportRow("ERROR: expected layer '" + expectedLayer + "' missing");
131+
reportRow( "ERROR: expected layer '" + expectedLayer + "' missing" );
132132
}
133133
}
134134
}
135135
G_CATCH( QgsGrass::Exception &e )
136136
{
137137
ok = false;
138-
reportRow( QString("ERROR: %1").arg(e.what()) );
138+
reportRow( QString( "ERROR: %1" ).arg( e.what() ) );
139139
}
140140

141141
QVERIFY( ok );
142-
reportRow("OK");
142+
reportRow( "OK" );
143143
}
144144

145145
QTEST_MAIN( TestQgsGrassProvider )

0 commit comments

Comments
 (0)