Skip to content

Commit 51f6fb0

Browse files
nyalldawsonnyalldawson
committed
QStringLiteral
1 parent c6db18d commit 51f6fb0

File tree

231 files changed

+1177
-1177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+1177
-1177
lines changed

‎src/analysis/interpolation/Bezier3D.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D *v )
4646

4747
else
4848
{
49-
QgsDebugMsg( "warning: null pointer" );
49+
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
5050
}
5151
}
5252

@@ -70,7 +70,7 @@ void Bezier3D::calcPoint( float t, QgsPoint *p )
7070

7171
else
7272
{
73-
QgsDebugMsg( "warning: null pointer" );
73+
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
7474
}
7575
}
7676

@@ -102,7 +102,7 @@ void Bezier3D::calcSecDer( float t, Vector3D *v )
102102

103103
else
104104
{
105-
QgsDebugMsg( "warning: null pointer" );
105+
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
106106
}
107107
}
108108

@@ -126,7 +126,7 @@ void Bezier3D::changeDirection()//does this work correctly? more testing is need
126126

127127
else
128128
{
129-
QgsDebugMsg( "warning: null pointer" );
129+
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
130130
}
131131
}
132132

‎src/analysis/interpolation/Bezier3D.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<QgsPoint *> *controlp
8282
inline void Bezier3D::add( ParametricLine *pl )
8383
{
8484
Q_UNUSED( pl );
85-
QgsDebugMsg( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." );
85+
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." ) );
8686
}
8787

8888
inline void Bezier3D::remove( int i )
8989
{
9090
Q_UNUSED( i );
91-
QgsDebugMsg( "Error!!!!! A Bezier-curve has no children to remove." );
91+
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve has no children to remove." ) );
9292
}
9393

9494
//-----------------------------------------------setters and getters---------------------------------------------------------------

‎src/analysis/interpolation/CloughTocherInterpolator.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ double CloughTocherInterpolator::calcBernsteinPoly( int n, int i, int j, int k,
3434
{
3535
if ( i < 0 || j < 0 || k < 0 )
3636
{
37-
QgsDebugMsg( "Invalid parameters for Bernstein poly calculation!" );
37+
QgsDebugMsg( QStringLiteral( "Invalid parameters for Bernstein poly calculation!" ) );
3838
return 0;
3939
}
4040

@@ -146,7 +146,7 @@ bool CloughTocherInterpolator::calcNormVec( double x, double y, Vector3D *result
146146
}
147147
else
148148
{
149-
QgsDebugMsg( "warning, null pointer" );
149+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
150150
return false;
151151
}
152152
}
@@ -459,7 +459,7 @@ void CloughTocherInterpolator::init( double x, double y )//version, which has th
459459
}
460460
else
461461
{
462-
QgsDebugMsg( "warning, null pointer" );
462+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
463463
}
464464
}
465465

@@ -728,7 +728,7 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni
728728

729729
else
730730
{
731-
QgsDebugMsg( "warning, null pointer" );
731+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
732732
}
733733
}
734734
#endif

‎src/analysis/interpolation/DualEdgeTriangulation.cpp

+23-23
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@ DualEdgeTriangulation::~DualEdgeTriangulation()
4848

4949
void DualEdgeTriangulation::performConsistencyTest()
5050
{
51-
QgsDebugMsg( "performing consistency test" );
51+
QgsDebugMsg( QStringLiteral( "performing consistency test" ) );
5252

5353
for ( int i = 0; i < mHalfEdge.count(); i++ )
5454
{
5555
int a = mHalfEdge[mHalfEdge[i]->getDual()]->getDual();
5656
int b = mHalfEdge[mHalfEdge[mHalfEdge[i]->getNext()]->getNext()]->getNext();
5757
if ( i != a )
5858
{
59-
QgsDebugMsg( "warning, first test failed" );
59+
QgsDebugMsg( QStringLiteral( "warning, first test failed" ) );
6060
}
6161
if ( i != b )
6262
{
63-
QgsDebugMsg( "warning, second test failed" );
63+
QgsDebugMsg( QStringLiteral( "warning, second test failed" ) );
6464
}
6565
}
66-
QgsDebugMsg( "consistency test finished" );
66+
QgsDebugMsg( QStringLiteral( "consistency test finished" ) );
6767
}
6868

6969
void DualEdgeTriangulation::addLine( const QVector<QgsPoint> &points, QgsInterpolator::SourceType lineType )
@@ -134,7 +134,7 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
134134
//test, if it is the same point as the first point
135135
if ( p.x() == mPointVector[0]->x() && p.y() == mPointVector[0]->y() )
136136
{
137-
QgsDebugMsg( "second point is the same as the first point, it thus has not been inserted" );
137+
QgsDebugMsg( QStringLiteral( "second point is the same as the first point, it thus has not been inserted" ) );
138138
QgsPoint *p = mPointVector[1];
139139
mPointVector.remove( 1 );
140140
delete p;
@@ -200,7 +200,7 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
200200
else//p is in a line with p0 and p1
201201
{
202202
mPointVector.remove( mPointVector.count() - 1 );
203-
QgsDebugMsg( "error: third point is on the same line as the first and the second point. It thus has not been inserted into the triangulation" );
203+
QgsDebugMsg( QStringLiteral( "error: third point is on the same line as the first and the second point. It thus has not been inserted into the triangulation" ) );
204204
return -100;
205205
}
206206
}
@@ -392,7 +392,7 @@ int DualEdgeTriangulation::baseEdgeOfPoint( int point )
392392
control += 1;
393393
if ( control > 1000000 )
394394
{
395-
// QgsDebugMsg( "warning, endless loop" );
395+
// QgsDebugMsg( QStringLiteral( "warning, endless loop" ) );
396396

397397
//use the secure and slow method
398398
//qWarning( "******************warning, using the slow method in baseEdgeOfPoint****************************************" );
@@ -626,7 +626,7 @@ bool DualEdgeTriangulation::calcNormal( double x, double y, Vector3D *result )
626626
}
627627
else
628628
{
629-
QgsDebugMsg( "warning, null pointer" );
629+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
630630
return false;
631631
}
632632
}
@@ -639,7 +639,7 @@ bool DualEdgeTriangulation::calcPoint( double x, double y, QgsPoint &result )
639639
}
640640
else
641641
{
642-
QgsDebugMsg( "warning, null pointer" );
642+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
643643
return false;
644644
}
645645
}
@@ -1167,7 +1167,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, QgsInterpolator:
11671167
control += 1;
11681168
if ( control > 17000 )
11691169
{
1170-
QgsDebugMsg( "warning, endless loop" );
1170+
QgsDebugMsg( QStringLiteral( "warning, endless loop" ) );
11711171
return -100;//return an error code
11721172
}
11731173

@@ -1534,7 +1534,7 @@ void DualEdgeTriangulation::setTriangleInterpolator( TriangleInterpolator *inter
15341534

15351535
void DualEdgeTriangulation::eliminateHorizontalTriangles()
15361536
{
1537-
QgsDebugMsg( "am in eliminateHorizontalTriangles" );
1537+
QgsDebugMsg( QStringLiteral( "am in eliminateHorizontalTriangles" ) );
15381538
double minangle = 0;//minimum angle for swapped triangles. If triangles generated by a swap would have a minimum angle (in degrees) below that value, the swap will not be done.
15391539

15401540
while ( true )
@@ -1618,7 +1618,7 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles()
16181618
delete[] control;
16191619
}
16201620

1621-
QgsDebugMsg( "end of method" );
1621+
QgsDebugMsg( QStringLiteral( "end of method" ) );
16221622
}
16231623

16241624
void DualEdgeTriangulation::ruppertRefinement()
@@ -1714,7 +1714,7 @@ void DualEdgeTriangulation::ruppertRefinement()
17141714
//calculate the circumcenter
17151715
if ( !MathUtils::circumcenter( mPointVector[mHalfEdge[minedge]->getPoint()], mPointVector[mHalfEdge[minedgenext]->getPoint()], mPointVector[mHalfEdge[minedgenextnext]->getPoint()], &circumcenter ) )
17161716
{
1717-
QgsDebugMsg( "warning, calculation of circumcenter failed" );
1717+
QgsDebugMsg( QStringLiteral( "warning, calculation of circumcenter failed" ) );
17181718
//put all three edges to dontexamine and remove them from the other maps
17191719
dontexamine.insert( minedge );
17201720
edge_angle.erase( minedge );
@@ -1757,7 +1757,7 @@ void DualEdgeTriangulation::ruppertRefinement()
17571757
{
17581758
encroached = true;
17591759
//split segment
1760-
QgsDebugMsg( "segment split" );
1760+
QgsDebugMsg( QStringLiteral( "segment split" ) );
17611761
int pointno = splitHalfEdge( i, 0.5 );
17621762

17631763
//update dontexmine, angle_edge, edge_angle
@@ -1963,7 +1963,7 @@ void DualEdgeTriangulation::ruppertRefinement()
19631963
if ( ( mHalfEdge[*it]->getForced() || edgeOnConvexHull( *it ) ) && MathUtils::inDiametral( mPointVector[mHalfEdge[*it]->getPoint()], mPointVector[mHalfEdge[mHalfEdge[*it]->getDual()]->getPoint()], &circumcenter ) )
19641964
{
19651965
//split segment
1966-
QgsDebugMsg( "segment split" );
1966+
QgsDebugMsg( QStringLiteral( "segment split" ) );
19671967
int pointno = splitHalfEdge( *it, 0.5 );
19681968
encroached = true;
19691969

@@ -2142,7 +2142,7 @@ void DualEdgeTriangulation::ruppertRefinement()
21422142
}
21432143
if ( !flag )
21442144
{
2145-
QgsDebugMsg( "point is not present in the triangulation" );
2145+
QgsDebugMsg( QStringLiteral( "point is not present in the triangulation" ) );
21462146
}
21472147
}
21482148
//put all three edges to dontexamine and remove them from the other maps
@@ -2158,7 +2158,7 @@ void DualEdgeTriangulation::ruppertRefinement()
21582158
}
21592159
else//insertion successful
21602160
{
2161-
QgsDebugMsg( "circumcenter added" );
2161+
QgsDebugMsg( QStringLiteral( "circumcenter added" ) );
21622162

21632163
//update the maps
21642164
//go around the inserted point and make changes for every half edge
@@ -2480,7 +2480,7 @@ void DualEdgeTriangulation::triangulatePolygon( QList<int> *poly, QList<int> *fr
24802480

24812481
else
24822482
{
2483-
QgsDebugMsg( "warning, null pointer" );
2483+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
24842484
}
24852485

24862486
}
@@ -2557,7 +2557,7 @@ bool DualEdgeTriangulation::pointInside( double x, double y )
25572557
}
25582558
if ( numinstabs > 0 )//a numerical instability occurred
25592559
{
2560-
QgsDebugMsg( "numerical instabilities" );
2560+
QgsDebugMsg( QStringLiteral( "numerical instabilities" ) );
25612561
return true;
25622562
}
25632563

@@ -2964,13 +2964,13 @@ QList<int> *DualEdgeTriangulation::getPointsAroundEdge( double x, double y )
29642964
}
29652965
else
29662966
{
2967-
QgsDebugMsg( "warning: null pointer" );
2967+
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
29682968
return nullptr;
29692969
}
29702970
}
29712971
else
29722972
{
2973-
QgsDebugMsg( "Edge number negative" );
2973+
QgsDebugMsg( QStringLiteral( "Edge number negative" ) );
29742974
return nullptr;
29752975
}
29762976
}
@@ -2985,7 +2985,7 @@ bool DualEdgeTriangulation::saveTriangulation( QgsFeatureSink *sink, QgsFeedback
29852985
bool *alreadyVisitedEdges = new bool[mHalfEdge.size()];
29862986
if ( !alreadyVisitedEdges )
29872987
{
2988-
QgsDebugMsg( "out of memory" );
2988+
QgsDebugMsg( QStringLiteral( "out of memory" ) );
29892989
return false;
29902990
}
29912991

@@ -3083,7 +3083,7 @@ int DualEdgeTriangulation::splitHalfEdge( int edge, float position )
30833083
//just a short test if position is between 0 and 1
30843084
if ( position < 0 || position > 1 )
30853085
{
3086-
QgsDebugMsg( "warning, position is not between 0 and 1" );
3086+
QgsDebugMsg( QStringLiteral( "warning, position is not between 0 and 1" ) );
30873087
}
30883088

30893089
//create the new point on the heap

‎src/analysis/interpolation/LinTriangleInterpolator.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ bool LinTriangleInterpolator::calcFirstDerX( double x, double y, Vector3D *vec )
3939

4040
else
4141
{
42-
QgsDebugMsg( "warning, null pointer" );
42+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
4343
return false;
4444
}
4545
}
@@ -65,7 +65,7 @@ bool LinTriangleInterpolator::calcFirstDerY( double x, double y, Vector3D *vec )
6565

6666
else
6767
{
68-
QgsDebugMsg( "warning, null pointer" );
68+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
6969
return false;
7070
}
7171
}
@@ -91,7 +91,7 @@ bool LinTriangleInterpolator::calcNormVec( double x, double y, Vector3D *vec )
9191

9292
else
9393
{
94-
QgsDebugMsg( "warning, null pointer" );
94+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
9595
return false;
9696
}
9797

@@ -121,7 +121,7 @@ bool LinTriangleInterpolator::calcPoint( double x, double y, QgsPoint &point )
121121
}
122122
else
123123
{
124-
QgsDebugMsg( "warning, null pointer" );
124+
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
125125
return false;
126126
}
127127

0 commit comments

Comments
 (0)