Skip to content

Commit

Permalink
Silence some clazy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jun 11, 2019
1 parent 296bfde commit d35197f
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions src/core/qgscoordinatetransform_p.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,9 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
}
else
{
const QString err = QObject::tr( "Could not use operation specified in project between %1 and %2. (Wanted to use: %3)." ).arg( mSourceCRS.authid() )
.arg( mDestCRS.authid() )
.arg( mProjCoordinateOperation );
const QString err = QObject::tr( "Could not use operation specified in project between %1 and %2. (Wanted to use: %3)." ).arg( mSourceCRS.authid(),
mDestCRS.authid(),
mProjCoordinateOperation );
QgsMessageLog::logMessage( err, QString(), Qgis::Critical );
}

Expand Down Expand Up @@ -395,9 +395,9 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
}
else
{
const QString err = QObject::tr( "Cannot create transform between %1 and %2, missing required grid %3" ).arg( mSourceCRS.authid() )
.arg( mDestCRS.authid() )
.arg( shortName );
const QString err = QObject::tr( "Cannot create transform between %1 and %2, missing required grid %3" ).arg( mSourceCRS.authid(),
mDestCRS.authid(),
shortName );
QgsMessageLog::logMessage( err, QString(), Qgis::Critical );
}
break;
Expand All @@ -411,8 +411,9 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
transform.reset( proj_normalize_for_visualization( context, transform.get() ) );
if ( !transform )
{
const QString err = QObject::tr( "Cannot normalize transform between %1 and %2" ).arg( mSourceCRS.authid() )
.arg( mDestCRS.authid() );
const QString err = QObject::tr( "Cannot normalize transform between %1 and %2" ).arg( mSourceCRS.authid(),
mDestCRS.authid() );
QgsMessageLog::logMessage( err, QString(), Qgis::Critical );
}
}
}
Expand Down Expand Up @@ -450,9 +451,10 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
}
else
{
const QString err = QObject::tr( "Using non-preferred coordinate operation between %1 and %2. Using %3, preferred %4." ).arg( mSourceCRS.authid() )
.arg( mDestCRS.authid() )
.arg( available.proj, preferred.proj );
const QString err = QObject::tr( "Using non-preferred coordinate operation between %1 and %2. Using %3, preferred %4." ).arg( mSourceCRS.authid(),
mDestCRS.authid(),
available.proj,
preferred.proj );
QgsMessageLog::logMessage( err, QString(), Qgis::Critical );
}
}
Expand All @@ -462,8 +464,8 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
transform.reset( proj_normalize_for_visualization( context, transform.get() ) );
if ( !transform )
{
const QString err = QObject::tr( "Cannot normalize transform between %1 and %2" ).arg( mSourceCRS.authid() )
.arg( mDestCRS.authid() );
const QString err = QObject::tr( "Cannot normalize transform between %1 and %2" ).arg( mSourceCRS.authid(),
mDestCRS.authid() );
QgsMessageLog::logMessage( err, QString(), Qgis::Critical );
}
}
Expand Down Expand Up @@ -493,9 +495,9 @@ ProjData QgsCoordinateTransformPrivate::threadLocalProjData()
}
else
{
const QString err = QObject::tr( "Cannot create transform between %1 and %2: %3" ).arg( mSourceCRS.authid() )
.arg( mDestCRS.authid() )
.arg( nonAvailableError );
const QString err = QObject::tr( "Cannot create transform between %1 and %2: %3" ).arg( mSourceCRS.authid(),
mDestCRS.authid(),
nonAvailableError );
QgsMessageLog::logMessage( err, QString(), Qgis::Critical );
}
}
Expand Down

0 comments on commit d35197f

Please sign in to comment.