sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

QStringLiteral

Browse Source
This commit is contained in:
Nyall Dawson 2018-10-16 10:50:29 +10:00
parent c6db18d37c
commit 51f6fb0667
231 changed files with 1177 additions and 1177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/analysis/interpolation/Bezier3D.cpp
View File

@ -46,7 +46,7 @@ void Bezier3D::calcFirstDer( float t, Vector3D *v )
else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}
@ -70,7 +70,7 @@ void Bezier3D::calcPoint( float t, QgsPoint *p )
else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}
@ -102,7 +102,7 @@ void Bezier3D::calcSecDer( float t, Vector3D *v )
else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}
@ -126,7 +126,7 @@ void Bezier3D::changeDirection()//does this work correctly? more testing is need
else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
}
}

4
src/analysis/interpolation/Bezier3D.h
View File

@ -82,13 +82,13 @@ inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<QgsPoint *> *controlp
inline void Bezier3D::add( ParametricLine *pl )
{
Q_UNUSED( pl );
QgsDebugMsg( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." );
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." ) );
}
inline void Bezier3D::remove( int i )
{
Q_UNUSED( i );
QgsDebugMsg( "Error!!!!! A Bezier-curve has no children to remove." );
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve has no children to remove." ) );
}
//-----------------------------------------------setters and getters---------------------------------------------------------------

8
src/analysis/interpolation/CloughTocherInterpolator.cpp
View File

@ -34,7 +34,7 @@ double CloughTocherInterpolator::calcBernsteinPoly( int n, int i, int j, int k,
{
if ( i < 0 || j < 0 || k < 0 )
{
QgsDebugMsg( "Invalid parameters for Bernstein poly calculation!" );
QgsDebugMsg( QStringLiteral( "Invalid parameters for Bernstein poly calculation!" ) );
return 0;
}
@ -146,7 +146,7 @@ bool CloughTocherInterpolator::calcNormVec( double x, double y, Vector3D *result
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -459,7 +459,7 @@ void CloughTocherInterpolator::init( double x, double y )//version, which has th
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -728,7 +728,7 @@ void CloughTocherInterpolator::init( double x, double y )//version which has uni
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
#endif

46
src/analysis/interpolation/DualEdgeTriangulation.cpp
View File

@ -48,7 +48,7 @@ DualEdgeTriangulation::~DualEdgeTriangulation()
void DualEdgeTriangulation::performConsistencyTest()
{
QgsDebugMsg( "performing consistency test" );
QgsDebugMsg( QStringLiteral( "performing consistency test" ) );
for ( int i = 0; i < mHalfEdge.count(); i++ )
{
@ -56,14 +56,14 @@ void DualEdgeTriangulation::performConsistencyTest()
int b = mHalfEdge[mHalfEdge[mHalfEdge[i]->getNext()]->getNext()]->getNext();
if ( i != a )
{
QgsDebugMsg( "warning, first test failed" );
QgsDebugMsg( QStringLiteral( "warning, first test failed" ) );
}
if ( i != b )
{
QgsDebugMsg( "warning, second test failed" );
QgsDebugMsg( QStringLiteral( "warning, second test failed" ) );
}
}
QgsDebugMsg( "consistency test finished" );
QgsDebugMsg( QStringLiteral( "consistency test finished" ) );
}
void DualEdgeTriangulation::addLine( const QVector<QgsPoint> &points, QgsInterpolator::SourceType lineType )
@ -134,7 +134,7 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
//test, if it is the same point as the first point
if ( p.x() == mPointVector[0]->x() && p.y() == mPointVector[0]->y() )
{
QgsDebugMsg( "second point is the same as the first point, it thus has not been inserted" );
QgsDebugMsg( QStringLiteral( "second point is the same as the first point, it thus has not been inserted" ) );
QgsPoint *p = mPointVector[1];
mPointVector.remove( 1 );
delete p;
@ -200,7 +200,7 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
else//p is in a line with p0 and p1
{
mPointVector.remove( mPointVector.count() - 1 );
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" );
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" ) );
return -100;
}
}
@ -392,7 +392,7 @@ int DualEdgeTriangulation::baseEdgeOfPoint( int point )
control += 1;
if ( control > 1000000 )
{
// QgsDebugMsg( "warning, endless loop" );
// QgsDebugMsg( QStringLiteral( "warning, endless loop" ) );
//use the secure and slow method
//qWarning( "******************warning, using the slow method in baseEdgeOfPoint****************************************" );
@ -626,7 +626,7 @@ bool DualEdgeTriangulation::calcNormal( double x, double y, Vector3D *result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -639,7 +639,7 @@ bool DualEdgeTriangulation::calcPoint( double x, double y, QgsPoint &result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -1167,7 +1167,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, QgsInterpolator:
control += 1;
if ( control > 17000 )
{
QgsDebugMsg( "warning, endless loop" );
QgsDebugMsg( QStringLiteral( "warning, endless loop" ) );
return -100;//return an error code
}
@ -1534,7 +1534,7 @@ void DualEdgeTriangulation::setTriangleInterpolator( TriangleInterpolator *inter
void DualEdgeTriangulation::eliminateHorizontalTriangles()
{
QgsDebugMsg( "am in eliminateHorizontalTriangles" );
QgsDebugMsg( QStringLiteral( "am in eliminateHorizontalTriangles" ) );
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.
while ( true )
@ -1618,7 +1618,7 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles()
delete[] control;
}
QgsDebugMsg( "end of method" );
QgsDebugMsg( QStringLiteral( "end of method" ) );
}
void DualEdgeTriangulation::ruppertRefinement()
@ -1714,7 +1714,7 @@ void DualEdgeTriangulation::ruppertRefinement()
//calculate the circumcenter
if ( !MathUtils::circumcenter( mPointVector[mHalfEdge[minedge]->getPoint()], mPointVector[mHalfEdge[minedgenext]->getPoint()], mPointVector[mHalfEdge[minedgenextnext]->getPoint()], &circumcenter ) )
{
QgsDebugMsg( "warning, calculation of circumcenter failed" );
QgsDebugMsg( QStringLiteral( "warning, calculation of circumcenter failed" ) );
//put all three edges to dontexamine and remove them from the other maps
dontexamine.insert( minedge );
edge_angle.erase( minedge );
@ -1757,7 +1757,7 @@ void DualEdgeTriangulation::ruppertRefinement()
{
encroached = true;
//split segment
QgsDebugMsg( "segment split" );
QgsDebugMsg( QStringLiteral( "segment split" ) );
int pointno = splitHalfEdge( i, 0.5 );
//update dontexmine, angle_edge, edge_angle
@ -1963,7 +1963,7 @@ void DualEdgeTriangulation::ruppertRefinement()
if ( ( mHalfEdge[*it]->getForced() || edgeOnConvexHull( *it ) ) && MathUtils::inDiametral( mPointVector[mHalfEdge[*it]->getPoint()], mPointVector[mHalfEdge[mHalfEdge[*it]->getDual()]->getPoint()], &circumcenter ) )
{
//split segment
QgsDebugMsg( "segment split" );
QgsDebugMsg( QStringLiteral( "segment split" ) );
int pointno = splitHalfEdge( *it, 0.5 );
encroached = true;
@ -2142,7 +2142,7 @@ void DualEdgeTriangulation::ruppertRefinement()
}
if ( !flag )
{
QgsDebugMsg( "point is not present in the triangulation" );
QgsDebugMsg( QStringLiteral( "point is not present in the triangulation" ) );
}
}
//put all three edges to dontexamine and remove them from the other maps
@ -2158,7 +2158,7 @@ void DualEdgeTriangulation::ruppertRefinement()
}
else//insertion successful
{
QgsDebugMsg( "circumcenter added" );
QgsDebugMsg( QStringLiteral( "circumcenter added" ) );
//update the maps
//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
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -2557,7 +2557,7 @@ bool DualEdgeTriangulation::pointInside( double x, double y )
}
if ( numinstabs > 0 )//a numerical instability occurred
{
QgsDebugMsg( "numerical instabilities" );
QgsDebugMsg( QStringLiteral( "numerical instabilities" ) );
return true;
}
@ -2964,13 +2964,13 @@ QList<int> *DualEdgeTriangulation::getPointsAroundEdge( double x, double y )
}
else
{
QgsDebugMsg( "warning: null pointer" );
QgsDebugMsg( QStringLiteral( "warning: null pointer" ) );
return nullptr;
}
}
else
{
QgsDebugMsg( "Edge number negative" );
QgsDebugMsg( QStringLiteral( "Edge number negative" ) );
return nullptr;
}
}
@ -2985,7 +2985,7 @@ bool DualEdgeTriangulation::saveTriangulation( QgsFeatureSink *sink, QgsFeedback
bool *alreadyVisitedEdges = new bool[mHalfEdge.size()];
if ( !alreadyVisitedEdges )
{
QgsDebugMsg( "out of memory" );
QgsDebugMsg( QStringLiteral( "out of memory" ) );
return false;
}
@ -3083,7 +3083,7 @@ int DualEdgeTriangulation::splitHalfEdge( int edge, float position )
//just a short test if position is between 0 and 1
if ( position < 0 || position > 1 )
{
QgsDebugMsg( "warning, position is not between 0 and 1" );
QgsDebugMsg( QStringLiteral( "warning, position is not between 0 and 1" ) );
}
//create the new point on the heap

8
src/analysis/interpolation/LinTriangleInterpolator.cpp
View File

@ -39,7 +39,7 @@ bool LinTriangleInterpolator::calcFirstDerX( double x, double y, Vector3D *vec )
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -65,7 +65,7 @@ bool LinTriangleInterpolator::calcFirstDerY( double x, double y, Vector3D *vec )
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -91,7 +91,7 @@ bool LinTriangleInterpolator::calcNormVec( double x, double y, Vector3D *vec )
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
@ -121,7 +121,7 @@ bool LinTriangleInterpolator::calcPoint( double x, double y, QgsPoint &point )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}

50
src/analysis/interpolation/MathUtils.cpp
View File

@ -42,7 +42,7 @@ bool MathUtils::calcBarycentricCoordinates( double x, double y, QgsPoint *p1, Qg
}
else//null pointer
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -58,7 +58,7 @@ bool MathUtils::BarycentricToXY( double u, double v, double w, QgsPoint *p1, Qgs
if ( area == 0 )
{
QgsDebugMsg( "warning, p1, p2 and p3 are in a line" );
QgsDebugMsg( QStringLiteral( "warning, p1, p2 and p3 are in a line" ) );
return false;
}
@ -93,7 +93,7 @@ bool MathUtils::BarycentricToXY( double u, double v, double w, QgsPoint *p1, Qgs
}
else//null pointer
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -130,7 +130,7 @@ bool MathUtils::circumcenter( QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsPoint
//if one of the denominator is zero we will have problems
if ( denominator == 0 )
{
QgsDebugMsg( "error: the three points are in a line" );
QgsDebugMsg( QStringLiteral( "error: the three points are in a line" ) );
return false;
}
else
@ -155,7 +155,7 @@ bool MathUtils::circumcenter( QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsPoint
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -213,7 +213,7 @@ double MathUtils::distPointFromLine( QgsPoint *thepoint, QgsPoint *p1, QgsPoint
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -258,7 +258,7 @@ bool MathUtils::inCircle( QgsPoint *testp, QgsPoint *p1, QgsPoint *p2, QgsPoint
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -303,7 +303,7 @@ double MathUtils::leftOf( const QgsPoint &thepoint, const QgsPoint *p1, const Qg
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -346,7 +346,7 @@ bool MathUtils::lineIntersection( QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsP
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -399,7 +399,7 @@ bool MathUtils::lineIntersection( QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsP
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -425,7 +425,7 @@ double MathUtils::triArea( QgsPoint *pa, QgsPoint *pb, QgsPoint *pc )
}
else//null pointer
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -434,7 +434,7 @@ double MathUtils::calcCubicHermitePoly( int n, int i, double t )
{
if ( n != 3 || i > n )
{
QgsDebugMsg( "error, can't calculate hermite polynom" );
QgsDebugMsg( QStringLiteral( "error, can't calculate hermite polynom" ) );
}
if ( n == 3 && i == 0 )
@ -458,7 +458,7 @@ double MathUtils::calcCubicHermitePoly( int n, int i, double t )
}
else//something went wrong
{
QgsDebugMsg( "unexpected error" );
QgsDebugMsg( QStringLiteral( "unexpected error" ) );
return 0;
}
}
@ -467,7 +467,7 @@ double MathUtils::cFDerCubicHermitePoly( int n, int i, double t )
{
if ( n != 3 || i > n )
{
QgsDebugMsg( "error, can't calculate hermite polynom" );
QgsDebugMsg( QStringLiteral( "error, can't calculate hermite polynom" ) );
}
if ( n == 3 && i == 0 )
@ -497,7 +497,7 @@ double MathUtils::cFDerCubicHermitePoly( int n, int i, double t )
}
else
{
QgsDebugMsg( "unexpected error" );
QgsDebugMsg( QStringLiteral( "unexpected error" ) );
return 0;
}
}
@ -545,7 +545,7 @@ bool MathUtils::normalLeft( Vector3D *v1, Vector3D *result, double length )
if ( d < 0 )//no solution in R
{
QgsDebugMsg( "Determinant Error" );
QgsDebugMsg( QStringLiteral( "Determinant Error" ) );
return false;
}
@ -602,7 +602,7 @@ bool MathUtils::normalRight( Vector3D *v1, Vector3D *result, double length )
if ( d < 0 )//no solution in R
{
QgsDebugMsg( "Determinant Error" );
QgsDebugMsg( QStringLiteral( "Determinant Error" ) );
return false;
}
@ -664,7 +664,7 @@ double MathUtils::crossVec( QgsPoint *first, Vector3D *vec1, QgsPoint *second, V
}
else//if a division by zero would occur
{
QgsDebugMsg( "warning: vectors are parallel" );
QgsDebugMsg( QStringLiteral( "warning: vectors are parallel" ) );
return 0;
}
}
@ -672,7 +672,7 @@ double MathUtils::crossVec( QgsPoint *first, Vector3D *vec1, QgsPoint *second, V
else//null pointer
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -714,7 +714,7 @@ bool MathUtils::normalMinDistance( Vector3D *tangent, Vector3D *target, Vector3D
double xgalpha1 = 1 / ( 2 * xt * xt * yw * yw * zt * zt - 2 * zt * zt * zt * xt * zw * xw + yt * yt * yt * yt * zw * zw + yt * yt * zw * zw * zt * zt + xt * xt * yt * yt * xw * xw + xt * xt * yw * yw * yt * yt - 2 * xt * xt * xt * zt * zw * xw + yt * yt * yt * yt * xw * xw + yt * yt * yw * yw * zt * zt + 2 * xt * xt * yt * yt * zw * zw - 2 * yt * yt * yt * yw * zt * zw + zt * zt * xt * xt * zw * zw + zt * zt * zt * zt * xw * xw + xt * xt * zt * zt * xw * xw + 2 * zt * zt * xw * xw * yt * yt - 2 * xt * xt * yw * zt * yt * zw - 2 * xt * yt * yt * yt * xw * yw - 2 * xt * xt * xt * yw * yt * xw - 2 * xt * zt * zt * xw * yt * yw - 2 * xt * zt * xw * yt * yt * zw - 2 * yw * zt * zt * zt * yt * zw + xt * xt * xt * xt * yw * yw + yw * yw * zt * zt * zt * zt + xt * xt * xt * xt * zw * zw );
if ( xgalpha1 < 0 )
{
QgsDebugMsg( "warning, only complex solution of xg" );
QgsDebugMsg( QStringLiteral( "warning, only complex solution of xg" ) );
return false;
}
xg1 = std::sqrt( xgalpha1 ) * ( -yt * yw * xt + yt * yt * xw + xw * zt * zt - zt * xt * zw );
@ -724,7 +724,7 @@ bool MathUtils::normalMinDistance( Vector3D *tangent, Vector3D *target, Vector3D
double ygalpha1 = 1 / ( 2 * xt * xt * yw * yw * zt * zt - 2 * zt * zt * zt * xt * zw * xw + yt * yt * yt * yt * zw * zw + yt * yt * zw * zw * zt * zt + xt * xt * yt * yt * xw * xw + xt * xt * yw * yw * yt * yt - 2 * xt * xt * xt * zt * zw * xw + yt * yt * yt * yt * xw * xw + yt * yt * yw * yw * zt * zt + 2 * xt * xt * yt * yt * zw * zw - 2 * yt * yt * yt * yw * zt * zw + zt * zt * xt * xt * zw * zw + zt * zt * zt * zt * xw * xw + xt * xt * zt * zt * xw * xw + 2 * zt * zt * xw * xw * yt * yt - 2 * xt * xt * yw * zt * yt * zw - 2 * xt * yt * yt * yt * xw * yw - 2 * xt * xt * xt * yw * yt * xw - 2 * xt * zt * zt * xw * yt * yw - 2 * xt * zt * xw * yt * yt * zw - 2 * yw * zt * zt * zt * yt * zw + xt * xt * xt * xt * yw * yw + yw * yw * zt * zt * zt * zt + xt * xt * xt * xt * zw * zw );
if ( ygalpha1 < 0 )
{
QgsDebugMsg( "warning, only complex solution of yg" );
QgsDebugMsg( QStringLiteral( "warning, only complex solution of yg" ) );
return false;
}
yg1 = -sqrt( ygalpha1 ) * ( -yw * xt * xt - zt * zt * yw + zt * yt * zw + yt * xw * xt );
@ -734,7 +734,7 @@ bool MathUtils::normalMinDistance( Vector3D *tangent, Vector3D *target, Vector3D
double zgalpha1 = 1 / ( 2 * xt * xt * yw * yw * zt * zt - 2 * zt * zt * zt * xt * zw * xw + yt * yt * yt * yt * zw * zw + yt * yt * zw * zw * zt * zt + xt * xt * yt * yt * xw * xw + xt * xt * yw * yw * yt * yt - 2 * xt * xt * xt * zt * zw * xw + yt * yt * yt * yt * xw * xw + yt * yt * yw * yw * zt * zt + 2 * xt * xt * yt * yt * zw * zw - 2 * yt * yt * yt * yw * zt * zw + zt * zt * xt * xt * zw * zw + zt * zt * zt * zt * xw * xw + xt * xt * zt * zt * xw * xw + 2 * zt * zt * xw * xw * yt * yt - 2 * xt * xt * yw * zt * yt * zw - 2 * xt * yt * yt * yt * xw * yw - 2 * xt * xt * xt * yw * yt * xw - 2 * xt * zt * zt * xw * yt * yw - 2 * xt * zt * xw * yt * yt * zw - 2 * yw * zt * zt * zt * yt * zw + xt * xt * xt * xt * yw * yw + yw * yw * zt * zt * zt * zt + xt * xt * xt * xt * zw * zw );
if ( zgalpha1 < 0 )
{
QgsDebugMsg( "warning, only complex solution of zg" );
QgsDebugMsg( QStringLiteral( "warning, only complex solution of zg" ) );
return false;
}
zg1 = -sqrt( zgalpha1 ) * ( yt * yw * zt - yt * yt * zw + xw * zt * xt - xt * xt * zw );
@ -760,7 +760,7 @@ bool MathUtils::normalMinDistance( Vector3D *tangent, Vector3D *target, Vector3D
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -778,7 +778,7 @@ double MathUtils::planeTest( QgsPoint *test, QgsPoint *pt1, QgsPoint *pt2, QgsPo
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -794,7 +794,7 @@ double MathUtils::angle( QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsPoint *p4
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}

28
src/analysis/interpolation/NormVecDecorator.cpp
View File

@ -95,7 +95,7 @@ bool NormVecDecorator::calcNormal( double x, double y, Vector3D *result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -129,7 +129,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
if ( ( ( vlist.count() ) % 4 ) != 0 ) //number of items in vlist has to be a multiple of 4
{
QgsDebugMsg( "warning, wrong number of items in vlist" );
QgsDebugMsg( QStringLiteral( "warning, wrong number of items in vlist" ) );
return false;
}
@ -142,7 +142,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
numberofruns++;
if ( numberofruns > limit )
{
QgsDebugMsg( "warning, a probable endless loop is detected" );
QgsDebugMsg( QStringLiteral( "warning, a probable endless loop is detected" ) );
return false;
}
@ -189,7 +189,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
{
if ( !pointfound )//the point with coordinates x, y was in no triangle
{
QgsDebugMsg( "warning: point (x,y) was in no triangle" );
QgsDebugMsg( QStringLiteral( "warning: point (x,y) was in no triangle" ) );
return false;
}
result->standardise();
@ -219,7 +219,7 @@ bool NormVecDecorator::calcNormalForPoint( double x, double y, int point, Vector
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
@ -241,7 +241,7 @@ bool NormVecDecorator::calcPoint( double x, double y, QgsPoint &result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -272,7 +272,7 @@ bool NormVecDecorator::getTriangle( double x, double y, QgsPoint &p1, Vector3D *
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
return true;
@ -285,7 +285,7 @@ bool NormVecDecorator::getTriangle( double x, double y, QgsPoint &p1, Vector3D *
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -298,7 +298,7 @@ NormVecDecorator::PointState NormVecDecorator::getState( int pointno ) const
}
else
{
QgsDebugMsg( "warning, number below 0" );
QgsDebugMsg( QStringLiteral( "warning, number below 0" ) );
return mPointState->at( 0 );//just to avoid a compiler warning
}
}
@ -338,7 +338,7 @@ bool NormVecDecorator::getTriangle( double x, double y, QgsPoint &p1, int &ptn1,
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -389,7 +389,7 @@ bool NormVecDecorator::estimateFirstDerivative( int pointno )
if ( ( vlist.count() % 4 ) != 0 ) //number of items in vlist has to be a multiple of 4
{
QgsDebugMsg( "warning, wrong number of items in vlist" );
QgsDebugMsg( QStringLiteral( "warning, wrong number of items in vlist" ) );
return false;
}
@ -522,7 +522,7 @@ void NormVecDecorator::eliminateHorizontalTriangles()
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -534,7 +534,7 @@ void NormVecDecorator::setState( int pointno, PointState s )
}
else
{
QgsDebugMsg( "warning, pointno>0" );
QgsDebugMsg( QStringLiteral( "warning, pointno>0" ) );
}
}
@ -565,7 +565,7 @@ bool NormVecDecorator::swapEdge( double x, double y )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}

2
src/analysis/interpolation/NormVecDecorator.h
View File

@ -113,7 +113,7 @@ inline Vector3D *NormVecDecorator::getNormal( int n ) const
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return nullptr;
}
}

22
src/analysis/interpolation/ParametricLine.cpp
View File

@ -20,69 +20,69 @@
void ParametricLine::add( ParametricLine *pl )
{
Q_UNUSED( pl );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}
void ParametricLine::calcFirstDer( float t, Vector3D *v )
{
Q_UNUSED( t );
Q_UNUSED( v );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}
void ParametricLine::calcSecDer( float t, Vector3D *v )
{
Q_UNUSED( t );
Q_UNUSED( v );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}
void ParametricLine::calcPoint( float t, QgsPoint *p )
{
Q_UNUSED( t );
Q_UNUSED( p );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}
ParametricLine *ParametricLine::getParent() const
{
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
return nullptr;
}
void ParametricLine::remove( int i )
{
Q_UNUSED( i );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}
void ParametricLine::setControlPoly( QVector<QgsPoint *> *cp )
{
Q_UNUSED( cp );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}
void ParametricLine::setParent( ParametricLine *paral )
{
Q_UNUSED( paral );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}
int ParametricLine::getDegree() const
{
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
return mDegree;
}
const QgsPoint *ParametricLine::getControlPoint( int number ) const
{
Q_UNUSED( number );
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
return nullptr;
}
const QVector<QgsPoint *> *ParametricLine::getControlPoly() const
{
QgsDebugMsg( "warning, derive a class from ParametricLine" );
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
return nullptr;
}

48
src/analysis/interpolation/TriDecorator.cpp
View File

@ -25,7 +25,7 @@ void TriDecorator::addLine( const QVector<QgsPoint> &points, QgsInterpolator::So
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -38,7 +38,7 @@ int TriDecorator::addPoint( const QgsPoint &p )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -51,7 +51,7 @@ void TriDecorator::performConsistencyTest()
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -64,7 +64,7 @@ bool TriDecorator::calcNormal( double x, double y, Vector3D *result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -78,7 +78,7 @@ bool TriDecorator::calcPoint( double x, double y, QgsPoint &result )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -92,7 +92,7 @@ QgsPoint *TriDecorator::getPoint( int i ) const
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return nullptr;
}
}
@ -106,7 +106,7 @@ bool TriDecorator::getTriangle( double x, double y, QgsPoint &p1, int &n1, QgsPo
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -120,7 +120,7 @@ bool TriDecorator::getTriangle( double x, double y, QgsPoint &p1, QgsPoint &p2,
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -133,7 +133,7 @@ int TriDecorator::getNumberOfPoints() const
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -147,7 +147,7 @@ int TriDecorator::getOppositePoint( int p1, int p2 )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -173,7 +173,7 @@ double TriDecorator::getXMax() const
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -187,7 +187,7 @@ double TriDecorator::getXMin() const
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -200,7 +200,7 @@ double TriDecorator::getYMax() const
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -214,7 +214,7 @@ double TriDecorator::getYMin() const
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return 0;
}
}
@ -227,7 +227,7 @@ void TriDecorator::setForcedCrossBehavior( Triangulation::ForcedCrossBehavior b
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -239,7 +239,7 @@ void TriDecorator::setEdgeColor( int r, int g, int b )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -251,7 +251,7 @@ void TriDecorator::setForcedEdgeColor( int r, int g, int b )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -263,7 +263,7 @@ void TriDecorator::setBreakEdgeColor( int r, int g, int b )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -275,7 +275,7 @@ void TriDecorator::setTriangleInterpolator( TriangleInterpolator *interpolator )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -287,7 +287,7 @@ void TriDecorator::eliminateHorizontalTriangles()
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -299,7 +299,7 @@ void TriDecorator::ruppertRefinement()
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
}
}
@ -312,7 +312,7 @@ bool TriDecorator::pointInside( double x, double y )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -326,7 +326,7 @@ bool TriDecorator::swapEdge( double x, double y )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return false;
}
}
@ -339,7 +339,7 @@ QList<int> *TriDecorator::getPointsAroundEdge( double x, double y )
}
else
{
QgsDebugMsg( "warning, null pointer" );
QgsDebugMsg( QStringLiteral( "warning, null pointer" ) );
return nullptr;
}
}

14
src/analysis/raster/qgsninecellfilter.cpp
View File

@ -285,14 +285,14 @@ int QgsNineCellFilter::processRasterGPU( const QString &source, QgsFeedback *fee
// Read scanline2: first real raster row
if ( GDALRasterIO( rasterBand, GF_Read, 0, i, xSize, 1, &scanLine[1], xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
queue.enqueueWriteBuffer( scanLine2Buffer, CL_TRUE, 0, bufferSize, scanLine.get() );
// Read scanline3: second real raster row
if ( GDALRasterIO( rasterBand, GF_Read, 0, i + 1, xSize, 1, &scanLine[1], xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
queue.enqueueWriteBuffer( scanLine3Buffer, CL_TRUE, 0, bufferSize, scanLine.get() );
}
@ -313,7 +313,7 @@ int QgsNineCellFilter::processRasterGPU( const QString &source, QgsFeedback *fee
{
if ( GDALRasterIO( rasterBand, GF_Read, 0, i + 1, xSize, 1, &scanLine[1], xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
queue.enqueueWriteBuffer( *scanLineBuffer[rowIndex[2]], CL_TRUE, 0, bufferSize, scanLine.get() ); // row 0
}
@ -334,7 +334,7 @@ int QgsNineCellFilter::processRasterGPU( const QString &source, QgsFeedback *fee
if ( GDALRasterIO( outputRasterBand, GF_Write, 0, i, xSize, 1, resultLine.get(), xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
std::rotate( rowIndex.begin(), rowIndex.begin() + 1, rowIndex.end() );
}
@ -430,7 +430,7 @@ int QgsNineCellFilter::processRasterCPU( QgsFeedback *feedback )
// Read scanline2
if ( GDALRasterIO( rasterBand, GF_Read, 0, 0, xSize, 1, &scanLine2[1], xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
}
else
@ -454,7 +454,7 @@ int QgsNineCellFilter::processRasterCPU( QgsFeedback *feedback )
{
if ( GDALRasterIO( rasterBand, GF_Read, 0, yIndex + 1, xSize, 1, &scanLine3[1], xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
}
// Set first and last extra columns to nodata
@ -476,7 +476,7 @@ int QgsNineCellFilter::processRasterCPU( QgsFeedback *feedback )
if ( GDALRasterIO( outputRasterBand, GF_Write, 0, yIndex, xSize, 1, resultLine, xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
}

2
src/analysis/raster/qgsrastercalculator.cpp
View File

@ -169,7 +169,7 @@ QgsRasterCalculator::Result QgsRasterCalculator::processCalculation( QgsFeedback
//write scanline to the dataset
if ( GDALRasterIO( outputRasterBand, GF_Write, 0, i, mNumOutputColumns, 1, calcData, mNumOutputColumns, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "RasterIO error!" );
QgsDebugMsg( QStringLiteral( "RasterIO error!" ) );
}
delete[] calcData;

14
src/analysis/raster/qgsrelief.cpp
View File

@ -179,7 +179,7 @@ int QgsRelief::processRaster( QgsFeedback *feedback )
}
if ( GDALRasterIO( rasterBand, GF_Read, 0, 0, xSize, 1, scanLine2, xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
}
else
@ -202,7 +202,7 @@ int QgsRelief::processRaster( QgsFeedback *feedback )
{
if ( GDALRasterIO( rasterBand, GF_Read, 0, i + 1, xSize, 1, scanLine3, xSize, 1, GDT_Float32, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
}
@ -237,15 +237,15 @@ int QgsRelief::processRaster( QgsFeedback *feedback )
if ( GDALRasterIO( outputRedBand, GF_Write, 0, i, xSize, 1, resultRedLine, xSize, 1, GDT_Byte, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
if ( GDALRasterIO( outputGreenBand, GF_Write, 0, i, xSize, 1, resultGreenLine, xSize, 1, GDT_Byte, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
if ( GDALRasterIO( outputBlueBand, GF_Write, 0, i, xSize, 1, resultBlueLine, xSize, 1, GDT_Byte, 0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
}
@ -514,7 +514,7 @@ bool QgsRelief::exportFrequencyDistributionToCsv( const QString &file )
scanLine, nCellsX, 1, GDT_Float32,
0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
for ( int j = 0; j < nCellsX; ++j )
@ -595,7 +595,7 @@ QList< QgsRelief::ReliefColor > QgsRelief::calculateOptimizedReliefClasses()
scanLine, nCellsX, 1, GDT_Float32,
0, 0 ) != CE_None )
{
QgsDebugMsg( "Raster IO Error" );
QgsDebugMsg( QStringLiteral( "Raster IO Error" ) );
}
for ( int j = 0; j < nCellsX; ++j )
{

2
src/analysis/vector/geometry_checker/qgsgeometrycheckerror.cpp
View File

@ -72,7 +72,7 @@ QgsGeometryCheckError::QgsGeometryCheckError( const QgsGeometryCheck *check,
}
catch ( const QgsCsException &e )
{
QgsDebugMsg( "Can not show error in current map coordinate reference system" );
QgsDebugMsg( QStringLiteral( "Can not show error in current map coordinate reference system" ) );
}
}
}

2
src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
View File

@ -47,7 +47,7 @@ QgsGeometryCheckerUtils::LayerFeature::LayerFeature( const QgsFeaturePool *pool,
}
catch ( const QgsCsException &e )
{
QgsDebugMsg( "Shrug. What shall we do with a geometry that cannot be converted?" );
QgsDebugMsg( QStringLiteral( "Shrug. What shall we do with a geometry that cannot be converted?" ) );
}
}
}

22
src/app/dwg/qgsdwgimporter.cpp
View File

@ -82,7 +82,7 @@ bool QgsDwgImporter::exec( const QString &sql, bool logError )
{
if ( !mDs )
{
QgsDebugMsg( "No data source" );
QgsDebugMsg( QStringLiteral( "No data source" ) );
return false;
}
@ -91,7 +91,7 @@ bool QgsDwgImporter::exec( const QString &sql, bool logError )
OGRLayerH layer = OGR_DS_ExecuteSQL( mDs.get(), sql.toUtf8().constData(), nullptr, nullptr );
if ( layer )
{
QgsDebugMsg( "Unexpected result set" );
QgsDebugMsg( QStringLiteral( "Unexpected result set" ) );
OGR_DS_ReleaseResultSet( mDs.get(), layer );
return false;
}
@ -111,7 +111,7 @@ OGRLayerH QgsDwgImporter::query( const QString &sql )
{
if ( !mDs )
{
QgsDebugMsg( "No data source" );
QgsDebugMsg( QStringLiteral( "No data source" ) );
return nullptr;
}
@ -120,7 +120,7 @@ OGRLayerH QgsDwgImporter::query( const QString &sql )
OGRLayerH layer = OGR_DS_ExecuteSQL( mDs.get(), sql.toUtf8().constData(), nullptr, nullptr );
if ( !layer )
{
QgsDebugMsg( "Result expected" );
QgsDebugMsg( QStringLiteral( "Result expected" ) );
return layer;
}
@ -1225,7 +1225,7 @@ void QgsDwgImporter::addEntity( OGRFeatureDefnH dfn, OGRFeatureH f, const DRW_En
QString linetype = linetypeString( data.lineType, data.layer );
if ( linetype == QLatin1String( "1" ) )
{
QgsDebugMsg( "Linetype == 1" );
QgsDebugMsg( QStringLiteral( "Linetype == 1" ) );
}
setString( dfn, f, QStringLiteral( "linetype" ), linetype.toUtf8().constData() );
setInteger( dfn, f, QStringLiteral( "ocolor" ), data.color );
@ -1357,7 +1357,7 @@ bool QgsDwgImporter::curveFromLWPolyline( const DRW_LWPolyline &data, QgsCompoun
size_t vertexnum = data.vertlist.size();
if ( vertexnum == 0 )
{
QgsDebugMsg( "polyline without points" );
QgsDebugMsg( QStringLiteral( "polyline without points" ) );
return false;
}
@ -1423,7 +1423,7 @@ void QgsDwgImporter::addLWPolyline( const DRW_LWPolyline &data )
size_t vertexnum = data.vertlist.size();
if ( vertexnum == 0 )
{
QgsDebugMsg( "LWPolyline without vertices" );
QgsDebugMsg( QStringLiteral( "LWPolyline without vertices" ) );
return;
}
@ -1619,7 +1619,7 @@ void QgsDwgImporter::addPolyline( const DRW_Polyline &data )
size_t vertexnum = data.vertlist.size();
if ( vertexnum == 0 )
{
QgsDebugMsg( "Polyline without vertices" );
QgsDebugMsg( QStringLiteral( "Polyline without vertices" ) );
return;
}
@ -2425,7 +2425,7 @@ bool QgsDwgImporter::expandInserts( QString &error )
OGRLayerH blocks = OGR_DS_GetLayerByName( mDs.get(), "blocks" );
if ( !blocks )
{
QgsDebugMsg( "could not open layer 'blocks'" );
QgsDebugMsg( QStringLiteral( "could not open layer 'blocks'" ) );
return false;
}
@ -2459,7 +2459,7 @@ bool QgsDwgImporter::expandInserts( QString &error )
OGRLayerH inserts = OGR_DS_GetLayerByName( mDs.get(), "inserts" );
if ( !inserts )
{
QgsDebugMsg( "could not open layer 'inserts'" );
QgsDebugMsg( QStringLiteral( "could not open layer 'inserts'" ) );
return false;
}
@ -2532,7 +2532,7 @@ bool QgsDwgImporter::expandInserts( QString &error )
QString blockLinetype = QString::fromUtf8( OGR_F_GetFieldAsString( insert.get(), linetypeIdx ) );
if ( blockLinetype == QLatin1String( "1" ) )
{
QgsDebugMsg( "blockLinetype == 1" );
QgsDebugMsg( QStringLiteral( "blockLinetype == 1" ) );
}
double blockLinewidth = OGR_F_GetFieldAsDouble( insert.get(), linewidthIdx );

2
src/app/gps/qgsgpsinformationwidget.cpp
View File

@ -834,7 +834,7 @@ void QgsGpsInformationWidget::mBtnAddVertex_clicked()
void QgsGpsInformationWidget::addVertex()
{
QgsDebugMsg( "Adding Vertex" );
QgsDebugMsg( QStringLiteral( "Adding Vertex" ) );
if ( !mpRubberBand )
{

2
src/app/layout/qgslayoutdesignerdialog.cpp
View File

@ -1261,7 +1261,7 @@ void QgsLayoutDesignerDialog::dropEvent( QDropEvent *event )
// [pzion 20150805] Work around
if ( fileName.startsWith( "/.file/id=" ) )
{
QgsDebugMsg( "Mac dropped URL with /.file/id= (converting)" );
QgsDebugMsg( QStringLiteral( "Mac dropped URL with /.file/id= (converting)" ) );
CFStringRef relCFStringRef =
CFStringCreateWithCString(
kCFAllocatorDefault,

2
src/app/layout/qgslayoutlegendwidget.cpp
View File

@ -827,7 +827,7 @@ void QgsLayoutLegendWidget::resetLayerNodeToDefaults()
void QgsLayoutLegendWidget::mCountToolButton_clicked( bool checked )
{
QgsDebugMsg( "Entered." );
QgsDebugMsg( QStringLiteral( "Entered." ) );
if ( !mLegend )
{
return;

12
src/app/main.cpp
View File

@ -241,7 +241,7 @@ static void dumpBacktrace( unsigned int depth )
// stdin from pipe
if ( dup( fd[0] ) != STDIN_FILENO )
{
QgsDebugMsg( "dup to stdin failed" );
QgsDebugMsg( QStringLiteral( "dup to stdin failed" ) );
}
close( fd[1] ); // close writing end
@ -261,7 +261,7 @@ static void dumpBacktrace( unsigned int depth )
{
if ( stderr_new >= 0 )
close( stderr_new );
QgsDebugMsg( "dup to stderr failed" );
QgsDebugMsg( QStringLiteral( "dup to stderr failed" ) );
}
close( fd[1] ); // close duped pipe
@ -279,7 +279,7 @@ static void dumpBacktrace( unsigned int depth )
if ( dup_stderr != STDERR_FILENO )
{
close( dup_stderr );
QgsDebugMsg( "dup to stderr failed" );
QgsDebugMsg( QStringLiteral( "dup to stderr failed" ) );
}
close( stderr_fd );
wait( &status );
@ -996,7 +996,7 @@ int main( int argc, char *argv[] )
if ( runMigration )
{
QgsDebugMsg( "RUNNING MIGRATION" );
QgsDebugMsg( QStringLiteral( "RUNNING MIGRATION" ) );
migration->runMigration();
}
}
@ -1267,7 +1267,7 @@ int main( int argc, char *argv[] )
// use restoreDefaultWindowState setting only if NOT using command line (then it is set already)
if ( myRestoreDefaultWindowState || settings.value( QStringLiteral( "qgis/restoreDefaultWindowState" ), false ).toBool() )
{
QgsDebugMsg( "Resetting /UI/state settings!" );
QgsDebugMsg( QStringLiteral( "Resetting /UI/state settings!" ) );
settings.remove( QStringLiteral( "/UI/state" ) );
settings.remove( QStringLiteral( "/qgis/restoreDefaultWindowState" ) );
}
@ -1351,7 +1351,7 @@ int main( int argc, char *argv[] )
if ( !ok )
{
QgsDebugMsg( "Error while parsing initial extent!" );
QgsDebugMsg( QStringLiteral( "Error while parsing initial extent!" ) );
}
else
{

10
src/app/mesh/qgsmeshlayerproperties.cpp
View File

@ -84,7 +84,7 @@ void QgsMeshLayerProperties::syncToLayer()
{
Q_ASSERT( mRendererMeshPropertiesWidget );
QgsDebugMsg( "populate general information tab" );
QgsDebugMsg( QStringLiteral( "populate general information tab" ) );
/*
* Information Tab
*/
@ -104,7 +104,7 @@ void QgsMeshLayerProperties::syncToLayer()
}
mInformationTextBrowser->setText( info );
QgsDebugMsg( "populate source tab" );
QgsDebugMsg( QStringLiteral( "populate source tab" ) );
/*
* Source Tab
*/
@ -120,7 +120,7 @@ void QgsMeshLayerProperties::syncToLayer()
mUriLabel->setText( tr( "Not assigned" ) );
}
QgsDebugMsg( "populate styling tab" );
QgsDebugMsg( QStringLiteral( "populate styling tab" ) );
/*
* Styling Tab
*/
@ -164,13 +164,13 @@ void QgsMeshLayerProperties::apply()
{
Q_ASSERT( mRendererMeshPropertiesWidget );
QgsDebugMsg( "processing general tab" );
QgsDebugMsg( QStringLiteral( "processing general tab" ) );
/*
* General Tab
*/
mMeshLayer->setName( mLayerOrigNameLineEd->text() );
QgsDebugMsg( "processing style tab" );
QgsDebugMsg( QStringLiteral( "processing style tab" ) );
/*
* Style Tab
*/

2
src/app/pluginmanager/qgsapppluginmanagerinterface.cpp
View File

@ -47,7 +47,7 @@ void QgsAppPluginManagerInterface::addPluginMetadata( const QMap<QString, QStrin
{
if ( metadata.isEmpty() || !metadata.contains( QStringLiteral( "id" ) ) )
{
QgsDebugMsg( "Warning: incomplete metadata" );
QgsDebugMsg( QStringLiteral( "Warning: incomplete metadata" ) );
return;
}
mPluginManager->addPluginMetadata( metadata.value( QStringLiteral( "id" ) ), metadata );

16
src/app/pluginmanager/qgspluginmanager.cpp
View File

@ -376,7 +376,7 @@ void QgsPluginManager::getCppPluginsMetadata()
void *handle = dlopen( lib.toLocal8Bit().data(), RTLD_LAZY | RTLD_GLOBAL );
if ( !handle )
{
QgsDebugMsg( "Error in dlopen: " );
QgsDebugMsg( QStringLiteral( "Error in dlopen: " ) );
QgsDebugMsg( dlerror() );
}
else
@ -425,7 +425,7 @@ void QgsPluginManager::getCppPluginsMetadata()
}
else
{
QgsDebugMsg( "Plugin name not returned when queried" );
QgsDebugMsg( QStringLiteral( "Plugin name not returned when queried" ) );
}
if ( pDesc )
{
@ -433,7 +433,7 @@ void QgsPluginManager::getCppPluginsMetadata()
}
else
{
QgsDebugMsg( "Plugin description not returned when queried" );
QgsDebugMsg( QStringLiteral( "Plugin description not returned when queried" ) );
}
if ( pCat )
{
@ -441,7 +441,7 @@ void QgsPluginManager::getCppPluginsMetadata()
}
else
{
QgsDebugMsg( "Plugin category not returned when queried" );
QgsDebugMsg( QStringLiteral( "Plugin category not returned when queried" ) );
}
if ( pVersion )
{
@ -449,7 +449,7 @@ void QgsPluginManager::getCppPluginsMetadata()
}
else
{
QgsDebugMsg( "Plugin version not returned when queried" );
QgsDebugMsg( QStringLiteral( "Plugin version not returned when queried" ) );
}
if ( pIcon )
{
@ -1438,7 +1438,7 @@ void QgsPluginManager::setRepositoryFilter()
void QgsPluginManager::clearRepositoryFilter()
{
QgsDebugMsg( "Enabling all repositories back" );
QgsDebugMsg( QStringLiteral( "Enabling all repositories back" ) );
QgsPythonRunner::run( QStringLiteral( "pyplugin_installer.instance().setRepositoryInspectionFilter()" ) );
}
@ -1446,7 +1446,7 @@ void QgsPluginManager::clearRepositoryFilter()
void QgsPluginManager::buttonRefreshRepos_clicked()
{
QgsDebugMsg( "Refreshing repositories..." );
QgsDebugMsg( QStringLiteral( "Refreshing repositories..." ) );
QgsPythonRunner::run( QStringLiteral( "pyplugin_installer.instance().reloadAndExportData()" ) );
}
@ -1454,7 +1454,7 @@ void QgsPluginManager::buttonRefreshRepos_clicked()
void QgsPluginManager::buttonAddRep_clicked()
{
QgsDebugMsg( "Adding repository connection..." );
QgsDebugMsg( QStringLiteral( "Adding repository connection..." ) );
QgsPythonRunner::run( QStringLiteral( "pyplugin_installer.instance().addRepository()" ) );
}

42
src/app/qgisapp.cpp
View File

@ -1387,7 +1387,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
#endif
profiler->endGroup();
QgsDebugMsg( "PROFILE TIMES" );
QgsDebugMsg( QStringLiteral( "PROFILE TIMES" ) );
QgsDebugMsg( QStringLiteral( "PROFILE TIMES TOTAL - %1 " ).arg( profiler->totalTime() ) );
#ifdef QGISDEBUG
QList<QPair<QString, double> > profileTimes = profiler->profileTimes();
@ -1596,7 +1596,7 @@ void QgisApp::dropEvent( QDropEvent *event )
// [pzion 20150805] Work around
if ( fileName.startsWith( "/.file/id=" ) )
{
QgsDebugMsg( "Mac dropped URL with /.file/id= (converting)" );
QgsDebugMsg( QStringLiteral( "Mac dropped URL with /.file/id= (converting)" ) );
CFStringRef relCFStringRef =
CFStringCreateWithCString(
kCFAllocatorDefault,
@ -4292,7 +4292,7 @@ void QgisApp::restoreWindowState()
if ( !restoreState( settings.value( QStringLiteral( "UI/state" ), QByteArray::fromRawData( reinterpret_cast< const char * >( defaultUIstate ), sizeof defaultUIstate ) ).toByteArray() ) )
{
QgsDebugMsg( "restore of UI state failed" );
QgsDebugMsg( QStringLiteral( "restore of UI state failed" ) );
}
if ( settings.value( QStringLiteral( "UI/hidebrowser" ), false ).toBool() )
@ -4305,7 +4305,7 @@ void QgisApp::restoreWindowState()
// restore window geometry
if ( !restoreGeometry( settings.value( QStringLiteral( "UI/geometry" ) ).toByteArray() ) )
{
QgsDebugMsg( "restore of UI geometry failed" );
QgsDebugMsg( QStringLiteral( "restore of UI geometry failed" ) );
// default to 80% of screen size, at 10% from top left corner
resize( QDesktopWidget().availableGeometry( this ).size() * 0.8 );
QSize pos = QDesktopWidget().availableGeometry( this ).size() * 0.1;
@ -5778,7 +5778,7 @@ bool QgisApp::addProject( const QString &projectFile )
}
mMapCanvas->updateScale();
QgsDebugMsg( "Scale restored..." );
QgsDebugMsg( QStringLiteral( "Scale restored..." ) );
mActionFilterLegend->setChecked( QgsProject::instance()->readBoolEntry( QStringLiteral( "Legend" ), QStringLiteral( "filterByMap" ) ) );
@ -6655,7 +6655,7 @@ void QgisApp::stopRendering()
//reimplements method from base (gui) class
void QgisApp::hideAllLayers()
{
QgsDebugMsg( "hiding all layers!" );
QgsDebugMsg( QStringLiteral( "hiding all layers!" ) );
mLayerTreeView->layerTreeModel()->rootGroup()->setItemVisibilityCheckedRecursive( false );
}
@ -6664,14 +6664,14 @@ void QgisApp::hideAllLayers()
// reimplements method from base (gui) class
void QgisApp::showAllLayers()
{
QgsDebugMsg( "Showing all layers!" );
QgsDebugMsg( QStringLiteral( "Showing all layers!" ) );
mLayerTreeView->layerTreeModel()->rootGroup()->setItemVisibilityCheckedRecursive( true );
}
//reimplements method from base (gui) class
void QgisApp::hideSelectedLayers()
{
QgsDebugMsg( "hiding selected layers!" );
QgsDebugMsg( QStringLiteral( "hiding selected layers!" ) );
Q_FOREACH ( QgsLayerTreeNode *node, mLayerTreeView->selectedNodes() )
{
@ -6694,7 +6694,7 @@ void QgisApp::hideDeselectedLayers()
// reimplements method from base (gui) class
void QgisApp::showSelectedLayers()
{
QgsDebugMsg( "show selected layers!" );
QgsDebugMsg( QStringLiteral( "show selected layers!" ) );
Q_FOREACH ( QgsLayerTreeNode *node, mLayerTreeView->selectedNodes() )
{
@ -6710,7 +6710,7 @@ void QgisApp::showSelectedLayers()
void QgisApp::zoomIn()
{
QgsDebugMsg( "Setting map tool to zoomIn" );
QgsDebugMsg( QStringLiteral( "Setting map tool to zoomIn" ) );
mMapCanvas->setMapTool( mMapTools.mZoomIn );
}
@ -7144,12 +7144,12 @@ void QgisApp::saveAsRasterFile( QgsRasterLayer *rasterLayer )
if ( d.mode() == QgsRasterLayerSaveAsDialog::RawDataMode )
{
QgsDebugMsg( "Writing raw data" );
QgsDebugMsg( QStringLiteral( "Writing raw data" ) );
//QgsDebugMsg( QStringLiteral( "Writing raw data" ).arg( pos ) );
pipe.reset( new QgsRasterPipe() );
if ( !pipe->set( rasterLayer->dataProvider()->clone() ) )
{
QgsDebugMsg( "Cannot set pipe provider" );
QgsDebugMsg( QStringLiteral( "Cannot set pipe provider" ) );
return;
}
@ -7160,7 +7160,7 @@ void QgisApp::saveAsRasterFile( QgsRasterLayer *rasterLayer )
}
if ( !pipe->insert( 1, nuller ) )
{
QgsDebugMsg( "Cannot set pipe nuller" );
QgsDebugMsg( QStringLiteral( "Cannot set pipe nuller" ) );
return;
}
@ -7171,7 +7171,7 @@ void QgisApp::saveAsRasterFile( QgsRasterLayer *rasterLayer )
projector->setCrs( rasterLayer->crs(), d.outputCrs() );
if ( !pipe->insert( 2, projector ) )
{
QgsDebugMsg( "Cannot set pipe projector" );
QgsDebugMsg( QStringLiteral( "Cannot set pipe projector" ) );
return;
}
}
@ -7179,12 +7179,12 @@ void QgisApp::saveAsRasterFile( QgsRasterLayer *rasterLayer )
else // RenderedImageMode
{
// clone the whole pipe
QgsDebugMsg( "Writing rendered image" );
QgsDebugMsg( QStringLiteral( "Writing rendered image" ) );
pipe.reset( new QgsRasterPipe( *rasterLayer->pipe() ) );
QgsRasterProjector *projector = pipe->projector();
if ( !projector )
{
QgsDebugMsg( "Cannot get pipe projector" );
QgsDebugMsg( QStringLiteral( "Cannot get pipe projector" ) );
return;
}
projector->setCrs( rasterLayer->crs(), d.outputCrs() );
@ -8870,7 +8870,7 @@ std::unique_ptr<QgsVectorLayer> QgisApp::pasteToNewMemoryVector()
}
if ( ! layer->addFeatures( convertedFeatures ) || !layer->commitChanges() )
{
QgsDebugMsg( "Cannot add features or commit changes" );
QgsDebugMsg( QStringLiteral( "Cannot add features or commit changes" ) );
return nullptr;
}
@ -12720,7 +12720,7 @@ QgsRasterLayer *QgisApp::addRasterLayerPrivate(
else
layer = new QgsRasterLayer( uri, baseName, providerKey );
QgsDebugMsg( "Constructed new layer" );
QgsDebugMsg( QStringLiteral( "Constructed new layer" ) );
QgsError error;
QString title;
@ -13611,7 +13611,7 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
QTimer *timer = reply->findChild<QTimer *>( QStringLiteral( "timeoutTimer" ) );
if ( timer )
{
QgsDebugMsg( "Stopping network reply timeout" );
QgsDebugMsg( QStringLiteral( "Stopping network reply timeout" ) );
timer->stop();
}
@ -13678,7 +13678,7 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList<QSslError> &errors
QTimer *timer = reply->findChild<QTimer *>( QStringLiteral( "timeoutTimer" ) );
if ( timer )
{
QgsDebugMsg( "Restarting network reply timeout" );
QgsDebugMsg( QStringLiteral( "Restarting network reply timeout" ) );
timer->setSingleShot( true );
timer->start( s.value( QStringLiteral( "/qgis/networkAndProxy/networkTimeout" ), "60000" ).toInt() );
}
@ -13724,7 +13724,7 @@ void QgisApp::eraseAuthenticationDatabase()
QgsLayerTreeGroup *layertree( QgsProject::instance()->layerTreeRoot() );
if ( layertree && layertree->customProperty( QStringLiteral( "loading" ) ).toBool() )
{
QgsDebugMsg( "Project loading, skipping auth db erase" );
QgsDebugMsg( QStringLiteral( "Project loading, skipping auth db erase" ) );
QgsApplication::authManager()->setScheduledAuthDatabaseEraseRequestEmitted( false );
return;
}

2
src/app/qgsattributesformproperties.cpp
View File

@ -474,7 +474,7 @@ QTreeWidgetItem *QgsAttributesFormProperties::loadAttributeEditorTreeItem( QgsAt
}
case QgsAttributeEditorElement::AeTypeInvalid:
{
QgsDebugMsg( "Not loading invalid attribute editor type..." );
QgsDebugMsg( QStringLiteral( "Not loading invalid attribute editor type..." ) );
break;
}
}

2
src/app/qgsattributetypedialog.cpp
View File

@ -166,7 +166,7 @@ void QgsAttributeTypeDialog::setEditorWidgetType( const QString &type )
}
else
{
QgsDebugMsg( "Oops, couldn't create editor widget config dialog..." );
QgsDebugMsg( QStringLiteral( "Oops, couldn't create editor widget config dialog..." ) );
}
}

8
src/app/qgsclipboard.cpp
View File

@ -55,7 +55,7 @@ void QgsClipboard::replaceWithCopyOf( QgsVectorLayer *src )
mFeatureClipboard = src->selectedFeatures();
mCRS = src->crs();
mSrcLayer = src;
QgsDebugMsg( "replaced QGis clipboard." );
QgsDebugMsg( QStringLiteral( "replaced QGis clipboard." ) );
setSystemClipboard();
mUseSystemClipboard = false;
@ -287,7 +287,7 @@ QgsFields QgsClipboard::retrieveFields() const
QgsFeatureList QgsClipboard::copyOf( const QgsFields &fields ) const
{
QgsDebugMsg( "returning clipboard." );
QgsDebugMsg( QStringLiteral( "returning clipboard." ) );
if ( !mUseSystemClipboard )
return mFeatureClipboard;
@ -306,7 +306,7 @@ void QgsClipboard::clear()
{
mFeatureClipboard.clear();
QgsDebugMsg( "cleared clipboard." );
QgsDebugMsg( QStringLiteral( "cleared clipboard." ) );
emit changed();
}
@ -337,7 +337,7 @@ QgsFeatureList QgsClipboard::transformedCopyOf( const QgsCoordinateReferenceSyst
QgisApp::instance()->askUserForDatumTransform( crs(), destCRS );
QgsCoordinateTransform ct = QgsCoordinateTransform( crs(), destCRS, QgsProject::instance() );
QgsDebugMsg( "transforming clipboard." );
QgsDebugMsg( QStringLiteral( "transforming clipboard." ) );
for ( QgsFeatureList::iterator iter = featureList.begin(); iter != featureList.end(); ++iter )
{
QgsGeometry g = iter->geometry();

2
src/app/qgscrashhandler.cpp
View File

@ -31,7 +31,7 @@
#ifdef _MSC_VER
LONG WINAPI QgsCrashHandler::handle( LPEXCEPTION_POINTERS exception )
{
QgsDebugMsg( "CRASH!!!" );
QgsDebugMsg( QStringLiteral( "CRASH!!!" ) );
DWORD processID = GetCurrentProcessId();
DWORD threadID = GetCurrentThreadId();

8
src/app/qgscustomization.cpp
View File

@ -111,7 +111,7 @@ QTreeWidgetItem *QgsCustomizationDialog::item( const QString &path, QTreeWidgetI
}
}
}
QgsDebugMsg( "not found" );
QgsDebugMsg( QStringLiteral( "not found" ) );
return nullptr;
}
@ -849,13 +849,13 @@ void QgsCustomization::customizeWidget( const QString &path, QWidget *widget, QS
QLayout *l = widget->layout();
if ( l )
{
QgsDebugMsg( "remove" );
QgsDebugMsg( QStringLiteral( "remove" ) );
QgsCustomization::removeFromLayout( l, w );
w->hide();
}
else
{
QgsDebugMsg( "hide" );
QgsDebugMsg( QStringLiteral( "hide" ) );
w->hide();
}
}
@ -896,7 +896,7 @@ void QgsCustomization::preNotify( QObject *receiver, QEvent *event, bool *done )
}
else if ( widget && event->type() == QEvent::MouseButtonPress )
{
//QgsDebugMsg( "click" );
//QgsDebugMsg( QStringLiteral( "click" ) );
if ( pDialog && pDialog->isVisible() )
{
QMouseEvent *e = static_cast<QMouseEvent *>( event );

8
src/app/qgscustomprojectiondialog.cpp
View File

@ -65,7 +65,7 @@ QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget *parent, Qt::Windo
fileInfo.setFile( QgsApplication::qgisSettingsDirPath() );
if ( !fileInfo.exists() )
{
QgsDebugMsg( "The qgis.db does not exist" );
QgsDebugMsg( QStringLiteral( "The qgis.db does not exist" ) );
}
populateList();
@ -198,7 +198,7 @@ void QgsCustomProjectionDialog::insertProjection( const QString &projectionAcro
{
if ( srsPreparedStatement.step() == SQLITE_ROW )
{
QgsDebugMsg( "Trying to insert projection" );
QgsDebugMsg( QStringLiteral( "Trying to insert projection" ) );
// We have the result from system srs.db. Now insert into user db.
sql = "insert into tbl_projection(acronym,name,notes,parameters) values ("
+ QgsSqliteUtils::quotedString( srsPreparedStatement.columnAsText( 0 ) )
@ -373,7 +373,7 @@ void QgsCustomProjectionDialog::buttonBox_accepted()
mCustomCRSparameters[i] = teParameters->toPlainText();
}
QgsDebugMsg( "We save the modified CRS." );
QgsDebugMsg( QStringLiteral( "We save the modified CRS." ) );
//Check if all CRS are valid:
QgsCoordinateReferenceSystem CRS;
@ -409,7 +409,7 @@ void QgsCustomProjectionDialog::buttonBox_accepted()
QgsDebugMsg( QStringLiteral( "Error when saving CRS '%1'" ).arg( mCustomCRSnames[i] ) );
}
}
QgsDebugMsg( "We remove the deleted CRS." );
QgsDebugMsg( QStringLiteral( "We remove the deleted CRS." ) );
for ( int i = 0; i < mDeletedCRSs.size(); ++i )
{
saveSuccess &= deleteCrs( mDeletedCRSs[i] );

14
src/app/qgsidentifyresultsdialog.cpp
View File

@ -239,7 +239,7 @@ QSize QgsIdentifyResultsWebView::sizeHint() const
}
else
{
QgsDebugMsg( "parent not available" );
QgsDebugMsg( QStringLiteral( "parent not available" ) );
}
// Always keep some minimum size, e.g. if page is not yet loaded
@ -1045,7 +1045,7 @@ void QgsIdentifyResultsDialog::contextMenuEvent( QContextMenuEvent *event )
QgsRasterLayer *rlayer = rasterLayer( item );
if ( !vlayer && !rlayer )
{
QgsDebugMsg( "Item does not belong to a layer." );
QgsDebugMsg( QStringLiteral( "Item does not belong to a layer." ) );
return;
}
@ -1917,7 +1917,7 @@ void QgsIdentifyResultsDialog::copyFeature()
if ( !item ) // should not happen
{
QgsDebugMsg( "Selected item is not feature" );
QgsDebugMsg( QStringLiteral( "Selected item is not feature" ) );
return;
}
@ -1934,7 +1934,7 @@ void QgsIdentifyResultsDialog::toggleFeatureSelection()
if ( !item ) // should not happen
{
QgsDebugMsg( "Selected item is not feature" );
QgsDebugMsg( QStringLiteral( "Selected item is not feature" ) );
return;
}
@ -1953,7 +1953,7 @@ void QgsIdentifyResultsDialog::formatChanged( int index )
QComboBox *combo = qobject_cast<QComboBox *>( sender() );
if ( !combo )
{
QgsDebugMsg( "sender is not QComboBox" );
QgsDebugMsg( QStringLiteral( "sender is not QComboBox" ) );
return;
}
@ -1962,7 +1962,7 @@ void QgsIdentifyResultsDialog::formatChanged( int index )
QgsRasterLayer *layer = qobject_cast<QgsRasterLayer *>( combo->itemData( index, Qt::UserRole + 1 ).value<QObject *>() );
if ( !layer )
{
QgsDebugMsg( "cannot get raster layer" );
QgsDebugMsg( QStringLiteral( "cannot get raster layer" ) );
return;
}
@ -1973,7 +1973,7 @@ void QgsIdentifyResultsDialog::formatChanged( int index )
QTreeWidgetItem *layItem = layerItem( layer );
if ( !layItem )
{
QgsDebugMsg( "cannot get layer item" );
QgsDebugMsg( QStringLiteral( "cannot get layer item" ) );
return;
}

2
src/app/qgsmaplayerstyleguiutils.cpp
View File

@ -146,7 +146,7 @@ void QgsMapLayerStyleGuiUtils::removeStyle()
bool res = layer->styleManager()->removeStyle( layer->styleManager()->currentStyle() );
if ( !res )
{
QgsDebugMsg( "Failed to remove current style" );
QgsDebugMsg( QStringLiteral( "Failed to remove current style" ) );
}
}

4
src/app/qgsmaptooladdpart.cpp
View File

@ -91,7 +91,7 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
if ( nextPoint( QgsPoint( mapPoint ), layerPoint ) != 0 )
{
QgsDebugMsg( "nextPoint failed" );
QgsDebugMsg( QStringLiteral( "nextPoint failed" ) );
return;
}
@ -109,7 +109,7 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
int error = addVertex( e->mapPoint(), e->mapPointMatch() );
if ( error == 1 )
{
QgsDebugMsg( "current layer is not a vector layer" );
QgsDebugMsg( QStringLiteral( "current layer is not a vector layer" ) );
return;
}
else if ( error == 2 )

2
src/app/qgsmaptoolselectutils.cpp
View File

@ -215,7 +215,7 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas *canvas,
{
Q_UNUSED( cse );
// catch exception for 'invalid' point and leave existing selection unchanged
QgsDebugMsg( "Caught CRS exception " );
QgsDebugMsg( QStringLiteral( "Caught CRS exception " ) );
QgisApp::instance()->messageBar()->pushMessage(
QObject::tr( "CRS Exception" ),
QObject::tr( "Selection extends beyond layer's coordinate system" ),

2
src/app/qgsmaptoolshowhidelabels.cpp
View File

@ -240,7 +240,7 @@ bool QgsMapToolShowHideLabels::selectedLabelFeatures( QgsVectorLayer *vlayer,
const QgsLabelingResults *labelingResults = mCanvas->labelingResults();
if ( !labelingResults )
{
QgsDebugMsg( "No labeling engine" );
QgsDebugMsg( QStringLiteral( "No labeling engine" ) );
return false;
}

2
src/app/qgsnewspatialitelayerdialog.cpp
View File

@ -312,7 +312,7 @@ bool QgsNewSpatialiteLayerDialog::createDb()
bool loaded = myLib->load();
if ( loaded )
{
QgsDebugMsg( "SpatiaLite provider loaded" );
QgsDebugMsg( QStringLiteral( "SpatiaLite provider loaded" ) );
typedef bool ( *createDbProc )( const QString &, QString & );
createDbProc createDbPtr = ( createDbProc ) cast_to_fptr( myLib->resolve( "createDb" ) );

8
src/app/qgspluginregistry.cpp
View File

@ -130,7 +130,7 @@ void QgsPluginRegistry::addPlugin( const QString &key, const QgsPluginMetadata &
void QgsPluginRegistry::dump()
{
QgsDebugMsg( "PLUGINS IN REGISTRY: key -> (name, library)" );
QgsDebugMsg( QStringLiteral( "PLUGINS IN REGISTRY: key -> (name, library)" ) );
for ( QMap<QString, QgsPluginMetadata>::const_iterator it = mPlugins.constBegin();
it != mPlugins.constEnd();
++it )
@ -144,7 +144,7 @@ void QgsPluginRegistry::dump()
#ifdef WITH_BINDINGS
if ( mPythonUtils && mPythonUtils->isEnabled() )
{
QgsDebugMsg( "PYTHON PLUGINS IN REGISTRY:" );
QgsDebugMsg( QStringLiteral( "PYTHON PLUGINS IN REGISTRY:" ) );
Q_FOREACH ( const QString &pluginName, mPythonUtils->listActivePlugins() )
{
Q_UNUSED( pluginName );
@ -518,7 +518,7 @@ void QgsPluginRegistry::restoreSessionPlugins( const QString &pluginDirString )
{
// check for python plugins system-wide
QStringList pluginList = mPythonUtils->pluginList();
QgsDebugMsg( "Loading python plugins" );
QgsDebugMsg( QStringLiteral( "Loading python plugins" ) );
QStringList corePlugins = QStringList();
corePlugins << QStringLiteral( "GdalTools" );
@ -579,7 +579,7 @@ void QgsPluginRegistry::restoreSessionPlugins( const QString &pluginDirString )
}
#endif
QgsDebugMsg( "Plugin loading completed" );
QgsDebugMsg( QStringLiteral( "Plugin loading completed" ) );
}

6
src/app/qgsprojectproperties.cpp
View File

@ -973,7 +973,7 @@ void QgsProjectProperties::apply()
// If the user fields have changed, use them instead.
if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
{
QgsDebugMsgLevel( "Using parameteric major/minor", 4 );
QgsDebugMsgLevel( QStringLiteral( "Using parameteric major/minor" ), 4 );
major = QLocale().toDouble( leSemiMajor->text() );
minor = QLocale().toDouble( leSemiMinor->text() );
}
@ -2155,7 +2155,7 @@ void QgsProjectProperties::updateEllipsoidUI( int newIndex )
// changing ellipsoid, save the modified coordinates
if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
{
QgsDebugMsgLevel( "Saving major/minor", 4 );
QgsDebugMsgLevel( QStringLiteral( "Saving major/minor" ), 4 );
mEllipsoidList[ mEllipsoidIndex ].semiMajor = QLocale().toDouble( leSemiMajor->text() );
mEllipsoidList[ mEllipsoidIndex ].semiMinor = QLocale().toDouble( leSemiMinor->text() );
}
@ -2190,7 +2190,7 @@ void QgsProjectProperties::updateEllipsoidUI( int newIndex )
void QgsProjectProperties::projectionSelectorInitialized()
{
QgsDebugMsgLevel( "Setting up ellipsoid", 4 );
QgsDebugMsgLevel( QStringLiteral( "Setting up ellipsoid" ), 4 );
// Reading ellipsoid from settings
QStringList mySplitEllipsoid = QgsProject::instance()->ellipsoid().split( ':' );

16
src/app/qgsrasterlayerproperties.cpp
View File

@ -573,7 +573,7 @@ void QgsRasterLayerProperties::setRendererWidget( const QString &rendererName )
{
if ( rendererEntry.widgetCreateFunction ) //single band color data renderer e.g. has no widget
{
QgsDebugMsg( "renderer has widgetCreateFunction" );
QgsDebugMsg( QStringLiteral( "renderer has widgetCreateFunction" ) );
// Current canvas extent (used to calc min/max) in layer CRS
QgsRectangle myExtent = mMapCanvas->mapSettings().outputExtentToLayerExtent( mRasterLayer, mMapCanvas->extent() );
if ( oldWidget && ( !oldRenderer || rendererName != oldRenderer->type() ) )
@ -662,7 +662,7 @@ void QgsRasterLayerProperties::sync()
}
}
QgsDebugMsg( "populate transparency tab" );
QgsDebugMsg( QStringLiteral( "populate transparency tab" ) );
/*
* Style tab (brightness and contrast)
@ -725,12 +725,12 @@ void QgsRasterLayerProperties::sync()
populateTransparencyTable( mRasterLayer->renderer() );
QgsDebugMsg( "populate colormap tab" );
QgsDebugMsg( QStringLiteral( "populate colormap tab" ) );
/*
* Transparent Pixel Tab
*/
QgsDebugMsg( "populate general tab" );
QgsDebugMsg( QStringLiteral( "populate general tab" ) );
/*
* General Tab
*/
@ -757,7 +757,7 @@ void QgsRasterLayerProperties::sync()
pixmapPalette->repaint();
#endif
QgsDebugMsg( "populate metadata tab" );
QgsDebugMsg( QStringLiteral( "populate metadata tab" ) );
/*
* Metadata Tab
*/
@ -837,7 +837,7 @@ void QgsRasterLayerProperties::apply()
*/
mLegendConfigEmbeddedWidget->applyToLayer();
QgsDebugMsg( "apply processing symbology tab" );
QgsDebugMsg( QStringLiteral( "apply processing symbology tab" ) );
/*
* Symbology Tab
*/
@ -848,7 +848,7 @@ void QgsRasterLayerProperties::apply()
mRasterLayer->brightnessFilter()->setBrightness( mSliderBrightness->value() );
mRasterLayer->brightnessFilter()->setContrast( mSliderContrast->value() );
QgsDebugMsg( "processing transparency tab" );
QgsDebugMsg( QStringLiteral( "processing transparency tab" ) );
/*
* Transparent Pixel Tab
*/
@ -926,7 +926,7 @@ void QgsRasterLayerProperties::apply()
rasterRenderer->setOpacity( mOpacityWidget->opacity() );
}
QgsDebugMsg( "processing general tab" );
QgsDebugMsg( QStringLiteral( "processing general tab" ) );
/*
* General Tab
*/

2
src/app/qgsrulebasedlabelingwidget.cpp
View File

@ -542,7 +542,7 @@ bool QgsRuleBasedLabelingModel::removeRows( int row, int count, const QModelInde
}
else
{
QgsDebugMsg( "trying to remove invalid index - this should not happen!" );
QgsDebugMsg( QStringLiteral( "trying to remove invalid index - this should not happen!" ) );
}
}

2
src/app/qgsversionmigration.cpp
View File

@ -234,7 +234,7 @@ QgsError Qgs2To3Migration::migrateSettings()
if ( keys.count() > 0 )
{
QgsDebugMsg( "MIGRATION: Translating settings keys" );
QgsDebugMsg( QStringLiteral( "MIGRATION: Translating settings keys" ) );
QList<QPair<QString, QString>>::iterator i;
for ( i = keys.begin(); i != keys.end(); ++i )
{

2
src/app/vertextool/qgsselectedfeature.cpp
View File

@ -267,7 +267,7 @@ void QgsSelectedFeature::createVertexMap()
if ( !mGeometry )
{
QgsDebugMsg( "Loading feature" );
QgsDebugMsg( QStringLiteral( "Loading feature" ) );
updateGeometry( nullptr );
}

12
src/app/vertextool/qgsvertextool.cpp
View File

@ -76,7 +76,7 @@ static bool isEndpointAtVertexIndex( const QgsGeometry &geom, int vertexIndex )
}
else
{
QgsDebugMsg( "is_endpoint_at_vertex_index: unexpected geometry type!" );
QgsDebugMsg( QStringLiteral( "is_endpoint_at_vertex_index: unexpected geometry type!" ) );
return false;
}
}
@ -105,7 +105,7 @@ int adjacentVertexIndexToEndpoint( const QgsGeometry &geom, int vertexIndex )
}
else
{
QgsDebugMsg( "adjacent_vertex_index_to_endpoint: unexpected geometry type!" );
QgsDebugMsg( QStringLiteral( "adjacent_vertex_index_to_endpoint: unexpected geometry type!" ) );
}
return -1;
}
@ -1525,7 +1525,7 @@ void QgsVertexTool::moveVertex( const QgsPointXY &mapPoint, const QgsPointLocato
QgsVertexId vid;
if ( !geom.vertexIdFromVertexNr( dragVertexId, vid ) )
{
QgsDebugMsg( "invalid vertex index" );
QgsDebugMsg( QStringLiteral( "invalid vertex index" ) );
return;
}
@ -1543,7 +1543,7 @@ void QgsVertexTool::moveVertex( const QgsPointXY &mapPoint, const QgsPointLocato
if ( !geomTmp->insertVertex( vid, pt ) )
{
QgsDebugMsg( "append vertex failed!" );
QgsDebugMsg( QStringLiteral( "append vertex failed!" ) );
return;
}
}
@ -1551,7 +1551,7 @@ void QgsVertexTool::moveVertex( const QgsPointXY &mapPoint, const QgsPointLocato
{
if ( !geomTmp->moveVertex( vid, QgsPoint( layerPoint ) ) )
{
QgsDebugMsg( "move vertex failed!" );
QgsDebugMsg( QStringLiteral( "move vertex failed!" ) );
return;
}
}
@ -1614,7 +1614,7 @@ void QgsVertexTool::addExtraVerticesToEdits( QgsVertexTool::VertexEdits &edits,
if ( !topoGeom.moveVertex( point.x(), point.y(), topo.vertexId ) )
{
QgsDebugMsg( "[topo] move vertex failed!" );
QgsDebugMsg( QStringLiteral( "[topo] move vertex failed!" ) );
continue;
}
edits[topo.layer][topo.fid] = topoGeom;

2
src/auth/basic/qgsauthbasicmethod.cpp
View File

@ -309,7 +309,7 @@ void QgsAuthBasicMethod::updateMethodConfig( QgsAuthMethodConfig &mconfig )
QMutexLocker locker( &mMutex );
if ( mconfig.hasConfig( QStringLiteral( "oldconfigstyle" ) ) )
{
QgsDebugMsg( "Updating old style auth method config" );
QgsDebugMsg( QStringLiteral( "Updating old style auth method config" ) );
QStringList conflist = mconfig.config( QStringLiteral( "oldconfigstyle" ) ).split( QStringLiteral( "|||" ) );
mconfig.setConfig( QStringLiteral( "realm" ), conflist.at( 0 ) );

6
src/auth/identcert/qgsauthidentcertmethod.cpp
View File

@ -118,10 +118,10 @@ bool QgsAuthIdentCertMethod::updateDataSourceUriItems( QStringList &connectionIt
QgsPkiConfigBundle *pkibundle = getPkiConfigBundle( authcfg );
if ( !pkibundle || !pkibundle->isValid() )
{
QgsDebugMsg( "Update URI items FAILED: PKI bundle invalid" );
QgsDebugMsg( QStringLiteral( "Update URI items FAILED: PKI bundle invalid" ) );
return false;
}
QgsDebugMsg( "Update URI items: PKI bundle valid" );
QgsDebugMsg( QStringLiteral( "Update URI items: PKI bundle valid" ) );
QString pkiTempFileBase = QStringLiteral( "tmppki_%1.pem" );
@ -213,7 +213,7 @@ void QgsAuthIdentCertMethod::updateMethodConfig( QgsAuthMethodConfig &mconfig )
QMutexLocker locker( &mMutex );
if ( mconfig.hasConfig( QStringLiteral( "oldconfigstyle" ) ) )
{
QgsDebugMsg( "Updating old style auth method config" );
QgsDebugMsg( QStringLiteral( "Updating old style auth method config" ) );
QStringList conflist = mconfig.config( QStringLiteral( "oldconfigstyle" ) ).split( QStringLiteral( "|||" ) );
mconfig.setConfig( QStringLiteral( "certid" ), conflist.at( 0 ) );

6
src/auth/pkipaths/qgsauthpkipathsmethod.cpp
View File

@ -132,10 +132,10 @@ bool QgsAuthPkiPathsMethod::updateDataSourceUriItems( QStringList &connectionIte
QgsPkiConfigBundle *pkibundle = getPkiConfigBundle( authcfg );
if ( !pkibundle || !pkibundle->isValid() )
{
QgsDebugMsg( "Update URI items FAILED: PKI bundle invalid" );
QgsDebugMsg( QStringLiteral( "Update URI items FAILED: PKI bundle invalid" ) );
return false;
}
QgsDebugMsg( "Update URI items: PKI bundle valid" );
QgsDebugMsg( QStringLiteral( "Update URI items: PKI bundle valid" ) );
QString pkiTempFileBase = QStringLiteral( "tmppki_%1.pem" );
@ -248,7 +248,7 @@ void QgsAuthPkiPathsMethod::updateMethodConfig( QgsAuthMethodConfig &mconfig )
QMutexLocker locker( &mMutex );
if ( mconfig.hasConfig( QStringLiteral( "oldconfigstyle" ) ) )
{
QgsDebugMsg( "Updating old style auth method config" );
QgsDebugMsg( QStringLiteral( "Updating old style auth method config" ) );
QStringList conflist = mconfig.config( QStringLiteral( "oldconfigstyle" ) ).split( QStringLiteral( "|||" ) );
mconfig.setConfig( QStringLiteral( "certpath" ), conflist.at( 0 ) );

6
src/auth/pkipkcs12/qgsauthpkcs12method.cpp
View File

@ -131,10 +131,10 @@ bool QgsAuthPkcs12Method::updateDataSourceUriItems( QStringList &connectionItems
QgsPkiConfigBundle *pkibundle = getPkiConfigBundle( authcfg );
if ( !pkibundle || !pkibundle->isValid() )
{
QgsDebugMsg( "Update URI items FAILED: PKI bundle invalid" );
QgsDebugMsg( QStringLiteral( "Update URI items FAILED: PKI bundle invalid" ) );
return false;
}
QgsDebugMsg( "Update URI items: PKI bundle valid" );
QgsDebugMsg( QStringLiteral( "Update URI items: PKI bundle valid" ) );
QString pkiTempFileBase = QStringLiteral( "tmppki_%1.pem" );
@ -247,7 +247,7 @@ void QgsAuthPkcs12Method::updateMethodConfig( QgsAuthMethodConfig &mconfig )
QMutexLocker locker( &mMutex );
if ( mconfig.hasConfig( QStringLiteral( "oldconfigstyle" ) ) )
{
QgsDebugMsg( "Updating old style auth method config" );
QgsDebugMsg( QStringLiteral( "Updating old style auth method config" ) );
QStringList conflist = mconfig.config( QStringLiteral( "oldconfigstyle" ) ).split( QStringLiteral( "|||" ) );
mconfig.setConfig( QStringLiteral( "bundlepath" ), conflist.at( 0 ) );

34
src/core/auth/qgsauthcertutils.cpp
View File

@ -242,7 +242,7 @@ QList<QSslCertificate> QgsAuthCertUtils::certsFromString( const QString &pemtext
certs = QSslCertificate::fromData( pemtext.toLatin1(), QSsl::Pem );
if ( certs.isEmpty() )
{
QgsDebugMsg( "Parsed cert(s) EMPTY" );
QgsDebugMsg( QStringLiteral( "Parsed cert(s) EMPTY" ) );
}
return certs;
}
@ -670,7 +670,7 @@ QString QgsAuthCertUtils::getCertDistinguishedName( const QSslCertificate &qcert
QCA::Certificate acert( QCA::Certificate::fromPEM( qcert.toPem(), &res, QStringLiteral( "qca-ossl" ) ) );
if ( res != QCA::ConvertGood || acert.isNull() )
{
QgsDebugMsg( "Certificate could not be converted to QCA cert" );
QgsDebugMsg( QStringLiteral( "Certificate could not be converted to QCA cert" ) );
return QString();
}
}
@ -754,7 +754,7 @@ QCA::Certificate QgsAuthCertUtils::qtCertToQcaCert( const QSslCertificate &cert
QCA::Certificate qcacert( QCA::Certificate::fromPEM( cert.toPem(), &res, QStringLiteral( "qca-ossl" ) ) );
if ( res != QCA::ConvertGood || qcacert.isNull() )
{
QgsDebugMsg( "Certificate could not be converted to QCA cert" );
QgsDebugMsg( QStringLiteral( "Certificate could not be converted to QCA cert" ) );
qcacert = QCA::Certificate();
}
return qcacert;
@ -939,13 +939,13 @@ QList<QgsAuthCertUtils::CertUsageType> QgsAuthCertUtils::certificateUsageTypes(
QCA::Certificate qcacert( QCA::Certificate::fromPEM( cert.toPem(), &res, QStringLiteral( "qca-ossl" ) ) );
if ( res != QCA::ConvertGood || qcacert.isNull() )
{
QgsDebugMsg( "Certificate could not be converted to QCA cert" );
QgsDebugMsg( QStringLiteral( "Certificate could not be converted to QCA cert" ) );
return usages;
}
if ( qcacert.isCA() )
{
QgsDebugMsg( "Certificate has 'CA:TRUE' basic constraint" );
QgsDebugMsg( QStringLiteral( "Certificate has 'CA:TRUE' basic constraint" ) );
usages << QgsAuthCertUtils::CertAuthorityUsage;
}
@ -954,12 +954,12 @@ QList<QgsAuthCertUtils::CertUsageType> QgsAuthCertUtils::certificateUsageTypes(
{
if ( certconst.known() == QCA::KeyCertificateSign )
{
QgsDebugMsg( "Certificate has 'Certificate Sign' key usage" );
QgsDebugMsg( QStringLiteral( "Certificate has 'Certificate Sign' key usage" ) );
usages << QgsAuthCertUtils::CertIssuerUsage;
}
else if ( certconst.known() == QCA::ServerAuth )
{
QgsDebugMsg( "Certificate has 'server authentication' extended key usage" );
QgsDebugMsg( QStringLiteral( "Certificate has 'server authentication' extended key usage" ) );
usages << QgsAuthCertUtils::TlsServerUsage;
}
}
@ -1039,13 +1039,13 @@ bool QgsAuthCertUtils::certificateIsSslServer( const QSslCertificate &cert )
QCA::Certificate qcacert( QCA::Certificate::fromPEM( cert.toPem(), &res, QString( "qca-ossl" ) ) );
if ( res != QCA::ConvertGood || qcacert.isNull() )
{
QgsDebugMsg( "Certificate could not be converted to QCA cert" );
QgsDebugMsg( QStringLiteral( "Certificate could not be converted to QCA cert" ) );
return false;
}
if ( qcacert.isCA() )
{
QgsDebugMsg( "SSL server certificate has 'CA:TRUE' basic constraint (and should not)" );
QgsDebugMsg( QStringLiteral( "SSL server certificate has 'CA:TRUE' basic constraint (and should not)" ) );
return false;
}
@ -1054,7 +1054,7 @@ bool QgsAuthCertUtils::certificateIsSslServer( const QSslCertificate &cert )
{
if ( certconst.known() == QCA::KeyCertificateSign )
{
QgsDebugMsg( "SSL server certificate has 'Certificate Sign' key usage (and should not)" );
QgsDebugMsg( QStringLiteral( "SSL server certificate has 'Certificate Sign' key usage (and should not)" ) );
return false;
}
}
@ -1068,22 +1068,22 @@ bool QgsAuthCertUtils::certificateIsSslServer( const QSslCertificate &cert )
{
if ( certconst.known() == QCA::DigitalSignature )
{
QgsDebugMsg( "SSL server certificate has 'digital signature' key usage" );
QgsDebugMsg( QStringLiteral( "SSL server certificate has 'digital signature' key usage" ) );
dsignature = true;
}
else if ( certconst.known() == QCA::KeyEncipherment )
{
QgsDebugMsg( "SSL server certificate has 'key encipherment' key usage" );
QgsDebugMsg( QStringLiteral( "SSL server certificate has 'key encipherment' key usage" ) );
keyencrypt = true;
}
else if ( certconst.known() == QCA::KeyAgreement )
{
QgsDebugMsg( "SSL server certificate has 'key agreement' key usage" );
QgsDebugMsg( QStringLiteral( "SSL server certificate has 'key agreement' key usage" ) );
keyencrypt = true;
}
else if ( certconst.known() == QCA::ServerAuth )
{
QgsDebugMsg( "SSL server certificate has 'server authentication' extended key usage" );
QgsDebugMsg( QStringLiteral( "SSL server certificate has 'server authentication' extended key usage" ) );
serverauth = true;
}
}
@ -1122,12 +1122,12 @@ bool QgsAuthCertUtils::certificateIsSslServer( const QSslCertificate &cert )
{
if ( certconst.known() == QCA::EncipherOnly )
{
QgsDebugMsg( "SSL server public key has 'encipher only' key usage" );
QgsDebugMsg( QStringLiteral( "SSL server public key has 'encipher only' key usage" ) );
encipheronly = true;
}
else if ( certconst.known() == QCA::DecipherOnly )
{
QgsDebugMsg( "SSL server public key has 'decipher only' key usage" );
QgsDebugMsg( QStringLiteral( "SSL server public key has 'decipher only' key usage" ) );
decipheronly = true;
}
}
@ -1393,7 +1393,7 @@ QStringList QgsAuthCertUtils::validatePKIBundle( QgsPkiBundle &bundle, bool useI
}
else
{
QgsDebugMsg( "Key is not DSA, RSA: validation is not supported by QCA" );
QgsDebugMsg( QStringLiteral( "Key is not DSA, RSA: validation is not supported by QCA" ) );
}
if ( ! keyValid )
{

108
src/core/auth/qgsauthmanager.cpp
View File

@ -154,10 +154,10 @@ bool QgsAuthManager::init( const QString &pluginPath, const QString &authDatabas
return true;
mAuthInit = true;
QgsDebugMsg( "Initializing QCA..." );
QgsDebugMsg( QStringLiteral( "Initializing QCA..." ) );
mQcaInitializer = new QCA::Initializer( QCA::Practical, 256 );
QgsDebugMsg( "QCA initialized." );
QgsDebugMsg( QStringLiteral( "QCA initialized." ) );
QCA::scanForPlugins();
QgsDebugMsg( QStringLiteral( "QCA Plugin Diagnostics Context: %1" ).arg( QCA::pluginDiagnosticText() ) );
@ -174,7 +174,7 @@ bool QgsAuthManager::init( const QString &pluginPath, const QString &authDatabas
return isDisabled();
}
QgsDebugMsg( "Prioritizing qca-ossl over all other QCA providers..." );
QgsDebugMsg( QStringLiteral( "Prioritizing qca-ossl over all other QCA providers..." ) );
const QCA::ProviderList provds = QCA::providers();
QStringList prlist;
for ( QCA::Provider *p : provds )
@ -190,7 +190,7 @@ bool QgsAuthManager::init( const QString &pluginPath, const QString &authDatabas
}
QgsDebugMsg( QStringLiteral( "QCA provider priorities: %1" ).arg( prlist.join( ", " ) ) );
QgsDebugMsg( "Populating auth method registry" );
QgsDebugMsg( QStringLiteral( "Populating auth method registry" ) );
QgsAuthMethodRegistry *authreg = QgsAuthMethodRegistry::instance( pluginPath );
QStringList methods = authreg->authMethodList();
@ -241,7 +241,7 @@ bool QgsAuthManager::init( const QString &pluginPath, const QString &authDatabas
}
if ( dbinfo.size() > 0 )
{
QgsDebugMsg( "Auth db exists and has data" );
QgsDebugMsg( QStringLiteral( "Auth db exists and has data" ) );
if ( !createCertTables() )
return false;
@ -280,7 +280,7 @@ bool QgsAuthManager::init( const QString &pluginPath, const QString &authDatabas
{
if ( setMasterPassword( masterpass, true ) )
{
QgsDebugMsg( "Authentication master password set from QGIS_AUTH_PASSWORD_FILE" );
QgsDebugMsg( QStringLiteral( "Authentication master password set from QGIS_AUTH_PASSWORD_FILE" ) );
}
else
{
@ -300,7 +300,7 @@ bool QgsAuthManager::init( const QString &pluginPath, const QString &authDatabas
}
else
{
QgsDebugMsg( "Auth db does not exist: creating through QSqlDatabase initial connection" );
QgsDebugMsg( QStringLiteral( "Auth db does not exist: creating through QSqlDatabase initial connection" ) );
if ( !createConfigTables() )
return false;
@ -373,7 +373,7 @@ bool QgsAuthManager::createCertTables()
{
QMutexLocker locker( mMutex );
// NOTE: these tables were added later, so IF NOT EXISTS is used
QgsDebugMsg( "Creating cert tables in auth db" );
QgsDebugMsg( QStringLiteral( "Creating cert tables in auth db" ) );
QSqlQuery query( authDatabaseConnection() );
@ -457,7 +457,7 @@ bool QgsAuthManager::isDisabled() const
{
if ( mAuthDisabled )
{
QgsDebugMsg( "Authentication system DISABLED: QCA's qca-ossl (OpenSSL) plugin is missing" );
QgsDebugMsg( QStringLiteral( "Authentication system DISABLED: QCA's qca-ossl (OpenSSL) plugin is missing" ) );
}
return mAuthDisabled;
}
@ -478,16 +478,16 @@ bool QgsAuthManager::setMasterPassword( bool verify )
if ( mMasterPass.isEmpty() )
{
QgsDebugMsg( "Master password is not yet set by user" );
QgsDebugMsg( QStringLiteral( "Master password is not yet set by user" ) );
if ( !masterPasswordInput() )
{
QgsDebugMsg( "Master password input canceled by user" );
QgsDebugMsg( QStringLiteral( "Master password input canceled by user" ) );
return false;
}
}
else
{
QgsDebugMsg( "Master password is set" );
QgsDebugMsg( QStringLiteral( "Master password is set" ) );
if ( !verify )
return true;
}
@ -495,7 +495,7 @@ bool QgsAuthManager::setMasterPassword( bool verify )
if ( !verifyMasterPassword() )
return false;
QgsDebugMsg( "Master password is set and verified" );
QgsDebugMsg( QStringLiteral( "Master password is set and verified" ) );
return true;
}
@ -577,7 +577,7 @@ bool QgsAuthManager::verifyMasterPassword( const QString &compare )
}
else
{
QgsDebugMsg( "Master password: verified against hash in database" );
QgsDebugMsg( QStringLiteral( "Master password: verified against hash in database" ) );
if ( compare.isNull() )
emit masterPasswordVerified( true );
}
@ -595,7 +595,7 @@ bool QgsAuthManager::verifyMasterPassword( const QString &compare )
}
else
{
QgsDebugMsg( "Master password: hash stored in database" );
QgsDebugMsg( QStringLiteral( "Master password: hash stored in database" ) );
}
// double-check storing
if ( !masterPasswordCheckAgainstDb() )
@ -610,7 +610,7 @@ bool QgsAuthManager::verifyMasterPassword( const QString &compare )
}
else
{
QgsDebugMsg( "Master password: verified against hash in database" );
QgsDebugMsg( QStringLiteral( "Master password: verified against hash in database" ) );
emit masterPasswordVerified( true );
}
}
@ -643,7 +643,7 @@ bool QgsAuthManager::resetMasterPassword( const QString &newpass, const QString
if ( !backupAuthenticationDatabase( &dbbackup ) )
return false;
QgsDebugMsg( "Master password reset: backed up current database" );
QgsDebugMsg( QStringLiteral( "Master password reset: backed up current database" ) );
// create new database and connection
authDatabaseConnection();
@ -665,7 +665,7 @@ bool QgsAuthManager::resetMasterPassword( const QString &newpass, const QString
}
if ( ok )
{
QgsDebugMsg( "Master password reset: cleared current password from database" );
QgsDebugMsg( QStringLiteral( "Master password reset: cleared current password from database" ) );
}
// mMasterPass empty, set new password (don't verify, since not stored yet)
@ -681,7 +681,7 @@ bool QgsAuthManager::resetMasterPassword( const QString &newpass, const QString
}
if ( ok )
{
QgsDebugMsg( "Master password reset: stored new password in database" );
QgsDebugMsg( QStringLiteral( "Master password reset: stored new password in database" ) );
}
// verify it stored password properly
@ -703,7 +703,7 @@ bool QgsAuthManager::resetMasterPassword( const QString &newpass, const QString
}
if ( ok )
{
QgsDebugMsg( "Master password reset: re-encrypted configs in database" );
QgsDebugMsg( QStringLiteral( "Master password reset: re-encrypted configs in database" ) );
}
// verify it all worked
@ -745,7 +745,7 @@ bool QgsAuthManager::resetMasterPassword( const QString &newpass, const QString
QFile::rename( dbbackup, authenticationDatabasePath() );
mMasterPass = prevpass;
authDatabaseConnection();
QgsDebugMsg( "Master password reset FAILED: reinstated previous password and database" );
QgsDebugMsg( QStringLiteral( "Master password reset FAILED: reinstated previous password and database" ) );
// assign error db backup
if ( backuppath )
@ -770,7 +770,7 @@ bool QgsAuthManager::resetMasterPassword( const QString &newpass, const QString
*backuppath = dbbackup;
}
QgsDebugMsg( "Master password reset: SUCCESS" );
QgsDebugMsg( QStringLiteral( "Master password reset: SUCCESS" ) );
emit authDatabaseChanged();
return true;
}
@ -938,7 +938,7 @@ void QgsAuthManager::updateConfigAuthMethods()
if ( query.isActive() )
{
QgsDebugMsg( "Synching existing auth config and their auth methods" );
QgsDebugMsg( QStringLiteral( "Synching existing auth config and their auth methods" ) );
mConfigAuthMethods.clear();
QStringList cfgmethods;
while ( query.next() )
@ -1381,7 +1381,7 @@ bool QgsAuthManager::eraseAuthenticationDatabase( bool backup, QString *backuppa
mMasterPass = QString();
QgsDebugMsg( "Creating Auth db through QSqlDatabase initial connection" );
QgsDebugMsg( QStringLiteral( "Creating Auth db through QSqlDatabase initial connection" ) );
QSqlDatabase authConn = authDatabaseConnection();
if ( !authConn.isValid() || !authConn.isOpen() )
@ -1686,12 +1686,12 @@ bool QgsAuthManager::storeCertIdentity( const QSslCertificate &cert, const QSslK
QMutexLocker locker( mMutex );
if ( cert.isNull() )
{
QgsDebugMsg( "Passed certificate is null" );
QgsDebugMsg( QStringLiteral( "Passed certificate is null" ) );
return false;
}
if ( key.isNull() )
{
QgsDebugMsg( "Passed private key is null" );
QgsDebugMsg( QStringLiteral( "Passed private key is null" ) );
return false;
}
@ -1911,7 +1911,7 @@ bool QgsAuthManager::removeCertIdentity( const QString &id )
QMutexLocker locker( mMutex );
if ( id.isEmpty() )
{
QgsDebugMsg( "Passed bundle ID is empty" );
QgsDebugMsg( QStringLiteral( "Passed bundle ID is empty" ) );
return false;
}
@ -1939,7 +1939,7 @@ bool QgsAuthManager::storeSslCertCustomConfig( const QgsAuthConfigSslServer &con
QMutexLocker locker( mMutex );
if ( config.isNull() )
{
QgsDebugMsg( "Passed config is null" );
QgsDebugMsg( QStringLiteral( "Passed config is null" ) );
return false;
}
@ -1983,7 +1983,7 @@ const QgsAuthConfigSslServer QgsAuthManager::sslCertCustomConfig( const QString
if ( id.isEmpty() || hostport.isEmpty() )
{
QgsDebugMsg( "Passed config ID or host:port is empty" );
QgsDebugMsg( QStringLiteral( "Passed config ID or host:port is empty" ) );
return config;
}
@ -2025,7 +2025,7 @@ const QgsAuthConfigSslServer QgsAuthManager::sslCertCustomConfigByHost( const QS
if ( hostport.isEmpty() )
{
QgsDebugMsg( "Passed host:port is empty" );
QgsDebugMsg( QStringLiteral( "Passed host:port is empty" ) );
return config;
}
@ -2091,7 +2091,7 @@ bool QgsAuthManager::existsSslCertCustomConfig( const QString &id, const QString
QMutexLocker locker( mMutex );
if ( id.isEmpty() || hostport.isEmpty() )
{
QgsDebugMsg( "Passed config ID or host:port is empty" );
QgsDebugMsg( QStringLiteral( "Passed config ID or host:port is empty" ) );
return false;
}
@ -2129,7 +2129,7 @@ bool QgsAuthManager::removeSslCertCustomConfig( const QString &id, const QString
QMutexLocker locker( mMutex );
if ( id.isEmpty() || hostport.isEmpty() )
{
QgsDebugMsg( "Passed config ID or host:port is empty" );
QgsDebugMsg( QStringLiteral( "Passed config ID or host:port is empty" ) );
return false;
}
@ -2165,7 +2165,7 @@ void QgsAuthManager::dumpIgnoredSslErrorsCache_()
QMutexLocker locker( mMutex );
if ( !mIgnoredSslErrorsCache.isEmpty() )
{
QgsDebugMsg( "Ignored SSL errors cache items:" );
QgsDebugMsg( QStringLiteral( "Ignored SSL errors cache items:" ) );
QHash<QString, QSet<QSslError::SslError> >::const_iterator i = mIgnoredSslErrorsCache.constBegin();
while ( i != mIgnoredSslErrorsCache.constEnd() )
{
@ -2180,7 +2180,7 @@ void QgsAuthManager::dumpIgnoredSslErrorsCache_()
}
else
{
QgsDebugMsg( "Ignored SSL errors cache EMPTY" );
QgsDebugMsg( QStringLiteral( "Ignored SSL errors cache EMPTY" ) );
}
}
@ -2189,7 +2189,7 @@ bool QgsAuthManager::updateIgnoredSslErrorsCacheFromConfig( const QgsAuthConfigS
QMutexLocker locker( mMutex );
if ( config.isNull() )
{
QgsDebugMsg( "Passed config is null" );
QgsDebugMsg( QStringLiteral( "Passed config is null" ) );
return false;
}
@ -2231,7 +2231,7 @@ bool QgsAuthManager::updateIgnoredSslErrorsCache( const QString &shahostport, co
if ( errors.isEmpty() )
{
QgsDebugMsg( "Passed errors list empty" );
QgsDebugMsg( QStringLiteral( "Passed errors list empty" ) );
return false;
}
@ -2246,7 +2246,7 @@ bool QgsAuthManager::updateIgnoredSslErrorsCache( const QString &shahostport, co
if ( errs.isEmpty() )
{
QgsDebugMsg( "Passed errors list does not contain errors" );
QgsDebugMsg( QStringLiteral( "Passed errors list does not contain errors" ) );
return false;
}
@ -2268,7 +2268,7 @@ bool QgsAuthManager::rebuildIgnoredSslErrorCache()
if ( !authDbQuery( &query ) )
{
QgsDebugMsg( "Rebuild of ignored SSL errors cache FAILED" );
QgsDebugMsg( QStringLiteral( "Rebuild of ignored SSL errors cache FAILED" ) );
return false;
}
@ -2308,12 +2308,12 @@ bool QgsAuthManager::rebuildIgnoredSslErrorCache()
{
mIgnoredSslErrorsCache.clear();
mIgnoredSslErrorsCache = nextcache;
QgsDebugMsg( "Rebuild of ignored SSL errors cache SUCCEEDED" );
QgsDebugMsg( QStringLiteral( "Rebuild of ignored SSL errors cache SUCCEEDED" ) );
dumpIgnoredSslErrorsCache_();
return true;
}
QgsDebugMsg( "Rebuild of ignored SSL errors cache SAME AS BEFORE" );
QgsDebugMsg( QStringLiteral( "Rebuild of ignored SSL errors cache SAME AS BEFORE" ) );
dumpIgnoredSslErrorsCache_();
return true;
}
@ -2324,7 +2324,7 @@ bool QgsAuthManager::storeCertAuthorities( const QList<QSslCertificate> &certs )
QMutexLocker locker( mMutex );
if ( certs.isEmpty() )
{
QgsDebugMsg( "Passed certificate list has no certs" );
QgsDebugMsg( QStringLiteral( "Passed certificate list has no certs" ) );
return false;
}
@ -2343,7 +2343,7 @@ bool QgsAuthManager::storeCertAuthority( const QSslCertificate &cert )
// as user may want to ignore that SSL connection error
if ( cert.isNull() )
{
QgsDebugMsg( "Passed certificate is null" );
QgsDebugMsg( QStringLiteral( "Passed certificate is null" ) );
return false;
}
@ -2411,7 +2411,7 @@ bool QgsAuthManager::existsCertAuthority( const QSslCertificate &cert )
QMutexLocker locker( mMutex );
if ( cert.isNull() )
{
QgsDebugMsg( "Passed certificate is null" );
QgsDebugMsg( QStringLiteral( "Passed certificate is null" ) );
return false;
}
@ -2449,7 +2449,7 @@ bool QgsAuthManager::removeCertAuthority( const QSslCertificate &cert )
QMutexLocker locker( mMutex );
if ( cert.isNull() )
{
QgsDebugMsg( "Passed certificate is null" );
QgsDebugMsg( QStringLiteral( "Passed certificate is null" ) );
return false;
}
@ -2565,7 +2565,7 @@ bool QgsAuthManager::storeCertTrustPolicy( const QSslCertificate &cert, QgsAuthC
QMutexLocker locker( mMutex );
if ( cert.isNull() )
{
QgsDebugMsg( "Passed certificate is null" );
QgsDebugMsg( QStringLiteral( "Passed certificate is null" ) );
return false;
}
@ -2604,7 +2604,7 @@ QgsAuthCertUtils::CertTrustPolicy QgsAuthManager::certTrustPolicy( const QSslCer
QMutexLocker locker( mMutex );
if ( cert.isNull() )
{
QgsDebugMsg( "Passed certificate is null" );
QgsDebugMsg( QStringLiteral( "Passed certificate is null" ) );
return QgsAuthCertUtils::DefaultTrust;
}
@ -2642,7 +2642,7 @@ bool QgsAuthManager::removeCertTrustPolicies( const QList<QSslCertificate> &cert
QMutexLocker locker( mMutex );
if ( certs.empty() )
{
QgsDebugMsg( "Passed certificate list has no certs" );
QgsDebugMsg( QStringLiteral( "Passed certificate list has no certs" ) );
return false;
}
@ -2659,7 +2659,7 @@ bool QgsAuthManager::removeCertTrustPolicy( const QSslCertificate &cert )
QMutexLocker locker( mMutex );
if ( cert.isNull() )
{
QgsDebugMsg( "Passed certificate is null" );
QgsDebugMsg( QStringLiteral( "Passed certificate is null" ) );
return false;
}
@ -2741,7 +2741,7 @@ bool QgsAuthManager::rebuildCertTrustCache()
if ( !authDbQuery( &query ) )
{
QgsDebugMsg( "Rebuild of cert trust policy cache FAILED" );
QgsDebugMsg( QStringLiteral( "Rebuild of cert trust policy cache FAILED" ) );
return false;
}
@ -2761,7 +2761,7 @@ bool QgsAuthManager::rebuildCertTrustCache()
}
}
QgsDebugMsg( "Rebuild of cert trust policy cache SUCCEEDED" );
QgsDebugMsg( QStringLiteral( "Rebuild of cert trust policy cache SUCCEEDED" ) );
return true;
}
@ -2829,7 +2829,7 @@ bool QgsAuthManager::rebuildTrustedCaCertsCache()
{
QMutexLocker locker( mMutex );
mTrustedCaCertsCache = trustedCaCerts();
QgsDebugMsg( "Rebuilt trusted cert authorities cache" );
QgsDebugMsg( QStringLiteral( "Rebuilt trusted cert authorities cache" ) );
// TODO: add some error trapping for the operation
return true;
}
@ -2915,7 +2915,7 @@ void QgsAuthManager::tryToStartDbErase()
if ( mScheduledDbEraseRequestCount >= trycutoff )
{
setScheduledAuthDatabaseErase( false );
QgsDebugMsg( "authDatabaseEraseRequest emitting/scheduling canceled" );
QgsDebugMsg( QStringLiteral( "authDatabaseEraseRequest emitting/scheduling canceled" ) );
return;
}
else
@ -2932,10 +2932,10 @@ void QgsAuthManager::tryToStartDbErase()
mMutex->unlock();
QgsDebugMsg( "authDatabaseEraseRequest emitted" );
QgsDebugMsg( QStringLiteral( "authDatabaseEraseRequest emitted" ) );
return;
}
QgsDebugMsg( "authDatabaseEraseRequest emit skipped" );
QgsDebugMsg( QStringLiteral( "authDatabaseEraseRequest emit skipped" ) );
}

2
src/core/auth/qgsauthmethodregistry.cpp
View File

@ -278,7 +278,7 @@ std::unique_ptr<QgsAuthMethod> QgsAuthMethodRegistry::authMethod( const QString
}
else
{
QgsDebugMsg( "dlopen succeeded" );
QgsDebugMsg( QStringLiteral( "dlopen succeeded" ) );
dlclose( handle );
}

6
src/core/dxf/qgsdxfpallabeling.cpp
View File

@ -48,20 +48,20 @@ QgsDxfRuleBasedLabelProvider::QgsDxfRuleBasedLabelProvider( const QgsRuleBasedLa
void QgsDxfRuleBasedLabelProvider::reinit( QgsVectorLayer *layer )
{
QgsDebugMsg( "Entering." );
QgsDebugMsg( QStringLiteral( "Entering." ) );
mRules->rootRule()->createSubProviders( layer, mSubProviders, this );
}
QgsVectorLayerLabelProvider *QgsDxfRuleBasedLabelProvider::createProvider( QgsVectorLayer *layer, const QString &providerId, bool withFeatureLoop, const QgsPalLayerSettings *settings )
{
QgsDebugMsg( "Entering." );
QgsDebugMsg( QStringLiteral( "Entering." ) );
Q_UNUSED( withFeatureLoop );
return new QgsDxfLabelProvider( layer, providerId, mDxfExport, settings );
}
void QgsDxfRuleBasedLabelProvider::drawLabel( QgsRenderContext &context, pal::LabelPosition *label ) const
{
QgsDebugMsg( "Entering." );
QgsDebugMsg( QStringLiteral( "Entering." ) );
Q_ASSERT( mDxfExport );
mDxfExport->drawLabel( layerId(), context, label, mSettings );
}

6
src/core/geocms/geonode/qgsgeonoderequest.cpp
View File

@ -163,12 +163,12 @@ void QgsGeoNodeRequest::setProtocol( const QString &protocol )
void QgsGeoNodeRequest::replyFinished()
{
QgsDebugMsg( "Reply finished" );
QgsDebugMsg( QStringLiteral( "Reply finished" ) );
if ( !mIsAborted && mGeoNodeReply )
{
if ( mGeoNodeReply->error() == QNetworkReply::NoError )
{
QgsDebugMsg( "reply OK" );
QgsDebugMsg( QStringLiteral( "reply OK" ) );
QVariant redirect = mGeoNodeReply->attribute( QNetworkRequest::RedirectionTargetAttribute );
if ( !redirect.isNull() )
{
@ -228,7 +228,7 @@ void QgsGeoNodeRequest::replyFinished()
}
else
{
QgsDebugMsg( "No cache for capabilities!" );
QgsDebugMsg( QStringLiteral( "No cache for capabilities!" ) );
}
mHttpGeoNodeResponse = mGeoNodeReply->readAll();

8
src/core/geometry/qgsgeometrymakevalid.cpp
View File

@ -877,7 +877,7 @@ static GEOSGeometry *LWGEOM_GEOS_makeValid( const GEOSGeometry *gin, QString &er
case GEOS_MULTIPOINT:
case GEOS_POINT:
// points are always valid, but we might have invalid ordinate values
QgsDebugMsg( "PUNTUAL geometry resulted invalid to GEOS -- dunno how to clean that up" );
QgsDebugMsg( QStringLiteral( "PUNTUAL geometry resulted invalid to GEOS -- dunno how to clean that up" ) );
return nullptr;
case GEOS_LINESTRING:
@ -911,12 +911,12 @@ std::unique_ptr< QgsAbstractGeometry > _qgis_lwgeom_make_valid( const QgsAbstrac
geos::unique_ptr geosgeom = QgsGeos::asGeos( lwgeom_in );
if ( !geosgeom )
{
QgsDebugMsg( "Original geom can't be converted to GEOS - will try cleaning that up first" );
QgsDebugMsg( QStringLiteral( "Original geom can't be converted to GEOS - will try cleaning that up first" ) );
std::unique_ptr<QgsAbstractGeometry> lwgeom_in_clone( lwgeom_in->clone() );
if ( !lwgeom_make_geos_friendly( lwgeom_in_clone.get() ) )
{
QgsDebugMsg( "Could not make a valid geometry out of input" );
QgsDebugMsg( QStringLiteral( "Could not make a valid geometry out of input" ) );
}
// try again as we did cleanup now
@ -931,7 +931,7 @@ std::unique_ptr< QgsAbstractGeometry > _qgis_lwgeom_make_valid( const QgsAbstrac
}
else
{
QgsDebugMsgLevel( "original geom converted to GEOS", 4 );
QgsDebugMsgLevel( QStringLiteral( "original geom converted to GEOS" ), 4 );
}
GEOSGeometry *geosout = LWGEOM_GEOS_makeValid( geosgeom.get(), errorMessage );

2
src/core/geometry/qgsgeos.cpp
View File

@ -910,7 +910,7 @@ QgsGeometryEngine::EngineOperationResult QgsGeos::splitPolygonGeometry( GEOSGeom
intersectGeometry.reset( GEOSIntersection_r( geosinit.ctxt, mGeos.get(), polygon ) );
if ( !intersectGeometry )
{
QgsDebugMsg( "intersectGeometry is nullptr" );
QgsDebugMsg( QStringLiteral( "intersectGeometry is nullptr" ) );
continue;
}

2
src/core/gps/qgsgpsdconnection.cpp
View File

@ -33,7 +33,7 @@ QgsGpsdConnection::QgsGpsdConnection( const QString &host, qint16 port, const QS
void QgsGpsdConnection::connected()
{
QgsDebugMsg( "connected!" );
QgsDebugMsg( QStringLiteral( "connected!" ) );
QTcpSocket *socket = qobject_cast< QTcpSocket * >( mSource );
socket->write( QStringLiteral( "?WATCH={\"enable\":true,\"nmea\":true,\"raw\":true%1};" ).arg( mDevice.isEmpty() ? mDevice : QStringLiteral( ",\"device\":%1" ).arg( mDevice ) ).toUtf8() );
}

14
src/core/gps/qgsnmeaconnection.cpp
View File

@ -96,35 +96,35 @@ void QgsNmeaConnection::processStringBuffer()
QgsDebugMsg( substring );
processGgaSentence( ba.data(), ba.length() );
mStatus = GPSDataReceived;
QgsDebugMsg( "*******************GPS data received****************" );
QgsDebugMsg( QStringLiteral( "*******************GPS data received****************" ) );
}
else if ( substring.startsWith( QLatin1String( "$GPRMC" ) ) || substring.startsWith( QLatin1String( "$GNRMC" ) ) )
{
QgsDebugMsg( substring );
processRmcSentence( ba.data(), ba.length() );
mStatus = GPSDataReceived;
QgsDebugMsg( "*******************GPS data received****************" );
QgsDebugMsg( QStringLiteral( "*******************GPS data received****************" ) );
}
else if ( substring.startsWith( QLatin1String( "$GPGSV" ) ) )
{
QgsDebugMsg( substring );
processGsvSentence( ba.data(), ba.length() );
mStatus = GPSDataReceived;
QgsDebugMsg( "*******************GPS data received****************" );
QgsDebugMsg( QStringLiteral( "*******************GPS data received****************" ) );
}
else if ( substring.startsWith( QLatin1String( "$GPVTG" ) ) )
{
QgsDebugMsg( substring );
processVtgSentence( ba.data(), ba.length() );
mStatus = GPSDataReceived;
QgsDebugMsg( "*******************GPS data received****************" );
QgsDebugMsg( QStringLiteral( "*******************GPS data received****************" ) );
}
else if ( substring.startsWith( QLatin1String( "$GPGSA" ) ) )
{
QgsDebugMsg( substring );
processGsaSentence( ba.data(), ba.length() );
mStatus = GPSDataReceived;
QgsDebugMsg( "*******************GPS data received****************" );
QgsDebugMsg( QStringLiteral( "*******************GPS data received****************" ) );
}
emit nmeaSentenceReceived( substring ); // added to be able to save raw data
}
@ -187,9 +187,9 @@ void QgsNmeaConnection::processRmcSentence( const char *data, int len )
mLastGPSInformation.utcDateTime.setTimeSpec( Qt::UTC );
mLastGPSInformation.utcDateTime.setDate( date );
mLastGPSInformation.utcDateTime.setTime( time );
QgsDebugMsg( "utc time:" );
QgsDebugMsg( QStringLiteral( "utc time:" ) );
QgsDebugMsg( mLastGPSInformation.utcDateTime.toString() );
QgsDebugMsg( "local time:" );
QgsDebugMsg( QStringLiteral( "local time:" ) );
QgsDebugMsg( mLastGPSInformation.utcDateTime.toLocalTime().toString() );
}
}

16
src/core/gps/qgsqtlocationconnection.cpp
View File

@ -88,7 +88,7 @@ void QgsQtLocationConnection::parseData()
//mLastGPSInformation.status; //< Status (A = active or V = void)
emit stateChanged( mLastGPSInformation );
QgsDebugMsg( "Valid QGeoPositionInfo, positionUpdated" );
QgsDebugMsg( QStringLiteral( "Valid QGeoPositionInfo, positionUpdated" ) );
}
}
}
@ -114,7 +114,7 @@ void QgsQtLocationConnection::satellitesInViewUpdated(
}
mLastGPSInformation.satInfoComplete = true; //to be used to determine when to graph signal and satellite position
emit stateChanged( mLastGPSInformation );
QgsDebugMsg( "satellitesInViewUpdated" );
QgsDebugMsg( QStringLiteral( "satellitesInViewUpdated" ) );
}
void QgsQtLocationConnection::satellitesInUseUpdated(
@ -151,12 +151,12 @@ void QgsQtLocationConnection::satellitesInUseUpdated(
}
mLastGPSInformation.satInfoComplete = true; //to be used to determine when to graph signal and satellite position
emit stateChanged( mLastGPSInformation );
QgsDebugMsg( "satellitesInUseUpdated" );
QgsDebugMsg( QStringLiteral( "satellitesInUseUpdated" ) );
}
void QgsQtLocationConnection::startGPS()
{
QgsDebugMsg( "Starting GPS QtLocation connection" );
QgsDebugMsg( QStringLiteral( "Starting GPS QtLocation connection" ) );
// Obtain the location data source if it is not obtained already
if ( !locationDataSource )
{
@ -177,7 +177,7 @@ void QgsQtLocationConnection::startGPS()
else
{
// Not able to obtain the location data source
QgsDebugMsg( "No QtLocation Position Source" );
QgsDebugMsg( QStringLiteral( "No QtLocation Position Source" ) );
}
}
else
@ -189,14 +189,14 @@ void QgsQtLocationConnection::startGPS()
void QgsQtLocationConnection::startSatelliteMonitor()
{
QgsDebugMsg( "Starting GPS QtLocation satellite monitor" );
QgsDebugMsg( QStringLiteral( "Starting GPS QtLocation satellite monitor" ) );
if ( !satelliteInfoSource )
{
satelliteInfoSource = QGeoSatelliteInfoSource::createDefaultSource( this );
if ( satelliteInfoSource )
{
QgsDebugMsg( "satelliteMonitor started" );
QgsDebugMsg( QStringLiteral( "satelliteMonitor started" ) );
// Whenever the satellite info source signals that the number of
// satellites in use is updated, the satellitesInUseUpdated function
// is called
@ -219,7 +219,7 @@ void QgsQtLocationConnection::startSatelliteMonitor()
else
{
// Not able to obtain the Satellite data source
QgsDebugMsg( "No QtLocation Satellite Source" );
QgsDebugMsg( QStringLiteral( "No QtLocation Satellite Source" ) );
}
}
else

4
src/core/layertree/qgslayertreemodel.cpp
View File

@ -561,7 +561,7 @@ void QgsLayerTreeModel::setLayerTreeNodeFont( int nodeType, const QFont &font )
}
else
{
QgsDebugMsgLevel( "invalid node type", 4 );
QgsDebugMsgLevel( QStringLiteral( "invalid node type" ), 4 );
}
}
@ -574,7 +574,7 @@ QFont QgsLayerTreeModel::layerTreeNodeFont( int nodeType ) const
return mFontLayer;
else
{
QgsDebugMsgLevel( "invalid node type", 4 );
QgsDebugMsgLevel( QStringLiteral( "invalid node type" ), 4 );
return QFont();
}
}

2
src/core/mesh/qgsmeshlayerrenderer.cpp
View File

@ -159,7 +159,7 @@ void QgsMeshLayerRenderer::copyVectorDatasetValues( QgsMeshLayer *layer )
bool isScalar = metadata.isScalar();
if ( isScalar )
{
QgsDebugMsg( "Dataset has no vector values" );
QgsDebugMsg( QStringLiteral( "Dataset has no vector values" ) );
}
else
{

2
src/core/qgsaction.cpp
View File

@ -55,7 +55,7 @@ void QgsAction::run( const QgsExpressionContext &expressionContext ) const
{
if ( !isValid() )
{
QgsDebugMsg( "Invalid action cannot be run" );
QgsDebugMsg( QStringLiteral( "Invalid action cannot be run" ) );
return;
}

2
src/core/qgsactionmanager.cpp
View File

@ -65,7 +65,7 @@ void QgsActionManager::addAction( const QgsAction &action )
mLayer->dataProvider()->setListening( true );
if ( !mOnNotifyConnected )
{
QgsDebugMsg( "connecting to notify" );
QgsDebugMsg( QStringLiteral( "connecting to notify" ) );
connect( mLayer->dataProvider(), &QgsDataProvider::notify, this, &QgsActionManager::onNotifyRunActions );
mOnNotifyConnected = true;
}

4
src/core/qgsapplication.cpp
View File

@ -368,7 +368,7 @@ bool QgsApplication::notify( QObject *receiver, QEvent *event )
}
catch ( ... )
{
QgsDebugMsg( "Caught unhandled unknown exception" );
QgsDebugMsg( QStringLiteral( "Caught unhandled unknown exception" ) );
if ( qApp->thread() == QThread::currentThread() )
QMessageBox::critical( activeWindow(), tr( "Exception" ), tr( "unknown exception" ) );
}
@ -1437,7 +1437,7 @@ void QgsApplication::applyGdalSkippedDrivers()
{
ABISYM( mGdalSkipList ).removeDuplicates();
QString myDriverList = ABISYM( mGdalSkipList ).join( QStringLiteral( " " ) );
QgsDebugMsg( "Gdal Skipped driver list set to:" );
QgsDebugMsg( QStringLiteral( "Gdal Skipped driver list set to:" ) );
QgsDebugMsg( myDriverList );
CPLSetConfigOption( "GDAL_SKIP", myDriverList.toUtf8() );
GDALAllRegister(); //to update driver list and skip missing ones

2
src/core/qgscadutils.cpp
View File

@ -310,7 +310,7 @@ QgsCadUtils::AlignMapPointOutput QgsCadUtils::alignMapPoint( const QgsPointXY &o
void QgsCadUtils::AlignMapPointContext::dump() const
{
QgsDebugMsg( "Constraints (locked / relative / value" );
QgsDebugMsg( QStringLiteral( "Constraints (locked / relative / value" ) );
QgsDebugMsg( QStringLiteral( "Angle: %1 %2 %3" ).arg( angleConstraint.locked ).arg( angleConstraint.relative ).arg( angleConstraint.value ) );
QgsDebugMsg( QStringLiteral( "Distance: %1 %2 %3" ).arg( distanceConstraint.locked ).arg( distanceConstraint.relative ).arg( distanceConstraint.value ) );
QgsDebugMsg( QStringLiteral( "X: %1 %2 %3" ).arg( xConstraint.locked ).arg( xConstraint.relative ).arg( xConstraint.value ) );

34
src/core/qgscoordinatereferencesystem.cpp
View File

@ -202,7 +202,7 @@ bool QgsCoordinateReferenceSystem::createFromId( const long id, CrsType type )
break;
default:
//THIS IS BAD...THIS PART OF CODE SHOULD NEVER BE REACHED...
QgsDebugMsg( "Unexpected case reached!" );
QgsDebugMsg( QStringLiteral( "Unexpected case reached!" ) );
};
return result;
}
@ -585,7 +585,7 @@ bool QgsCoordinateReferenceSystem::createFromWkt( const QString &wkt )
if ( wkt.isEmpty() )
{
QgsDebugMsgLevel( "theWkt is uninitialized, operation failed", 4 );
QgsDebugMsgLevel( QStringLiteral( "theWkt is uninitialized, operation failed" ), 4 );
return d->mIsValid;
}
QByteArray ba = wkt.toLatin1();
@ -595,11 +595,11 @@ bool QgsCoordinateReferenceSystem::createFromWkt( const QString &wkt )
if ( myInputResult != OGRERR_NONE )
{
QgsDebugMsg( "\n---------------------------------------------------------------" );
QgsDebugMsg( "This CRS could *** NOT *** be set from the supplied Wkt " );
QgsDebugMsg( QStringLiteral( "\n---------------------------------------------------------------" ) );
QgsDebugMsg( QStringLiteral( "This CRS could *** NOT *** be set from the supplied Wkt " ) );
QgsDebugMsg( "INPUT: " + wkt );
QgsDebugMsg( QStringLiteral( "UNUSED WKT: %1" ).arg( pWkt ) );
QgsDebugMsg( "---------------------------------------------------------------\n" );
QgsDebugMsg( QStringLiteral( "---------------------------------------------------------------\n" ) );
sCRSWktLock.lockForWrite();
sWktCache.insert( wkt, *this );
@ -763,7 +763,7 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString &proj4String )
myStart2 = 0;
myStart2 = myLat2RegExp.indexIn( proj4String, myStart2 );
proj4StringModified.replace( myStart2 + LAT_PREFIX_LEN, myLength2 - LAT_PREFIX_LEN, lat1Str );
QgsDebugMsgLevel( "trying proj4string match with swapped lat_1,lat_2", 4 );
QgsDebugMsgLevel( QStringLiteral( "trying proj4string match with swapped lat_1,lat_2" ), 4 );
myRecord = getRecord( "select * from tbl_srs where parameters=" + QgsSqliteUtils::quotedString( proj4StringModified.trimmed() ) + " order by deprecated" );
}
}
@ -855,7 +855,7 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString &proj4String )
// if we failed to look up the projection in database, don't worry. we can still use it :)
if ( !d->mIsValid )
{
QgsDebugMsgLevel( "Projection is not found in databases.", 4 );
QgsDebugMsgLevel( QStringLiteral( "Projection is not found in databases." ), 4 );
//setProj4String will set mIsValidFlag to true if there is no issue
setProj4String( myProj4String );
}
@ -908,7 +908,7 @@ QgsCoordinateReferenceSystem::RecordMap QgsCoordinateReferenceSystem::getRecord(
}
if ( statement.step() != SQLITE_DONE )
{
QgsDebugMsgLevel( "Multiple records found in srs.db", 4 );
QgsDebugMsgLevel( QStringLiteral( "Multiple records found in srs.db" ), 4 );
myMap.clear();
}
}
@ -924,7 +924,7 @@ QgsCoordinateReferenceSystem::RecordMap QgsCoordinateReferenceSystem::getRecord(
myFileInfo.setFile( myDatabaseFileName );
if ( !myFileInfo.exists() )
{
QgsDebugMsg( "user qgis.db not found" );
QgsDebugMsg( QStringLiteral( "user qgis.db not found" ) );
return myMap;
}
@ -950,7 +950,7 @@ QgsCoordinateReferenceSystem::RecordMap QgsCoordinateReferenceSystem::getRecord(
if ( statement.step() != SQLITE_DONE )
{
QgsDebugMsgLevel( "Multiple records found in srs.db", 4 );
QgsDebugMsgLevel( QStringLiteral( "Multiple records found in srs.db" ), 4 );
myMap.clear();
}
}
@ -1128,7 +1128,7 @@ void QgsCoordinateReferenceSystem::setProj4String( const QString &proj4String )
projPJ proj = pj_init_plus_ctx( pContext, proj4String.trimmed().toLatin1().constData() );
if ( !proj )
{
QgsDebugMsgLevel( "proj.4 string rejected by pj_init_plus_ctx()", 4 );
QgsDebugMsgLevel( QStringLiteral( "proj.4 string rejected by pj_init_plus_ctx()" ), 4 );
d->mIsValid = false;
}
else
@ -1496,7 +1496,7 @@ QString QgsCoordinateReferenceSystem::proj4FromSrsId( const int srsId )
myFileInfo.setFile( myDatabaseFileName );
if ( !myFileInfo.exists() ) //its unlikely that this condition will ever be reached
{
QgsDebugMsg( "users qgis.db not found" );
QgsDebugMsg( QStringLiteral( "users qgis.db not found" ) );
return QString();
}
}
@ -1562,7 +1562,7 @@ CUSTOM_CRS_VALIDATION QgsCoordinateReferenceSystem::customCrsValidation()
void QgsCoordinateReferenceSystem::debugPrint()
{
QgsDebugMsg( "***SpatialRefSystem***" );
QgsDebugMsg( QStringLiteral( "***SpatialRefSystem***" ) );
QgsDebugMsg( "* Valid : " + ( d->mIsValid ? QString( "true" ) : QString( "false" ) ) );
QgsDebugMsg( "* SrsId : " + QString::number( d->mSrsId ) );
QgsDebugMsg( "* Proj4 : " + toProj4() );
@ -1570,15 +1570,15 @@ void QgsCoordinateReferenceSystem::debugPrint()
QgsDebugMsg( "* Desc. : " + d->mDescription );
if ( mapUnits() == QgsUnitTypes::DistanceMeters )
{
QgsDebugMsg( "* Units : meters" );
QgsDebugMsg( QStringLiteral( "* Units : meters" ) );
}
else if ( mapUnits() == QgsUnitTypes::DistanceFeet )
{
QgsDebugMsg( "* Units : feet" );
QgsDebugMsg( QStringLiteral( "* Units : feet" ) );
}
else if ( mapUnits() == QgsUnitTypes::DistanceDegrees )
{
QgsDebugMsg( "* Units : degrees" );
QgsDebugMsg( QStringLiteral( "* Units : degrees" ) );
}
}
@ -1600,7 +1600,7 @@ long QgsCoordinateReferenceSystem::saveAsUserCrs( const QString &name )
{
if ( !d->mIsValid )
{
QgsDebugMsgLevel( "Can't save an invalid CRS!", 4 );
QgsDebugMsgLevel( QStringLiteral( "Can't save an invalid CRS!" ), 4 );
return -1;
}

26
src/core/qgscoordinatetransform.cpp
View File

@ -216,7 +216,7 @@ QgsPointXY QgsCoordinateTransform::transform( const QgsPointXY &point, Transform
catch ( const QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
@ -233,7 +233,7 @@ QgsPointXY QgsCoordinateTransform::transform( const double theX, const double th
catch ( const QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
}
@ -260,12 +260,12 @@ QgsRectangle QgsCoordinateTransform::transform( const QgsRectangle &rect, Transf
catch ( const QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
#ifdef COORDINATE_TRANSFORM_VERBOSE
QgsDebugMsg( "Rect projection..." );
QgsDebugMsg( QStringLiteral( "Rect projection..." ) );
QgsDebugMsg( QStringLiteral( "Xmin : %1 --> %2" ).arg( rect.xMinimum() ).arg( x1 ) );
QgsDebugMsg( QStringLiteral( "Ymin : %1 --> %2" ).arg( rect.yMinimum() ).arg( y1 ) );
QgsDebugMsg( QStringLiteral( "Xmax : %1 --> %2" ).arg( rect.xMaximum() ).arg( x2 ) );
@ -290,7 +290,7 @@ void QgsCoordinateTransform::transformInPlace( double &x, double &y, double &z,
catch ( const QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
}
@ -326,7 +326,7 @@ void QgsCoordinateTransform::transformInPlace( float &x, float &y, float &z,
catch ( QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
}
@ -364,7 +364,7 @@ void QgsCoordinateTransform::transformPolygon( QPolygonF &poly, TransformDirecti
catch ( const QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
@ -401,7 +401,7 @@ void QgsCoordinateTransform::transformInPlace(
catch ( const QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
}
@ -463,7 +463,7 @@ void QgsCoordinateTransform::transformInPlace(
catch ( QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
}
@ -503,7 +503,7 @@ QgsRectangle QgsCoordinateTransform::transformBoundingBox( const QgsRectangle &r
QVector<double> y( nXPoints * nYPoints );
QVector<double> z( nXPoints * nYPoints );
QgsDebugMsgLevel( "Entering transformBoundingBox...", 4 );
QgsDebugMsgLevel( QStringLiteral( "Entering transformBoundingBox..." ), 4 );
// Populate the vectors
@ -539,7 +539,7 @@ QgsRectangle QgsCoordinateTransform::transformBoundingBox( const QgsRectangle &r
catch ( const QgsCsException & )
{
// rethrow the exception
QgsDebugMsg( "rethrowing exception" );
QgsDebugMsg( QStringLiteral( "rethrowing exception" ) );
throw;
}
@ -615,7 +615,7 @@ void QgsCoordinateTransform::transformCoords( int numPoints, double *x, double *
#ifdef QGISDEBUG
if ( !mHasContext )
QgsDebugMsgLevel( "No QgsCoordinateTransformContext context set for transform", 4 );
QgsDebugMsgLevel( QStringLiteral( "No QgsCoordinateTransformContext context set for transform" ), 4 );
#endif
// use proj4 to do the transform
@ -683,7 +683,7 @@ void QgsCoordinateTransform::transformCoords( int numPoints, double *x, double *
pj_dalloc( dstdef );
QgsDebugMsg( "Projection failed emitting invalid transform signal: " + msg );
QgsDebugMsg( "throwing exception" );
QgsDebugMsg( QStringLiteral( "throwing exception" ) );
throw QgsCsException( msg );
}

22
src/core/qgscoordinatetransform_p.cpp
View File

@ -111,7 +111,7 @@ bool QgsCoordinateTransformPrivate::initialize()
{
// Pass through with no projection since we have no idea what the layer
// coordinates are and projecting them may not be appropriate
QgsDebugMsgLevel( "Source CRS is invalid!", 4 );
QgsDebugMsgLevel( QStringLiteral( "Source CRS is invalid!" ), 4 );
return false;
}
@ -120,7 +120,7 @@ bool QgsCoordinateTransformPrivate::initialize()
//No destination projection is set so we set the default output projection to
//be the same as input proj.
mDestCRS = mSourceCRS;
QgsDebugMsgLevel( "Destination CRS is invalid!", 4 );
QgsDebugMsgLevel( QStringLiteral( "Destination CRS is invalid!" ), 4 );
return false;
}
@ -174,22 +174,22 @@ bool QgsCoordinateTransformPrivate::initialize()
#ifdef COORDINATE_TRANSFORM_VERBOSE
if ( mIsValid )
{
QgsDebugMsg( "------------------------------------------------------------" );
QgsDebugMsg( "The OGR Coordinate transformation for this layer was set to" );
QgsDebugMsg( QStringLiteral( "------------------------------------------------------------" ) );
QgsDebugMsg( QStringLiteral( "The OGR Coordinate transformation for this layer was set to" ) );
QgsLogger::debug<QgsCoordinateReferenceSystem>( "Input", mSourceCRS, __FILE__, __FUNCTION__, __LINE__ );
QgsLogger::debug<QgsCoordinateReferenceSystem>( "Output", mDestCRS, __FILE__, __FUNCTION__, __LINE__ );
QgsDebugMsg( "------------------------------------------------------------" );
QgsDebugMsg( QStringLiteral( "------------------------------------------------------------" ) );
}
else
{
QgsDebugMsg( "------------------------------------------------------------" );
QgsDebugMsg( "The OGR Coordinate transformation FAILED TO INITIALIZE!" );
QgsDebugMsg( "------------------------------------------------------------" );
QgsDebugMsg( QStringLiteral( "------------------------------------------------------------" ) );
QgsDebugMsg( QStringLiteral( "The OGR Coordinate transformation FAILED TO INITIALIZE!" ) );
QgsDebugMsg( QStringLiteral( "------------------------------------------------------------" ) );
}
#else
if ( !mIsValid )
{
QgsDebugMsg( "Coordinate transformation failed to initialize!" );
QgsDebugMsg( QStringLiteral( "Coordinate transformation failed to initialize!" ) );
}
#endif
@ -201,13 +201,13 @@ bool QgsCoordinateTransformPrivate::initialize()
// If the source and destination projection are the same, set the short
// circuit flag (no transform takes place)
mShortCircuit = true;
QgsDebugMsgLevel( "Source/Dest CRS equal, shortcircuit is set.", 3 );
QgsDebugMsgLevel( QStringLiteral( "Source/Dest CRS equal, shortcircuit is set." ), 3 );
}
else
{
// Transform must take place
mShortCircuit = false;
QgsDebugMsgLevel( "Source/Dest CRS not equal, shortcircuit is not set.", 3 );
QgsDebugMsgLevel( QStringLiteral( "Source/Dest CRS not equal, shortcircuit is not set." ), 3 );
}
return mIsValid;
}

4
src/core/qgscredentials.cpp
View File

@ -24,7 +24,7 @@ void QgsCredentials::setInstance( QgsCredentials *instance )
{
if ( sInstance )
{
QgsDebugMsg( "already registered an instance of QgsCredentials" );
QgsDebugMsg( QStringLiteral( "already registered an instance of QgsCredentials" ) );
}
sInstance = instance;
@ -73,7 +73,7 @@ bool QgsCredentials::getMasterPassword( QString &password, bool stored )
{
if ( requestMasterPassword( password, stored ) )
{
QgsDebugMsg( "requested master password" );
QgsDebugMsg( QStringLiteral( "requested master password" ) );
return true;
}
return false;

12
src/core/qgsdataitem.cpp
View File

@ -151,7 +151,7 @@ QgsDataItem::~QgsDataItem()
if ( mFutureWatcher && !mFutureWatcher->isFinished() )
{
// this should not usually happen (until the item was deleted directly when createChildren was running)
QgsDebugMsg( "mFutureWatcher not finished (should not happen) -> waitForFinished()" );
QgsDebugMsg( QStringLiteral( "mFutureWatcher not finished (should not happen) -> waitForFinished()" ) );
mDeferredDelete = true;
mFutureWatcher->waitForFinished();
}
@ -188,7 +188,7 @@ void QgsDataItem::deleteLater()
if ( mFutureWatcher && !mFutureWatcher->isFinished() )
{
QgsDebugMsg( "mFutureWatcher not finished -> schedule to delete later" );
QgsDebugMsg( QStringLiteral( "mFutureWatcher not finished -> schedule to delete later" ) );
mDeferredDelete = true;
}
else
@ -301,7 +301,7 @@ void QgsDataItem::childrenCreated()
if ( deferredDelete() )
{
QgsDebugMsg( "Item was scheduled to be deleted later" );
QgsDebugMsg( QStringLiteral( "Item was scheduled to be deleted later" ) );
QObject::deleteLater();
return;
}
@ -978,7 +978,7 @@ void QgsDirectoryItem::childrenCreated()
if ( mRefreshLater )
{
QgsDebugMsgLevel( "directory changed during createChidren() -> refresh() again", 3 );
QgsDebugMsgLevel( QStringLiteral( "directory changed during createChidren() -> refresh() again" ), 3 );
mRefreshLater = false;
setState( Populated );
refresh();
@ -1405,7 +1405,7 @@ QVector<QgsDataItem *> QgsZipItem::createChildren()
}
else
{
QgsDebugMsgLevel( "not loaded item", 3 );
QgsDebugMsgLevel( QStringLiteral( "not loaded item" ), 3 );
}
}
}
@ -1468,7 +1468,7 @@ QgsDataItem *QgsZipItem::itemFromPath( QgsDataItem *parent, const QString &fileP
// only display if has children or if is not populated
if ( zipItem && ( !populated || zipItem->rowCount() > 0 ) )
{
QgsDebugMsgLevel( "returning zipItem", 3 );
QgsDebugMsgLevel( QStringLiteral( "returning zipItem" ), 3 );
return zipItem;
}

18
src/core/qgsdatasourceuri.cpp
View File

@ -40,7 +40,7 @@ QgsDataSourceUri::QgsDataSourceUri( QString uri )
if ( uri[i] == '=' )
{
QgsDebugMsg( "parameter name expected before =" );
QgsDebugMsg( QStringLiteral( "parameter name expected before =" ) );
i++;
continue;
}
@ -102,7 +102,7 @@ QgsDataSourceUri::QgsDataSourceUri( QString uri )
if ( i == uri.length() )
{
QgsDebugMsg( "closing parenthesis missing" );
QgsDebugMsg( QStringLiteral( "closing parenthesis missing" ) );
}
mGeometryColumn = uri.mid( start, i - start );
@ -154,7 +154,7 @@ QgsDataSourceUri::QgsDataSourceUri( QString uri )
}
else if ( pname == QLatin1String( "connect_timeout" ) )
{
QgsDebugMsg( "connection timeout ignored" );
QgsDebugMsg( QStringLiteral( "connection timeout ignored" ) );
}
else if ( pname == QLatin1String( "dbname" ) )
{
@ -166,7 +166,7 @@ QgsDataSourceUri::QgsDataSourceUri( QString uri )
}
else if ( pname == QLatin1String( "hostaddr" ) )
{
QgsDebugMsg( "database host ip address ignored" );
QgsDebugMsg( QStringLiteral( "database host ip address ignored" ) );
}
else if ( pname == QLatin1String( "port" ) )
{
@ -178,11 +178,11 @@ QgsDataSourceUri::QgsDataSourceUri( QString uri )
}
else if ( pname == QLatin1String( "tty" ) )
{
QgsDebugMsg( "backend debug tty ignored" );
QgsDebugMsg( QStringLiteral( "backend debug tty ignored" ) );
}
else if ( pname == QLatin1String( "options" ) )
{
QgsDebugMsg( "backend debug options ignored" );
QgsDebugMsg( QStringLiteral( "backend debug options ignored" ) );
}
else if ( pname == QLatin1String( "sslmode" ) )
{
@ -197,11 +197,11 @@ QgsDataSourceUri::QgsDataSourceUri( QString uri )
}
else if ( pname == QLatin1String( "krbsrvname" ) )
{
QgsDebugMsg( "kerberos server name ignored" );
QgsDebugMsg( QStringLiteral( "kerberos server name ignored" ) );
}
else if ( pname == QLatin1String( "gsslib" ) )
{
QgsDebugMsg( "gsslib ignored" );
QgsDebugMsg( QStringLiteral( "gsslib ignored" ) );
}
else
{
@ -408,7 +408,7 @@ QString QgsDataSourceUri::getValue( const QString &uri, int &i )
{
if ( i == uri.length() )
{
QgsDebugMsg( "unterminated quoted string in connection info string" );
QgsDebugMsg( QStringLiteral( "unterminated quoted string in connection info string" ) );
return pval;
}

2
src/core/qgsdistancearea.cpp
View File

@ -330,7 +330,7 @@ double QgsDistanceArea::measureLine( const QgsPointXY &p1, const QgsPointXY &p2
}
else
{
QgsDebugMsgLevel( "Cartesian calculation on canvas coordinates", 4 );
QgsDebugMsgLevel( QStringLiteral( "Cartesian calculation on canvas coordinates" ), 4 );
result = p2.distance( p1 );
}
}

2
src/core/qgseditformconfig.cpp
View File

@ -77,7 +77,7 @@ bool QgsEditFormConfig::setWidgetConfig( const QString &widgetName, const QVaria
{
if ( d->mFields.indexOf( widgetName ) != -1 )
{
QgsDebugMsg( "Trying to set a widget config for a field on QgsEditFormConfig. Use layer->setEditorWidgetSetup() instead." );
QgsDebugMsg( QStringLiteral( "Trying to set a widget config for a field on QgsEditFormConfig. Use layer->setEditorWidgetSetup() instead." ) );
return false;
}

2
src/core/qgsfeaturerequest.cpp
View File

@ -331,7 +331,7 @@ QgsAbstractFeatureSource::~QgsAbstractFeatureSource()
while ( !mActiveIterators.empty() )
{
QgsAbstractFeatureIterator *it = *mActiveIterators.begin();
QgsDebugMsg( "closing active iterator" );
QgsDebugMsg( QStringLiteral( "closing active iterator" ) );
it->close();
}
}

12
src/core/qgsgml.cpp
View File

@ -822,7 +822,7 @@ void QgsGmlStreamingParser::startElement( const XML_Char *el, const XML_Char **a
{
if ( readEpsgFromAttribute( mEpsg, attr ) != 0 )
{
QgsDebugMsg( "error, could not get epsg id" );
QgsDebugMsg( QStringLiteral( "error, could not get epsg id" ) );
}
else
{
@ -902,7 +902,7 @@ void QgsGmlStreamingParser::endElement( const XML_Char *el )
!mBoundedByNullFound &&
!createBBoxFromCoordinateString( mCurrentExtent, mStringCash ) )
{
QgsDebugMsg( "creation of bounding box failed" );
QgsDebugMsg( QStringLiteral( "creation of bounding box failed" ) );
}
if ( !mCurrentExtent.isNull() && mLayerExtent.isNull() &&
!mCurrentFeature && mFeatureCount == 0 )
@ -1014,7 +1014,7 @@ void QgsGmlStreamingParser::endElement( const XML_Char *el )
}
else
{
QgsDebugMsg( "No wkb fragments" );
QgsDebugMsg( QStringLiteral( "No wkb fragments" ) );
delete [] wkbPtr;
}
}
@ -1053,7 +1053,7 @@ void QgsGmlStreamingParser::endElement( const XML_Char *el )
}
else
{
QgsDebugMsg( "no wkb fragments" );
QgsDebugMsg( QStringLiteral( "no wkb fragments" ) );
delete [] wkbPtr;
}
}
@ -1080,7 +1080,7 @@ void QgsGmlStreamingParser::endElement( const XML_Char *el )
else
{
delete[] wkbPtr;
QgsDebugMsg( "no wkb fragments" );
QgsDebugMsg( QStringLiteral( "no wkb fragments" ) );
}
}
else if ( ( parseMode == Geometry || parseMode == MultiPolygon ) && isGMLNS &&
@ -1313,7 +1313,7 @@ int QgsGmlStreamingParser::pointsFromPosListString( QList<QgsPointXY> &points, c
if ( coordinates.size() % dimension != 0 )
{
QgsDebugMsg( "Wrong number of coordinates" );
QgsDebugMsg( QStringLiteral( "Wrong number of coordinates" ) );
}
int ncoor = coordinates.size() / dimension;

4
src/core/qgslayerdefinition.cpp
View File

@ -286,14 +286,14 @@ QList<QgsMapLayer *> QgsLayerDefinition::loadLayerDefinitionLayers( const QStrin
QFile file( qlrfile );
if ( !file.open( QIODevice::ReadOnly ) )
{
QgsDebugMsg( "Can't open file" );
QgsDebugMsg( QStringLiteral( "Can't open file" ) );
return QList<QgsMapLayer *>();
}
QDomDocument doc;
if ( !doc.setContent( &file ) )
{
QgsDebugMsg( "Can't set content" );
QgsDebugMsg( QStringLiteral( "Can't set content" ) );
return QList<QgsMapLayer *>();
}

4
src/core/qgsmaplayerlegend.cpp
View File

@ -85,7 +85,7 @@ static QList<int> _makeNodeOrder( QgsLayerTreeLayer *nodeLayer )
{
if ( !nodeLayer->layer() || !nodeLayer->layer()->legend() )
{
QgsDebugMsg( "Legend node order manipulation is invalid without existing legend" );
QgsDebugMsg( QStringLiteral( "Legend node order manipulation is invalid without existing legend" ) );
return QList<int>();
}
@ -167,7 +167,7 @@ void QgsMapLayerLegendUtils::applyLayerNodeProperties( QgsLayerTreeLayer *nodeLa
{
if ( usedIndices.contains( idx ) )
{
QgsDebugMsg( "invalid node order. ignoring." );
QgsDebugMsg( QStringLiteral( "invalid node order. ignoring." ) );
return;
}

2
src/core/qgsmaplayerstore.cpp
View File

@ -57,7 +57,7 @@ QList<QgsMapLayer *> QgsMapLayerStore::addMapLayers( const QList<QgsMapLayer *>
{
if ( !myLayer || !myLayer->isValid() )
{
QgsDebugMsg( "Cannot add invalid layers" );
QgsDebugMsg( QStringLiteral( "Cannot add invalid layers" ) );
continue;
}
//check the layer is not already registered!

2
src/core/qgsmaplayerstyle.cpp
View File

@ -72,7 +72,7 @@ void QgsMapLayerStyle::writeToLayer( QgsMapLayer *layer ) const
QDomDocument doc( QStringLiteral( "qgis" ) );
if ( !doc.setContent( mXmlData ) )
{
QgsDebugMsg( "Failed to parse XML of previously stored XML data - this should not happen!" );
QgsDebugMsg( QStringLiteral( "Failed to parse XML of previously stored XML data - this should not happen!" ) );
return;
}

26
src/core/qgsmaprenderercustompainterjob.cpp
View File

@ -32,12 +32,12 @@ QgsMapRendererCustomPainterJob::QgsMapRendererCustomPainterJob( const QgsMapSett
, mActive( false )
, mRenderSynchronously( false )
{
QgsDebugMsgLevel( "QPAINTER construct", 5 );
QgsDebugMsgLevel( QStringLiteral( "QPAINTER construct" ), 5 );
}
QgsMapRendererCustomPainterJob::~QgsMapRendererCustomPainterJob()
{
QgsDebugMsgLevel( "QPAINTER destruct", 5 );
QgsDebugMsgLevel( QStringLiteral( "QPAINTER destruct" ), 5 );
Q_ASSERT( !mFutureWatcher.isRunning() );
//cancel();
}
@ -53,9 +53,9 @@ void QgsMapRendererCustomPainterJob::start()
mErrors.clear();
QgsDebugMsgLevel( "QPAINTER run!", 5 );
QgsDebugMsgLevel( QStringLiteral( "QPAINTER run!" ), 5 );
QgsDebugMsgLevel( "Preparing list of layer jobs for rendering", 5 );
QgsDebugMsgLevel( QStringLiteral( "Preparing list of layer jobs for rendering" ), 5 );
QTime prepareTime;
prepareTime.start();
@ -103,11 +103,11 @@ void QgsMapRendererCustomPainterJob::cancel()
{
if ( !isActive() )
{
QgsDebugMsgLevel( "QPAINTER not running!", 4 );
QgsDebugMsgLevel( QStringLiteral( "QPAINTER not running!" ), 4 );
return;
}
QgsDebugMsgLevel( "QPAINTER canceling", 5 );
QgsDebugMsgLevel( QStringLiteral( "QPAINTER canceling" ), 5 );
disconnect( &mFutureWatcher, &QFutureWatcher<void>::finished, this, &QgsMapRendererCustomPainterJob::futureFinished );
cancelWithoutBlocking();
@ -120,14 +120,14 @@ void QgsMapRendererCustomPainterJob::cancel()
futureFinished();
QgsDebugMsgLevel( "QPAINTER canceled", 5 );
QgsDebugMsgLevel( QStringLiteral( "QPAINTER canceled" ), 5 );
}
void QgsMapRendererCustomPainterJob::cancelWithoutBlocking()
{
if ( !isActive() )
{
QgsDebugMsg( "QPAINTER not running!" );
QgsDebugMsg( QStringLiteral( "QPAINTER not running!" ) );
return;
}
@ -197,7 +197,7 @@ void QgsMapRendererCustomPainterJob::futureFinished()
{
mActive = false;
mRenderingTime = mRenderingStart.elapsed();
QgsDebugMsgLevel( "QPAINTER futureFinished", 5 );
QgsDebugMsgLevel( QStringLiteral( "QPAINTER futureFinished" ), 5 );
logRenderingTime( mLayerJobs, mLabelJob );
@ -227,13 +227,13 @@ void QgsMapRendererCustomPainterJob::staticRender( QgsMapRendererCustomPainterJo
}
catch ( ... )
{
QgsDebugMsg( "Caught unhandled unknown exception" );
QgsDebugMsg( QStringLiteral( "Caught unhandled unknown exception" ) );
}
}
void QgsMapRendererCustomPainterJob::doRender()
{
QgsDebugMsgLevel( "Starting to render layer stack.", 5 );
QgsDebugMsgLevel( QStringLiteral( "Starting to render layer stack." ), 5 );
QTime renderTime;
renderTime.start();
@ -277,7 +277,7 @@ void QgsMapRendererCustomPainterJob::doRender()
}
QgsDebugMsgLevel( "Done rendering map layers", 5 );
QgsDebugMsgLevel( QStringLiteral( "Done rendering map layers" ), 5 );
if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) && !mLabelJob.context.renderingStopped() )
{
@ -318,7 +318,7 @@ void QgsMapRendererCustomPainterJob::doRender()
void QgsMapRendererJob::drawLabeling( const QgsMapSettings &settings, QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter )
{
QgsDebugMsgLevel( "Draw labeling start", 5 );
QgsDebugMsgLevel( QStringLiteral( "Draw labeling start" ), 5 );
QTime t;
t.start();

6
src/core/qgsmaprendererjob.cpp
View File

@ -208,7 +208,7 @@ bool QgsMapRendererJob::reprojectToLayerExtent( const QgsMapLayer *ml, const Qgs
catch ( QgsCsException &cse )
{
Q_UNUSED( cse );
QgsDebugMsg( "Transform error caught" );
QgsDebugMsg( QStringLiteral( "Transform error caught" ) );
extent = QgsRectangle( std::numeric_limits<double>::lowest(), std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max(), std::numeric_limits<double>::max() );
r2 = QgsRectangle( std::numeric_limits<double>::lowest(), std::numeric_limits<double>::lowest(), std::numeric_limits<double>::max(), std::numeric_limits<double>::max() );
}
@ -247,7 +247,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter *painter, QgsLabelingEn
if ( !ml->isInScaleRange( mSettings.scale() ) ) //|| mOverview )
{
QgsDebugMsgLevel( "Layer not rendered because it is not within the defined visibility scale range", 3 );
QgsDebugMsgLevel( QStringLiteral( "Layer not rendered because it is not within the defined visibility scale range" ), 3 );
continue;
}
@ -435,7 +435,7 @@ void QgsMapRendererJob::cleanupLabelJob( LabelRenderJob &job )
{
if ( mCache && !job.cached && !job.context.renderingStopped() )
{
QgsDebugMsg( "caching label result image" );
QgsDebugMsg( QStringLiteral( "caching label result image" ) );
mCache->setCacheImage( LABEL_CACHE_ID, *job.img, _qgis_listQPointerToRaw( job.participatingLayers ) );
}

8
src/core/qgsmaprendererparalleljob.cpp
View File

@ -198,7 +198,7 @@ void QgsMapRendererParallelJob::renderLayersFinished()
// compose final image
mFinalImage = composeImage( mSettings, mLayerJobs, mLabelJob );
QgsDebugMsg( "PARALLEL layers finished" );
QgsDebugMsg( QStringLiteral( "PARALLEL layers finished" ) );
if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) && !mLabelJob.context.renderingStopped() )
{
@ -219,7 +219,7 @@ void QgsMapRendererParallelJob::renderLayersFinished()
void QgsMapRendererParallelJob::renderingFinished()
{
QgsDebugMsg( "PARALLEL finished" );
QgsDebugMsg( QStringLiteral( "PARALLEL finished" ) );
logRenderingTime( mLayerJobs, mLabelJob );
@ -267,7 +267,7 @@ void QgsMapRendererParallelJob::renderLayerStatic( LayerRenderJob &job )
}
catch ( ... )
{
QgsDebugMsg( "Caught unhandled unknown exception" );
QgsDebugMsg( QStringLiteral( "Caught unhandled unknown exception" ) );
}
job.renderingTime += t.elapsed();
QgsDebugMsgLevel( QStringLiteral( "job %1 end [%2 ms] (layer %3)" ).arg( reinterpret_cast< quint64 >( &job ), 0, 16 ).arg( job.renderingTime ).arg( job.layer ? job.layer->id() : QString() ), 2 );
@ -311,7 +311,7 @@ void QgsMapRendererParallelJob::renderLabelsStatic( QgsMapRendererParallelJob *s
}
catch ( ... )
{
QgsDebugMsg( "Caught unhandled unknown exception" );
QgsDebugMsg( QStringLiteral( "Caught unhandled unknown exception" ) );
}
painter.end();

14
src/core/qgsmaprenderersequentialjob.cpp
View File

@ -23,7 +23,7 @@ QgsMapRendererSequentialJob::QgsMapRendererSequentialJob( const QgsMapSettings &
: QgsMapRendererQImageJob( settings )
{
QgsDebugMsgLevel( "SEQUENTIAL construct", 5 );
QgsDebugMsgLevel( QStringLiteral( "SEQUENTIAL construct" ), 5 );
mImage = QImage( mSettings.outputSize(), mSettings.outputImageFormat() );
mImage.setDotsPerMeterX( 1000 * settings.outputDpi() / 25.4 );
@ -33,11 +33,11 @@ QgsMapRendererSequentialJob::QgsMapRendererSequentialJob( const QgsMapSettings &
QgsMapRendererSequentialJob::~QgsMapRendererSequentialJob()
{
QgsDebugMsgLevel( "SEQUENTIAL destruct", 5 );
QgsDebugMsgLevel( QStringLiteral( "SEQUENTIAL destruct" ), 5 );
if ( isActive() )
{
// still running!
QgsDebugMsgLevel( "SEQUENTIAL destruct -- still running! (canceling)", 5 );
QgsDebugMsgLevel( QStringLiteral( "SEQUENTIAL destruct -- still running! (canceling)" ), 5 );
cancel();
}
@ -56,7 +56,7 @@ void QgsMapRendererSequentialJob::start()
mErrors.clear();
QgsDebugMsgLevel( "SEQUENTIAL START", 5 );
QgsDebugMsgLevel( QStringLiteral( "SEQUENTIAL START" ), 5 );
Q_ASSERT( !mInternalJob && !mPainter );
@ -76,7 +76,7 @@ void QgsMapRendererSequentialJob::cancel()
if ( !isActive() )
return;
QgsDebugMsgLevel( "sequential - cancel internal", 5 );
QgsDebugMsgLevel( QStringLiteral( "sequential - cancel internal" ), 5 );
mInternalJob->cancel();
Q_ASSERT( !mInternalJob && !mPainter );
@ -87,7 +87,7 @@ void QgsMapRendererSequentialJob::cancelWithoutBlocking()
if ( !isActive() )
return;
QgsDebugMsgLevel( "sequential - cancel internal", 5 );
QgsDebugMsgLevel( QStringLiteral( "sequential - cancel internal" ), 5 );
mInternalJob->cancelWithoutBlocking();
}
@ -127,7 +127,7 @@ QImage QgsMapRendererSequentialJob::renderedImage()
void QgsMapRendererSequentialJob::internalFinished()
{
QgsDebugMsgLevel( "SEQUENTIAL finished", 5 );
QgsDebugMsgLevel( QStringLiteral( "SEQUENTIAL finished" ), 5 );
mPainter->end();
delete mPainter;

2
src/core/qgsmapsettings.cpp
View File

@ -372,7 +372,7 @@ QgsCoordinateTransformContext QgsMapSettings::transformContext() const
{
#ifdef QGISDEBUG
if ( !mHasTransformContext )
QgsDebugMsgLevel( "No QgsCoordinateTransformContext context set for transform", 4 );
QgsDebugMsgLevel( QStringLiteral( "No QgsCoordinateTransformContext context set for transform" ), 4 );
#endif
return mTransformContext;

10
src/core/qgsofflineediting.cpp
View File

@ -270,7 +270,7 @@ void QgsOfflineEditing::synchronize()
QgsDebugMsgLevel( QStringLiteral( "Found %1 commits" ).arg( commitNo ), 4 );
for ( int i = 0; i < commitNo; i++ )
{
QgsDebugMsgLevel( "Apply commits chronologically", 4 );
QgsDebugMsgLevel( QStringLiteral( "Apply commits chronologically" ), 4 );
// apply commits chronologically
applyAttributesAdded( remoteLayer, database.get(), layerId, i );
applyAttributeValueChanges( offlineLayer, remoteLayer, database.get(), layerId, i );
@ -304,7 +304,7 @@ void QgsOfflineEditing::synchronize()
}
else
{
QgsDebugMsg( "Could not find the layer id in the edit logs!" );
QgsDebugMsg( QStringLiteral( "Could not find the layer id in the edit logs!" ) );
}
// Invalidate the connection to force a reload if the project is put offline
// again with the same path
@ -322,7 +322,7 @@ void QgsOfflineEditing::synchronize()
}
else
{
QgsDebugMsg( "Remote layer is not valid!" );
QgsDebugMsg( QStringLiteral( "Remote layer is not valid!" ) );
}
}
@ -1085,13 +1085,13 @@ sqlite3_database_unique_ptr QgsOfflineEditing::openLoggingDb()
int rc = database.open( absoluteDbPath );
if ( rc != SQLITE_OK )
{
QgsDebugMsg( "Could not open the SpatiaLite logging database" );
QgsDebugMsg( QStringLiteral( "Could not open the SpatiaLite logging database" ) );
showWarning( tr( "Could not open the SpatiaLite logging database" ) );
}
}
else
{
QgsDebugMsg( "dbPath is empty!" );
QgsDebugMsg( QStringLiteral( "dbPath is empty!" ) );
}
return database;
}

2
src/core/qgsogrutils.cpp
View File

@ -175,7 +175,7 @@ QVariant QgsOgrUtils::getOgrFeatureAttribute( OGRFeatureH ogrFet, const QgsField
if ( ok )
*ok = false;
QgsDebugMsg( "ogrFet->GetFieldDefnRef(attindex) returns NULL" );
QgsDebugMsg( QStringLiteral( "ogrFet->GetFieldDefnRef(attindex) returns NULL" ) );
return QVariant();
}

2
src/core/qgspluginlayerregistry.cpp
View File

@ -56,7 +56,7 @@ QgsPluginLayerRegistry::~QgsPluginLayerRegistry()
{
if ( !mPluginLayerTypes.isEmpty() )
{
QgsDebugMsg( "QgsPluginLayerRegistry::~QgsPluginLayerRegistry(): creator list not empty" );
QgsDebugMsg( QStringLiteral( "QgsPluginLayerRegistry::~QgsPluginLayerRegistry(): creator list not empty" ) );
PluginLayerTypes::const_iterator it = mPluginLayerTypes.constBegin();
for ( ; it != mPluginLayerTypes.constEnd(); ++it )
{

10
src/core/qgsprojectbadlayerhandler.cpp
View File

@ -35,20 +35,20 @@ QgsProjectBadLayerHandler::DataType QgsProjectBadLayerHandler::dataType( const Q
if ( type.isNull() )
{
QgsDebugMsg( "cannot find ``type'' attribute" );
QgsDebugMsg( QStringLiteral( "cannot find ``type'' attribute" ) );
return IS_BOGUS;
}
if ( "raster" == type )
{
QgsDebugMsg( "is a raster" );
QgsDebugMsg( QStringLiteral( "is a raster" ) );
return IS_RASTER;
}
else if ( "vector" == type )
{
QgsDebugMsg( "is a vector" );
QgsDebugMsg( QStringLiteral( "is a vector" ) );
return IS_VECTOR;
}
@ -64,7 +64,7 @@ QString QgsProjectBadLayerHandler::dataSource( const QDomNode &layerNode )
if ( dataSourceNode.isNull() )
{
QgsDebugMsg( "cannot find datasource node" );
QgsDebugMsg( QStringLiteral( "cannot find datasource node" ) );
return QString();
}
@ -103,7 +103,7 @@ QgsProjectBadLayerHandler::ProviderType QgsProjectBadLayerHandler::providerType(
return IS_FILE;
default:
QgsDebugMsg( "unknown ``type'' attribute" );
QgsDebugMsg( QStringLiteral( "unknown ``type'' attribute" ) );
}
return IS_Unknown;

8
src/core/qgsprojectfiletransform.cpp
View File

@ -108,7 +108,7 @@ void QgsProjectFileTransform::dump()
void QgsProjectFileTransform::transform081to090()
{
QgsDebugMsg( "Entering..." );
QgsDebugMsg( QStringLiteral( "Entering..." ) );
if ( ! mDom.isNull() )
{
// Start with inserting a mapcanvas element and populate it
@ -119,7 +119,7 @@ void QgsProjectFileTransform::transform081to090()
QDomNode qgis = mDom.firstChildElement( QStringLiteral( "qgis" ) );
if ( ! qgis.isNull() )
{
QgsDebugMsg( "Populating new mapcanvas" );
QgsDebugMsg( QStringLiteral( "Populating new mapcanvas" ) );
// Create a mapcanvas
mapCanvas = mDom.createElement( QStringLiteral( "mapcanvas" ) );
@ -197,7 +197,7 @@ void QgsProjectFileTransform::transform081to090()
if ( id == legendLayerFile.attribute( QStringLiteral( "layerid" ) ) )
{
// Found a the legend layer that matches the maplayer
QgsDebugMsg( "Found matching id" );
QgsDebugMsg( QStringLiteral( "Found matching id" ) );
// Set visible flag from maplayer to legendlayer
legendLayerFile.setAttribute( QStringLiteral( "visible" ), mapLayer.attribute( QStringLiteral( "visible" ) ) );
@ -376,7 +376,7 @@ void QgsProjectFileTransform::transform0110to1000()
void QgsProjectFileTransform::transform1100to1200()
{
QgsDebugMsg( "Entering..." );
QgsDebugMsg( QStringLiteral( "Entering..." ) );
if ( mDom.isNull() )
return;

38
src/core/qgsprojectproperty.cpp
View File

@ -85,11 +85,11 @@ bool QgsProjectPropertyValue::readXml( const QDomNode &keyNode )
return false;
case QVariant::Map:
QgsDebugMsg( "no support for QVariant::Map" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Map" ) );
return false;
case QVariant::List:
QgsDebugMsg( "no support for QVariant::List" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::List" ) );
return false;
case QVariant::String:
@ -124,39 +124,39 @@ bool QgsProjectPropertyValue::readXml( const QDomNode &keyNode )
}
case QVariant::Font:
QgsDebugMsg( "no support for QVariant::Font" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Font" ) );
return false;
case QVariant::Pixmap:
QgsDebugMsg( "no support for QVariant::Pixmap" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Pixmap" ) );
return false;
case QVariant::Brush:
QgsDebugMsg( "no support for QVariant::Brush" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Brush" ) );
return false;
case QVariant::Rect:
QgsDebugMsg( "no support for QVariant::Rect" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Rect" ) );
return false;
case QVariant::Size:
QgsDebugMsg( "no support for QVariant::Size" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Size" ) );
return false;
case QVariant::Color:
QgsDebugMsg( "no support for QVariant::Color" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Color" ) );
return false;
case QVariant::Palette:
QgsDebugMsg( "no support for QVariant::Palette" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Palette" ) );
return false;
case QVariant::Point:
QgsDebugMsg( "no support for QVariant::Point" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Point" ) );
return false;
case QVariant::Image:
QgsDebugMsg( "no support for QVariant::Image" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Image" ) );
return false;
case QVariant::Int:
@ -180,31 +180,31 @@ bool QgsProjectPropertyValue::readXml( const QDomNode &keyNode )
break;
case QVariant::Polygon:
QgsDebugMsg( "no support for QVariant::Polygon" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Polygon" ) );
return false;
case QVariant::Region:
QgsDebugMsg( "no support for QVariant::Region" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Region" ) );
return false;
case QVariant::Bitmap:
QgsDebugMsg( "no support for QVariant::Bitmap" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Bitmap" ) );
return false;
case QVariant::Cursor:
QgsDebugMsg( "no support for QVariant::Cursor" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Cursor" ) );
return false;
case QVariant::BitArray :
QgsDebugMsg( "no support for QVariant::BitArray" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::BitArray" ) );
return false;
case QVariant::KeySequence :
QgsDebugMsg( "no support for QVariant::KeySequence" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::KeySequence" ) );
return false;
case QVariant::Pen :
QgsDebugMsg( "no support for QVariant::Pen" );
QgsDebugMsg( QStringLiteral( "no support for QVariant::Pen" ) );
return false;
#if 0 // Currently unsupported variant types
@ -283,7 +283,7 @@ QVariant QgsProjectPropertyKey::value() const
if ( !foundQgsProperty )
{
QgsDebugMsg( "key has null child" );
QgsDebugMsg( QStringLiteral( "key has null child" ) );
return QVariant(); // just return an QVariant::Invalid
}

2
src/core/qgsproviderregistry.cpp
View File

@ -406,7 +406,7 @@ QgsDataProvider *QgsProviderRegistry::createProvider( QString const &providerKey
}
else
{
QgsDebugMsg( "dlopen succeeded" );
QgsDebugMsg( QStringLiteral( "dlopen succeeded" ) );
dlclose( handle );
}

4
src/core/qgspythonrunner.cpp
View File

@ -34,7 +34,7 @@ bool QgsPythonRunner::run( const QString &command, const QString &messageOnError
}
else
{
QgsDebugMsg( "Unable to run Python command: runner not available!" );
QgsDebugMsg( QStringLiteral( "Unable to run Python command: runner not available!" ) );
return false;
}
}
@ -47,7 +47,7 @@ bool QgsPythonRunner::eval( const QString &command, QString &result )
}
else
{
QgsDebugMsg( "Unable to run Python command: runner not available!" );
QgsDebugMsg( QStringLiteral( "Unable to run Python command: runner not available!" ) );
return false;
}
}

4
src/core/qgsrelation.cpp
View File

@ -364,7 +364,7 @@ void QgsRelation::updateRelationStatus()
if ( d->mRelationId.isEmpty() )
{
QgsDebugMsg( "Invalid relation: no ID" );
QgsDebugMsg( QStringLiteral( "Invalid relation: no ID" ) );
d->mValid = false;
}
else
@ -383,7 +383,7 @@ void QgsRelation::updateRelationStatus()
{
if ( d->mFieldPairs.count() < 1 )
{
QgsDebugMsgLevel( "Invalid relation: no pair of field is specified.", 4 );
QgsDebugMsgLevel( QStringLiteral( "Invalid relation: no pair of field is specified." ), 4 );
d->mValid = false;
}

4
src/core/qgsrelationmanager.cpp
View File

@ -170,7 +170,7 @@ void QgsRelationManager::readProject( const QDomDocument &doc, QgsReadWriteConte
}
else
{
QgsDebugMsg( "No relations data present in this document" );
QgsDebugMsg( QStringLiteral( "No relations data present in this document" ) );
}
emit relationsLoaded();
@ -182,7 +182,7 @@ void QgsRelationManager::writeProject( QDomDocument &doc )
QDomNodeList nl = doc.elementsByTagName( QStringLiteral( "qgis" ) );
if ( !nl.count() )
{
QgsDebugMsg( "Unable to find qgis element in project file" );
QgsDebugMsg( QStringLiteral( "Unable to find qgis element in project file" ) );
return;
}
QDomNode qgisNode = nl.item( 0 ); // there should only be one

2
src/core/qgsrendercontext.cpp
View File

@ -110,7 +110,7 @@ QgsCoordinateTransformContext QgsRenderContext::transformContext() const
{
#ifdef QGISDEBUG
if ( !mHasTransformContext )
QgsDebugMsgLevel( "No QgsCoordinateTransformContext context set for transform", 4 );
QgsDebugMsgLevel( QStringLiteral( "No QgsCoordinateTransformContext context set for transform" ), 4 );
#endif
return mTransformContext;
}

2
src/core/qgsrulebasedlabeling.cpp
View File

@ -238,7 +238,7 @@ QgsRuleBasedLabeling::Rule *QgsRuleBasedLabeling::Rule::create( const QDomElemen
}
else
{
//QgsDebugMsg( "failed to init a child rule!" );
//QgsDebugMsg( QStringLiteral( "failed to init a child rule!" ) );
}
childRuleElem = childRuleElem.nextSiblingElement( QStringLiteral( "rule" ) );
}

2
src/core/qgsscalecalculator.cpp
View File

@ -79,7 +79,7 @@ double QgsScaleCalculator::calculate( const QgsRectangle &mapExtent, int canvasW
}
if ( canvasWidth == 0 || qgsDoubleNear( mDpi, 0.0 ) )
{
QgsDebugMsg( "Can't calculate scale from the input values" );
QgsDebugMsg( QStringLiteral( "Can't calculate scale from the input values" ) );
return 0;
}
double scale = ( delta * conversionFactor ) / ( static_cast< double >( canvasWidth ) / mDpi );

8
src/core/qgssettings.h
View File

@ -239,7 +239,7 @@ class CORE_EXPORT QgsSettings : public QObject
Q_ASSERT( metaEnum.isValid() );
if ( !metaEnum.isValid() )
{
QgsDebugMsg( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." );
QgsDebugMsg( QStringLiteral( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." ) );
}
T v;
@ -295,7 +295,7 @@ class CORE_EXPORT QgsSettings : public QObject
}
else
{
QgsDebugMsg( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." );
QgsDebugMsg( QStringLiteral( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." ) );
}
}
@ -317,7 +317,7 @@ class CORE_EXPORT QgsSettings : public QObject
Q_ASSERT( metaEnum.isValid() );
if ( !metaEnum.isValid() )
{
QgsDebugMsg( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." );
QgsDebugMsg( QStringLiteral( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." ) );
}
T v;
@ -373,7 +373,7 @@ class CORE_EXPORT QgsSettings : public QObject
}
else
{
QgsDebugMsg( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." );
QgsDebugMsg( QStringLiteral( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." ) );
}
}
#endif

4
src/core/qgsvectordataprovider.cpp
View File

@ -387,11 +387,11 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
}
}
QgsDebugMsg( "native type matches" );
QgsDebugMsg( QStringLiteral( "native type matches" ) );
return true;
}
QgsDebugMsg( "no sufficient native type found" );
QgsDebugMsg( QStringLiteral( "no sufficient native type found" ) );
return false;
}

10
src/core/qgsvectorfilewriter.cpp
View File

@ -363,11 +363,11 @@ void QgsVectorFileWriter::init( QString vectorFileName,
if ( action == CreateOrOverwriteFile )
{
QgsDebugMsg( "Created data source" );
QgsDebugMsg( QStringLiteral( "Created data source" ) );
}
else
{
QgsDebugMsg( "Opened data source in update mode" );
QgsDebugMsg( QStringLiteral( "Opened data source in update mode" ) );
}
// use appropriate codec
@ -481,7 +481,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
OGRFeatureDefnH defn = OGR_L_GetLayerDefn( mLayer );
QgsDebugMsg( "created layer" );
QgsDebugMsg( QStringLiteral( "created layer" ) );
// create the fields
QgsDebugMsg( "creating " + QString::number( fields.size() ) + " fields" );
@ -687,7 +687,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
}
}
QgsDebugMsg( "Done creating fields" );
QgsDebugMsg( QStringLiteral( "Done creating fields" ) );
mWkbType = geometryType;
@ -2316,7 +2316,7 @@ QgsVectorFileWriter::~QgsVectorFileWriter()
{
if ( OGRERR_NONE != OGR_L_CommitTransaction( mLayer ) )
{
QgsDebugMsg( "Error while committing transaction on OGRLayer." );
QgsDebugMsg( QStringLiteral( "Error while committing transaction on OGRLayer." ) );
}
}

12
src/core/qgsvectorlayer.cpp
View File

@ -1203,12 +1203,12 @@ QgsGeometry::OperationResult QgsVectorLayer::addPart( const QList<QgsPointXY> &p
if ( mSelectedFeatureIds.empty() )
{
QgsDebugMsgLevel( "Number of selected features < 1", 3 );
QgsDebugMsgLevel( QStringLiteral( "Number of selected features < 1" ), 3 );
return QgsGeometry::OperationResult::SelectionIsEmpty;
}
else if ( mSelectedFeatureIds.size() > 1 )
{
QgsDebugMsgLevel( "Number of selected features > 1", 3 );
QgsDebugMsgLevel( QStringLiteral( "Number of selected features > 1" ), 3 );
return QgsGeometry::OperationResult::SelectionIsGreaterThanOne;
}
@ -1229,12 +1229,12 @@ QgsGeometry::OperationResult QgsVectorLayer::addPart( const QgsPointSequence &po
if ( mSelectedFeatureIds.empty() )
{
QgsDebugMsgLevel( "Number of selected features <1", 3 );
QgsDebugMsgLevel( QStringLiteral( "Number of selected features <1" ), 3 );
return QgsGeometry::OperationResult::SelectionIsEmpty;
}
else if ( mSelectedFeatureIds.size() > 1 )
{
QgsDebugMsgLevel( "Number of selected features >1", 3 );
QgsDebugMsgLevel( QStringLiteral( "Number of selected features >1" ), 3 );
return QgsGeometry::OperationResult::SelectionIsGreaterThanOne;
}
@ -1255,12 +1255,12 @@ QgsGeometry::OperationResult QgsVectorLayer::addPart( QgsCurve *ring )
if ( mSelectedFeatureIds.empty() )
{
QgsDebugMsgLevel( "Number of selected features <1", 3 );
QgsDebugMsgLevel( QStringLiteral( "Number of selected features <1" ), 3 );
return QgsGeometry::OperationResult::SelectionIsEmpty;
}
else if ( mSelectedFeatureIds.size() > 1 )
{
QgsDebugMsgLevel( "Number of selected features >1", 3 );
QgsDebugMsgLevel( QStringLiteral( "Number of selected features >1" ), 3 );
return QgsGeometry::OperationResult::SelectionIsGreaterThanOne;
}

8
src/core/qgsvectorlayereditbuffer.cpp
View File

@ -147,7 +147,7 @@ bool QgsVectorLayerEditBuffer::deleteFeature( QgsFeatureId fid )
{
if ( !( L->dataProvider()->capabilities() & QgsVectorDataProvider::DeleteFeatures ) )
{
QgsDebugMsg( "Cannot delete features (missing DeleteFeature capability)" );
QgsDebugMsg( QStringLiteral( "Cannot delete features (missing DeleteFeature capability)" ) );
return false;
}
@ -155,7 +155,7 @@ bool QgsVectorLayerEditBuffer::deleteFeature( QgsFeatureId fid )
{
if ( !mAddedFeatures.contains( fid ) )
{
QgsDebugMsg( "Cannot delete features (in the list of added features)" );
QgsDebugMsg( QStringLiteral( "Cannot delete features (in the list of added features)" ) );
return false;
}
}
@ -163,7 +163,7 @@ bool QgsVectorLayerEditBuffer::deleteFeature( QgsFeatureId fid )
{
if ( mDeletedFeatureIds.contains( fid ) )
{
QgsDebugMsg( "Cannot delete features (in the list of deleted features)" );
QgsDebugMsg( QStringLiteral( "Cannot delete features (in the list of deleted features)" ) );
return false;
}
}
@ -176,7 +176,7 @@ bool QgsVectorLayerEditBuffer::deleteFeatures( const QgsFeatureIds &fids )
{
if ( !( L->dataProvider()->capabilities() & QgsVectorDataProvider::DeleteFeatures ) )
{
QgsDebugMsg( "Cannot delete features (missing DeleteFeatures capability)" );
QgsDebugMsg( QStringLiteral( "Cannot delete features (missing DeleteFeatures capability)" ) );
return false;
}

Some files were not shown because too many files have changed in this diff Show More