Skip to content

Commit 0e4b595

Browse files
authored
Merge pull request #7168 from m-kuhn/noTrDebugMessages
Do not translate debug messages
2 parents 4af0e44 + 474809e commit 0e4b595

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/app/qgisapp.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3572,7 +3572,7 @@ QgsMapCanvasDockWidget *QgisApp::createNewMapCanvasDock( const QString &name )
35723572
{
35733573
if ( canvas->objectName() == name )
35743574
{
3575-
QgsDebugMsg( tr( "A map canvas with name '%1' already exists!" ).arg( name ) );
3575+
QgsDebugMsg( QStringLiteral( "A map canvas with name '%1' already exists!" ).arg( name ) );
35763576
return nullptr;
35773577
}
35783578
}
@@ -10687,7 +10687,7 @@ Qgs3DMapCanvasDockWidget *QgisApp::createNew3DMapCanvasDock( const QString &name
1068710687
{
1068810688
if ( canvas->objectName() == name )
1068910689
{
10690-
QgsDebugMsg( tr( "A map canvas with name '%1' already exists!" ).arg( name ) );
10690+
QgsDebugMsg( QStringLiteral( "A map canvas with name '%1' already exists!" ).arg( name ) );
1069110691
return nullptr;
1069210692
}
1069310693
}

src/core/qgsvirtuallayertask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bool QgsVirtualLayerTask::run()
3636
}
3737
catch ( std::exception &e )
3838
{
39-
QgsDebugMsg( tr( "Reload error: %1" ).arg( e.what() ) );
39+
QgsDebugMsg( QStringLiteral( "Reload error: %1" ).arg( e.what() ) );
4040
rc = false;
4141
}
4242
return rc;

src/providers/ogr/qgsogrdataitems.cpp

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

src/providers/wcs/qgswcsprovider.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,9 @@ void QgsWcsProvider::readBlock( int bandNo, QgsRectangle const &viewExtent, int
546546
{
547547
// Rotate counter clockwise
548548
// If GridOffsets With GeoServer,
549-
QgsDebugMsg( tr( "Rotating raster" ) );
549+
QgsDebugMsg( QStringLiteral( "Rotating raster" ) );
550550
int pixelSize = QgsRasterBlock::typeSize( dataType( bandNo ) );
551-
QgsDebugMsg( QString( "pixelSize = %1" ).arg( pixelSize ) );
551+
QgsDebugMsg( QStringLiteral( "pixelSize = %1" ).arg( pixelSize ) );
552552
int size = width * height * pixelSize;
553553
void *tmpData = malloc( size );
554554
if ( ! tmpData )
@@ -1896,7 +1896,7 @@ void QgsWcsDownloadHandler::cacheReplyProgress( qint64 bytesReceived, qint64 byt
18961896
{
18971897
Q_UNUSED( bytesReceived );
18981898
Q_UNUSED( bytesTotal );
1899-
QgsDebugMsgLevel( tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ), 3 );
1899+
QgsDebugMsgLevel( QStringLiteral( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ), 3 );
19001900
}
19011901

19021902
void QgsWcsDownloadHandler::canceled()

src/providers/wfs/qgswfsrequest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ void QgsWfsRequest::abort()
209209

210210
void QgsWfsRequest::replyProgress( qint64 bytesReceived, qint64 bytesTotal )
211211
{
212-
QgsDebugMsg( tr( "%1 of %2 bytes downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
212+
QgsDebugMsg( QStringLiteral( "%1 of %2 bytes downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
213213

214214
if ( bytesReceived != 0 )
215215
mGotNonEmptyResponse = true;

src/providers/wms/qgswmsprovider.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ bool QgsWmsProvider::addLayers()
323323
Q_FOREACH ( const QString &layer, mSettings.mActiveSubLayers )
324324
{
325325
mActiveSubLayerVisibility[ layer ] = true;
326-
QgsDebugMsg( "set visibility of layer '" + layer + "' to true." );
326+
QgsDebugMsg( QStringLiteral( "set visibility of layer '%1' to true." ).arg( layer ) );
327327
}
328328

329329
// now that the layers have changed, the extent will as well.
@@ -1326,7 +1326,7 @@ bool QgsWmsProvider::extentForNonTiledLayer( const QString &layerName, const QSt
13261326
QgsCoordinateTransform xform( wgs, dst );
13271327
Q_NOWARN_DEPRECATED_POP
13281328

1329-
QgsDebugMsg( QString( "transforming layer extent %1" ).arg( extent.toString( true ) ) );
1329+
QgsDebugMsg( QStringLiteral( "transforming layer extent %1" ).arg( extent.toString( true ) ) );
13301330
try
13311331
{
13321332
extent = xform.transformBoundingBox( extent );
@@ -1336,7 +1336,7 @@ bool QgsWmsProvider::extentForNonTiledLayer( const QString &layerName, const QSt
13361336
Q_UNUSED( cse );
13371337
return false;
13381338
}
1339-
QgsDebugMsg( QString( "transformed layer extent %1" ).arg( extent.toString( true ) ) );
1339+
QgsDebugMsg( QStringLiteral( "transformed layer extent %1" ).arg( extent.toString( true ) ) );
13401340

13411341
//make sure extent does not contain 'inf' or 'nan'
13421342
if ( !extent.isFinite() )
@@ -3703,7 +3703,7 @@ void QgsWmsImageDownloadHandler::cacheReplyProgress( qint64 bytesReceived, qint6
37033703
{
37043704
Q_UNUSED( bytesReceived );
37053705
Q_UNUSED( bytesTotal );
3706-
QgsDebugMsg( tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
3706+
QgsDebugMsg( QStringLiteral( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) );
37073707
}
37083708

37093709
void QgsWmsImageDownloadHandler::canceled()

0 commit comments

Comments
 (0)