Skip to content

Commit 5ed3d1b

Browse files
nyalldawsonnyalldawson
committed
Use QString::arg multi argument method to avoid extra heap allocations
1 parent f50e1a7 commit 5ed3d1b

File tree

191 files changed

+1182
-1172
lines changed

Some content is hidden

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

191 files changed

+1182
-1172
lines changed

‎python/core/qgsfield.sip‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class QgsField
155155
if ( !sipRes )
156156
{
157157
PyErr_SetString(PyExc_ValueError,
158-
QString( "Value %1 (%2) could not be converted to field type %3." ).arg( a0->toString() ).arg ( a0->typeName() ).arg( sipCpp->type() ).toUtf8().constData() );
158+
QString( "Value %1 (%2) could not be converted to field type %3." ).arg( a0->toString(), a0->typeName() ).arg( sipCpp->type() ).toUtf8().constData() );
159159
sipError = sipErrorFail;
160160
}
161161

‎src/analysis/openstreetmap/qgsosmdatabase.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ bool QgsOSMDatabase::prepareStatements()
282282
{
283283
const char* errMsg = sqlite3_errmsg( mDatabase ); // does not require free
284284
mError = QString( "Error preparing SQL command:\n%1\nSQL:\n%2" )
285-
.arg( QString::fromUtf8( errMsg ) ).arg( QString::fromUtf8( sql[i] ) );
285+
.arg( QString::fromUtf8( errMsg ), QString::fromUtf8( sql[i] ) );
286286
return false;
287287
}
288288
}
@@ -348,8 +348,8 @@ bool QgsOSMDatabase::createSpatialTable( const QString& tableName, const QString
348348
}
349349

350350
QString sqlAddGeomColumn = QString( "SELECT AddGeometryColumn(%1, 'geometry', 4326, %2, 'XY')" )
351-
.arg( quotedValue( tableName ) )
352-
.arg( quotedValue( geometryType ) );
351+
.arg( quotedValue( tableName ),
352+
quotedValue( geometryType ) );
353353
ret = sqlite3_exec( mDatabase, sqlAddGeomColumn.toUtf8().constData(), NULL, NULL, &errMsg );
354354
if ( ret != SQLITE_OK )
355355
{

‎src/analysis/openstreetmap/qgsosmimport.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ bool QgsOSMXmlImport::createDatabase()
169169
if ( sqlite3_exec( mDatabase, sqlInitStatements[i], 0, 0, &errMsg ) != SQLITE_OK )
170170
{
171171
mError = QString( "Error executing SQL command:\n%1\nSQL:\n%2" )
172-
.arg( QString::fromUtf8( errMsg ) ).arg( QString::fromUtf8( sqlInitStatements[i] ) );
172+
.arg( QString::fromUtf8( errMsg ), QString::fromUtf8( sqlInitStatements[i] ) );
173173
sqlite3_free( errMsg );
174174
closeDatabase();
175175
return false;
@@ -201,7 +201,7 @@ bool QgsOSMXmlImport::createDatabase()
201201
{
202202
const char* errMsg = sqlite3_errmsg( mDatabase ); // does not require free
203203
mError = QString( "Error preparing SQL command:\n%1\nSQL:\n%2" )
204-
.arg( QString::fromUtf8( errMsg ) ).arg( QString::fromUtf8( sqlInsertStatements[i] ) );
204+
.arg( QString::fromUtf8( errMsg ), QString::fromUtf8( sqlInsertStatements[i] ) );
205205
closeDatabase();
206206
return false;
207207
}

‎src/analysis/raster/qgsalignraster.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ bool QgsAlignRaster::checkInputParameters()
272272
mErrorMessage = QString( "Failed to get suggested warp output.\n\n"
273273
"File:\n%1\n\n"
274274
"Source WKT:\n%2\n\nDestination WKT:\n%3" )
275-
.arg( r.inputFilename )
276-
.arg( info.mCrsWkt )
277-
.arg( mCrsWkt );
275+
.arg( r.inputFilename,
276+
info.mCrsWkt,
277+
mCrsWkt );
278278
return false;
279279
}
280280

‎src/app/composer/qgsatlascompositionwidget.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenamePatternEdit_editingFinished()
118118
QMessageBox::warning( this
119119
, tr( "Could not evaluate filename pattern" )
120120
, tr( "Could not set filename pattern as '%1'.\nParser error:\n%2" )
121-
.arg( mAtlasFilenamePatternEdit->text() )
122-
.arg( atlasMap->filenamePatternErrorString() )
121+
.arg( mAtlasFilenamePatternEdit->text(),
122+
atlasMap->filenamePatternErrorString() )
123123
);
124124
}
125125
}
@@ -149,8 +149,8 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
149149
QMessageBox::warning( this
150150
, tr( "Could not evaluate filename pattern" )
151151
, tr( "Could not set filename pattern as '%1'.\nParser error:\n%2" )
152-
.arg( expression )
153-
.arg( atlasMap->filenamePatternErrorString() )
152+
.arg( expression,
153+
atlasMap->filenamePatternErrorString() )
154154
);
155155
}
156156
}

‎src/app/gps/qgsgpsinformationwidget.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ void QgsGPSInformationWidget::connectGps()
410410
}
411411
else if ( mRadGpsd->isChecked() )
412412
{
413-
port = QString( "%1:%2:%3" ).arg( mGpsdHost->text() ).arg( mGpsdPort->text() ).arg( mGpsdDevice->text() );
413+
port = QString( "%1:%2:%3" ).arg( mGpsdHost->text(), mGpsdPort->text(), mGpsdDevice->text() );
414414
}
415415
else if ( mRadInternal->isChecked() )
416416
{
@@ -847,8 +847,8 @@ void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
847847
QMessageBox::information( this,
848848
tr( "Error" ),
849849
tr( "Could not commit changes to layer %1\n\nErrors: %2\n" )
850-
.arg( vlayer->name() )
851-
.arg( vlayer->commitErrors().join( "\n " ) ) );
850+
.arg( vlayer->name(),
851+
vlayer->commitErrors().join( "\n " ) ) );
852852
}
853853

854854
vlayer->startEditing();
@@ -977,8 +977,8 @@ void QgsGPSInformationWidget::on_mBtnCloseFeature_clicked()
977977
QMessageBox::information( this,
978978
tr( "Error" ),
979979
tr( "Could not commit changes to layer %1\n\nErrors: %2\n" )
980-
.arg( vlayer->name() )
981-
.arg( vlayer->commitErrors().join( "\n " ) ) );
980+
.arg( vlayer->name(),
981+
vlayer->commitErrors().join( "\n " ) ) );
982982
}
983983

984984
vlayer->startEditing();

‎src/app/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ int main( int argc, char *argv[] )
947947
}
948948
else
949949
{
950-
qWarning( "loading of qgis translation failed [%s]", QString( "%1/qgis_%2" ).arg( i18nPath ).arg( myTranslationCode ).toLocal8Bit().constData() );
950+
qWarning( "loading of qgis translation failed [%s]", QString( "%1/qgis_%2" ).arg( i18nPath, myTranslationCode ).toLocal8Bit().constData() );
951951
}
952952

953953
/* Translation file for Qt.
@@ -961,7 +961,7 @@ int main( int argc, char *argv[] )
961961
}
962962
else
963963
{
964-
qWarning( "loading of qt translation failed [%s]", QString( "%1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ) ).arg( myTranslationCode ).toLocal8Bit().constData() );
964+
qWarning( "loading of qt translation failed [%s]", QString( "%1/qt_%2" ).arg( QLibraryInfo::location( QLibraryInfo::TranslationsPath ), myTranslationCode ).toLocal8Bit().constData() );
965965
}
966966
}
967967

‎src/app/ogr/qgsvectorlayersaveasdialog.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,23 +343,23 @@ QStringList QgsVectorLayerSaveAsDialog::datasourceOptions() const
343343
{
344344
QComboBox* cb = mDatasourceOptionsGroupBox->findChild<QComboBox*>( it.key() );
345345
if ( cb && !cb->itemData( cb->currentIndex() ).isNull() )
346-
options << QString( "%1=%2" ).arg( it.key() ).arg( cb->currentText() );
346+
options << QString( "%1=%2" ).arg( it.key(), cb->currentText() );
347347
break;
348348
}
349349

350350
case QgsVectorFileWriter::String:
351351
{
352352
QLineEdit* le = mDatasourceOptionsGroupBox->findChild<QLineEdit*>( it.key() );
353353
if ( le )
354-
options << QString( "%1=%2" ).arg( it.key() ).arg( le->text() );
354+
options << QString( "%1=%2" ).arg( it.key(), le->text() );
355355
break;
356356
}
357357

358358
case QgsVectorFileWriter::Hidden:
359359
{
360360
QgsVectorFileWriter::HiddenOption *opt =
361361
dynamic_cast<QgsVectorFileWriter::HiddenOption*>( it.value() );
362-
options << QString( "%1=%2" ).arg( it.key() ).arg( opt->mValue );
362+
options << QString( "%1=%2" ).arg( it.key(), opt->mValue );
363363
break;
364364
}
365365
}
@@ -393,22 +393,22 @@ QStringList QgsVectorLayerSaveAsDialog::layerOptions() const
393393
case QgsVectorFileWriter::Set:
394394
{
395395
QComboBox* cb = mLayerOptionsGroupBox->findChild<QComboBox*>( it.key() );
396-
options << QString( "%1=%2" ).arg( it.key() ).arg( cb->currentText() );
396+
options << QString( "%1=%2" ).arg( it.key(), cb->currentText() );
397397
break;
398398
}
399399

400400
case QgsVectorFileWriter::String:
401401
{
402402
QLineEdit* le = mLayerOptionsGroupBox->findChild<QLineEdit*>( it.key() );
403-
options << QString( "%1=%2" ).arg( it.key() ).arg( le->text() );
403+
options << QString( "%1=%2" ).arg( it.key(), le->text() );
404404
break;
405405
}
406406

407407
case QgsVectorFileWriter::Hidden:
408408
{
409409
QgsVectorFileWriter::HiddenOption *opt =
410410
dynamic_cast<QgsVectorFileWriter::HiddenOption*>( it.value() );
411-
options << QString( "%1=%2" ).arg( it.key() ).arg( opt->mValue );
411+
options << QString( "%1=%2" ).arg( it.key(), opt->mValue );
412412
break;
413413
}
414414
}

‎src/app/openstreetmap/qgsosmexportdialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void QgsOSMExportDialog::updateLayerName()
7878
layerType = "polylines";
7979
else
8080
layerType = "polygons";
81-
editLayerName->setText( QString( "%1_%2" ).arg( baseName ).arg( layerType ) );
81+
editLayerName->setText( QString( "%1_%2" ).arg( baseName, layerType ) );
8282
}
8383

8484

‎src/app/pluginmanager/qgspluginmanager.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ void QgsPluginManager::getCppPluginsMetadata()
322322

323323
for ( uint i = 0; i < pluginDir.count(); i++ )
324324
{
325-
QString lib = QString( "%1/%2" ).arg( myPluginDir ).arg( pluginDir[i] );
325+
QString lib = QString( "%1/%2" ).arg( myPluginDir, pluginDir[i] );
326326

327327
#ifdef TESTLIB
328328
// This doesn't work on windows and causes problems with plugins
@@ -354,7 +354,7 @@ void QgsPluginManager::getCppPluginsMetadata()
354354
bool loaded = myLib->load();
355355
if ( !loaded )
356356
{
357-
QgsDebugMsg( QString( "Failed to load: %1 (%2)" ).arg( myLib->fileName() ).arg( myLib->errorString() ) );
357+
QgsDebugMsg( QString( "Failed to load: %1 (%2)" ).arg( myLib->fileName(), myLib->errorString() ) );
358358
delete myLib;
359359
continue;
360360
}
@@ -680,15 +680,15 @@ void QgsPluginManager::showPluginDetails( QStandardItem * item )
680680
QString errorMsg;
681681
if ( metadata->value( "error" ) == "incompatible" )
682682
{
683-
errorMsg = QString( "<b>%1</b><br/>%2" ).arg( tr( "This plugin is incompatible with this version of QGIS" ) ).arg( tr( "Plugin designed for QGIS %1", "compatible QGIS version(s)" ).arg( metadata->value( "error_details" ) ) );
683+
errorMsg = QString( "<b>%1</b><br/>%2" ).arg( tr( "This plugin is incompatible with this version of QGIS" ), tr( "Plugin designed for QGIS %1", "compatible QGIS version(s)" ).arg( metadata->value( "error_details" ) ) );
684684
}
685685
else if ( metadata->value( "error" ) == "dependent" )
686686
{
687-
errorMsg = QString( "<b>%1:</b><br/>%2" ).arg( tr( "This plugin requires a missing module" ) ).arg( metadata->value( "error_details" ) );
687+
errorMsg = QString( "<b>%1:</b><br/>%2" ).arg( tr( "This plugin requires a missing module" ), metadata->value( "error_details" ) );
688688
}
689689
else
690690
{
691-
errorMsg = QString( "<b>%1</b><br/>%2" ).arg( tr( "This plugin is broken" ) ).arg( metadata->value( "error_details" ) );
691+
errorMsg = QString( "<b>%1</b><br/>%2" ).arg( tr( "This plugin is broken" ), metadata->value( "error_details" ) );
692692
}
693693
html += QString( "<table bgcolor=\"#FFFF88\" cellspacing=\"2\" cellpadding=\"6\" width=\"100%\">"
694694
" <tr><td width=\"100%\" style=\"color:#CC0000\">%1</td></tr>"
@@ -780,51 +780,51 @@ void QgsPluginManager::showPluginDetails( QStandardItem * item )
780780

781781
if ( ! metadata->value( "category" ).isEmpty() )
782782
{
783-
html += QString( "%1: %2 <br/>" ).arg( tr( "Category" ) ).arg( metadata->value( "category" ) );
783+
html += QString( "%1: %2 <br/>" ).arg( tr( "Category" ), metadata->value( "category" ) );
784784
}
785785
if ( ! metadata->value( "tags" ).isEmpty() )
786786
{
787-
html += QString( "%1: %2 <br/>" ).arg( tr( "Tags" ) ).arg( metadata->value( "tags" ) );
787+
html += QString( "%1: %2 <br/>" ).arg( tr( "Tags" ), metadata->value( "tags" ) );
788788
}
789789
if ( ! metadata->value( "homepage" ).isEmpty() || ! metadata->value( "tracker" ).isEmpty() || ! metadata->value( "code_repository" ).isEmpty() )
790790
{
791791
html += QString( "%1: " ).arg( tr( "More info" ) );
792792
if ( ! metadata->value( "homepage" ).isEmpty() )
793793
{
794-
html += QString( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( "homepage" ) ).arg( tr( "homepage" ) );
794+
html += QString( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( "homepage" ), tr( "homepage" ) );
795795
}
796796
if ( ! metadata->value( "tracker" ).isEmpty() )
797797
{
798-
html += QString( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( "tracker" ) ).arg( tr( "tracker" ) );
798+
html += QString( "<a href='%1'>%2</a> &nbsp; " ).arg( metadata->value( "tracker" ), tr( "tracker" ) );
799799
}
800800
if ( ! metadata->value( "code_repository" ).isEmpty() )
801801
{
802-
html += QString( "<a href='%1'>%2</a>" ).arg( metadata->value( "code_repository" ) ).arg( tr( "code_repository" ) );
802+
html += QString( "<a href='%1'>%2</a>" ).arg( metadata->value( "code_repository" ), tr( "code_repository" ) );
803803
}
804804
html += "<br/>";
805805
}
806806
html += "<br/>";
807807

808808
if ( ! metadata->value( "author_email" ).isEmpty() )
809809
{
810-
html += QString( "%1: <a href='mailto:%2'>%3</a>" ).arg( tr( "Author" ) ).arg( metadata->value( "author_email" ) ).arg( metadata->value( "author_name" ) );
810+
html += QString( "%1: <a href='mailto:%2'>%3</a>" ).arg( tr( "Author" ), metadata->value( "author_email" ), metadata->value( "author_name" ) );
811811
html += "<br/><br/>";
812812
}
813813
else if ( ! metadata->value( "author_name" ).isEmpty() )
814814
{
815-
html += QString( "%1: %2" ).arg( tr( "Author" ) ).arg( metadata->value( "author_name" ) );
815+
html += QString( "%1: %2" ).arg( tr( "Author" ), metadata->value( "author_name" ) );
816816
html += "<br/><br/>";
817817
}
818818

819819
if ( ! metadata->value( "version_installed" ).isEmpty() )
820820
{
821821
QString ver = metadata->value( "version_installed" );
822822
if ( ver == "-1" ) ver = "?";
823-
html += tr( "Installed version: %1 (in %2)<br/>" ).arg( ver ).arg( metadata->value( "library" ) );
823+
html += tr( "Installed version: %1 (in %2)<br/>" ).arg( ver, metadata->value( "library" ) );
824824
}
825825
if ( ! metadata->value( "version_available" ).isEmpty() )
826826
{
827-
html += tr( "Available version: %1 (in %2)<br/>" ).arg( metadata->value( "version_available" ) ).arg( metadata->value( "zip_repository" ) );
827+
html += tr( "Available version: %1 (in %2)<br/>" ).arg( metadata->value( "version_available" ), metadata->value( "zip_repository" ) );
828828
}
829829

830830
if ( ! metadata->value( "changelog" ).isEmpty() )
@@ -1160,8 +1160,8 @@ void QgsPluginManager::on_wvDetails_linkClicked( const QUrl & url )
11601160
QString params = url.path();
11611161
QString response;
11621162
QgsPythonRunner::eval( QString( "pyplugin_installer.instance().sendVote('%1', '%2')" )
1163-
.arg( params.split( "/" )[1] )
1164-
.arg( params.split( "/" )[2] ), response );
1163+
.arg( params.split( "/" )[1],
1164+
params.split( "/" )[2] ), response );
11651165
if ( response == "True" )
11661166
{
11671167
pushMessage( tr( "Vote sent successfully" ), QgsMessageBar::INFO );
@@ -1460,7 +1460,7 @@ void QgsPluginManager::updateWindowTitle()
14601460
QListWidgetItem *curitem = mOptListWidget->currentItem();
14611461
if ( curitem )
14621462
{
1463-
QString title = QString( "%1 | %2" ).arg( tr( "Plugins" ) ).arg( curitem->text() );
1463+
QString title = QString( "%1 | %2" ).arg( tr( "Plugins" ), curitem->text() );
14641464
if ( mOptionsListWidget->currentRow() < mOptionsListWidget->count() - 1 )
14651465
{
14661466
// if it's not the Settings tab, add the plugin count

0 commit comments

Comments
 (0)