Merge pull request #7168 from m-kuhn/noTrDebugMessages

Do not translate debug messages
This commit is contained in:
Matthias Kuhn 2018-06-04 14:57:40 +02:00 committed by GitHub
commit 0e4b595717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions

View File

@ -3572,7 +3572,7 @@ QgsMapCanvasDockWidget *QgisApp::createNewMapCanvasDock( const QString &name )
{
if ( canvas->objectName() == name )
{
QgsDebugMsg( tr( "A map canvas with name '%1' already exists!" ).arg( name ) );
QgsDebugMsg( QStringLiteral( "A map canvas with name '%1' already exists!" ).arg( name ) );
return nullptr;
}
}
@ -10687,7 +10687,7 @@ Qgs3DMapCanvasDockWidget *QgisApp::createNew3DMapCanvasDock( const QString &name
{
if ( canvas->objectName() == name )
{
QgsDebugMsg( tr( "A map canvas with name '%1' already exists!" ).arg( name ) );
QgsDebugMsg( QStringLiteral( "A map canvas with name '%1' already exists!" ).arg( name ) );
return nullptr;
}
}

View File

@ -36,7 +36,7 @@ bool QgsVirtualLayerTask::run()
}
catch ( std::exception &e )
{
QgsDebugMsg( tr( "Reload error: %1" ).arg( e.what() ) );
QgsDebugMsg( QStringLiteral( "Reload error: %1" ).arg( e.what() ) );
rc = false;
}
return rc;

View File

@ -166,7 +166,7 @@ QList<QgsOgrDbLayerInfo *> QgsOgrLayerItem::subLayers( const QString &path, cons
QgsVectorLayer layer( path, QStringLiteral( "ogr_tmp" ), QStringLiteral( "ogr" ) );
if ( ! layer.isValid( ) )
{
QgsDebugMsgLevel( tr( "Layer is not a valid %1 Vector layer %2" ).arg( path ), 3 );
QgsDebugMsgLevel( QStringLiteral( "Layer is not a valid %1 Vector layer %2" ).arg( path ), 3 );
}
else
{

View File

@ -546,9 +546,9 @@ void QgsWcsProvider::readBlock( int bandNo, QgsRectangle const &viewExtent, int
{
// Rotate counter clockwise
// If GridOffsets With GeoServer,
QgsDebugMsg( tr( "Rotating raster" ) );
QgsDebugMsg( QStringLiteral( "Rotating raster" ) );
int pixelSize = QgsRasterBlock::typeSize( dataType( bandNo ) );
QgsDebugMsg( QString( "pixelSize = %1" ).arg( pixelSize ) );
QgsDebugMsg( QStringLiteral( "pixelSize = %1" ).arg( pixelSize ) );
int size = width * height * pixelSize;
void *tmpData = malloc( size );
if ( ! tmpData )
@ -1896,7 +1896,7 @@ void QgsWcsDownloadHandler::cacheReplyProgress( qint64 bytesReceived, qint64 byt
{
Q_UNUSED( bytesReceived );
Q_UNUSED( bytesTotal );
QgsDebugMsgLevel( tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ), 3 );
QgsDebugMsgLevel( QStringLiteral( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ), 3 );
}
void QgsWcsDownloadHandler::canceled()

View File

@ -209,7 +209,7 @@ void QgsWfsRequest::abort()
void QgsWfsRequest::replyProgress( qint64 bytesReceived, qint64 bytesTotal )
{
QgsDebugMsg( tr( "%1 of %2 bytes downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
QgsDebugMsg( QStringLiteral( "%1 of %2 bytes downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
if ( bytesReceived != 0 )
mGotNonEmptyResponse = true;

View File

@ -323,7 +323,7 @@ bool QgsWmsProvider::addLayers()
Q_FOREACH ( const QString &layer, mSettings.mActiveSubLayers )
{
mActiveSubLayerVisibility[ layer ] = true;
QgsDebugMsg( "set visibility of layer '" + layer + "' to true." );
QgsDebugMsg( QStringLiteral( "set visibility of layer '%1' to true." ).arg( layer ) );
}
// now that the layers have changed, the extent will as well.
@ -1326,7 +1326,7 @@ bool QgsWmsProvider::extentForNonTiledLayer( const QString &layerName, const QSt
QgsCoordinateTransform xform( wgs, dst );
Q_NOWARN_DEPRECATED_POP
QgsDebugMsg( QString( "transforming layer extent %1" ).arg( extent.toString( true ) ) );
QgsDebugMsg( QStringLiteral( "transforming layer extent %1" ).arg( extent.toString( true ) ) );
try
{
extent = xform.transformBoundingBox( extent );
@ -1336,7 +1336,7 @@ bool QgsWmsProvider::extentForNonTiledLayer( const QString &layerName, const QSt
Q_UNUSED( cse );
return false;
}
QgsDebugMsg( QString( "transformed layer extent %1" ).arg( extent.toString( true ) ) );
QgsDebugMsg( QStringLiteral( "transformed layer extent %1" ).arg( extent.toString( true ) ) );
//make sure extent does not contain 'inf' or 'nan'
if ( !extent.isFinite() )
@ -3703,7 +3703,7 @@ void QgsWmsImageDownloadHandler::cacheReplyProgress( qint64 bytesReceived, qint6
{
Q_UNUSED( bytesReceived );
Q_UNUSED( bytesTotal );
QgsDebugMsg( tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
QgsDebugMsg( QStringLiteral( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
}
void QgsWmsImageDownloadHandler::canceled()