Skip to content

Commit 160f172

Browse files
nyalldawsonnyalldawson
committed
Flip some QStrings to QLatin1String where they may be faster
1 parent 52f0b5b commit 160f172

39 files changed

+114
-114
lines changed

‎src/app/gps/qgsgpsinformationwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ void QgsGPSInformationWidget::connectGps()
414414
}
415415
else if ( mRadInternal->isChecked() )
416416
{
417-
port = QString( "internalGPS" );
417+
port = QLatin1String( "internalGPS" );
418418
}
419419

420420
mGPSPlainTextEdit->appendPlainText( tr( "Connecting..." ) );

‎src/app/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ int main( int argc, char *argv[] )
10031003

10041004
//set up splash screen
10051005
QString mySplashPath( QgsCustomization::instance()->splashPath() );
1006-
QPixmap myPixmap( mySplashPath + QString( "splash.png" ) );
1006+
QPixmap myPixmap( mySplashPath + QLatin1String( "splash.png" ) );
10071007
QSplashScreen *mypSplash = new QSplashScreen( myPixmap );
10081008
if ( mySettings.value( "/qgis/hideSplash" ).toBool() || myHideSplash )
10091009
{

‎src/app/qgisapp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3948,7 +3948,7 @@ bool QgisApp::fileNewFromTemplate( const QString& fileName )
39483948

39493949
void QgisApp::fileNewFromDefaultTemplate()
39503950
{
3951-
QString projectTemplate = QgsApplication::qgisSettingsDirPath() + QString( "project_default.qgs" );
3951+
QString projectTemplate = QgsApplication::qgisSettingsDirPath() + QLatin1String( "project_default.qgs" );
39523952
QString msgTxt;
39533953
if ( !projectTemplate.isEmpty() && QFile::exists( projectTemplate ) )
39543954
{
@@ -4043,7 +4043,7 @@ void QgisApp::fileOpenAfterLaunch()
40434043
return;
40444044
}
40454045

4046-
if ( !projPath.endsWith( QString( "qgs" ), Qt::CaseInsensitive ) )
4046+
if ( !projPath.endsWith( QLatin1String( "qgs" ), Qt::CaseInsensitive ) )
40474047
{
40484048
messageBar()->pushMessage( autoOpenMsgTitle,
40494049
tr( "Not valid project file: %1" ).arg( projPath ),
@@ -4063,7 +4063,7 @@ void QgisApp::fileOpenAfterLaunch()
40634063
QgsMessageBar::WARNING );
40644064
}
40654065

4066-
if ( projPath.endsWith( QString( "project_default.qgs" ) ) )
4066+
if ( projPath.endsWith( QLatin1String( "project_default.qgs" ) ) )
40674067
{
40684068
messageBar()->pushMessage( autoOpenMsgTitle,
40694069
tr( "Default template has been reopened: %1" ).arg( projPath ),

‎src/app/qgscustomization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ QgsCustomizationDialog::QgsCustomizationDialog( QWidget *parent, QSettings* sett
5555
myHeaders << tr( "Object name" ) << tr( "Label" ) << tr( "Description" );
5656
treeWidget->setHeaderLabels( myHeaders );
5757

58-
mLastDirSettingsName = QString( "/UI/lastCustomizationDir" );
58+
mLastDirSettingsName = QLatin1String( "/UI/lastCustomizationDir" );
5959
//treeWidget->hideColumn(0)
6060
connect( buttonBox->button( QDialogButtonBox::Ok ), SIGNAL( clicked() ), this, SLOT( ok() ) );
6161
connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );

‎src/app/qgslabelinggui.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,8 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
952952

953953
mFontCaseDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::FontCase ),
954954
QgsDataDefinedButton::String,
955-
trString + QString( "[<b>NoChange</b>|<b>Upper</b>|<br>"
956-
"<b>Lower</b>|<b>Capitalize</b>]" ) );
955+
trString + QLatin1String( "[<b>NoChange</b>|<b>Upper</b>|<br>"
956+
"<b>Lower</b>|<b>Capitalize</b>]" ) );
957957

958958
mFontLetterSpacingDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::FontLetterSpacing ),
959959
QgsDataDefinedButton::AnyType, QgsDataDefinedButton::doubleDesc() );
@@ -1016,8 +1016,8 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
10161016
mShapeDrawDDBtn->registerCheckedWidget( mShapeDrawChkBx );
10171017
mShapeTypeDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::ShapeKind ),
10181018
QgsDataDefinedButton::String,
1019-
trString + QString( "[<b>Rectangle</b>|<b>Square</b>|<br>"
1020-
"<b>Ellipse</b>|<b>Circle</b>|<b>SVG</b>]" ) );
1019+
trString + QLatin1String( "[<b>Rectangle</b>|<b>Square</b>|<br>"
1020+
"<b>Ellipse</b>|<b>Circle</b>|<b>SVG</b>]" ) );
10211021
mShapeSVGPathDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::ShapeSVGFile ),
10221022
QgsDataDefinedButton::String, QgsDataDefinedButton::svgPathDesc() );
10231023
mShapeSizeTypeDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::ShapeSizeType ),
@@ -1063,8 +1063,8 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
10631063
mShadowDrawDDBtn->registerCheckedWidget( mShadowDrawChkBx );
10641064
mShadowUnderDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::ShadowUnder ),
10651065
QgsDataDefinedButton::String,
1066-
trString + QString( "[<b>Lowest</b>|<b>Text</b>|<br>"
1067-
"<b>Buffer</b>|<b>Background</b>]" ) );
1066+
trString + QLatin1String( "[<b>Lowest</b>|<b>Text</b>|<br>"
1067+
"<b>Buffer</b>|<b>Background</b>]" ) );
10681068
mShadowOffsetAngleDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::ShadowOffsetAngle ),
10691069
QgsDataDefinedButton::AnyType, QgsDataDefinedButton::double180RotDesc() );
10701070
mShadowOffsetDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::ShadowOffsetDist ),
@@ -1090,9 +1090,9 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
10901090
trString + "[<b>Visible</b>|<b>Whole</b>]" );
10911091
mPointQuadOffsetDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::OffsetQuad ),
10921092
QgsDataDefinedButton::AnyType,
1093-
tr( "int<br>" ) + QString( "[<b>0</b>=Above Left|<b>1</b>=Above|<b>2</b>=Above Right|<br>"
1094-
"<b>3</b>=Left|<b>4</b>=Over|<b>5</b>=Right|<br>"
1095-
"<b>6</b>=Below Left|<b>7</b>=Below|<b>8</b>=Below Right]" ) );
1093+
tr( "int<br>" ) + QLatin1String( "[<b>0</b>=Above Left|<b>1</b>=Above|<b>2</b>=Above Right|<br>"
1094+
"<b>3</b>=Left|<b>4</b>=Over|<b>5</b>=Right|<br>"
1095+
"<b>6</b>=Below Left|<b>7</b>=Below|<b>8</b>=Below Right]" ) );
10961096
mPointOffsetDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::OffsetXY ),
10971097
QgsDataDefinedButton::AnyType, QgsDataDefinedButton::doubleXYDesc() );
10981098
mPointOffsetUnitsDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::OffsetUnits ),
@@ -1130,8 +1130,8 @@ void QgsLabelingGui::populateDataDefinedButtons( QgsPalLayerSettings& s )
11301130
mCoordAlignmentHDDBtn->setUsageInfo( ddPlaceInfo );
11311131
mCoordAlignmentVDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::Vali ),
11321132
QgsDataDefinedButton::String,
1133-
trString + QString( "[<b>Bottom</b>|<b>Base</b>|<br>"
1134-
"<b>Half</b>|<b>Cap</b>|<b>Top</b>]" ) );
1133+
trString + QLatin1String( "[<b>Bottom</b>|<b>Base</b>|<br>"
1134+
"<b>Half</b>|<b>Cap</b>|<b>Top</b>]" ) );
11351135
mCoordAlignmentVDDBtn->setUsageInfo( ddPlaceInfo );
11361136
mCoordRotationDDBtn->init( mLayer, s.dataDefinedProperty( QgsPalLayerSettings::Rotation ),
11371137
QgsDataDefinedButton::AnyType, QgsDataDefinedButton::double180RotDesc() );

‎src/app/qgsoptions.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ void QgsOptions::on_cbxProjectDefaultNew_toggled( bool checked )
883883
{
884884
if ( checked )
885885
{
886-
QString fileName = QgsApplication::qgisSettingsDirPath() + QString( "project_default.qgs" );
886+
QString fileName = QgsApplication::qgisSettingsDirPath() + QLatin1String( "project_default.qgs" );
887887
if ( ! QFile::exists( fileName ) )
888888
{
889889
QMessageBox::information( 0, tr( "Save default project" ), tr( "You must set a default project" ) );
@@ -894,7 +894,7 @@ void QgsOptions::on_cbxProjectDefaultNew_toggled( bool checked )
894894

895895
void QgsOptions::on_pbnProjectDefaultSetCurrent_clicked()
896896
{
897-
QString fileName = QgsApplication::qgisSettingsDirPath() + QString( "project_default.qgs" );
897+
QString fileName = QgsApplication::qgisSettingsDirPath() + QLatin1String( "project_default.qgs" );
898898
if ( QgsProject::instance()->write( QFileInfo( fileName ) ) )
899899
{
900900
QMessageBox::information( 0, tr( "Save default project" ), tr( "Current project saved as default" ) );
@@ -907,7 +907,7 @@ void QgsOptions::on_pbnProjectDefaultSetCurrent_clicked()
907907

908908
void QgsOptions::on_pbnProjectDefaultReset_clicked()
909909
{
910-
QString fileName = QgsApplication::qgisSettingsDirPath() + QString( "project_default.qgs" );
910+
QString fileName = QgsApplication::qgisSettingsDirPath() + QLatin1String( "project_default.qgs" );
911911
if ( QFile::exists( fileName ) )
912912
{
913913
QFile::remove( fileName );
@@ -927,7 +927,7 @@ void QgsOptions::on_pbnTemplateFolderBrowse_pressed()
927927

928928
void QgsOptions::on_pbnTemplateFolderReset_pressed()
929929
{
930-
leTemplateFolder->setText( QgsApplication::qgisSettingsDirPath() + QString( "project_templates" ) );
930+
leTemplateFolder->setText( QgsApplication::qgisSettingsDirPath() + QLatin1String( "project_templates" ) );
931931
}
932932

933933
void QgsOptions::iconSizeChanged( const QString &iconSize )

‎src/app/qgsprojectproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ void QgsProjectProperties::populateEllipsoidList()
15081508
myItem.semiMinor = 0.0;
15091509
mEllipsoidList.append( myItem );
15101510

1511-
myItem.acronym = QString( "PARAMETER:6370997:6370997" );
1511+
myItem.acronym = QLatin1String( "PARAMETER:6370997:6370997" );
15121512
myItem.description = tr( "Parameters:" );
15131513
myItem.semiMajor = 6370997.0;
15141514
myItem.semiMinor = 6370997.0;

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,13 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
193193
if ( myRasterPyramidIterator->exists )
194194
{
195195
lbxPyramidResolutions->addItem( new QListWidgetItem( myPyramidPixmap,
196-
QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
196+
QString::number( myRasterPyramidIterator->xDim ) + QLatin1String( " x " ) +
197197
QString::number( myRasterPyramidIterator->yDim ) ) );
198198
}
199199
else
200200
{
201201
lbxPyramidResolutions->addItem( new QListWidgetItem( myNoPyramidPixmap,
202-
QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
202+
QString::number( myRasterPyramidIterator->xDim ) + QLatin1String( " x " ) +
203203
QString::number( myRasterPyramidIterator->yDim ) ) );
204204
}
205205
}
@@ -1038,13 +1038,13 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked()
10381038
if ( myRasterPyramidIterator->exists )
10391039
{
10401040
lbxPyramidResolutions->addItem( new QListWidgetItem( myPyramidPixmap,
1041-
QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
1041+
QString::number( myRasterPyramidIterator->xDim ) + QLatin1String( " x " ) +
10421042
QString::number( myRasterPyramidIterator->yDim ) ) );
10431043
}
10441044
else
10451045
{
10461046
lbxPyramidResolutions->addItem( new QListWidgetItem( myNoPyramidPixmap,
1047-
QString::number( myRasterPyramidIterator->xDim ) + QString( " x " ) +
1047+
QString::number( myRasterPyramidIterator->xDim ) + QLatin1String( " x " ) +
10481048
QString::number( myRasterPyramidIterator->yDim ) ) );
10491049
}
10501050
}

‎src/auth/identcert/qgsauthidentcertmethod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool QgsAuthIdentCertMethod::updateNetworkRequest( QNetworkRequest &request, con
7373
Q_UNUSED( dataprovider )
7474

7575
// TODO: is this too restrictive, to intercept only HTTPS connections?
76-
if ( request.url().scheme().toLower() != QString( "https" ) )
76+
if ( request.url().scheme().toLower() != QLatin1String( "https" ) )
7777
{
7878
QgsDebugMsg( QString( "Update request SSL config SKIPPED for authcfg %1: not HTTPS" ).arg( authcfg ) );
7979
return true;

‎src/auth/pkipaths/qgsauthpkipathsmethod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool QgsAuthPkiPathsMethod::updateNetworkRequest( QNetworkRequest &request, cons
7373
Q_UNUSED( dataprovider )
7474

7575
// TODO: is this too restrictive, to intercept only HTTPS connections?
76-
if ( request.url().scheme().toLower() != QString( "https" ) )
76+
if ( request.url().scheme().toLower() != QLatin1String( "https" ) )
7777
{
7878
QgsDebugMsg( QString( "Update request SSL config SKIPPED for authcfg %1: not HTTPS" ).arg( authcfg ) );
7979
return true;

‎src/auth/pkipkcs12/qgsauthpkcs12method.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bool QgsAuthPkcs12Method::updateNetworkRequest( QNetworkRequest &request, const
7373
Q_UNUSED( dataprovider )
7474

7575
// TODO: is this too restrictive, to intercept only HTTPS connections?
76-
if ( request.url().scheme().toLower() != QString( "https" ) )
76+
if ( request.url().scheme().toLower() != QLatin1String( "https" ) )
7777
{
7878
QgsDebugMsg( QString( "Update request SSL config SKIPPED for authcfg %1: not HTTPS" ).arg( authcfg ) );
7979
return true;

‎src/browser/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int main( int argc, char ** argv )
4141
|| theme == "classic"
4242
|| theme == "nkids" )
4343
{
44-
theme = QString( "default" );
44+
theme = QLatin1String( "default" );
4545
}
4646
a.setThemeName( theme );
4747
a.initQgis();

‎src/core/auth/qgsauthmanager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ bool QgsAuthManager::init( const QString& pluginPath )
129129
{
130130
QString pn = p->name();
131131
int pr = 0;
132-
if ( pn != QString( "qca-ossl" ) )
132+
if ( pn != QLatin1String( "qca-ossl" ) )
133133
{
134134
pr = QCA::providerPriority( pn ) + 1;
135135
}
@@ -632,7 +632,7 @@ bool QgsAuthManager::resetMasterPassword( const QString& newpass, const QString
632632
// backup database of failed attempt, for inspection
633633
authDbConnection().close();
634634
QString errdbbackup( dbbackup );
635-
errdbbackup.replace( QString( ".db" ), QString( "_ERROR.db" ) );
635+
errdbbackup.replace( QLatin1String( ".db" ), QLatin1String( "_ERROR.db" ) );
636636
QFile::rename( authenticationDbPath(), errdbbackup );
637637
QgsDebugMsg( QString( "Master password reset FAILED: backed up failed db at %1" ).arg( errdbbackup ) );
638638

@@ -1204,7 +1204,7 @@ bool QgsAuthManager::backupAuthenticationDatabase( QString *backuppath )
12041204
// duplicate current db file to 'qgis-auth_YYYY-MM-DD-HHMMSS.db' backup
12051205
QString datestamp( QDateTime::currentDateTime().toString( "yyyy-MM-dd-hhmmss" ) );
12061206
QString dbbackup( authenticationDbPath() );
1207-
dbbackup.replace( QString( ".db" ), QString( "_%1.db" ).arg( datestamp ) );
1207+
dbbackup.replace( QLatin1String( ".db" ), QString( "_%1.db" ).arg( datestamp ) );
12081208

12091209
if ( !QFile::copy( authenticationDbPath(), dbbackup ) )
12101210
{

‎src/core/composer/qgscomposerpicture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ void QgsComposerPicture::loadPicture( const QString &path )
426426
{
427427
//trying to load an invalid file or bad expression, show cross picture
428428
mMode = SVG;
429-
QString badFile = QString( ":/images/composer/missing_image.svg" );
429+
QString badFile( ":/images/composer/missing_image.svg" );
430430
mSVG.load( badFile );
431431
if ( mSVG.isValid() )
432432
{

0 commit comments

Comments
 (0)