Skip to content

Commit 0956654

Browse files
PeterPetrikPeterPetrik
committed
fix style
1 parent ff8b314 commit 0956654

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎.github/workflows/win.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
uses: pat-s/[email protected]
112112
with:
113113
path: ${{ github.workspace }}/input-sdk
114-
key: ${{ runner.os }}-input-sdk-v0-${{ env.INPUT_SDK_VERSION }}-${{ env.CACHE_VERSION }}
114+
key: ${{ runner.os }}-input-sdk-v1-${{ env.INPUT_SDK_VERSION }}-${{ env.CACHE_VERSION }}
115115

116116
- name: Install Input-SDK
117117
shell: bash

‎app/inpututils.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2084,17 +2084,17 @@ static double qgsRuntimeProfilerExtractModelAsText( QStringList &lines, const QS
20842084
for ( int r = 0; r < rc; r++ )
20852085
{
20862086
QModelIndex rowIndex = QgsApplication::profiler()->index( r, 0, parent );
2087-
if ( QgsApplication::profiler()->data( rowIndex, static_cast<int>(QgsRuntimeProfilerNode::CustomRole::Group) ).toString() != group )
2087+
if ( QgsApplication::profiler()->data( rowIndex, static_cast<int>( QgsRuntimeProfilerNode::CustomRole::Group ) ).toString() != group )
20882088
continue;
20892089
bool ok;
2090-
double elapsed = QgsApplication::profiler()->data( rowIndex, static_cast<int>(QgsRuntimeProfilerNode::CustomRole::Elapsed) ).toDouble( &ok );
2090+
double elapsed = QgsApplication::profiler()->data( rowIndex, static_cast<int>( QgsRuntimeProfilerNode::CustomRole::Elapsed ) ).toDouble( &ok );
20912091
if ( !ok )
20922092
elapsed = 0.0;
20932093
total_elapsed += elapsed;
20942094

20952095
if ( elapsed > PROFILER_THRESHOLD )
20962096
{
2097-
QString name = QgsApplication::profiler()->data( rowIndex, static_cast<int>(QgsRuntimeProfilerNode::CustomRole::Name) ).toString();
2097+
QString name = QgsApplication::profiler()->data( rowIndex, static_cast<int>( QgsRuntimeProfilerNode::CustomRole::Name ) ).toString();
20982098
lines << QStringLiteral( " %1 %2: %3 sec" ).arg( QStringLiteral( ">" ).repeated( level + 1 ), name, QString::number( elapsed, 'f', 3 ) );
20992099
}
21002100
total_elapsed += qgsRuntimeProfilerExtractModelAsText( lines, group, rowIndex, level + 1 );

‎app/test/testmaptools.cpp‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,7 +1851,7 @@ void TestMapTools::testVerticesStructure()
18511851

18521852
QCOMPARE( mapTool.collectedVertices().length(), 1 );
18531853
QVERIFY( mapTool.collectedVertices().at( 0 ).type() == Vertex::Existing );
1854-
QCOMPARE( mapTool.collectedVertices().at( 0 ).coordinates(), QgsPoint(pointdata) );
1854+
QCOMPARE( mapTool.collectedVertices().at( 0 ).coordinates(), QgsPoint( pointdata ) );
18551855

18561856
//
18571857
// multipoint
@@ -1883,9 +1883,9 @@ void TestMapTools::testVerticesStructure()
18831883
QVERIFY( verticesmp.at( 1 ).type() == Vertex::Existing );
18841884
QVERIFY( verticesmp.at( 2 ).type() == Vertex::Existing );
18851885

1886-
QCOMPARE( verticesmp.at( 0 ).coordinates(), QgsPoint(multipointdata.at( 0 )) );
1887-
QCOMPARE( verticesmp.at( 1 ).coordinates(), QgsPoint(multipointdata.at( 1 )) );
1888-
QCOMPARE( verticesmp.at( 2 ).coordinates(), QgsPoint(multipointdata.at( 2 )) );
1886+
QCOMPARE( verticesmp.at( 0 ).coordinates(), QgsPoint( multipointdata.at( 0 ) ) );
1887+
QCOMPARE( verticesmp.at( 1 ).coordinates(), QgsPoint( multipointdata.at( 1 ) ) );
1888+
QCOMPARE( verticesmp.at( 2 ).coordinates(), QgsPoint( multipointdata.at( 2 ) ) );
18891889

18901890
//
18911891
// linestring
@@ -1922,9 +1922,9 @@ void TestMapTools::testVerticesStructure()
19221922
QVERIFY( verticesl.at( 5 ).type() == Vertex::Existing );
19231923
QVERIFY( verticesl.at( 6 ).type() == Vertex::HandleEnd );
19241924

1925-
QCOMPARE( verticesl.at( 1 ).coordinates(), QgsPoint(linestringdata.at( 0 )) );
1926-
QCOMPARE( verticesl.at( 3 ).coordinates(), QgsPoint(linestringdata.at( 1 )) );
1927-
QCOMPARE( verticesl.at( 5 ).coordinates(), QgsPoint(linestringdata.at( 2 )) );
1925+
QCOMPARE( verticesl.at( 1 ).coordinates(), QgsPoint( linestringdata.at( 0 ) ) );
1926+
QCOMPARE( verticesl.at( 3 ).coordinates(), QgsPoint( linestringdata.at( 1 ) ) );
1927+
QCOMPARE( verticesl.at( 5 ).coordinates(), QgsPoint( linestringdata.at( 2 ) ) );
19281928

19291929
// single point line
19301930
QgsLineString *r = qgsgeometry_cast<QgsLineString *>( linestrindataGEO.get() );
@@ -1942,7 +1942,7 @@ void TestMapTools::testVerticesStructure()
19421942

19431943
QCOMPARE( mapTool.collectedVertices().length(), 1 );
19441944
QVERIFY( mapTool.collectedVertices().at( 0 ).type() == Vertex::Existing );
1945-
QCOMPARE( mapTool.collectedVertices().at( 0 ).coordinates(), QgsPoint(linestringdata.at( 0 )) );
1945+
QCOMPARE( mapTool.collectedVertices().at( 0 ).coordinates(), QgsPoint( linestringdata.at( 0 ) ) );
19461946

19471947
//
19481948
// multilinestring
@@ -1998,12 +1998,12 @@ void TestMapTools::testVerticesStructure()
19981998
QVERIFY( verticesml.at( 11 ).type() == Vertex::HandleEnd );
19991999
QVERIFY( verticesml.at( 12 ).type() == Vertex::Existing );
20002000

2001-
QCOMPARE( verticesml.at( 1 ).coordinates(), QgsPoint(multilinestringdata.at( 0 ).at( 0 )) );
2002-
QCOMPARE( verticesml.at( 3 ).coordinates(), QgsPoint(multilinestringdata.at( 0 ).at( 1 )) );
2003-
QCOMPARE( verticesml.at( 5 ).coordinates(), QgsPoint(multilinestringdata.at( 0 ).at( 2 )) );
2004-
QCOMPARE( verticesml.at( 8 ).coordinates(), QgsPoint(multilinestringdata.at( 1 ).at( 0 )) );
2005-
QCOMPARE( verticesml.at( 10 ).coordinates(), QgsPoint(multilinestringdata.at( 1 ).at( 1 )) );
2006-
QCOMPARE( verticesml.at( 12 ).coordinates(), QgsPoint(multilinestringdata.at( 2 ).at( 0 )) );
2001+
QCOMPARE( verticesml.at( 1 ).coordinates(), QgsPoint( multilinestringdata.at( 0 ).at( 0 ) ) );
2002+
QCOMPARE( verticesml.at( 3 ).coordinates(), QgsPoint( multilinestringdata.at( 0 ).at( 1 ) ) );
2003+
QCOMPARE( verticesml.at( 5 ).coordinates(), QgsPoint( multilinestringdata.at( 0 ).at( 2 ) ) );
2004+
QCOMPARE( verticesml.at( 8 ).coordinates(), QgsPoint( multilinestringdata.at( 1 ).at( 0 ) ) );
2005+
QCOMPARE( verticesml.at( 10 ).coordinates(), QgsPoint( multilinestringdata.at( 1 ).at( 1 ) ) );
2006+
QCOMPARE( verticesml.at( 12 ).coordinates(), QgsPoint( multilinestringdata.at( 2 ).at( 0 ) ) );
20072007

20082008
QCOMPARE( verticesml.at( 0 ).vertexId().part, 0 );
20092009
QCOMPARE( verticesml.at( 7 ).vertexId().part, 1 );
@@ -2049,10 +2049,10 @@ void TestMapTools::testVerticesStructure()
20492049
QVERIFY( verticesspn.at( 6 ).type() == Vertex::Existing );
20502050
QVERIFY( verticesspn.at( 7 ).type() == Vertex::MidPoint );
20512051

2052-
QCOMPARE( verticesspn.at( 0 ).coordinates(), QgsPoint(simplepolygondata.at( 0 ).at( 0 )) );
2053-
QCOMPARE( verticesspn.at( 2 ).coordinates(), QgsPoint(simplepolygondata.at( 0 ).at( 1 )) );
2054-
QCOMPARE( verticesspn.at( 4 ).coordinates(), QgsPoint(simplepolygondata.at( 0 ).at( 2 )) );
2055-
QCOMPARE( verticesspn.at( 6 ).coordinates(), QgsPoint(simplepolygondata.at( 0 ).at( 3 )) );
2052+
QCOMPARE( verticesspn.at( 0 ).coordinates(), QgsPoint( simplepolygondata.at( 0 ).at( 0 ) ) );
2053+
QCOMPARE( verticesspn.at( 2 ).coordinates(), QgsPoint( simplepolygondata.at( 0 ).at( 1 ) ) );
2054+
QCOMPARE( verticesspn.at( 4 ).coordinates(), QgsPoint( simplepolygondata.at( 0 ).at( 2 ) ) );
2055+
QCOMPARE( verticesspn.at( 6 ).coordinates(), QgsPoint( simplepolygondata.at( 0 ).at( 3 ) ) );
20562056

20572057
//
20582058
// polygon (with hole)
@@ -2104,13 +2104,13 @@ void TestMapTools::testVerticesStructure()
21042104
QVERIFY( verticespn.at( 12 ).type() == Vertex::Existing );
21052105
QVERIFY( verticespn.at( 13 ).type() == Vertex::MidPoint );
21062106

2107-
QCOMPARE( verticespn.at( 0 ).coordinates(), QgsPoint(polygondata.at( 0 ).at( 0 )) );
2108-
QCOMPARE( verticespn.at( 2 ).coordinates(), QgsPoint(polygondata.at( 0 ).at( 1 )) );
2109-
QCOMPARE( verticespn.at( 4 ).coordinates(), QgsPoint(polygondata.at( 0 ).at( 2 )) );
2110-
QCOMPARE( verticespn.at( 6 ).coordinates(), QgsPoint(polygondata.at( 0 ).at( 3 )) );
2111-
QCOMPARE( verticespn.at( 8 ).coordinates(), QgsPoint(polygondata.at( 1 ).at( 0 )) );
2112-
QCOMPARE( verticespn.at( 10 ).coordinates(), QgsPoint(polygondata.at( 1 ).at( 1 )) );
2113-
QCOMPARE( verticespn.at( 12 ).coordinates(), QgsPoint(polygondata.at( 1 ).at( 2 )) );
2107+
QCOMPARE( verticespn.at( 0 ).coordinates(), QgsPoint( polygondata.at( 0 ).at( 0 ) ) );
2108+
QCOMPARE( verticespn.at( 2 ).coordinates(), QgsPoint( polygondata.at( 0 ).at( 1 ) ) );
2109+
QCOMPARE( verticespn.at( 4 ).coordinates(), QgsPoint( polygondata.at( 0 ).at( 2 ) ) );
2110+
QCOMPARE( verticespn.at( 6 ).coordinates(), QgsPoint( polygondata.at( 0 ).at( 3 ) ) );
2111+
QCOMPARE( verticespn.at( 8 ).coordinates(), QgsPoint( polygondata.at( 1 ).at( 0 ) ) );
2112+
QCOMPARE( verticespn.at( 10 ).coordinates(), QgsPoint( polygondata.at( 1 ).at( 1 ) ) );
2113+
QCOMPARE( verticespn.at( 12 ).coordinates(), QgsPoint( polygondata.at( 1 ).at( 2 ) ) );
21142114

21152115
QCOMPARE( verticespn.at( 0 ).vertexId().part, 0 );
21162116
QCOMPARE( verticespn.at( 7 ).vertexId().part, 0 );
@@ -2225,22 +2225,22 @@ void TestMapTools::testVerticesStructure()
22252225
QVERIFY( verticesmpr.at( 24 ).type() == Vertex::Existing );
22262226

22272227
// part 1
2228-
QCOMPARE( verticesmpr.at( 0 ).coordinates(), QgsPoint(multipolygonringsdata.at( 0 ).at( 0 ).at( 0 )) );
2229-
QCOMPARE( verticesmpr.at( 2 ).coordinates(), QgsPoint(multipolygonringsdata.at( 0 ).at( 0 ).at( 1 )) );
2230-
QCOMPARE( verticesmpr.at( 4 ).coordinates(), QgsPoint(multipolygonringsdata.at( 0 ).at( 0 ).at( 2 )) );
2231-
QCOMPARE( verticesmpr.at( 6 ).coordinates(), QgsPoint(multipolygonringsdata.at( 0 ).at( 0 ).at( 3 )) );
2228+
QCOMPARE( verticesmpr.at( 0 ).coordinates(), QgsPoint( multipolygonringsdata.at( 0 ).at( 0 ).at( 0 ) ) );
2229+
QCOMPARE( verticesmpr.at( 2 ).coordinates(), QgsPoint( multipolygonringsdata.at( 0 ).at( 0 ).at( 1 ) ) );
2230+
QCOMPARE( verticesmpr.at( 4 ).coordinates(), QgsPoint( multipolygonringsdata.at( 0 ).at( 0 ).at( 2 ) ) );
2231+
QCOMPARE( verticesmpr.at( 6 ).coordinates(), QgsPoint( multipolygonringsdata.at( 0 ).at( 0 ).at( 3 ) ) );
22322232
// part 2 - ext
2233-
QCOMPARE( verticesmpr.at( 8 ).coordinates(),QgsPoint(multipolygonringsdata.at( 1 ).at( 0 ).at( 0 )) );
2234-
QCOMPARE( verticesmpr.at( 10 ).coordinates(), QgsPoint(multipolygonringsdata.at( 1 ).at( 0 ).at( 1 )) );
2235-
QCOMPARE( verticesmpr.at( 12 ).coordinates(), QgsPoint(multipolygonringsdata.at( 1 ).at( 0 ).at( 2 )) );
2236-
QCOMPARE( verticesmpr.at( 14 ).coordinates(), QgsPoint(multipolygonringsdata.at( 1 ).at( 0 ).at( 3 ) ));
2233+
QCOMPARE( verticesmpr.at( 8 ).coordinates(), QgsPoint( multipolygonringsdata.at( 1 ).at( 0 ).at( 0 ) ) );
2234+
QCOMPARE( verticesmpr.at( 10 ).coordinates(), QgsPoint( multipolygonringsdata.at( 1 ).at( 0 ).at( 1 ) ) );
2235+
QCOMPARE( verticesmpr.at( 12 ).coordinates(), QgsPoint( multipolygonringsdata.at( 1 ).at( 0 ).at( 2 ) ) );
2236+
QCOMPARE( verticesmpr.at( 14 ).coordinates(), QgsPoint( multipolygonringsdata.at( 1 ).at( 0 ).at( 3 ) ) );
22372237
// part 2 - hole
2238-
QCOMPARE( verticesmpr.at( 16 ).coordinates(), QgsPoint(multipolygonringsdata.at( 1 ).at( 1 ).at( 0 )) );
2239-
QCOMPARE( verticesmpr.at( 18 ).coordinates(), QgsPoint(multipolygonringsdata.at( 1 ).at( 1 ).at( 1 )) );
2240-
QCOMPARE( verticesmpr.at( 20 ).coordinates(), QgsPoint(multipolygonringsdata.at( 1 ).at( 1 ).at( 2 )) );
2238+
QCOMPARE( verticesmpr.at( 16 ).coordinates(), QgsPoint( multipolygonringsdata.at( 1 ).at( 1 ).at( 0 ) ) );
2239+
QCOMPARE( verticesmpr.at( 18 ).coordinates(), QgsPoint( multipolygonringsdata.at( 1 ).at( 1 ).at( 1 ) ) );
2240+
QCOMPARE( verticesmpr.at( 20 ).coordinates(), QgsPoint( multipolygonringsdata.at( 1 ).at( 1 ).at( 2 ) ) );
22412241
// part 3
2242-
QCOMPARE( verticesmpr.at( 22 ).coordinates(), QgsPoint(multipolygonringsdata.at( 2 ).at( 0 ).at( 0 )) );
2243-
QCOMPARE( verticesmpr.at( 24 ).coordinates(), QgsPoint(multipolygonringsdata.at( 2 ).at( 0 ).at( 1 )) );
2242+
QCOMPARE( verticesmpr.at( 22 ).coordinates(), QgsPoint( multipolygonringsdata.at( 2 ).at( 0 ).at( 0 ) ) );
2243+
QCOMPARE( verticesmpr.at( 24 ).coordinates(), QgsPoint( multipolygonringsdata.at( 2 ).at( 0 ).at( 1 ) ) );
22442244

22452245
QCOMPARE( verticesmpr.at( 1 ).vertexId().part, 0 );
22462246
QCOMPARE( verticesmpr.at( 3 ).vertexId().part, 0 );
@@ -2358,18 +2358,18 @@ void TestMapTools::testVerticesStructure()
23582358
// part 4 - empty, no element
23592359

23602360
// part 1
2361-
QCOMPARE( verticesmpi.at( 0 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 0 ).at( 0 ).at( 0 ) ));
2362-
QCOMPARE( verticesmpi.at( 2 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 0 ).at( 0 ).at( 1 ) ));
2363-
QCOMPARE( verticesmpi.at( 4 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 0 ).at( 0 ).at( 2 ) ));
2361+
QCOMPARE( verticesmpi.at( 0 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 0 ).at( 0 ).at( 0 ) ) );
2362+
QCOMPARE( verticesmpi.at( 2 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 0 ).at( 0 ).at( 1 ) ) );
2363+
QCOMPARE( verticesmpi.at( 4 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 0 ).at( 0 ).at( 2 ) ) );
23642364
// part 2 - ext
2365-
QCOMPARE( verticesmpi.at( 6 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 1 ).at( 0 ).at( 0 ) ));
2366-
QCOMPARE( verticesmpi.at( 8 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 1 ).at( 0 ).at( 1 ) ));
2365+
QCOMPARE( verticesmpi.at( 6 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 1 ).at( 0 ).at( 0 ) ) );
2366+
QCOMPARE( verticesmpi.at( 8 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 1 ).at( 0 ).at( 1 ) ) );
23672367
// part 2 - hole
2368-
QCOMPARE( verticesmpi.at( 9 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 1 ).at( 1 ).at( 0 ) ));
2369-
QCOMPARE( verticesmpi.at( 11 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 1 ).at( 1 ).at( 1 ) ));
2370-
QCOMPARE( verticesmpi.at( 13 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 1 ).at( 1 ).at( 2 ) ));
2368+
QCOMPARE( verticesmpi.at( 9 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 1 ).at( 1 ).at( 0 ) ) );
2369+
QCOMPARE( verticesmpi.at( 11 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 1 ).at( 1 ).at( 1 ) ) );
2370+
QCOMPARE( verticesmpi.at( 13 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 1 ).at( 1 ).at( 2 ) ) );
23712371
// part 3
2372-
QCOMPARE( verticesmpi.at( 15 ).coordinates(), QgsPoint(multipolygoninvaliddata.at( 2 ).at( 0 ).at( 0 ) ));
2372+
QCOMPARE( verticesmpi.at( 15 ).coordinates(), QgsPoint( multipolygoninvaliddata.at( 2 ).at( 0 ).at( 0 ) ) );
23732373

23742374
QCOMPARE( verticesmpi.at( 1 ).vertexId().part, 0 );
23752375
QCOMPARE( verticesmpi.at( 3 ).vertexId().part, 0 );

0 commit comments

Comments
 (0)