From e0fa9eb9cf20d3153489bc995e13b10e30240bd5 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 28 Aug 2018 11:56:16 +1000 Subject: [PATCH] Add QStringLiteral(), QStringLiteral( "" ) and QLatin1String( "" ) to banned keywords And replace use with QString() --- src/app/dwg/qgsdwgimporter.cpp | 7 ++- src/app/gps/qgsgpsinformationwidget.cpp | 6 +- src/app/pluginmanager/qgspluginmanager.cpp | 6 +- src/app/qgisapp.cpp | 10 ++-- src/app/qgsattributeactiondialog.cpp | 20 +++---- src/app/qgsbookmarks.cpp | 4 +- src/app/qgscustomization.cpp | 4 +- src/app/qgsdxfexportdialog.cpp | 4 +- src/app/qgsfieldcalculator.cpp | 2 +- src/app/qgshandlebadlayers.cpp | 2 +- src/app/qgsidentifyresultsdialog.cpp | 8 +-- src/app/qgsloadstylefromdbdialog.cpp | 8 +-- src/app/qgsmaptoollabel.cpp | 6 +- src/app/qgsnewspatialitelayerdialog.cpp | 4 +- src/app/qgsprojectproperties.cpp | 56 +++++++++---------- src/app/qgsrastercalcdialog.cpp | 2 +- src/app/qgsrasterlayerproperties.cpp | 2 +- src/app/qgssettingstree.cpp | 4 +- src/app/qgsvariantdelegate.cpp | 2 +- src/app/qgsvectorlayerproperties.cpp | 2 +- src/auth/pkipaths/qgsauthpkipathsedit.cpp | 8 +-- src/auth/pkipkcs12/qgsauthpkcs12edit.cpp | 6 +- src/auth/pkipkcs12/qgsauthpkcs12method.cpp | 2 +- src/core/annotations/qgshtmlannotation.cpp | 2 +- src/core/auth/qgsauthconfig.cpp | 2 +- src/core/auth/qgsauthmanager.cpp | 2 +- src/core/dxf/qgsdxfexport.cpp | 8 +-- src/core/expression/qgsexpression.cpp | 2 +- src/core/layout/qgscompositionconverter.cpp | 22 ++++---- .../layout/qgslayoutitemattributetable.cpp | 4 +- src/core/layout/qgslayoutitemmapgrid.cpp | 2 +- src/core/layout/qgslayoutitempicture.cpp | 2 +- src/core/layout/qgslayoutitempolyline.cpp | 4 +- src/core/layout/qgslayoutitemscalebar.cpp | 4 +- src/core/layout/qgslayouttable.cpp | 4 +- src/core/layout/qgslayouttablecolumn.cpp | 4 +- .../providers/memory/qgsmemoryprovider.cpp | 4 +- src/core/qgis.cpp | 2 +- src/core/qgsapplication.cpp | 4 +- src/core/qgsauxiliarystorage.cpp | 2 +- src/core/qgsbrowsermodel.cpp | 2 +- src/core/qgscolorramp.cpp | 2 +- src/core/qgsdataprovider.h | 4 +- src/core/qgsgmlschema.cpp | 10 ++-- src/core/qgslegendstyle.cpp | 6 +- src/core/qgsmaplayer.cpp | 12 ++-- src/core/qgsmessageoutput.cpp | 2 +- src/core/qgsmultirenderchecker.cpp | 2 +- src/core/qgsofflineediting.cpp | 2 +- src/core/qgspallabeling.cpp | 6 +- src/core/qgspathresolver.cpp | 2 +- src/core/qgsprojectfiletransform.cpp | 2 +- src/core/qgsvectordataprovider.cpp | 2 +- src/core/qgsvectorfilewriter.cpp | 54 +++++++++--------- src/core/qgsvectorfilewriter.h | 2 +- src/core/qgsvirtuallayerdefinition.cpp | 4 +- src/core/raster/qgsrasterlayer.cpp | 2 +- .../qgscategorizedsymbolrenderer.cpp | 6 +- src/core/symbology/qgscptcityarchive.cpp | 2 +- src/core/symbology/qgsellipsesymbollayer.cpp | 8 +-- src/core/symbology/qgsfillsymbollayer.cpp | 24 ++++---- .../symbology/qgsgraduatedsymbolrenderer.cpp | 4 +- src/core/symbology/qgslinesymbollayer.cpp | 12 ++-- .../qgspointdisplacementrenderer.cpp | 6 +- src/core/symbology/qgsrulebasedrenderer.cpp | 6 +- .../symbology/qgssinglesymbolrenderer.cpp | 2 +- src/core/symbology/qgssymbol.cpp | 2 +- src/core/symbology/qgssymbollayer.cpp | 6 +- src/core/symbology/qgssymbollayerutils.cpp | 18 +++--- .../attributetable/qgsattributetableview.cpp | 2 +- src/gui/auth/qgsauthcertificateinfo.cpp | 6 +- .../auth/qgsauthcerttrustpolicycombobox.cpp | 2 +- src/gui/auth/qgsauthconfigedit.cpp | 2 +- src/gui/auth/qgsauthconfigidedit.cpp | 4 +- src/gui/auth/qgsauthconfigselect.cpp | 10 ++-- src/gui/auth/qgsauthguiutils.cpp | 4 +- src/gui/auth/qgsauthimportcertdialog.cpp | 2 +- src/gui/auth/qgsauthimportidentitydialog.cpp | 6 +- src/gui/auth/qgsauthsslconfigwidget.cpp | 8 +-- src/gui/auth/qgsauthsslimportdialog.cpp | 6 +- src/gui/editorwidgets/qgstexteditwrapper.cpp | 2 +- src/gui/ogr/qgsnewogrconnection.cpp | 4 +- src/gui/qgscolorrampbutton.cpp | 2 +- src/gui/qgscredentialdialog.cpp | 8 +-- src/gui/qgserrordialog.cpp | 2 +- src/gui/qgsfieldcombobox.cpp | 2 +- src/gui/qgsfieldexpressionwidget.cpp | 2 +- src/gui/qgsfieldvalidator.cpp | 2 +- src/gui/qgsformannotation.cpp | 2 +- src/gui/qgskeyvaluewidget.cpp | 2 +- src/gui/qgslegendfilterbutton.cpp | 2 +- src/gui/qgsmaplayerstylemanagerwidget.cpp | 2 +- src/gui/qgsmaptoolidentify.cpp | 2 +- src/gui/qgsnewvectorlayerdialog.cpp | 6 +- src/gui/qgsorderbydialog.cpp | 4 +- src/gui/qgsprojectionselectiontreewidget.cpp | 6 +- src/gui/qgsquerybuilder.cpp | 6 +- src/gui/qgsrasterformatsaveoptionswidget.cpp | 10 ++-- src/gui/qgsshortcutsmanager.cpp | 2 +- src/gui/qgssqlcomposerdialog.cpp | 14 ++--- src/gui/qgstextformatwidget.cpp | 2 +- src/gui/raster/qgsrasterhistogramwidget.cpp | 4 +- .../raster/qgsrastertransparencywidget.cpp | 2 +- .../qgscategorizedsymbolrendererwidget.cpp | 2 +- .../symbology/qgscptcitycolorrampdialog.cpp | 6 +- .../qgsgraduatedsymbolrendererwidget.cpp | 2 +- .../qgspointdisplacementrendererwidget.cpp | 2 +- .../qgsstylegroupselectiondialog.cpp | 2 +- src/gui/symbology/qgsstylemanagerdialog.cpp | 4 +- .../qgsvectorfieldsymbollayerwidget.cpp | 4 +- .../coordinate_capture/coordinatecapture.cpp | 4 +- .../qgsgeometrycheckerresulttab.cpp | 2 +- src/plugins/georeferencer/qgsgeorefplugin.cpp | 2 +- .../georeferencer/qgsgeorefplugingui.cpp | 6 +- src/plugins/gps_importer/qgsgpsplugin.cpp | 2 +- src/plugins/grass/qgsgrassmapcalc.cpp | 2 +- src/plugins/grass/qgsgrassmodule.cpp | 4 +- src/plugins/grass/qgsgrassmoduleinput.cpp | 8 +-- src/plugins/grass/qgsgrassmoduleparam.cpp | 18 +++--- src/plugins/grass/qgsgrassnewmapset.cpp | 4 +- src/plugins/grass/qgsgrassplugin.cpp | 10 ++-- src/plugins/grass/qgsgrassshell.cpp | 4 +- src/plugins/grass/qgsgrasstools.cpp | 2 +- src/plugins/topology/rulesDialog.cpp | 8 +-- .../arcgisrest/qgsarcgisrestutils.cpp | 2 +- .../qgsarcgisservicesourceselect.cpp | 4 +- src/providers/db2/qgsdb2newconnection.cpp | 4 +- src/providers/db2/qgsdb2sourceselect.cpp | 4 +- src/providers/db2/qgsdb2tablemodel.cpp | 2 +- .../qgsdelimitedtextprovider.cpp | 2 +- .../qgsdelimitedtextsourceselect.cpp | 4 +- src/providers/grass/qgis.v.in.cpp | 2 +- src/providers/grass/qgsgrass.cpp | 26 ++++----- src/providers/grass/qgsgrassimport.cpp | 8 +-- .../grass/qgsgrassprovidermodule.cpp | 14 ++--- .../mssql/qgsmssqlgeomcolumntypethread.cpp | 4 +- src/providers/mssql/qgsmssqlnewconnection.cpp | 4 +- src/providers/mssql/qgsmssqlsourceselect.cpp | 2 +- src/providers/mssql/qgsmssqltablemodel.cpp | 2 +- src/providers/ogr/qgsogrdataitems.cpp | 8 +-- src/providers/ogr/qgsogrdbsourceselect.cpp | 4 +- src/providers/ogr/qgsogrprovider.cpp | 10 ++-- src/providers/postgres/qgspgnewconnection.cpp | 4 +- src/providers/postgres/qgspgsourceselect.cpp | 2 +- src/providers/postgres/qgspgtablemodel.cpp | 10 ++-- src/providers/postgres/qgspostgresconn.cpp | 4 +- .../postgres/qgspostgresfeatureiterator.cpp | 3 +- .../postgres/qgspostgresprovider.cpp | 16 +++--- .../qgsspatialitefeatureiterator.cpp | 2 +- .../spatialite/qgsspatialiteprovider.cpp | 14 ++--- .../spatialite/qgsspatialitesourceselect.cpp | 8 +-- .../spatialite/qgsspatialitetablemodel.cpp | 2 +- .../virtual/qgsvirtuallayerprovider.cpp | 4 +- src/providers/wcs/qgswcsdataitems.cpp | 2 +- src/providers/wcs/qgswcsprovider.cpp | 2 +- src/providers/wfs/qgswfscapabilities.cpp | 2 +- src/providers/wfs/qgswfsfeatureiterator.cpp | 2 +- src/providers/wfs/qgswfsprovider.cpp | 2 +- src/providers/wfs/qgswfssourceselect.cpp | 6 +- src/providers/wms/qgswmsdataitems.cpp | 4 +- src/providers/wms/qgswmsprovider.cpp | 10 ++-- src/providers/wms/qgswmssourceselect.cpp | 6 +- .../wfs/qgswfsdescribefeaturetype.cpp | 2 +- src/server/services/wfs/qgswfsgetfeature.cpp | 10 ++-- tests/code_layout/test_banned_keywords.sh | 9 +++ tests/src/analysis/testqgszonalstatistics.cpp | 2 +- .../src/app/testqgsmaptoolidentifyaction.cpp | 2 +- .../core/testqgscoordinatereferencesystem.cpp | 10 ++-- tests/src/core/testqgsdataitem.cpp | 2 +- tests/src/core/testqgsexpression.cpp | 2 +- tests/src/core/testqgsfields.cpp | 4 +- tests/src/core/testqgsgml.cpp | 18 +++--- tests/src/core/testqgsogcutils.cpp | 4 +- tests/src/core/testqgsogrutils.cpp | 4 +- tests/src/core/testqgsproperty.cpp | 4 +- tests/src/core/testqgsrasterlayer.cpp | 2 +- tests/src/core/testqgsstyle.cpp | 4 +- tests/src/core/testziplayer.cpp | 10 ++-- tests/src/gui/testqgsfiledownloader.cpp | 2 +- tests/src/gui/testqgsscalecombobox.cpp | 2 +- tests/src/gui/testqgssqlcomposerdialog.cpp | 6 +- .../gui/testqgsvaluerelationwidgetwrapper.cpp | 2 +- .../src/providers/testqgswcspublicservers.cpp | 4 +- 183 files changed, 514 insertions(+), 503 deletions(-) diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp index ccb20929c24..9c563109bfe 100644 --- a/src/app/dwg/qgsdwgimporter.cpp +++ b/src/app/dwg/qgsdwgimporter.cpp @@ -793,7 +793,8 @@ void QgsDwgImporter::addLType( const DRW_LType &data ) } } - QString typeName( data.name.c_str() ), dash( QLatin1String( "" ) ); + QString typeName( data.name.c_str() ); + QString dash; if ( !upath.empty() ) { QStringList l; @@ -866,9 +867,9 @@ QString QgsDwgImporter::linetypeString( const std::string &olinetype, const std: QString linetype( olinetype.c_str() ); if ( linetype == QLatin1String( "bylayer" ) ) - return mLayerLinetype.value( layer.c_str(), QLatin1String( "" ) ); + return mLayerLinetype.value( layer.c_str(), QString() ); else - return mLinetype.value( linetype, QLatin1String( "" ) ); + return mLinetype.value( linetype, QString() ); } void QgsDwgImporter::addLayer( const DRW_Layer &data ) diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp index 01fdbc1a2fa..b723f0d28fe 100644 --- a/src/app/gps/qgsgpsinformationwidget.cpp +++ b/src/app/gps/qgsgpsinformationwidget.cpp @@ -760,11 +760,11 @@ void QgsGpsInformationWidget::displayGPSInformation( const QgsGpsInformation &in mTxtVacc->setEnabled( false ); mTxtVacc->setText( tr( "Not available" ) ); } - mTxtFixMode->setText( info.fixMode == 'A' ? tr( "Automatic" ) : info.fixMode == 'M' ? tr( "Manual" ) : QLatin1String( "" ) ); // A=automatic 2d/3d, M=manual; allowing for anything else + mTxtFixMode->setText( info.fixMode == 'A' ? tr( "Automatic" ) : info.fixMode == 'M' ? tr( "Manual" ) : QString() ); // A=automatic 2d/3d, M=manual; allowing for anything else mTxtFixType->setText( info.fixType == 3 ? tr( "3D" ) : info.fixType == 2 ? tr( "2D" ) : info.fixType == 1 ? tr( "No fix" ) : QString::number( info.fixType ) ); // 1=no fix, 2=2D, 3=3D; allowing for anything else - mTxtQuality->setText( info.quality == 2 ? tr( "Differential" ) : info.quality == 1 ? tr( "Non-differential" ) : info.quality == 0 ? tr( "No position" ) : info.quality > 2 ? QString::number( info.quality ) : QLatin1String( "" ) ); // allowing for anything else + mTxtQuality->setText( info.quality == 2 ? tr( "Differential" ) : info.quality == 1 ? tr( "Non-differential" ) : info.quality == 0 ? tr( "No position" ) : info.quality > 2 ? QString::number( info.quality ) : QString() ); // allowing for anything else mTxtSatellitesUsed->setText( QString::number( info.satellitesUsed ) ); - mTxtStatus->setText( info.status == 'A' ? tr( "Valid" ) : info.status == 'V' ? tr( "Invalid" ) : QLatin1String( "" ) ); + mTxtStatus->setText( info.status == 'A' ? tr( "Valid" ) : info.status == 'V' ? tr( "Invalid" ) : QString() ); } //position // Avoid refreshing / panning if we haven't moved diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp index 23e5bb64f0c..91c901cfb6f 100644 --- a/src/app/pluginmanager/qgspluginmanager.cpp +++ b/src/app/pluginmanager/qgspluginmanager.cpp @@ -509,7 +509,7 @@ void QgsPluginManager::reloadModelData() if ( !mCurrentlyDisplayedPlugin.isEmpty() ) { - wvDetails->setHtml( QLatin1String( "" ) ); + wvDetails->setHtml( QString() ); buttonInstall->setEnabled( false ); buttonUninstall->setEnabled( false ); } @@ -1161,12 +1161,12 @@ void QgsPluginManager::setCurrentTab( int idx ) { case PLUGMAN_TAB_ALL: // all (statuses ends with Z are for spacers to always sort properly) - acceptedStatuses << QStringLiteral( "installed" ) << QStringLiteral( "not installed" ) << QStringLiteral( "new" ) << QStringLiteral( "orphan" ) << QStringLiteral( "newer" ) << QStringLiteral( "upgradeable" ) << QStringLiteral( "not installedZ" ) << QStringLiteral( "installedZ" ) << QStringLiteral( "upgradeableZ" ) << QStringLiteral( "orphanZ" ) << QStringLiteral( "newerZZ" ) << QLatin1String( "" ); + acceptedStatuses << QStringLiteral( "installed" ) << QStringLiteral( "not installed" ) << QStringLiteral( "new" ) << QStringLiteral( "orphan" ) << QStringLiteral( "newer" ) << QStringLiteral( "upgradeable" ) << QStringLiteral( "not installedZ" ) << QStringLiteral( "installedZ" ) << QStringLiteral( "upgradeableZ" ) << QStringLiteral( "orphanZ" ) << QStringLiteral( "newerZZ" ) << QString(); tabTitle = QStringLiteral( "all_plugins" ); break; case PLUGMAN_TAB_INSTALLED: // installed (statuses ends with Z are for spacers to always sort properly) - acceptedStatuses << QStringLiteral( "installed" ) << QStringLiteral( "orphan" ) << QStringLiteral( "newer" ) << QStringLiteral( "upgradeable" ) << QStringLiteral( "installedZ" ) << QStringLiteral( "upgradeableZ" ) << QStringLiteral( "orphanZ" ) << QStringLiteral( "newerZZ" ) << QLatin1String( "" ); + acceptedStatuses << QStringLiteral( "installed" ) << QStringLiteral( "orphan" ) << QStringLiteral( "newer" ) << QStringLiteral( "upgradeable" ) << QStringLiteral( "installedZ" ) << QStringLiteral( "upgradeableZ" ) << QStringLiteral( "orphanZ" ) << QStringLiteral( "newerZZ" ) << QString(); tabTitle = QStringLiteral( "installed_plugins" ); break; case PLUGMAN_TAB_NOT_INSTALLED: diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index ed9091886be..15e6bdb4a5a 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -6757,7 +6757,7 @@ void QgisApp::refreshFeatureActions() if ( !vlayer->isEditable() && action.isEnabledOnlyWhenEditable() ) continue; - QString actionTitle = !action.shortTitle().isEmpty() ? action.shortTitle() : action.icon().isNull() ? action.name() : QStringLiteral( "" ); + QString actionTitle = !action.shortTitle().isEmpty() ? action.shortTitle() : action.icon().isNull() ? action.name() : QString(); QAction *qAction = new QAction( action.icon(), actionTitle, mFeatureActionMenu ); qAction->setData( QVariant::fromValue( action ) ); mFeatureActionMenu->addAction( qAction ); @@ -6853,7 +6853,7 @@ void QgisApp::labelingFontNotFound( QgsVectorLayer *vlayer, const QString &fontf act->setText( tr( "Open labeling dialog" ) ); btnOpenPrefs->addAction( act ); btnOpenPrefs->setDefaultAction( act ); - btnOpenPrefs->setToolTip( QLatin1String( "" ) ); + btnOpenPrefs->setToolTip( QString() ); connect( btnOpenPrefs, &QToolButton::triggered, this, &QgisApp::labelingDialogFontNotFound ); // no timeout set, since notice needs attention and is only shown first time layer is labeled @@ -9668,7 +9668,7 @@ void QgisApp::duplicateLayers( const QList &lyrList ) tr( "Duplicate layer: " ), tr( "%1 (%2 type unsupported)" ) .arg( selectedLyr->name(), - !unSppType.isEmpty() ? QStringLiteral( "'" ) + unSppType + "' " : QLatin1String( "" ) ), + !unSppType.isEmpty() ? QStringLiteral( "'" ) + unSppType + "' " : QString() ), Qgis::Warning, 0, mInfoBar ) ); @@ -11105,7 +11105,7 @@ void QgisApp::closeProject() mTrustedMacros = false; - mLegendExpressionFilterButton->setExpressionText( QLatin1String( "" ) ); + mLegendExpressionFilterButton->setExpressionText( QString() ); mLegendExpressionFilterButton->setChecked( false ); mActionFilterLegend->setChecked( false ); @@ -13501,7 +13501,7 @@ void QgisApp::namProxyAuthenticationRequired( const QNetworkProxy &proxy, QAuthe if ( !settings.value( QStringLiteral( "proxy/proxyEnabled" ), false ).toBool() || settings.value( QStringLiteral( "proxy/proxyType" ), "" ).toString() == QLatin1String( "DefaultProxy" ) ) { - auth->setUser( QLatin1String( "" ) ); + auth->setUser( QString() ); return; } diff --git a/src/app/qgsattributeactiondialog.cpp b/src/app/qgsattributeactiondialog.cpp index a979a10bdce..4a1d6c627f2 100644 --- a/src/app/qgsattributeactiondialog.cpp +++ b/src/app/qgsattributeactiondialog.cpp @@ -141,7 +141,7 @@ void QgsAttributeActionDialog::insertRow( int row, const QgsAction &action ) // Icon QIcon icon = action.icon(); - QTableWidgetItem *headerItem = new QTableWidgetItem( icon, QLatin1String( "" ) ); + QTableWidgetItem *headerItem = new QTableWidgetItem( icon, QString() ); headerItem->setData( Qt::UserRole, action.iconPath() ); mAttributeActionTable->setVerticalHeaderItem( row, headerItem ); @@ -312,15 +312,15 @@ void QgsAttributeActionDialog::updateButtons() void QgsAttributeActionDialog::addDefaultActions() { int pos = 0; - insertRow( pos++, QgsAction::Generic, tr( "Echo attribute's value" ), QStringLiteral( "echo \"[% \"MY_FIELD\" %]\"" ), QLatin1String( "" ), true, tr( "Attribute Value" ), QSet() << QStringLiteral( "Field" ), QString() ); - insertRow( pos++, QgsAction::Generic, tr( "Run an application" ), QStringLiteral( "ogr2ogr -f \"GPKG\" \"[% \"OUTPUT_PATH\" %]\" \"[% \"INPUT_FILE\" %]\"" ), QLatin1String( "" ), true, tr( "Run application" ), QSet() << QStringLiteral( "Feature" ) << QStringLiteral( "Canvas" ), QString() ); - insertRow( pos++, QgsAction::GenericPython, tr( "Get feature id" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nQtWidgets.QMessageBox.information(None, \"Feature id\", \"feature id is [% $id %]\")" ), QLatin1String( "" ), false, tr( "Feature ID" ), QSet() << QStringLiteral( "Feature" ) << QStringLiteral( "Canvas" ), QString() ); - insertRow( pos++, QgsAction::GenericPython, tr( "Selected field's value (Identify features tool)" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nQtWidgets.QMessageBox.information(None, \"Current field's value\", \"[% @current_field %]\")" ), QLatin1String( "" ), false, tr( "Field Value" ), QSet() << QStringLiteral( "Field" ), QString() ); - insertRow( pos++, QgsAction::GenericPython, tr( "Clicked coordinates (Run feature actions tool)" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nQtWidgets.QMessageBox.information(None, \"Clicked coords\", \"layer: [% @layer_id %]\\ncoords: ([% @click_x %],[% @click_y %])\")" ), QLatin1String( "" ), false, tr( "Clicked Coordinate" ), QSet() << QStringLiteral( "Canvas" ), QString() ); - insertRow( pos++, QgsAction::OpenUrl, tr( "Open file" ), QStringLiteral( "[% \"PATH\" %]" ), QLatin1String( "" ), false, tr( "Open file" ), QSet() << QStringLiteral( "Feature" ) << QStringLiteral( "Canvas" ), QString() ); - insertRow( pos++, QgsAction::OpenUrl, tr( "Search on web based on attribute's value" ), QStringLiteral( "http://www.google.com/search?q=[% \"ATTRIBUTE\" %]" ), QLatin1String( "" ), false, tr( "Search Web" ), QSet() << QStringLiteral( "Field" ), QString() ); - insertRow( pos++, QgsAction::GenericPython, tr( "List feature ids" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nlayer = QgsProject.instance().mapLayer('[% @layer_id %]')\nif layer.selectedFeatureCount():\n ids = layer.selectedFeatureIds()\nelse:\n ids = [f.id() for f in layer.getFeatures()]\n\nQtWidgets.QMessageBox.information(None, \"Feature ids\", ', '.join([str(id) for id in ids]))" ), QLatin1String( "" ), false, tr( "List feature ids" ), QSet() << QStringLiteral( "Layer" ), QString() ); - insertRow( pos++, QgsAction::GenericPython, tr( "Duplicate selected features" ), QStringLiteral( "project = QgsProject.instance()\nlayer = QgsProject.instance().mapLayer('[% @layer_id %]')\nif not layer.isEditable():\n qgis.utils.iface.messageBar().pushMessage( 'Cannot duplicate feature in not editable mode on layer {layer}'.format( layer=layer.name() ) )\nelse:\n features=[]\n if len('[% $id %]')>0:\n features.append( layer.getFeature( [% $id %] ) )\n else:\n for x in layer.selectedFeatures():\n features.append( x )\n feature_count=0\n children_info=''\n featureids=[]\n for f in features:\n result=QgsVectorLayerUtils.duplicateFeature(layer, f, project, 0 )\n featureids.append( result[0].id() )\n feature_count+=1\n for ch_layer in result[1].layers():\n children_info+='{number_of_children} children on layer {children_layer}\\n'.format( number_of_children=str( len( result[1].duplicatedFeatures(ch_layer) ) ), children_layer=ch_layer.name() )\n ch_layer.selectByIds( result[1].duplicatedFeatures(ch_layer) )\n layer.selectByIds( featureids )\n qgis.utils.iface.messageBar().pushMessage( '{number_of_features} features on layer {layer} duplicated with\\n{children_info}'.format( number_of_features=str( feature_count ), layer=layer.name(), children_info=children_info ) )" ), QLatin1String( "" ), false, tr( "Duplicate selected" ), QSet() << QStringLiteral( "Layer" ), QString(), true ); + insertRow( pos++, QgsAction::Generic, tr( "Echo attribute's value" ), QStringLiteral( "echo \"[% \"MY_FIELD\" %]\"" ), QString(), true, tr( "Attribute Value" ), QSet() << QStringLiteral( "Field" ), QString() ); + insertRow( pos++, QgsAction::Generic, tr( "Run an application" ), QStringLiteral( "ogr2ogr -f \"GPKG\" \"[% \"OUTPUT_PATH\" %]\" \"[% \"INPUT_FILE\" %]\"" ), QString(), true, tr( "Run application" ), QSet() << QStringLiteral( "Feature" ) << QStringLiteral( "Canvas" ), QString() ); + insertRow( pos++, QgsAction::GenericPython, tr( "Get feature id" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nQtWidgets.QMessageBox.information(None, \"Feature id\", \"feature id is [% $id %]\")" ), QString(), false, tr( "Feature ID" ), QSet() << QStringLiteral( "Feature" ) << QStringLiteral( "Canvas" ), QString() ); + insertRow( pos++, QgsAction::GenericPython, tr( "Selected field's value (Identify features tool)" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nQtWidgets.QMessageBox.information(None, \"Current field's value\", \"[% @current_field %]\")" ), QString(), false, tr( "Field Value" ), QSet() << QStringLiteral( "Field" ), QString() ); + insertRow( pos++, QgsAction::GenericPython, tr( "Clicked coordinates (Run feature actions tool)" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nQtWidgets.QMessageBox.information(None, \"Clicked coords\", \"layer: [% @layer_id %]\\ncoords: ([% @click_x %],[% @click_y %])\")" ), QString(), false, tr( "Clicked Coordinate" ), QSet() << QStringLiteral( "Canvas" ), QString() ); + insertRow( pos++, QgsAction::OpenUrl, tr( "Open file" ), QStringLiteral( "[% \"PATH\" %]" ), QString(), false, tr( "Open file" ), QSet() << QStringLiteral( "Feature" ) << QStringLiteral( "Canvas" ), QString() ); + insertRow( pos++, QgsAction::OpenUrl, tr( "Search on web based on attribute's value" ), QStringLiteral( "http://www.google.com/search?q=[% \"ATTRIBUTE\" %]" ), QString(), false, tr( "Search Web" ), QSet() << QStringLiteral( "Field" ), QString() ); + insertRow( pos++, QgsAction::GenericPython, tr( "List feature ids" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nlayer = QgsProject.instance().mapLayer('[% @layer_id %]')\nif layer.selectedFeatureCount():\n ids = layer.selectedFeatureIds()\nelse:\n ids = [f.id() for f in layer.getFeatures()]\n\nQtWidgets.QMessageBox.information(None, \"Feature ids\", ', '.join([str(id) for id in ids]))" ), QString(), false, tr( "List feature ids" ), QSet() << QStringLiteral( "Layer" ), QString() ); + insertRow( pos++, QgsAction::GenericPython, tr( "Duplicate selected features" ), QStringLiteral( "project = QgsProject.instance()\nlayer = QgsProject.instance().mapLayer('[% @layer_id %]')\nif not layer.isEditable():\n qgis.utils.iface.messageBar().pushMessage( 'Cannot duplicate feature in not editable mode on layer {layer}'.format( layer=layer.name() ) )\nelse:\n features=[]\n if len('[% $id %]')>0:\n features.append( layer.getFeature( [% $id %] ) )\n else:\n for x in layer.selectedFeatures():\n features.append( x )\n feature_count=0\n children_info=''\n featureids=[]\n for f in features:\n result=QgsVectorLayerUtils.duplicateFeature(layer, f, project, 0 )\n featureids.append( result[0].id() )\n feature_count+=1\n for ch_layer in result[1].layers():\n children_info+='{number_of_children} children on layer {children_layer}\\n'.format( number_of_children=str( len( result[1].duplicatedFeatures(ch_layer) ) ), children_layer=ch_layer.name() )\n ch_layer.selectByIds( result[1].duplicatedFeatures(ch_layer) )\n layer.selectByIds( featureids )\n qgis.utils.iface.messageBar().pushMessage( '{number_of_features} features on layer {layer} duplicated with\\n{children_info}'.format( number_of_features=str( feature_count ), layer=layer.name(), children_info=children_info ) )" ), QString(), false, tr( "Duplicate selected" ), QSet() << QStringLiteral( "Layer" ), QString(), true ); } diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp index 5c046d1841b..0823353931c 100644 --- a/src/app/qgsbookmarks.cpp +++ b/src/app/qgsbookmarks.cpp @@ -155,7 +155,7 @@ void QgsBookmarks::addClicked() QgsMapCanvas *canvas = QgisApp::instance()->mapCanvas(); Q_ASSERT( canvas ); - QString projStr( QLatin1String( "" ) ); + QString projStr; if ( QgsProject::instance() ) { if ( !QgsProject::instance()->title().isEmpty() ) @@ -165,7 +165,7 @@ void QgsBookmarks::addClicked() else if ( !QgsProject::instance()->fileName().isEmpty() ) { QFileInfo fi( QgsProject::instance()->fileName() ); - projStr = fi.exists() ? fi.fileName() : QLatin1String( "" ); + projStr = fi.exists() ? fi.fileName() : QString(); } } diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp index 8eeb97167f5..12f0ab4ead5 100644 --- a/src/app/qgscustomization.cpp +++ b/src/app/qgscustomization.cpp @@ -344,7 +344,7 @@ QTreeWidgetItem *QgsCustomizationDialog::readWidgetsXmlNode( const QDomNode &nod { QDomElement myElement = node.toElement(); - QString name = myElement.attribute( QStringLiteral( "objectName" ), QLatin1String( "" ) ); + QString name = myElement.attribute( QStringLiteral( "objectName" ), QString() ); QStringList data( name ); data << myElement.attribute( QStringLiteral( "label" ), name ); @@ -353,7 +353,7 @@ QTreeWidgetItem *QgsCustomizationDialog::readWidgetsXmlNode( const QDomNode &nod // It is nice to have icons for each Qt widget class, is it too heavy? // There are 47 png files, total 196K in qt/tools/designer/src/components/formeditor/images/ - QString iconName = myElement.attribute( QStringLiteral( "class" ), QLatin1String( "" ) ).toLower().mid( 1 ) + ".png"; + QString iconName = myElement.attribute( QStringLiteral( "class" ), QString() ).toLower().mid( 1 ) + ".png"; QString iconPath = QgsApplication::iconPath( "/customization/" + iconName ); QgsDebugMsg( "iconPath = " + iconPath ); if ( QFile::exists( iconPath ) ) diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp index caee732476d..f786ba61d64 100644 --- a/src/app/qgsdxfexportdialog.cpp +++ b/src/app/qgsdxfexportdialog.cpp @@ -475,9 +475,9 @@ QgsDxfExportDialog::QgsDxfExportDialog( QWidget *parent, Qt::WindowFlags f ) mMTextCheckBox->setChecked( QgsProject::instance()->readEntry( QStringLiteral( "dxf" ), QStringLiteral( "/lastDxfUseMText" ), settings.value( QStringLiteral( "qgis/lastDxfUseMText" ), "true" ).toString() ) != QLatin1String( "false" ) ); QStringList ids = QgsProject::instance()->mapThemeCollection()->mapThemes(); - ids.prepend( QLatin1String( "" ) ); + ids.prepend( QString() ); mVisibilityPresets->addItems( ids ); - mVisibilityPresets->setCurrentIndex( mVisibilityPresets->findText( QgsProject::instance()->readEntry( QStringLiteral( "dxf" ), QStringLiteral( "/lastVisibliltyPreset" ), QLatin1String( "" ) ) ) ); + mVisibilityPresets->setCurrentIndex( mVisibilityPresets->findText( QgsProject::instance()->readEntry( QStringLiteral( "dxf" ), QStringLiteral( "/lastVisibliltyPreset" ), QString() ) ) ); buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false ); diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp index 4484b2b90d7..29510e68897 100644 --- a/src/app/qgsfieldcalculator.cpp +++ b/src/app/qgsfieldcalculator.cpp @@ -484,7 +484,7 @@ void QgsFieldCalculator::setOkButtonState() return; } - okButton->setToolTip( QLatin1String( "" ) ); + okButton->setToolTip( QString() ); okButton->setEnabled( true ); } diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp index 2506c87ba9c..94629640209 100644 --- a/src/app/qgshandlebadlayers.cpp +++ b/src/app/qgshandlebadlayers.cpp @@ -135,7 +135,7 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList &layers ) } else { - item = new QTableWidgetItem( QLatin1String( "" ) ); + item = new QTableWidgetItem( QString() ); mLayerList->setItem( j, 3, item ); } diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp index ebbce095e74..56f201831f6 100644 --- a/src/app/qgsidentifyresultsdialog.cpp +++ b/src/app/qgsidentifyresultsdialog.cpp @@ -526,7 +526,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat if ( vlayer->fields().size() > 0 ) { - QTreeWidgetItem *editItem = new QTreeWidgetItem( QStringList() << QLatin1String( "" ) << ( vlayer->isEditable() ? tr( "Edit feature form" ) : tr( "View feature form" ) ) ); + QTreeWidgetItem *editItem = new QTreeWidgetItem( QStringList() << QString() << ( vlayer->isEditable() ? tr( "Edit feature form" ) : tr( "View feature form" ) ) ); editItem->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mActionFormView.svg" ) ) ); editItem->setData( 0, Qt::UserRole, "edit" ); actionItem->addChild( editItem ); @@ -540,7 +540,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat if ( action.isEnabledOnlyWhenEditable() ) continue; - QTreeWidgetItem *twi = new QTreeWidgetItem( QStringList() << QLatin1String( "" ) << action.name() ); + QTreeWidgetItem *twi = new QTreeWidgetItem( QStringList() << QString() << action.name() ); twi->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mAction.svg" ) ) ); twi->setData( 0, Qt::UserRole, "action" ); twi->setData( 0, Qt::UserRole + 1, action.id() ); @@ -554,7 +554,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat continue; QgsMapLayerAction *action = registeredActions.at( i ); - QTreeWidgetItem *twi = new QTreeWidgetItem( QStringList() << QLatin1String( "" ) << action->text() ); + QTreeWidgetItem *twi = new QTreeWidgetItem( QStringList() << QString() << action->text() ); twi->setIcon( 0, QgsApplication::getThemeIcon( QStringLiteral( "/mAction.svg" ) ) ); twi->setData( 0, Qt::UserRole, "map_layer_action" ); twi->setData( 0, Qt::UserRole + 1, qVariantFromValue( qobject_cast( action ) ) ); @@ -830,7 +830,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer, // Set/reset getFeatureInfoUrl (currently only available for Feature, so it may change if format changes) layItem->setData( 0, GetFeatureInfoUrlRole, params.value( QStringLiteral( "getFeatureInfoUrl" ) ) ); - QgsIdentifyResultsFeatureItem *featItem = new QgsIdentifyResultsFeatureItem( fields, feature, layer->crs(), QStringList() << label << QLatin1String( "" ) ); + QgsIdentifyResultsFeatureItem *featItem = new QgsIdentifyResultsFeatureItem( fields, feature, layer->crs(), QStringList() << label << QString() ); layItem->addChild( featItem ); // add feature attributes diff --git a/src/app/qgsloadstylefromdbdialog.cpp b/src/app/qgsloadstylefromdbdialog.cpp index 1ffb09d9560..bc5cf7b0fee 100644 --- a/src/app/qgsloadstylefromdbdialog.cpp +++ b/src/app/qgsloadstylefromdbdialog.cpp @@ -83,18 +83,18 @@ void QgsLoadStyleFromDBDialog::initializeLists( const QStringList &ids, const QS for ( int i = 0; i < sectionLimit; i++ ) { - QTableWidgetItem *item = new QTableWidgetItem( names.value( i, QLatin1String( "" ) ) ); + QTableWidgetItem *item = new QTableWidgetItem( names.value( i, QString() ) ); item->setData( Qt::UserRole, ids[i] ); mRelatedTable->setItem( i, 0, item ); - mRelatedTable->setItem( i, 1, new QTableWidgetItem( descriptions.value( i, QLatin1String( "" ) ) ) ); + mRelatedTable->setItem( i, 1, new QTableWidgetItem( descriptions.value( i, QString() ) ) ); } for ( int i = sectionLimit; i < ids.count(); i++ ) { int j = i - sectionLimit; - QTableWidgetItem *item = new QTableWidgetItem( names.value( i, QLatin1String( "" ) ) ); + QTableWidgetItem *item = new QTableWidgetItem( names.value( i, QString() ) ); item->setData( Qt::UserRole, ids[i] ); mOthersTable->setItem( j, 0, item ); - mOthersTable->setItem( j, 1, new QTableWidgetItem( descriptions.value( i, QLatin1String( "" ) ) ) ); + mOthersTable->setItem( j, 1, new QTableWidgetItem( descriptions.value( i, QString() ) ) ); } } diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp index a901d2f5a78..9249255c6cd 100644 --- a/src/app/qgsmaptoollabel.cpp +++ b/src/app/qgsmaptoollabel.cpp @@ -135,7 +135,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc ) { if ( !mCurrentLabel.valid ) { - return QLatin1String( "" ); + return QString(); } QgsPalLayerSettings &labelSettings = mCurrentLabel.settings; @@ -155,7 +155,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc ) QgsVectorLayer *vlayer = mCurrentLabel.layer; if ( !vlayer ) { - return QLatin1String( "" ); + return QString(); } QString labelField = labelSettings.fieldName; @@ -175,7 +175,7 @@ QString QgsMapToolLabel::currentLabelText( int trunc ) } } } - return QLatin1String( "" ); + return QString(); } void QgsMapToolLabel::currentAlignment( QString &hali, QString &vali ) diff --git a/src/app/qgsnewspatialitelayerdialog.cpp b/src/app/qgsnewspatialitelayerdialog.cpp index bf1be6963e1..81fb6e8ca41 100644 --- a/src/app/qgsnewspatialitelayerdialog.cpp +++ b/src/app/qgsnewspatialitelayerdialog.cpp @@ -56,7 +56,7 @@ QgsNewSpatialiteLayerDialog::QgsNewSpatialiteLayerDialog( QWidget *parent, Qt::W connect( buttonBox, &QDialogButtonBox::accepted, this, &QgsNewSpatialiteLayerDialog::buttonBox_accepted ); connect( buttonBox, &QDialogButtonBox::rejected, this, &QgsNewSpatialiteLayerDialog::buttonBox_rejected ); - mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconTableLayer.svg" ) ), tr( "No geometry" ), QStringLiteral( "" ) ); + mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconTableLayer.svg" ) ), tr( "No geometry" ), QString() ); mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconPointLayer.svg" ) ), tr( "Point" ), QStringLiteral( "POINT" ) ); mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconLineLayer.svg" ) ), tr( "Line" ), QStringLiteral( "LINESTRING" ) ); mGeometryTypeBox->addItem( QgsApplication::getThemeIcon( QStringLiteral( "/mIconPolygonLayer.svg" ) ), tr( "Polygon" ), QStringLiteral( "POLYGON" ) ); @@ -457,7 +457,7 @@ bool QgsNewSpatialiteLayerDialog::apply() QgsVectorLayer *layer = new QgsVectorLayer( QStringLiteral( "dbname='%1' table='%2'%3 sql=" ) .arg( mDatabaseComboBox->currentText(), leLayerName->text(), - mGeometryTypeBox->currentIndex() != 0 ? QStringLiteral( "(%1)" ).arg( leGeometryColumn->text() ) : QStringLiteral( "" ) ), + mGeometryTypeBox->currentIndex() != 0 ? QStringLiteral( "(%1)" ).arg( leGeometryColumn->text() ) : QString() ), leLayerName->text(), QStringLiteral( "spatialite" ) ); if ( layer->isValid() ) { diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp index b6b623e3ab5..abacdaa0adc 100644 --- a/src/app/qgsprojectproperties.cpp +++ b/src/app/qgsprojectproperties.cpp @@ -423,13 +423,13 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa grpOWSServiceCapabilities->setChecked( QgsProject::instance()->readBoolEntry( QStringLiteral( "WMSServiceCapabilities" ), QStringLiteral( "/" ), false ) ); mWMSTitle->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSServiceTitle" ), QStringLiteral( "/" ) ) ); mWMSName->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSRootName" ), QStringLiteral( "/" ) ) ); - mWMSContactOrganization->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactOrganization" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); - mWMSContactPerson->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactPerson" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); - mWMSContactMail->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactMail" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); - mWMSContactPhone->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactPhone" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); - mWMSAbstract->setPlainText( QgsProject::instance()->readEntry( QStringLiteral( "WMSServiceAbstract" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); - mWMSOnlineResourceLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSOnlineResource" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); - mWMSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSUrl" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); + mWMSContactOrganization->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactOrganization" ), QStringLiteral( "/" ), QString() ) ); + mWMSContactPerson->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactPerson" ), QStringLiteral( "/" ), QString() ) ); + mWMSContactMail->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactMail" ), QStringLiteral( "/" ), QString() ) ); + mWMSContactPhone->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSContactPhone" ), QStringLiteral( "/" ), QString() ) ); + mWMSAbstract->setPlainText( QgsProject::instance()->readEntry( QStringLiteral( "WMSServiceAbstract" ), QStringLiteral( "/" ), QString() ) ); + mWMSOnlineResourceLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSOnlineResource" ), QStringLiteral( "/" ), QString() ) ); + mWMSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMSUrl" ), QStringLiteral( "/" ), QString() ) ); mWMSKeywordList->setText( QgsProject::instance()->readListEntry( QStringLiteral( "WMSKeywordList" ), QStringLiteral( "/" ) ).join( QStringLiteral( ", " ) ) ); // WMS Name validator @@ -437,8 +437,8 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa mWMSName->setValidator( shortNameValidator ); // WMS Contact Position - QString contactPositionText = QgsProject::instance()->readEntry( QStringLiteral( "WMSContactPosition" ), QStringLiteral( "/" ), QLatin1String( "" ) ); - mWMSContactPositionCb->addItem( QLatin1String( "" ) ); + QString contactPositionText = QgsProject::instance()->readEntry( QStringLiteral( "WMSContactPosition" ), QStringLiteral( "/" ), QString() ); + mWMSContactPositionCb->addItem( QString() ); mWMSContactPositionCb->addItem( tr( "Custodian" ), "custodian" ); mWMSContactPositionCb->addItem( tr( "Owner" ), "owner" ); mWMSContactPositionCb->addItem( tr( "User" ), "user" ); @@ -460,7 +460,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa } // WMS Fees - QString feesText = QgsProject::instance()->readEntry( QStringLiteral( "WMSFees" ), QStringLiteral( "/" ), QLatin1String( "" ) ); + QString feesText = QgsProject::instance()->readEntry( QStringLiteral( "WMSFees" ), QStringLiteral( "/" ), QString() ); mWMSFeesCb->addItem( tr( "Conditions unknown" ), "conditions unknown" ); mWMSFeesCb->addItem( tr( "No conditions apply" ), "no conditions apply" ); int feesIndex = mWMSFeesCb->findData( feesText ); @@ -474,7 +474,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa } // WMS Access Constraints - QString accessConstraintsText = QgsProject::instance()->readEntry( QStringLiteral( "WMSAccessConstraints" ), QStringLiteral( "/" ), QLatin1String( "" ) ); + QString accessConstraintsText = QgsProject::instance()->readEntry( QStringLiteral( "WMSAccessConstraints" ), QStringLiteral( "/" ), QString() ); mWMSAccessConstraintsCb->addItem( tr( "None" ), "None" ); mWMSAccessConstraintsCb->addItem( tr( "Copyright" ), "copyright" ); mWMSAccessConstraintsCb->addItem( tr( "Patent" ), "patent" ); @@ -533,30 +533,30 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa if ( addWMSInspire ) { mWMSInspire->setChecked( addWMSInspire ); - QString inspireLanguage = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/language" ), QLatin1String( "" ) ); + QString inspireLanguage = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/language" ), QString() ); int inspireLanguageIndex = mWMSInspireLanguage->findData( inspireLanguage ); mWMSInspireLanguage->setCurrentIndex( inspireLanguageIndex ); - QString inspireMetadataUrl = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/metadataUrl" ), QLatin1String( "" ) ); + QString inspireMetadataUrl = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/metadataUrl" ), QString() ); if ( !inspireMetadataUrl.isEmpty() ) { mWMSInspireScenario1->setChecked( true ); mWMSInspireMetadataUrl->setText( inspireMetadataUrl ); mWMSInspireMetadataUrlType->setCurrentIndex( mWMSInspireMetadataUrlType->findText( - QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/metadataUrlType" ), QLatin1String( "" ) ) + QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/metadataUrlType" ), QString() ) ) ); } else { - QString inspireTemporalReference = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/temporalReference" ), QLatin1String( "" ) ); + QString inspireTemporalReference = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/temporalReference" ), QString() ); if ( !inspireTemporalReference.isEmpty() ) { mWMSInspireScenario2->setChecked( true ); mWMSInspireTemporalReference->setDate( QDate::fromString( inspireTemporalReference, QStringLiteral( "yyyy-MM-dd" ) ) ); } - QString inspireMetadataDate = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/metadataDate" ), QLatin1String( "" ) ); + QString inspireMetadataDate = QgsProject::instance()->readEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/metadataDate" ), QString() ); if ( !inspireMetadataDate.isEmpty() ) { mWMSInspireScenario2->setChecked( true ); @@ -663,7 +663,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa mWMSImageQualitySpinBox->setValue( imageQuality ); } - mWMTSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); + mWMTSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WMTSUrl" ), QStringLiteral( "/" ), QString() ) ); mWMTSMinScaleLineEdit->setValue( QgsProject::instance()->readNumEntry( QStringLiteral( "WMTSMinScale" ), QStringLiteral( "/" ), 5000 ) ); bool wmtsProject = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMTSLayers" ), QStringLiteral( "Project" ) ); @@ -706,7 +706,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa } connect( twWmtsLayers, &QTreeWidget::itemChanged, this, &QgsProjectProperties::twWmtsItemChanged ); - mWFSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WFSUrl" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); + mWFSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WFSUrl" ), QStringLiteral( "/" ), QString() ) ); QStringList wfsLayerIdList = QgsProject::instance()->readListEntry( QStringLiteral( "WFSLayers" ), QStringLiteral( "/" ) ); QStringList wfstUpdateLayerIdList = QgsProject::instance()->readListEntry( QStringLiteral( "WFSTLayers" ), QStringLiteral( "Update" ) ); QStringList wfstInsertLayerIdList = QgsProject::instance()->readListEntry( QStringLiteral( "WFSTLayers" ), QStringLiteral( "Insert" ) ); @@ -773,7 +773,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa twWFSLayers->setRowCount( j ); twWFSLayers->verticalHeader()->setSectionResizeMode( QHeaderView::ResizeToContents ); - mWCSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WCSUrl" ), QStringLiteral( "/" ), QLatin1String( "" ) ) ); + mWCSUrlLineEdit->setText( QgsProject::instance()->readEntry( QStringLiteral( "WCSUrl" ), QStringLiteral( "/" ), QString() ) ); QStringList wcsLayerIdList = QgsProject::instance()->readListEntry( QStringLiteral( "WCSLayers" ), QStringLiteral( "/" ) ); QSignalMapper *smWcsPublied = new QSignalMapper( this ); @@ -1131,7 +1131,7 @@ void QgsProjectProperties::apply() QStringList keywordStringList = mWMSKeywordList->text().split( ',' ); if ( !keywordStringList.isEmpty() ) { - keywordStringList.replaceInStrings( QRegExp( "^\\s+" ), QLatin1String( "" ) ).replaceInStrings( QRegExp( "\\s+$" ), QLatin1String( "" ) ); + keywordStringList.replaceInStrings( QRegExp( "^\\s+" ), QString() ).replaceInStrings( QRegExp( "\\s+$" ), QString() ); QgsProject::instance()->writeEntry( QStringLiteral( "WMSKeywordList" ), QStringLiteral( "/" ), keywordStringList ); } else @@ -1886,17 +1886,17 @@ void QgsProjectProperties::populateStyles() QStringList prefList; QList cboList; cboList << cboStyleMarker; - prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/Marker" ), QLatin1String( "" ) ); + prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/Marker" ), QString() ); cboList << cboStyleLine; - prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/Line" ), QLatin1String( "" ) ); + prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/Line" ), QString() ); cboList << cboStyleFill; - prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/Fill" ), QLatin1String( "" ) ); + prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/Fill" ), QString() ); cboList << cboStyleColorRamp; - prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/ColorRamp" ), QLatin1String( "" ) ); + prefList << QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/ColorRamp" ), QString() ); for ( int i = 0; i < cboList.count(); i++ ) { cboList[i]->clear(); - cboList[i]->addItem( QLatin1String( "" ) ); + cboList[i]->addItem( QString() ); } // populate symbols @@ -1999,13 +1999,13 @@ void QgsProjectProperties::editSymbol( QComboBox *cbo ) QString symbolName = cbo->currentText(); if ( symbolName.isEmpty() ) { - QMessageBox::information( this, QLatin1String( "" ), tr( "Select a valid symbol" ) ); + QMessageBox::information( this, QString(), tr( "Select a valid symbol" ) ); return; } std::unique_ptr< QgsSymbol > symbol( mStyle->symbol( symbolName ) ); if ( ! symbol ) { - QMessageBox::warning( this, QLatin1String( "" ), tr( "Invalid symbol : " ) + symbolName ); + QMessageBox::warning( this, QString(), tr( "Invalid symbol : " ) + symbolName ); return; } @@ -2179,7 +2179,7 @@ void QgsProjectProperties::updateEllipsoidUI( int newIndex ) leSemiMinor->clear(); cmbEllipsoid->setEnabled( mCrs.isValid() ); - cmbEllipsoid->setToolTip( QLatin1String( "" ) ); + cmbEllipsoid->setToolTip( QString() ); if ( mEllipsoidList.at( mEllipsoidIndex ).acronym.startsWith( QLatin1String( "PARAMETER:" ) ) ) { leSemiMajor->setEnabled( true ); diff --git a/src/app/qgsrastercalcdialog.cpp b/src/app/qgsrastercalcdialog.cpp index 4f5caec5405..63c2e250393 100644 --- a/src/app/qgsrastercalcdialog.cpp +++ b/src/app/qgsrastercalcdialog.cpp @@ -120,7 +120,7 @@ QString QgsRasterCalcDialog::outputFormat() const int index = mOutputFormatComboBox->currentIndex(); if ( index == -1 ) { - return QLatin1String( "" ); + return QString(); } return mOutputFormatComboBox->itemData( index ).toString(); } diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index eb97dcf7960..208447f7085 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -715,7 +715,7 @@ void QgsRasterLayerProperties::sync() } else { - leNoDataValue->insert( QLatin1String( "" ) ); + leNoDataValue->insert( QString() ); } mRefreshLayerCheckBox->setChecked( mRasterLayer->hasAutoRefreshEnabled() ); diff --git a/src/app/qgssettingstree.cpp b/src/app/qgssettingstree.cpp index 999c97e234c..4b509942af6 100644 --- a/src/app/qgssettingstree.cpp +++ b/src/app/qgssettingstree.cpp @@ -181,8 +181,8 @@ void QgsSettingsTree::updateChildItems( QTreeWidgetItem *parent ) if ( childIndex != -1 ) { child = childAt( parent, childIndex ); - child->setText( 1, QLatin1String( "" ) ); - child->setText( 2, QLatin1String( "" ) ); + child->setText( 1, QString() ); + child->setText( 2, QString() ); child->setData( 2, Qt::UserRole, QVariant() ); moveItemForward( parent, childIndex, dividerIndex ); } diff --git a/src/app/qgsvariantdelegate.cpp b/src/app/qgsvariantdelegate.cpp index 3464709a562..e2039cee3f5 100644 --- a/src/app/qgsvariantdelegate.cpp +++ b/src/app/qgsvariantdelegate.cpp @@ -53,7 +53,7 @@ QgsVariantDelegate::QgsVariantDelegate( QObject *parent ) mByteArrayExp.setPattern( QStringLiteral( "[\\x00-\\xff]*" ) ); mCharExp.setPattern( QStringLiteral( "." ) ); mColorExp.setPattern( QStringLiteral( "\\(([0-9]*),([0-9]*),([0-9]*),([0-9]*)\\)" ) ); - mDoubleExp.setPattern( QLatin1String( "" ) ); + mDoubleExp.setPattern( QString() ); mPointExp.setPattern( QStringLiteral( "\\((-?[0-9]*),(-?[0-9]*)\\)" ) ); mRectExp.setPattern( QStringLiteral( "\\((-?[0-9]*),(-?[0-9]*),(-?[0-9]*),(-?[0-9]*)\\)" ) ); mSignedIntegerExp.setPattern( QStringLiteral( "-?[0-9]*" ) ); diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index cfa053c0b09..0248436bcb4 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -970,7 +970,7 @@ void QgsVectorLayerProperties::saveDefaultStyle_clicked() case 0: return; case 2: - mLayer->saveStyleToDatabase( QLatin1String( "" ), QLatin1String( "" ), true, QLatin1String( "" ), errorMsg ); + mLayer->saveStyleToDatabase( QString(), QString(), true, QString(), errorMsg ); if ( errorMsg.isNull() ) { return; diff --git a/src/auth/pkipaths/qgsauthpkipathsedit.cpp b/src/auth/pkipaths/qgsauthpkipathsedit.cpp index 80dc4f2e4e1..84b5d31ee54 100644 --- a/src/auth/pkipaths/qgsauthpkipathsedit.cpp +++ b/src/auth/pkipaths/qgsauthpkipathsedit.cpp @@ -132,7 +132,7 @@ void QgsAuthPkiPathsEdit::clearConfig() void QgsAuthPkiPathsEdit::clearPkiMessage( QLineEdit *lineedit ) { lineedit->clear(); - lineedit->setStyleSheet( QLatin1String( "" ) ); + lineedit->setStyleSheet( QString() ); } void QgsAuthPkiPathsEdit::writePkiMessage( QLineEdit *lineedit, const QString &msg, Validity valid ) @@ -160,20 +160,20 @@ void QgsAuthPkiPathsEdit::writePkiMessage( QLineEdit *lineedit, const QString &m void QgsAuthPkiPathsEdit::clearPkiPathsCertPath() { lePkiPathsCert->clear(); - lePkiPathsCert->setStyleSheet( QLatin1String( "" ) ); + lePkiPathsCert->setStyleSheet( QString() ); } void QgsAuthPkiPathsEdit::clearPkiPathsKeyPath() { lePkiPathsKey->clear(); - lePkiPathsKey->setStyleSheet( QLatin1String( "" ) ); + lePkiPathsKey->setStyleSheet( QString() ); } void QgsAuthPkiPathsEdit::clearPkiPathsKeyPass() { lePkiPathsKeyPass->clear(); - lePkiPathsKeyPass->setStyleSheet( QLatin1String( "" ) ); + lePkiPathsKeyPass->setStyleSheet( QString() ); chkPkiPathsPassShow->setChecked( false ); } diff --git a/src/auth/pkipkcs12/qgsauthpkcs12edit.cpp b/src/auth/pkipkcs12/qgsauthpkcs12edit.cpp index c3d8d267d39..242cdf49206 100644 --- a/src/auth/pkipkcs12/qgsauthpkcs12edit.cpp +++ b/src/auth/pkipkcs12/qgsauthpkcs12edit.cpp @@ -165,7 +165,7 @@ void QgsAuthPkcs12Edit::clearConfig() void QgsAuthPkcs12Edit::clearPkiMessage( QLineEdit *lineedit ) { lineedit->clear(); - lineedit->setStyleSheet( QLatin1String( "" ) ); + lineedit->setStyleSheet( QString() ); } void QgsAuthPkcs12Edit::writePkiMessage( QLineEdit *lineedit, const QString &msg, Validity valid ) @@ -193,13 +193,13 @@ void QgsAuthPkcs12Edit::writePkiMessage( QLineEdit *lineedit, const QString &msg void QgsAuthPkcs12Edit::clearPkcs12BundlePath() { lePkcs12Bundle->clear(); - lePkcs12Bundle->setStyleSheet( QLatin1String( "" ) ); + lePkcs12Bundle->setStyleSheet( QString() ); } void QgsAuthPkcs12Edit::clearPkcs12BundlePass() { lePkcs12KeyPass->clear(); - lePkcs12KeyPass->setStyleSheet( QLatin1String( "" ) ); + lePkcs12KeyPass->setStyleSheet( QString() ); lePkcs12KeyPass->setPlaceholderText( QStringLiteral( "Optional passphrase" ) ); chkPkcs12PassShow->setChecked( false ); } diff --git a/src/auth/pkipkcs12/qgsauthpkcs12method.cpp b/src/auth/pkipkcs12/qgsauthpkcs12method.cpp index 73fce2c07b2..98517cbfbac 100644 --- a/src/auth/pkipkcs12/qgsauthpkcs12method.cpp +++ b/src/auth/pkipkcs12/qgsauthpkcs12method.cpp @@ -304,7 +304,7 @@ QgsPkiConfigBundle *QgsAuthPkcs12Method::getPkiConfigBundle( const QString &auth // !!! DON'T LEAVE THESE UNCOMMENTED !!! // QgsDebugMsg( QString( "PKI bundle key for authcfg: \n%1" ).arg( bundlelist.at( 1 ) ) ); // QgsDebugMsg( QString( "PKI bundle key pass for authcfg: \n%1" ) - // .arg( !mconfig.config( QStringLiteral( "bundlepass" ) ).isNull() ? mconfig.config( QStringLiteral( "bundlepass" ) ) : QStringLiteral() ) ); + // .arg( !mconfig.config( QStringLiteral( "bundlepass" ) ).isNull() ? mconfig.config( QStringLiteral( "bundlepass" ) ) : QString() ) ); // init key QSslKey clientkey( bundlelist.at( 1 ).toLatin1(), diff --git a/src/core/annotations/qgshtmlannotation.cpp b/src/core/annotations/qgshtmlannotation.cpp index f64a368d2f8..34b6893ff62 100644 --- a/src/core/annotations/qgshtmlannotation.cpp +++ b/src/core/annotations/qgshtmlannotation.cpp @@ -111,7 +111,7 @@ void QgsHtmlAnnotation::writeXml( QDomElement &elem, QDomDocument &doc, const Qg void QgsHtmlAnnotation::readXml( const QDomElement &itemElem, const QgsReadWriteContext &context ) { - mHtmlFile = itemElem.attribute( QStringLiteral( "htmlfile" ), QLatin1String( "" ) ); + mHtmlFile = itemElem.attribute( QStringLiteral( "htmlfile" ), QString() ); QDomElement annotationElem = itemElem.firstChildElement( QStringLiteral( "AnnotationItem" ) ); if ( !annotationElem.isNull() ) { diff --git a/src/core/auth/qgsauthconfig.cpp b/src/core/auth/qgsauthconfig.cpp index 4ac00f09061..bc18f70ee8c 100644 --- a/src/core/auth/qgsauthconfig.cpp +++ b/src/core/auth/qgsauthconfig.cpp @@ -149,7 +149,7 @@ bool QgsAuthMethodConfig::uriToResource( const QString &accessurl, QString *reso if ( url.isValid() ) { res = QStringLiteral( "%1://%2:%3%4" ).arg( url.scheme(), url.host() ) - .arg( url.port() ).arg( withpath ? url.path() : QLatin1String( "" ) ); + .arg( url.port() ).arg( withpath ? url.path() : QString() ); } } *resource = res; diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp index 08e217c30b4..25c061f3d60 100644 --- a/src/core/auth/qgsauthmanager.cpp +++ b/src/core/auth/qgsauthmanager.cpp @@ -2994,7 +2994,7 @@ bool QgsAuthManager::passwordHelperDelete() QString QgsAuthManager::passwordHelperRead() { // Retrieve it! - QString password( QLatin1String( "" ) ); + QString password; passwordHelperLog( tr( "Opening %1 for READ…" ).arg( AUTH_PASSWORD_HELPER_DISPLAY_NAME ) ); QKeychain::ReadPasswordJob job( AUTH_PASSWORD_HELPER_FOLDER_NAME ); QgsSettings settings; diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp index 8c0b9e8c1b8..e2f052af4bc 100644 --- a/src/core/dxf/qgsdxfexport.cpp +++ b/src/core/dxf/qgsdxfexport.cpp @@ -849,7 +849,7 @@ void QgsDxfExport::writeTables() writeGroup( 71, 0 ); writeGroup( 42, 5.0 ); writeGroup( 3, QStringLiteral( "romans.shx" ) ); - writeGroup( 4, QLatin1String( "" ) ); + writeGroup( 4, QString() ); writeGroup( 0, QStringLiteral( "ENDTAB" ) ); @@ -874,7 +874,7 @@ void QgsDxfExport::writeBlocks() writeGroup( 70, 0 ); writeGroup( 0, QgsPoint( QgsWkbTypes::PointZ ) ); writeGroup( 3, block ); - writeGroup( 1, QLatin1String( "" ) ); + writeGroup( 1, QString() ); writeGroup( 0, QStringLiteral( "ENDBLK" ) ); writeHandle(); writeGroup( 100, QStringLiteral( "AcDbEntity" ) ); @@ -927,7 +927,7 @@ void QgsDxfExport::writeBlocks() // size *= mapUnitScaleFactor( mSymbologyScale, ml->sizeUnit(), mMapUnits ); writeGroup( 0, QgsPoint( QgsWkbTypes::PointZ ) ); writeGroup( 3, block ); - writeGroup( 1, QLatin1String( "" ) ); + writeGroup( 1, QString() ); // maplayer 0 -> block receives layer from INSERT statement ml->writeDxf( *this, mapUnitScaleFactor( mSymbologyScale, ml->sizeUnit(), mMapUnits, ctx.renderContext().mapToPixel().mapUnitsPerPixel() ), QStringLiteral( "0" ), ctx ); @@ -4182,7 +4182,7 @@ void QgsDxfExport::writeLinetype( const QString &styleName, const QVector writeGroup( 100, QStringLiteral( "AcDbLinetypeTableRecord" ) ); writeGroup( 2, styleName ); writeGroup( 70, 64 ); // 0? - writeGroup( 3, QLatin1String( "" ) ); + writeGroup( 3, QString() ); writeGroup( 72, 65 ); writeGroup( 73, pattern.size() ); writeGroup( 40, length ); diff --git a/src/core/expression/qgsexpression.cpp b/src/core/expression/qgsexpression.cpp index c84137f0643..9b135d2aa35 100644 --- a/src/core/expression/qgsexpression.cpp +++ b/src/core/expression/qgsexpression.cpp @@ -603,7 +603,7 @@ QString QgsExpression::helpText( QString name ) helpContents += delim; helpContents += QStringLiteral( "%2%3" ).arg( a.mArg, - a.mDefaultVal.isEmpty() ? QLatin1String( "" ) : '=' + a.mDefaultVal + a.mDefaultVal.isEmpty() ? QString() : '=' + a.mDefaultVal ); if ( a.mOptional ) diff --git a/src/core/layout/qgscompositionconverter.cpp b/src/core/layout/qgscompositionconverter.cpp index e3a43243ba4..22cf279ed4b 100644 --- a/src/core/layout/qgscompositionconverter.cpp +++ b/src/core/layout/qgscompositionconverter.cpp @@ -974,7 +974,7 @@ bool QgsCompositionConverter::readMapXml( QgsLayoutItemMap *layoutItem, const QD mapGrid->setAnnotationDirection( QgsLayoutItemMapGrid::AnnotationDirection( annotationElem.attribute( QStringLiteral( "bottomDirection" ), QStringLiteral( "0" ) ).toInt() ), QgsLayoutItemMapGrid::Bottom ); mapGrid->setAnnotationFrameDistance( annotationElem.attribute( QStringLiteral( "frameDistance" ), QStringLiteral( "0" ) ).toDouble() ); QFont annotationFont; - annotationFont.fromString( annotationElem.attribute( QStringLiteral( "font" ), QLatin1String( "" ) ) ); + annotationFont.fromString( annotationElem.attribute( QStringLiteral( "font" ), QString() ) ); mapGrid->setAnnotationFont( annotationFont ); mapGrid->setAnnotationFontColor( QgsSymbolLayerUtils::decodeColor( itemElem.attribute( QStringLiteral( "fontColor" ), QStringLiteral( "0,0,0,255" ) ) ) ); @@ -1029,7 +1029,7 @@ bool QgsCompositionConverter::readScaleBarXml( QgsLayoutItemScaleBar *layoutItem QFont f; if ( !QgsFontUtils::setFromXmlChildNode( f, itemElem, QStringLiteral( "scaleBarFont" ) ) ) { - f.fromString( itemElem.attribute( QStringLiteral( "font" ), QLatin1String( "" ) ) ); + f.fromString( itemElem.attribute( QStringLiteral( "font" ), QString() ) ); } Q_NOWARN_DEPRECATED_PUSH layoutItem->setFont( f ); @@ -1141,7 +1141,7 @@ bool QgsCompositionConverter::readScaleBarXml( QgsLayoutItemScaleBar *layoutItem } //style - QString styleString = itemElem.attribute( QStringLiteral( "style" ), QLatin1String( "" ) ); + QString styleString = itemElem.attribute( QStringLiteral( "style" ), QString() ); layoutItem->setStyle( QObject::tr( styleString.toLocal8Bit().data() ) ); if ( itemElem.attribute( QStringLiteral( "unitType" ) ).isEmpty() ) @@ -1299,19 +1299,19 @@ bool QgsCompositionConverter::readAtlasXml( QgsLayoutAtlas *atlasItem, const QDo atlasItem->setPageNameExpression( itemElem.attribute( QStringLiteral( "pageNameExpression" ), QString() ) ); QString errorString; - atlasItem->setFilenameExpression( itemElem.attribute( QStringLiteral( "filenamePattern" ), QLatin1String( "" ) ), errorString ); + atlasItem->setFilenameExpression( itemElem.attribute( QStringLiteral( "filenamePattern" ), QString() ), errorString ); // note: no error reporting for errorString atlasItem->setSortFeatures( itemElem.attribute( QStringLiteral( "sortFeatures" ), QStringLiteral( "false" ) ) == QLatin1String( "true" ) ); if ( atlasItem->sortFeatures() ) { - atlasItem->setSortExpression( itemElem.attribute( QStringLiteral( "sortKey" ), QLatin1String( "" ) ) ); + atlasItem->setSortExpression( itemElem.attribute( QStringLiteral( "sortKey" ), QString() ) ); atlasItem->setSortAscending( itemElem.attribute( QStringLiteral( "sortAscending" ), QStringLiteral( "true" ) ) == QLatin1String( "true" ) ); } atlasItem->setFilterFeatures( itemElem.attribute( QStringLiteral( "filterFeatures" ), QStringLiteral( "false" ) ) == QLatin1String( "true" ) ); if ( atlasItem->filterFeatures( ) ) { QString expErrorString; - atlasItem->setFilterExpression( itemElem.attribute( QStringLiteral( "featureFilter" ), QLatin1String( "" ) ), expErrorString ); + atlasItem->setFilterExpression( itemElem.attribute( QStringLiteral( "featureFilter" ), QString() ), expErrorString ); // note: no error reporting for errorString } @@ -1399,14 +1399,14 @@ bool QgsCompositionConverter::readTableXml( QgsLayoutItemAttributeTable *layoutI layoutItem->setShowEmptyRows( itemElem.attribute( QStringLiteral( "showEmptyRows" ), QStringLiteral( "0" ) ).toInt() ); if ( !QgsFontUtils::setFromXmlChildNode( layoutItem->mHeaderFont, itemElem, QStringLiteral( "headerFontProperties" ) ) ) { - layoutItem->mHeaderFont.fromString( itemElem.attribute( QStringLiteral( "headerFont" ), QLatin1String( "" ) ) ); + layoutItem->mHeaderFont.fromString( itemElem.attribute( QStringLiteral( "headerFont" ), QString() ) ); } layoutItem->setHeaderFontColor( QgsSymbolLayerUtils::decodeColor( itemElem.attribute( QStringLiteral( "headerFontColor" ), QStringLiteral( "0,0,0,255" ) ) ) ); layoutItem->setHeaderHAlignment( static_cast( itemElem.attribute( QStringLiteral( "headerHAlignment" ), QStringLiteral( "0" ) ).toInt() ) ) ; layoutItem->setHeaderMode( static_cast( itemElem.attribute( QStringLiteral( "headerMode" ), QStringLiteral( "0" ) ).toInt() ) ); if ( !QgsFontUtils::setFromXmlChildNode( layoutItem->mContentFont, itemElem, QStringLiteral( "contentFontProperties" ) ) ) { - layoutItem->mContentFont.fromString( itemElem.attribute( QStringLiteral( "contentFont" ), QLatin1String( "" ) ) ); + layoutItem->mContentFont.fromString( itemElem.attribute( QStringLiteral( "contentFont" ), QString() ) ); } layoutItem->setContentFontColor( QgsSymbolLayerUtils::decodeColor( itemElem.attribute( QStringLiteral( "contentFontColor" ), QStringLiteral( "0,0,0,255" ) ) ) ); layoutItem->setCellMargin( itemElem.attribute( QStringLiteral( "cellMargin" ), QStringLiteral( "1.0" ) ).toDouble() ); @@ -1431,8 +1431,8 @@ bool QgsCompositionConverter::readTableXml( QgsLayoutItemAttributeTable *layoutI QgsLayoutTableColumn *column = new QgsLayoutTableColumn; column->mHAlignment = static_cast< Qt::AlignmentFlag >( columnElem.attribute( QStringLiteral( "hAlignment" ), QString::number( Qt::AlignLeft ) ).toInt() ); column->mVAlignment = static_cast< Qt::AlignmentFlag >( columnElem.attribute( QStringLiteral( "vAlignment" ), QString::number( Qt::AlignVCenter ) ).toInt() ); - column->mHeading = columnElem.attribute( QStringLiteral( "heading" ), QLatin1String( "" ) ); - column->mAttribute = columnElem.attribute( QStringLiteral( "attribute" ), QLatin1String( "" ) ); + column->mHeading = columnElem.attribute( QStringLiteral( "heading" ), QString() ); + column->mAttribute = columnElem.attribute( QStringLiteral( "attribute" ), QString() ); column->mSortByRank = columnElem.attribute( QStringLiteral( "sortByRank" ), QStringLiteral( "0" ) ).toInt(); column->mSortOrder = static_cast< Qt::SortOrder >( columnElem.attribute( QStringLiteral( "sortOrder" ), QString::number( Qt::AscendingOrder ) ).toInt() ); column->mWidth = columnElem.attribute( QStringLiteral( "width" ), QStringLiteral( "0.0" ) ).toDouble(); @@ -1538,7 +1538,7 @@ bool QgsCompositionConverter::readXml( QgsLayoutItem *layoutItem, const QDomElem layoutItem->mTemplateUuid = itemElem.attribute( QStringLiteral( "templateUuid" ) ); //id - QString id = itemElem.attribute( QStringLiteral( "id" ), QStringLiteral( "" ) ); + QString id = itemElem.attribute( QStringLiteral( "id" ), QString() ); layoutItem->setId( id ); //frame diff --git a/src/core/layout/qgslayoutitemattributetable.cpp b/src/core/layout/qgslayoutitemattributetable.cpp index a0825bfddc9..b935450c91e 100644 --- a/src/core/layout/qgslayoutitemattributetable.cpp +++ b/src/core/layout/qgslayoutitemattributetable.cpp @@ -708,7 +708,7 @@ bool QgsLayoutItemAttributeTable::readPropertiesFromElement( const QDomElement & return false; mSource = QgsLayoutItemAttributeTable::ContentSource( itemElem.attribute( QStringLiteral( "source" ), QStringLiteral( "0" ) ).toInt() ); - mRelationId = itemElem.attribute( QStringLiteral( "relationId" ), QLatin1String( "" ) ); + mRelationId = itemElem.attribute( QStringLiteral( "relationId" ), QString() ); if ( mSource == QgsLayoutItemAttributeTable::AtlasFeature ) { @@ -719,7 +719,7 @@ bool QgsLayoutItemAttributeTable::readPropertiesFromElement( const QDomElement & mShowOnlyVisibleFeatures = itemElem.attribute( QStringLiteral( "showOnlyVisibleFeatures" ), QStringLiteral( "1" ) ).toInt(); mFilterToAtlasIntersection = itemElem.attribute( QStringLiteral( "filterToAtlasIntersection" ), QStringLiteral( "0" ) ).toInt(); mFilterFeatures = itemElem.attribute( QStringLiteral( "filterFeatures" ), QStringLiteral( "false" ) ) == QLatin1String( "true" ); - mFeatureFilter = itemElem.attribute( QStringLiteral( "featureFilter" ), QLatin1String( "" ) ); + mFeatureFilter = itemElem.attribute( QStringLiteral( "featureFilter" ), QString() ); mMaximumNumberOfFeatures = itemElem.attribute( QStringLiteral( "maxFeatures" ), QStringLiteral( "5" ) ).toInt(); mWrapString = itemElem.attribute( QStringLiteral( "wrapString" ) ); diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp index 9b970804efd..f86da2e70e0 100644 --- a/src/core/layout/qgslayoutitemmapgrid.cpp +++ b/src/core/layout/qgslayoutitemmapgrid.cpp @@ -358,7 +358,7 @@ bool QgsLayoutItemMapGrid::readXml( const QDomElement &itemElem, const QDomDocum mAnnotationFrameDistance = itemElem.attribute( QStringLiteral( "frameAnnotationDistance" ), QStringLiteral( "0" ) ).toDouble(); if ( !QgsFontUtils::setFromXmlChildNode( mGridAnnotationFont, itemElem, QStringLiteral( "annotationFontProperties" ) ) ) { - mGridAnnotationFont.fromString( itemElem.attribute( QStringLiteral( "annotationFont" ), QLatin1String( "" ) ) ); + mGridAnnotationFont.fromString( itemElem.attribute( QStringLiteral( "annotationFont" ), QString() ) ); } mGridAnnotationFontColor = QgsSymbolLayerUtils::decodeColor( itemElem.attribute( QStringLiteral( "annotationFontColor" ), QStringLiteral( "0,0,0,255" ) ) ); mGridAnnotationPrecision = itemElem.attribute( QStringLiteral( "annotationPrecision" ), QStringLiteral( "3" ) ).toInt(); diff --git a/src/core/layout/qgslayoutitempicture.cpp b/src/core/layout/qgslayoutitempicture.cpp index 29fe101a0fa..f04973ee970 100644 --- a/src/core/layout/qgslayoutitempicture.cpp +++ b/src/core/layout/qgslayoutitempicture.cpp @@ -752,7 +752,7 @@ bool QgsLayoutItemPicture::readPropertiesFromElement( const QDomElement &itemEle if ( itemElem.hasAttribute( QStringLiteral( "sourceExpression" ) ) ) { //update pre 2.5 picture expression to use data defined expression - QString sourceExpression = itemElem.attribute( QStringLiteral( "sourceExpression" ), QLatin1String( "" ) ); + QString sourceExpression = itemElem.attribute( QStringLiteral( "sourceExpression" ), QString() ); QString useExpression = itemElem.attribute( QStringLiteral( "useExpression" ) ); bool expressionActive; expressionActive = ( useExpression.compare( QLatin1String( "true" ), Qt::CaseInsensitive ) == 0 ); diff --git a/src/core/layout/qgslayoutitempolyline.cpp b/src/core/layout/qgslayoutitempolyline.cpp index 7d74b893cf6..27f83bd058e 100644 --- a/src/core/layout/qgslayoutitempolyline.cpp +++ b/src/core/layout/qgslayoutitempolyline.cpp @@ -401,8 +401,8 @@ bool QgsLayoutItemPolyline::readPropertiesFromElement( const QDomElement &elmt, mArrowHeadStrokeColor = QgsSymbolLayerUtils::decodeColor( elmt.attribute( QStringLiteral( "arrowHeadOutlineColor" ), QStringLiteral( "0,0,0,255" ) ) ); mArrowHeadStrokeWidth = elmt.attribute( QStringLiteral( "outlineWidth" ), QStringLiteral( "1.0" ) ).toDouble(); // relative paths to absolute - QString startMarkerPath = elmt.attribute( QStringLiteral( "startMarkerFile" ), QLatin1String( "" ) ); - QString endMarkerPath = elmt.attribute( QStringLiteral( "endMarkerFile" ), QLatin1String( "" ) ); + QString startMarkerPath = elmt.attribute( QStringLiteral( "startMarkerFile" ), QString() ); + QString endMarkerPath = elmt.attribute( QStringLiteral( "endMarkerFile" ), QString() ); setStartSvgMarkerPath( QgsSymbolLayerUtils::svgSymbolNameToPath( startMarkerPath, context.pathResolver() ) ); setEndSvgMarkerPath( QgsSymbolLayerUtils::svgSymbolNameToPath( endMarkerPath, context.pathResolver() ) ); mEndMarker = static_cast< QgsLayoutItemPolyline::MarkerMode >( elmt.attribute( QStringLiteral( "markerMode" ), QStringLiteral( "0" ) ).toInt() ); diff --git a/src/core/layout/qgslayoutitemscalebar.cpp b/src/core/layout/qgslayoutitemscalebar.cpp index 2a19e8ab46b..91a308e485c 100644 --- a/src/core/layout/qgslayoutitemscalebar.cpp +++ b/src/core/layout/qgslayoutitemscalebar.cpp @@ -683,7 +683,7 @@ bool QgsLayoutItemScaleBar::readPropertiesFromElement( const QDomElement &itemEl QFont f; if ( !QgsFontUtils::setFromXmlChildNode( f, itemElem, QStringLiteral( "scaleBarFont" ) ) ) { - f.fromString( itemElem.attribute( QStringLiteral( "font" ), QLatin1String( "" ) ) ); + f.fromString( itemElem.attribute( QStringLiteral( "font" ), QString() ) ); } mSettings.textFormat().setFont( f ); if ( f.pointSizeF() > 0 ) @@ -800,7 +800,7 @@ bool QgsLayoutItemScaleBar::readPropertiesFromElement( const QDomElement &itemEl } //style - QString styleString = itemElem.attribute( QStringLiteral( "style" ), QLatin1String( "" ) ); + QString styleString = itemElem.attribute( QStringLiteral( "style" ), QString() ); setStyle( styleString.toLocal8Bit().data() ); if ( itemElem.attribute( QStringLiteral( "unitType" ) ).isEmpty() ) diff --git a/src/core/layout/qgslayouttable.cpp b/src/core/layout/qgslayouttable.cpp index fdd4f3f6902..051e9553bfe 100644 --- a/src/core/layout/qgslayouttable.cpp +++ b/src/core/layout/qgslayouttable.cpp @@ -128,14 +128,14 @@ bool QgsLayoutTable::readPropertiesFromElement( const QDomElement &itemElem, con mShowEmptyRows = itemElem.attribute( QStringLiteral( "showEmptyRows" ), QStringLiteral( "0" ) ).toInt(); if ( !QgsFontUtils::setFromXmlChildNode( mHeaderFont, itemElem, QStringLiteral( "headerFontProperties" ) ) ) { - mHeaderFont.fromString( itemElem.attribute( QStringLiteral( "headerFont" ), QLatin1String( "" ) ) ); + mHeaderFont.fromString( itemElem.attribute( QStringLiteral( "headerFont" ), QString() ) ); } mHeaderFontColor = QgsSymbolLayerUtils::decodeColor( itemElem.attribute( QStringLiteral( "headerFontColor" ), QStringLiteral( "0,0,0,255" ) ) ); mHeaderHAlignment = QgsLayoutTable::HeaderHAlignment( itemElem.attribute( QStringLiteral( "headerHAlignment" ), QStringLiteral( "0" ) ).toInt() ); mHeaderMode = QgsLayoutTable::HeaderMode( itemElem.attribute( QStringLiteral( "headerMode" ), QStringLiteral( "0" ) ).toInt() ); if ( !QgsFontUtils::setFromXmlChildNode( mContentFont, itemElem, QStringLiteral( "contentFontProperties" ) ) ) { - mContentFont.fromString( itemElem.attribute( QStringLiteral( "contentFont" ), QLatin1String( "" ) ) ); + mContentFont.fromString( itemElem.attribute( QStringLiteral( "contentFont" ), QString() ) ); } mContentFontColor = QgsSymbolLayerUtils::decodeColor( itemElem.attribute( QStringLiteral( "contentFontColor" ), QStringLiteral( "0,0,0,255" ) ) ); mCellMargin = itemElem.attribute( QStringLiteral( "cellMargin" ), QStringLiteral( "1.0" ) ).toDouble(); diff --git a/src/core/layout/qgslayouttablecolumn.cpp b/src/core/layout/qgslayouttablecolumn.cpp index 2e79b7c4ef4..6f059211b5b 100644 --- a/src/core/layout/qgslayouttablecolumn.cpp +++ b/src/core/layout/qgslayouttablecolumn.cpp @@ -51,8 +51,8 @@ bool QgsLayoutTableColumn::readXml( const QDomElement &columnElem ) { mHAlignment = static_cast< Qt::AlignmentFlag >( columnElem.attribute( QStringLiteral( "hAlignment" ), QString::number( Qt::AlignLeft ) ).toInt() ); mVAlignment = static_cast< Qt::AlignmentFlag >( columnElem.attribute( QStringLiteral( "vAlignment" ), QString::number( Qt::AlignVCenter ) ).toInt() ); - mHeading = columnElem.attribute( QStringLiteral( "heading" ), QLatin1String( "" ) ); - mAttribute = columnElem.attribute( QStringLiteral( "attribute" ), QLatin1String( "" ) ); + mHeading = columnElem.attribute( QStringLiteral( "heading" ), QString() ); + mAttribute = columnElem.attribute( QStringLiteral( "attribute" ), QString() ); mSortByRank = columnElem.attribute( QStringLiteral( "sortByRank" ), QStringLiteral( "0" ) ).toInt(); mSortOrder = static_cast< Qt::SortOrder >( columnElem.attribute( QStringLiteral( "sortOrder" ), QString::number( Qt::AscendingOrder ) ).toInt() ); mWidth = columnElem.attribute( QStringLiteral( "width" ), QStringLiteral( "0.0" ) ).toDouble(); diff --git a/src/core/providers/memory/qgsmemoryprovider.cpp b/src/core/providers/memory/qgsmemoryprovider.cpp index c65532788da..b884406a040 100644 --- a/src/core/providers/memory/qgsmemoryprovider.cpp +++ b/src/core/providers/memory/qgsmemoryprovider.cpp @@ -173,7 +173,7 @@ QgsMemoryProvider::QgsMemoryProvider( const QString &uri, const ProviderOptions } } if ( !name.isEmpty() ) - attributes.append( QgsField( name, type, typeName, length, precision, QLatin1String( "" ), subType ) ); + attributes.append( QgsField( name, type, typeName, length, precision, QString(), subType ) ); } addAttributes( attributes ); } @@ -220,7 +220,7 @@ QString QgsMemoryProvider::dataSourceUri( bool expandAuthConfig ) const if ( mCrs.isValid() ) { - QString crsDef( QLatin1String( "" ) ); + QString crsDef; QString authid = mCrs.authid(); if ( authid.startsWith( QLatin1String( "EPSG:" ) ) ) { diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp index 4302ca03645..467140d57cd 100644 --- a/src/core/qgis.cpp +++ b/src/core/qgis.cpp @@ -230,7 +230,7 @@ QString qgsVsiPrefix( const QString &path ) path.endsWith( QLatin1String( ".gz" ), Qt::CaseInsensitive ) ) return QStringLiteral( "/vsigzip/" ); else - return QLatin1String( "" ); + return QString(); } uint qHash( const QVariant &variant ) diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index e640ff7839b..79c7045d2ce 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -715,7 +715,7 @@ QHash QgsApplication::uiThemes() { QStringList paths = QStringList() << userThemesFolder() << defaultThemesFolder(); QHash mapping; - mapping.insert( QStringLiteral( "default" ), QLatin1String( "" ) ); + mapping.insert( QStringLiteral( "default" ), QString() ); Q_FOREACH ( const QString &path, paths ) { QDir folder( path ); @@ -1348,7 +1348,7 @@ QString QgsApplication::relativePathToAbsolutePath( const QString &rpath, const #if !defined(Q_OS_WIN) // make path absolute - targetElems.prepend( QLatin1String( "" ) ); + targetElems.prepend( QString() ); #endif return targetElems.join( QStringLiteral( "/" ) ); diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp index 2e67b5082e3..714bc2a893d 100644 --- a/src/core/qgsauxiliarystorage.cpp +++ b/src/core/qgsauxiliarystorage.cpp @@ -812,7 +812,7 @@ QgsDataSourceUri QgsAuxiliaryStorage::parseOgrUri( const QgsDataSourceUri &uri ) if ( tableParts.count() < 1 ) return newUri; - const QString tableName = tableParts[0].replace( QStringLiteral( "layername=" ), QStringLiteral( "" ) ); + const QString tableName = tableParts[0].replace( QStringLiteral( "layername=" ), QString() ); newUri.setDataSource( QString(), tableName, QString() ); newUri.setDatabase( databasePath ); diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp index c70cd82d5a1..efcb62402cc 100644 --- a/src/core/qgsbrowsermodel.cpp +++ b/src/core/qgsbrowsermodel.cpp @@ -138,7 +138,7 @@ void QgsBrowserModel::addRootItems() continue; } - QgsDataItem *item = pr->createDataItem( QLatin1String( "" ), nullptr ); // empty path -> top level + QgsDataItem *item = pr->createDataItem( QString(), nullptr ); // empty path -> top level if ( item ) { // Forward the signal from the root items to the model (and then to the app) diff --git a/src/core/qgscolorramp.cpp b/src/core/qgscolorramp.cpp index 83fc49b8323..ff139610b0f 100644 --- a/src/core/qgscolorramp.cpp +++ b/src/core/qgscolorramp.cpp @@ -638,7 +638,7 @@ void QgsCptCityColorRamp::invert() QgsCptCityColorRamp *QgsCptCityColorRamp::clone() const { - QgsCptCityColorRamp *ramp = new QgsCptCityColorRamp( QLatin1String( "" ), QLatin1String( "" ), mInverted, false ); + QgsCptCityColorRamp *ramp = new QgsCptCityColorRamp( QString(), QString(), mInverted, false ); ramp->copy( this ); return ramp; } diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h index 8956a7a44d9..6e20a9df48c 100644 --- a/src/core/qgsdataprovider.h +++ b/src/core/qgsdataprovider.h @@ -349,7 +349,7 @@ class CORE_EXPORT QgsDataProvider : public QObject */ virtual QString fileVectorFilters() const { - return QLatin1String( "" ); + return QString(); } @@ -365,7 +365,7 @@ class CORE_EXPORT QgsDataProvider : public QObject */ virtual QString fileRasterFilters() const { - return QLatin1String( "" ); + return QString(); } /** diff --git a/src/core/qgsgmlschema.cpp b/src/core/qgsgmlschema.cpp index 8c6f7ef078b..bed095f0fa6 100644 --- a/src/core/qgsgmlschema.cpp +++ b/src/core/qgsgmlschema.cpp @@ -105,7 +105,7 @@ bool QgsGmlSchema::parseXSD( const QByteArray &xml ) if ( gmlBaseType == QLatin1String( "AbstractFeatureType" ) ) { // Get feature type definition - QgsGmlFeatureClass featureClass( name, QLatin1String( "" ) ); + QgsGmlFeatureClass featureClass( name, QString() ); xsdFeatureClass( docElem, stripNS( type ), featureClass ); mFeatureClassMap.insert( name, featureClass ); } @@ -234,14 +234,14 @@ QString QgsGmlSchema::xsdComplexTypeGmlBaseType( const QDomElement &element, con { //QgsDebugMsg("name = " + name ); QDomElement complexTypeElement = domElement( element, QStringLiteral( "complexType" ), QStringLiteral( "name" ), name ); - if ( complexTypeElement.isNull() ) return QLatin1String( "" ); + if ( complexTypeElement.isNull() ) return QString(); QDomElement extrest = domElement( complexTypeElement, QStringLiteral( "complexContent.extension" ) ); if ( extrest.isNull() ) { extrest = domElement( complexTypeElement, QStringLiteral( "complexContent.restriction" ) ); } - if ( extrest.isNull() ) return QLatin1String( "" ); + if ( extrest.isNull() ) return QString(); QString extrestName = extrest.attribute( QStringLiteral( "base" ) ); if ( extrestName.startsWith( QLatin1String( "gml:" ) ) ) @@ -357,7 +357,7 @@ void QgsGmlSchema::startElement( const XML_Char *el, const XML_Char **attr ) QStringList splitName = elementName.split( NS_SEPARATOR ); QString localName = splitName.last(); - QString ns = splitName.size() > 1 ? splitName.first() : QLatin1String( "" ); + QString ns = splitName.size() > 1 ? splitName.first() : QString(); //QgsDebugMsg( "ns = " + ns + " localName = " + localName ); ParseMode parseMode = modeStackTop(); @@ -459,7 +459,7 @@ void QgsGmlSchema::endElement( const XML_Char *el ) QStringList splitName = elementName.split( NS_SEPARATOR ); QString localName = splitName.last(); - QString ns = splitName.size() > 1 ? splitName.first() : QLatin1String( "" ); + QString ns = splitName.size() > 1 ? splitName.first() : QString(); QgsGmlSchema::ParseMode parseMode = modeStackTop(); diff --git a/src/core/qgslegendstyle.cpp b/src/core/qgslegendstyle.cpp index b018cf109e8..1ac7c7f5b14 100644 --- a/src/core/qgslegendstyle.cpp +++ b/src/core/qgslegendstyle.cpp @@ -84,7 +84,7 @@ QString QgsLegendStyle::styleName( Style s ) switch ( s ) { case Undefined: - return QLatin1String( "" ); + return QString(); case Hidden: return QStringLiteral( "hidden" ); case Title: @@ -98,7 +98,7 @@ QString QgsLegendStyle::styleName( Style s ) case SymbolLabel: return QStringLiteral( "symbolLabel" ); } - return QLatin1String( "" ); + return QString(); } QgsLegendStyle::Style QgsLegendStyle::styleFromName( const QString &styleName ) @@ -131,5 +131,5 @@ QString QgsLegendStyle::styleLabel( Style s ) case SymbolLabel: return QObject::tr( "Symbol label" ); } - return QLatin1String( "" ); + return QString(); } diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp index 204e2ff7ccb..b96d108e23d 100644 --- a/src/core/qgsmaplayer.cpp +++ b/src/core/qgsmaplayer.cpp @@ -356,7 +356,7 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, QgsReadWriteCo if ( !dataUrlElem.isNull() ) { mDataUrl = dataUrlElem.text(); - mDataUrlFormat = dataUrlElem.attribute( QStringLiteral( "format" ), QLatin1String( "" ) ); + mDataUrlFormat = dataUrlElem.attribute( QStringLiteral( "format" ), QString() ); } //legendUrl @@ -364,7 +364,7 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, QgsReadWriteCo if ( !legendUrlElem.isNull() ) { mLegendUrl = legendUrlElem.text(); - mLegendUrlFormat = legendUrlElem.attribute( QStringLiteral( "format" ), QLatin1String( "" ) ); + mLegendUrlFormat = legendUrlElem.attribute( QStringLiteral( "format" ), QString() ); } //attribution @@ -372,7 +372,7 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, QgsReadWriteCo if ( !attribElem.isNull() ) { mAttribution = attribElem.text(); - mAttributionUrl = attribElem.attribute( QStringLiteral( "href" ), QLatin1String( "" ) ); + mAttributionUrl = attribElem.attribute( QStringLiteral( "href" ), QString() ); } //metadataUrl @@ -380,8 +380,8 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, QgsReadWriteCo if ( !metaUrlElem.isNull() ) { mMetadataUrl = metaUrlElem.text(); - mMetadataUrlType = metaUrlElem.attribute( QStringLiteral( "type" ), QLatin1String( "" ) ); - mMetadataUrlFormat = metaUrlElem.attribute( QStringLiteral( "format" ), QLatin1String( "" ) ); + mMetadataUrlType = metaUrlElem.attribute( QStringLiteral( "type" ), QString() ); + mMetadataUrlFormat = metaUrlElem.attribute( QStringLiteral( "format" ), QString() ); } // mMetadata.readFromLayer( this ); @@ -1527,7 +1527,7 @@ QString QgsMapLayer::loadSldStyle( const QString &uri, bool &resultFlag ) return myErrorMessage; } - return QLatin1String( "" ); + return QString(); } bool QgsMapLayer::readStyle( const QDomNode &node, QString &errorMessage, QgsReadWriteContext &context ) diff --git a/src/core/qgsmessageoutput.cpp b/src/core/qgsmessageoutput.cpp index 3042231b38f..928a2c27e65 100644 --- a/src/core/qgsmessageoutput.cpp +++ b/src/core/qgsmessageoutput.cpp @@ -66,7 +66,7 @@ void QgsMessageOutputConsole::showMessage( bool ) { mMessage.replace( QLatin1String( "
" ), QLatin1String( "\n" ) ); mMessage.replace( QLatin1String( " " ), QLatin1String( " " ) ); - mMessage.replace( QRegExp( "]+>" ), QLatin1String( "" ) ); + mMessage.replace( QRegExp( "]+>" ), QString() ); } QgsMessageLog::logMessage( mMessage, mTitle.isNull() ? QObject::tr( "Console" ) : mTitle ); emit destroyed(); diff --git a/src/core/qgsmultirenderchecker.cpp b/src/core/qgsmultirenderchecker.cpp index 04834941daa..2255d41ba2e 100644 --- a/src/core/qgsmultirenderchecker.cpp +++ b/src/core/qgsmultirenderchecker.cpp @@ -42,7 +42,7 @@ bool QgsMultiRenderChecker::runTest( const QString &testName, unsigned int misma if ( subDirs.isEmpty() ) { - subDirs << QLatin1String( "" ); + subDirs << QString(); } QVector dartMeasurements; diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp index e24dda601be..af92f03efc6 100644 --- a/src/core/qgsofflineediting.cpp +++ b/src/core/qgsofflineediting.cpp @@ -1224,7 +1224,7 @@ QList QgsOfflineEditing::sqlQueryAttributesAdded( sqlite3 *db, const Q { QgsField field( QString( reinterpret_cast< const char * >( sqlite3_column_text( stmt, 0 ) ) ), static_cast< QVariant::Type >( sqlite3_column_int( stmt, 1 ) ), - QLatin1String( "" ), // typeName + QString(), // typeName sqlite3_column_int( stmt, 2 ), sqlite3_column_int( stmt, 3 ), QString( reinterpret_cast< const char * >( sqlite3_column_text( stmt, 4 ) ) ) ); diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp index 321fc571e88..9d46e61f6e6 100644 --- a/src/core/qgspallabeling.cpp +++ b/src/core/qgspallabeling.cpp @@ -422,7 +422,7 @@ QString updateDataDefinedString( const QString &value ) QStringList values; values << QStringLiteral( "1" ); // all old-style values are active if not empty values << QStringLiteral( "0" ); - values << QLatin1String( "" ); + values << QString(); values << value; // all old-style values are only field names newValue = values.join( QStringLiteral( "~~" ) ); } @@ -1316,12 +1316,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont QgsDebugMsgLevel( QString( "Expression parser eval error:%1" ).arg( exp->evalErrorString() ), 4 ); return; } - labelText = result.isNull() ? QLatin1String( "" ) : result.toString(); + labelText = result.isNull() ? QString() : result.toString(); } else { const QVariant &v = f.attribute( fieldIndex ); - labelText = v.isNull() ? QLatin1String( "" ) : v.toString(); + labelText = v.isNull() ? QString() : v.toString(); } // apply text replacements diff --git a/src/core/qgspathresolver.cpp b/src/core/qgspathresolver.cpp index 4124df9c2f4..d665dd1dc86 100644 --- a/src/core/qgspathresolver.cpp +++ b/src/core/qgspathresolver.cpp @@ -135,7 +135,7 @@ QString QgsPathResolver::readPath( const QString &filename ) const #if !defined(Q_OS_WIN) // make path absolute - projElems.prepend( QLatin1String( "" ) ); + projElems.prepend( QString() ); #endif return vsiPrefix + projElems.join( QStringLiteral( "/" ) ); diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp index 3fd94cbad8a..2a9ebeb1ddc 100644 --- a/src/core/qgsprojectfiletransform.cpp +++ b/src/core/qgsprojectfiletransform.cpp @@ -342,7 +342,7 @@ void QgsProjectFileTransform::transform0110to1000() //create the layer to get the provider for int->fieldName conversion QgsVectorLayer::LayerOptions options; options.loadDefaultStyle = false; - QgsVectorLayer *layer = new QgsVectorLayer( dataSource, QLatin1String( "" ), providerKey, options ); + QgsVectorLayer *layer = new QgsVectorLayer( dataSource, QString(), providerKey, options ); if ( !layer->isValid() ) { delete layer; diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp index a981d758aa9..9594102e526 100644 --- a/src/core/qgsvectordataprovider.cpp +++ b/src/core/qgsvectordataprovider.cpp @@ -217,7 +217,7 @@ QString QgsVectorDataProvider::encoding() const return mEncoding->name(); } - return QLatin1String( "" ); + return QString(); } QString QgsVectorDataProvider::capabilitiesString() const diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index 4a2102d3b6d..3b536b3c7a4 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -224,7 +224,7 @@ void QgsVectorFileWriter::init( QString vectorFileName, if ( mOgrDriverName == QLatin1String( "ESRI Shapefile" ) ) { - if ( layerOptions.join( QLatin1String( "" ) ).toUpper().indexOf( QLatin1String( "ENCODING=" ) ) == -1 ) + if ( layerOptions.join( QString() ).toUpper().indexOf( QLatin1String( "ENCODING=" ) ) == -1 ) { layerOptions.append( "ENCODING=" + convertCodecNameForEncodingOption( fileEncoding ) ); } @@ -892,7 +892,7 @@ class QgsVectorFileWriterMetadataContainer #if defined(GDAL_COMPUTE_VERSION) && GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(2,2,0) << QStringLiteral( "MULTIPATCH" ) #endif - << QStringLiteral( "" ), + << QString(), QString(), // Default value true // Allow None ) ); @@ -1027,44 +1027,44 @@ class QgsVectorFileWriterMetadataContainer QObject::tr( "XML content that will be put between the element and the " "first element for a RSS document, or between the xml tag and " "the first element for an Atom document." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "TITLE" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Value put inside the element in the header. " "If not provided, a dummy value will be used as that element is compulsory." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "DESCRIPTION" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Value put inside the <description> element in the header. " "If not provided, a dummy value will be used as that element is compulsory." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "LINK" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Value put inside the <link> element in the header. " "If not provided, a dummy value will be used as that element is compulsory." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "UPDATED" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Value put inside the <updated> element in the header. " "Should be formatted as a XML datetime. " "If not provided, a dummy value will be used as that element is compulsory." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "AUTHOR_NAME" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Value put inside the <author><name> element in the header. " "If not provided, a dummy value will be used as that element is compulsory." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "ID" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Value put inside the <id> element in the header. " "If not provided, a dummy value will be used as that element is compulsory." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); driverMetadata.insert( QStringLiteral( "GeoRSS" ), @@ -1127,7 +1127,7 @@ class QgsVectorFileWriterMetadataContainer << QStringLiteral( "GML3" ) << QStringLiteral( "GML3Deegree" ) << QStringLiteral( "GML3.2" ), - QLatin1String( "" ), // Default value + QString(), // Default value true // Allow None ) ); @@ -1175,12 +1175,12 @@ class QgsVectorFileWriterMetadataContainer layerOptions.insert( QStringLiteral( "IDENTIFIER" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Human-readable identifier (e.g. short name) for the layer content" ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); layerOptions.insert( QStringLiteral( "DESCRIPTION" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Human-readable description for the layer content" ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); layerOptions.insert( QStringLiteral( "FID" ), new QgsVectorFileWriter::StringOption( @@ -1273,7 +1273,7 @@ class QgsVectorFileWriterMetadataContainer QStringList() << QStringLiteral( "CRLF" ) << QStringLiteral( "LF" ), - QLatin1String( "" ), // Default value + QString(), // Default value true // Allow None ) ); @@ -1391,7 +1391,7 @@ class QgsVectorFileWriterMetadataContainer QObject::tr( "xmin,ymin,xmax,ymax: Define custom layer bounds to increase the " "accuracy of the coordinates. Note: the geometry of written " "features must be within the defined box." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); }; insertMapInfoOptions( datasetOptions, layerOptions ); @@ -1434,7 +1434,7 @@ class QgsVectorFileWriterMetadataContainer datasetOptions.insert( QStringLiteral( "SEED" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Override the seed file to use." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "COPY_WHOLE_SEED_FILE" ), new QgsVectorFileWriter::BoolOption( @@ -1451,13 +1451,13 @@ class QgsVectorFileWriterMetadataContainer datasetOptions.insert( QStringLiteral( "MASTER_UNIT_NAME" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Override the master unit name from the seed file with " "the provided one or two character unit name." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "SUB_UNIT_NAME" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Override the sub unit name from the seed file with the provided " "one or two character unit name." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "SUB_UNITS_PER_MASTER_UNIT" ), new QgsVectorFileWriter::IntOption( @@ -1475,7 +1475,7 @@ class QgsVectorFileWriterMetadataContainer datasetOptions.insert( QStringLiteral( "ORIGIN" ), new QgsVectorFileWriter::StringOption( QObject::tr( "ORIGIN=x,y,z: Override the origin of the design plane. " "By default the origin from the seed file is used." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); driverMetadata.insert( QStringLiteral( "DGN" ), @@ -1623,7 +1623,7 @@ class QgsVectorFileWriterMetadataContainer ) ); layerOptions.insert( QStringLiteral( "SRID" ), new QgsVectorFileWriter::HiddenOption( - QLatin1String( "" ) + QString() ) ); layerOptions.insert( QStringLiteral( "COMPRESS_COLUMNS" ), new QgsVectorFileWriter::StringOption( @@ -1636,7 +1636,7 @@ class QgsVectorFileWriterMetadataContainer "done transparently. However, such columns cannot be (easily) queried with " "an attribute filter or WHERE clause. Note: in table definition, such columns " "have the 'VARCHAR_deflate' declaration type." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); driverMetadata.insert( QStringLiteral( "SQLite" ), @@ -1705,7 +1705,7 @@ class QgsVectorFileWriterMetadataContainer "the spatial_ref_sys table. When the SRID option is specified, this " "search (and the eventual insertion of a new entry) will not be done: " "the specified SRID is used as such." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); layerOptions.insert( QStringLiteral( "COMPRESS_COLUMNS" ), new QgsVectorFileWriter::StringOption( @@ -1718,7 +1718,7 @@ class QgsVectorFileWriterMetadataContainer "done transparently. However, such columns cannot be (easily) queried with " "an attribute filter or WHERE clause. Note: in table definition, such columns " "have the 'VARCHAR_deflate' declaration type." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); driverMetadata.insert( QStringLiteral( "SpatiaLite" ), @@ -1738,12 +1738,12 @@ class QgsVectorFileWriterMetadataContainer datasetOptions.insert( QStringLiteral( "HEADER" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Override the header file used - in place of header.dxf." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "TRAILER" ), new QgsVectorFileWriter::StringOption( QObject::tr( "Override the trailer file used - in place of trailer.dxf." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); driverMetadata.insert( QStringLiteral( "DXF" ), @@ -1774,7 +1774,7 @@ class QgsVectorFileWriterMetadataContainer QObject::tr( "Path to the GCT: the GCT file describes the GeoConcept types definitions: " "In this file, every line must start with //# followed by a keyword. " "Lines starting with // are comments." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); datasetOptions.insert( QStringLiteral( "FEATURETYPE" ), new QgsVectorFileWriter::StringOption( @@ -1782,7 +1782,7 @@ class QgsVectorFileWriterMetadataContainer "found in the GCT file for a type section. The SUBTYPE corresponds to one of " "the Name found in the GCT file for a sub-type section within the previous " "type section." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); driverMetadata.insert( QStringLiteral( "Geoconcept" ), @@ -1803,7 +1803,7 @@ class QgsVectorFileWriterMetadataContainer layerOptions.insert( QStringLiteral( "FEATURE_DATASET" ), new QgsVectorFileWriter::StringOption( QObject::tr( "When this option is set, the new layer will be created inside the named " "FeatureDataset folder. If the folder does not already exist, it will be created." ), - QLatin1String( "" ) // Default value + QString() // Default value ) ); layerOptions.insert( QStringLiteral( "GEOMETRY_NAME" ), new QgsVectorFileWriter::StringOption( diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h index e8773979dc5..cb5c20c4429 100644 --- a/src/core/qgsvectorfilewriter.h +++ b/src/core/qgsvectorfilewriter.h @@ -132,7 +132,7 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink { public: explicit HiddenOption( const QString &value ) - : Option( QLatin1String( "" ), Hidden ) + : Option( QString(), Hidden ) , mValue( value ) {} diff --git a/src/core/qgsvirtuallayerdefinition.cpp b/src/core/qgsvirtuallayerdefinition.cpp index 1ba6b0c3991..747b0d6dae8 100644 --- a/src/core/qgsvirtuallayerdefinition.cpp +++ b/src/core/qgsvirtuallayerdefinition.cpp @@ -194,7 +194,7 @@ QUrl QgsVirtualLayerDefinition::toUrl() const url.addQueryItem( QStringLiteral( "uid" ), uid() ); if ( geometryWkbType() == QgsWkbTypes::NoGeometry ) - url.addQueryItem( QStringLiteral( "nogeometry" ), QLatin1String( "" ) ); + url.addQueryItem( QStringLiteral( "nogeometry" ), QString() ); else if ( !geometryField().isEmpty() ) { if ( hasDefinedGeometry() ) @@ -215,7 +215,7 @@ QUrl QgsVirtualLayerDefinition::toUrl() const if ( isLazy() ) { - url.addQueryItem( QStringLiteral( "lazy" ), QLatin1String( "" ) ); + url.addQueryItem( QStringLiteral( "lazy" ), QString() ); } return url; diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index cc086590d73..7034cef6c75 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -1764,7 +1764,7 @@ QString QgsRasterLayer::decodedSource( const QString &source, const QString &pro { // resolutions are no more needed and size limit is not used for tiles // we have to tell to the provider however that it is tiled - uri.setParam( QStringLiteral( "tileMatrixSet" ), QLatin1String( "" ) ); + uri.setParam( QStringLiteral( "tileMatrixSet" ), QString() ); } } else if ( item.startsWith( QLatin1String( "featureCount=" ) ) ) diff --git a/src/core/symbology/qgscategorizedsymbolrenderer.cpp b/src/core/symbology/qgscategorizedsymbolrenderer.cpp index e4cc4d75c78..2b214ca1b97 100644 --- a/src/core/symbology/qgscategorizedsymbolrenderer.cpp +++ b/src/core/symbology/qgscategorizedsymbolrenderer.cpp @@ -111,7 +111,7 @@ QString QgsRendererCategory::dump() const void QgsRendererCategory::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const { - if ( !mSymbol.get() || props.value( QStringLiteral( "attribute" ), QLatin1String( "" ) ).isEmpty() ) + if ( !mSymbol.get() || props.value( QStringLiteral( "attribute" ), QString() ).isEmpty() ) return; QString attrName = props[ QStringLiteral( "attribute" )]; @@ -199,7 +199,7 @@ QgsSymbol *QgsCategorizedSymbolRenderer::symbolForValue( const QVariant &value, foundMatchingSymbol = false; // TODO: special case for int, double - QHash<QString, QgsSymbol *>::const_iterator it = mSymbolHash.constFind( value.isNull() ? QLatin1String( "" ) : value.toString() ); + QHash<QString, QgsSymbol *>::const_iterator it = mSymbolHash.constFind( value.isNull() ? QString() : value.toString() ); if ( it == mSymbolHash.constEnd() ) { if ( mSymbolHash.isEmpty() ) @@ -932,7 +932,7 @@ QgsCategorizedSymbolRenderer *QgsCategorizedSymbolRenderer::convertFromRenderer( if ( !r ) { - r = new QgsCategorizedSymbolRenderer( QLatin1String( "" ), QgsCategoryList() ); + r = new QgsCategorizedSymbolRenderer( QString(), QgsCategoryList() ); QgsRenderContext context; QgsSymbolList symbols = const_cast<QgsFeatureRenderer *>( renderer )->symbols( context ); if ( !symbols.isEmpty() ) diff --git a/src/core/symbology/qgscptcityarchive.cpp b/src/core/symbology/qgscptcityarchive.cpp index 75c6f3da339..b4cf81ee5e7 100644 --- a/src/core/symbology/qgscptcityarchive.cpp +++ b/src/core/symbology/qgscptcityarchive.cpp @@ -373,7 +373,7 @@ QMap< double, QPair<QColor, QColor> >QgsCptCityArchive::gradientColorMap( const //todo integrate this into symbollayerutils, keep here for now... double offset; QString offsetStr = e.attribute( QStringLiteral( "offset" ) ); // offset="50.00%" | offset="0.5" - QString colorStr = e.attribute( QStringLiteral( "stop-color" ), QLatin1String( "" ) ); // stop-color="rgb(222,235,247)" + QString colorStr = e.attribute( QStringLiteral( "stop-color" ), QString() ); // stop-color="rgb(222,235,247)" QString opacityStr = e.attribute( QStringLiteral( "stop-opacity" ), QStringLiteral( "1.0" ) ); // stop-opacity="1.0000" if ( offsetStr.endsWith( '%' ) ) offset = offsetStr.remove( offsetStr.size() - 1, 1 ).toDouble() / 100.0; diff --git a/src/core/symbology/qgsellipsesymbollayer.cpp b/src/core/symbology/qgsellipsesymbollayer.cpp index b6fbf7c87b5..2d2239df2a5 100644 --- a/src/core/symbology/qgsellipsesymbollayer.cpp +++ b/src/core/symbology/qgsellipsesymbollayer.cpp @@ -347,12 +347,12 @@ QgsEllipseSymbolLayer *QgsEllipseSymbolLayer::clone() const void QgsEllipseSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props ) const { QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:PointSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); // <Geometry> - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); writeSldMarker( doc, symbolizerElem, props ); } @@ -370,7 +370,7 @@ void QgsEllipseSymbolLayer::writeSldMarker( QDomDocument &doc, QDomElement &elem // <Rotation> QgsProperty ddRotation = mDataDefinedProperties.property( QgsSymbolLayer::PropertyAngle ); - QString angleFunc = props.value( QStringLiteral( "angle" ), QLatin1String( "" ) ); + QString angleFunc = props.value( QStringLiteral( "angle" ), QString() ); if ( angleFunc.isEmpty() ) // symbol has no angle set { if ( ddRotation && ddRotation.isActive() ) diff --git a/src/core/symbology/qgsfillsymbollayer.cpp b/src/core/symbology/qgsfillsymbollayer.cpp index 6f1a7e97b7b..5479f4e5b4f 100644 --- a/src/core/symbology/qgsfillsymbollayer.cpp +++ b/src/core/symbology/qgsfillsymbollayer.cpp @@ -322,12 +322,12 @@ void QgsSimpleFillSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, c return; QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:PolygonSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); // <Geometry> - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); if ( mBrushStyle != Qt::NoBrush ) { @@ -2055,11 +2055,11 @@ QgsSVGFillSymbolLayer *QgsSVGFillSymbolLayer::clone() const void QgsSVGFillSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props ) const { QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:PolygonSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); QDomElement fillElem = doc.createElement( QStringLiteral( "se:Fill" ) ); symbolizerElem.appendChild( fillElem ); @@ -2829,12 +2829,12 @@ QgsLinePatternFillSymbolLayer *QgsLinePatternFillSymbolLayer::clone() const void QgsLinePatternFillSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props ) const { QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:PolygonSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); // <Geometry> - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); QDomElement fillElem = doc.createElement( QStringLiteral( "se:Fill" ) ); symbolizerElem.appendChild( fillElem ); @@ -3243,12 +3243,12 @@ void QgsPointPatternFillSymbolLayer::toSld( QDomDocument &doc, QDomElement &elem for ( int i = 0; i < mMarkerSymbol->symbolLayerCount(); i++ ) { QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:PolygonSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); // <Geometry> - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); QDomElement fillElem = doc.createElement( QStringLiteral( "se:Fill" ) ); symbolizerElem.appendChild( fillElem ); diff --git a/src/core/symbology/qgsgraduatedsymbolrenderer.cpp b/src/core/symbology/qgsgraduatedsymbolrenderer.cpp index 72f5afe5986..74a54f4471f 100644 --- a/src/core/symbology/qgsgraduatedsymbolrenderer.cpp +++ b/src/core/symbology/qgsgraduatedsymbolrenderer.cpp @@ -139,7 +139,7 @@ QString QgsRendererRange::dump() const void QgsRendererRange::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props, bool firstRange ) const { - if ( !mSymbol || props.value( QStringLiteral( "attribute" ), QLatin1String( "" ) ).isEmpty() ) + if ( !mSymbol || props.value( QStringLiteral( "attribute" ), QString() ).isEmpty() ) return; QString attrName = props[ QStringLiteral( "attribute" )]; @@ -1597,7 +1597,7 @@ QgsGraduatedSymbolRenderer *QgsGraduatedSymbolRenderer::convertFromRenderer( con if ( !r ) { - r = new QgsGraduatedSymbolRenderer( QLatin1String( "" ), QgsRangeList() ); + r = new QgsGraduatedSymbolRenderer( QString(), QgsRangeList() ); QgsRenderContext context; QgsSymbolList symbols = const_cast<QgsFeatureRenderer *>( renderer )->symbols( context ); if ( !symbols.isEmpty() ) diff --git a/src/core/symbology/qgslinesymbollayer.cpp b/src/core/symbology/qgslinesymbollayer.cpp index 4cebaaf3354..e0d78f1c75e 100644 --- a/src/core/symbology/qgslinesymbollayer.cpp +++ b/src/core/symbology/qgslinesymbollayer.cpp @@ -384,12 +384,12 @@ void QgsSimpleLineSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, c return; QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:LineSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); // <Geometry> - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); // <Stroke> QDomElement strokeElem = doc.createElement( QStringLiteral( "se:Stroke" ) ); @@ -1390,12 +1390,12 @@ void QgsMarkerLineSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, c for ( int i = 0; i < mMarker->symbolLayerCount(); i++ ) { QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:LineSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); // <Geometry> - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); QString gap; switch ( mPlacement ) diff --git a/src/core/symbology/qgspointdisplacementrenderer.cpp b/src/core/symbology/qgspointdisplacementrenderer.cpp index ee87d5b4851..0df34edbb12 100644 --- a/src/core/symbology/qgspointdisplacementrenderer.cpp +++ b/src/core/symbology/qgspointdisplacementrenderer.cpp @@ -141,13 +141,13 @@ QgsFeatureRenderer *QgsPointDisplacementRenderer::create( QDomElement &symbology QFont labelFont; if ( !QgsFontUtils::setFromXmlChildNode( labelFont, symbologyElem, QStringLiteral( "labelFontProperties" ) ) ) { - labelFont.fromString( symbologyElem.attribute( QStringLiteral( "labelFont" ), QLatin1String( "" ) ) ); + labelFont.fromString( symbologyElem.attribute( QStringLiteral( "labelFont" ), QString() ) ); } r->setLabelFont( labelFont ); r->setPlacement( static_cast< Placement >( symbologyElem.attribute( QStringLiteral( "placement" ), QStringLiteral( "0" ) ).toInt() ) ); r->setCircleWidth( symbologyElem.attribute( QStringLiteral( "circleWidth" ), QStringLiteral( "0.4" ) ).toDouble() ); - r->setCircleColor( QgsSymbolLayerUtils::decodeColor( symbologyElem.attribute( QStringLiteral( "circleColor" ), QLatin1String( "" ) ) ) ); - r->setLabelColor( QgsSymbolLayerUtils::decodeColor( symbologyElem.attribute( QStringLiteral( "labelColor" ), QLatin1String( "" ) ) ) ); + r->setCircleColor( QgsSymbolLayerUtils::decodeColor( symbologyElem.attribute( QStringLiteral( "circleColor" ), QString() ) ) ); + r->setLabelColor( QgsSymbolLayerUtils::decodeColor( symbologyElem.attribute( QStringLiteral( "labelColor" ), QString() ) ) ); r->setCircleRadiusAddition( symbologyElem.attribute( QStringLiteral( "circleRadiusAddition" ), QStringLiteral( "0.0" ) ).toDouble() ); r->setMinimumLabelScale( symbologyElem.attribute( QStringLiteral( "maxLabelScaleDenominator" ), QStringLiteral( "-1" ) ).toDouble() ); r->setTolerance( symbologyElem.attribute( QStringLiteral( "tolerance" ), QStringLiteral( "0.00001" ) ).toDouble() ); diff --git a/src/core/symbology/qgsrulebasedrenderer.cpp b/src/core/symbology/qgsrulebasedrenderer.cpp index 8ea2e600163..e3ea168e03f 100644 --- a/src/core/symbology/qgsrulebasedrenderer.cpp +++ b/src/core/symbology/qgsrulebasedrenderer.cpp @@ -318,7 +318,7 @@ void QgsRuleBasedRenderer::Rule::toSld( QDomDocument &doc, QDomElement &element, if ( !mFilterExp.isEmpty() ) { - if ( !props.value( QStringLiteral( "filter" ), QLatin1String( "" ) ).isEmpty() ) + if ( !props.value( QStringLiteral( "filter" ), QString() ).isEmpty() ) props[ QStringLiteral( "filter" )] += QLatin1String( " AND " ); props[ QStringLiteral( "filter" )] += mFilterExp; } @@ -354,9 +354,9 @@ void QgsRuleBasedRenderer::Rule::toSld( QDomDocument &doc, QDomElement &element, ruleElem.appendChild( descrElem ); } - if ( !props.value( QStringLiteral( "filter" ), QLatin1String( "" ) ).isEmpty() ) + if ( !props.value( QStringLiteral( "filter" ), QString() ).isEmpty() ) { - QgsSymbolLayerUtils::createFunctionElement( doc, ruleElem, props.value( QStringLiteral( "filter" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createFunctionElement( doc, ruleElem, props.value( QStringLiteral( "filter" ), QString() ) ); } QgsSymbolLayerUtils::applyScaleDependency( doc, ruleElem, props ); diff --git a/src/core/symbology/qgssinglesymbolrenderer.cpp b/src/core/symbology/qgssinglesymbolrenderer.cpp index 06aaa5f0796..ef5541204b4 100644 --- a/src/core/symbology/qgssinglesymbolrenderer.cpp +++ b/src/core/symbology/qgssinglesymbolrenderer.cpp @@ -93,7 +93,7 @@ void QgsSingleSymbolRenderer::setSymbol( QgsSymbol *s ) QString QgsSingleSymbolRenderer::dump() const { - return mSymbol ? QStringLiteral( "SINGLE: %1" ).arg( mSymbol->dump() ) : QLatin1String( "" ); + return mSymbol ? QStringLiteral( "SINGLE: %1" ).arg( mSymbol->dump() ) : QString(); } QgsSingleSymbolRenderer *QgsSingleSymbolRenderer::clone() const diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp index c2f6742a422..bac266fe912 100644 --- a/src/core/symbology/qgssymbol.cpp +++ b/src/core/symbology/qgssymbol.cpp @@ -597,7 +597,7 @@ void QgsSymbol::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap pro props[ QStringLiteral( "alpha" )] = QString::number( opacity() ); double scaleFactor = 1.0; props[ QStringLiteral( "uom" )] = QgsSymbolLayerUtils::encodeSldUom( outputUnit(), &scaleFactor ); - props[ QStringLiteral( "uomScale" )] = ( !qgsDoubleNear( scaleFactor, 1.0 ) ? qgsDoubleToString( scaleFactor ) : QLatin1String( "" ) ); + props[ QStringLiteral( "uomScale" )] = ( !qgsDoubleNear( scaleFactor, 1.0 ) ? qgsDoubleToString( scaleFactor ) : QString() ); for ( QgsSymbolLayerList::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it ) { diff --git a/src/core/symbology/qgssymbollayer.cpp b/src/core/symbology/qgssymbollayer.cpp index e2da4f67c50..6952ba44b94 100644 --- a/src/core/symbology/qgssymbollayer.cpp +++ b/src/core/symbology/qgssymbollayer.cpp @@ -690,12 +690,12 @@ void QgsFillSymbolLayer::_renderPolygon( QPainter *p, const QPolygonF &points, c void QgsMarkerSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props ) const { QDomElement symbolizerElem = doc.createElement( QStringLiteral( "se:PointSymbolizer" ) ); - if ( !props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ).isEmpty() ) - symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QLatin1String( "" ) ) ); + if ( !props.value( QStringLiteral( "uom" ), QString() ).isEmpty() ) + symbolizerElem.setAttribute( QStringLiteral( "uom" ), props.value( QStringLiteral( "uom" ), QString() ) ); element.appendChild( symbolizerElem ); // <Geometry> - QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QLatin1String( "" ) ) ); + QgsSymbolLayerUtils::createGeometryElement( doc, symbolizerElem, props.value( QStringLiteral( "geom" ), QString() ) ); writeSldMarker( doc, symbolizerElem, props ); } diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp index d4df5eef4c9..df442513163 100644 --- a/src/core/symbology/qgssymbollayerutils.cpp +++ b/src/core/symbology/qgssymbollayerutils.cpp @@ -98,7 +98,7 @@ QString QgsSymbolLayerUtils::encodeSldFontStyle( QFont::Style style ) case QFont::StyleOblique: return QStringLiteral( "oblique" ); default: - return QLatin1String( "" ); + return QString(); } } @@ -202,7 +202,7 @@ QString QgsSymbolLayerUtils::encodeSldLineJoinStyle( Qt::PenJoinStyle style ) case Qt::RoundJoin: return QStringLiteral( "round" ); default: - return QLatin1String( "" ); + return QString(); } } @@ -248,7 +248,7 @@ QString QgsSymbolLayerUtils::encodeSldLineCapStyle( Qt::PenCapStyle style ) case Qt::RoundCap: return QStringLiteral( "round" ); default: - return QLatin1String( "" ); + return QString(); } } @@ -1022,7 +1022,7 @@ static QString _nameForSymbolType( QgsSymbol::SymbolType type ) case QgsSymbol::Fill: return QStringLiteral( "fill" ); default: - return QLatin1String( "" ); + return QString(); } } @@ -3156,7 +3156,7 @@ QgsNamedColorList QgsSymbolLayerUtils::colorListFromMimeData( const QMimeData *d QPair< QColor, QString> namedColor; namedColor.first = QgsSymbolLayerUtils::decodeColor( currentElem.attribute( QStringLiteral( "color" ), QStringLiteral( "255,255,255,255" ) ) ); - namedColor.second = currentElem.attribute( QStringLiteral( "label" ), QLatin1String( "" ) ); + namedColor.second = currentElem.attribute( QStringLiteral( "label" ), QString() ); mimeColors << namedColor; } @@ -4168,17 +4168,17 @@ QVector<qreal> QgsSymbolLayerUtils::rescaleUom( const QVector<qreal> &array, Qgs void QgsSymbolLayerUtils::applyScaleDependency( QDomDocument &doc, QDomElement &ruleElem, QgsStringMap &props ) { - if ( !props.value( QStringLiteral( "scaleMinDenom" ), QLatin1String( "" ) ).isEmpty() ) + if ( !props.value( QStringLiteral( "scaleMinDenom" ), QString() ).isEmpty() ) { QDomElement scaleMinDenomElem = doc.createElement( QStringLiteral( "se:MinScaleDenominator" ) ); - scaleMinDenomElem.appendChild( doc.createTextNode( props.value( QStringLiteral( "scaleMinDenom" ), QLatin1String( "" ) ) ) ); + scaleMinDenomElem.appendChild( doc.createTextNode( props.value( QStringLiteral( "scaleMinDenom" ), QString() ) ) ); ruleElem.appendChild( scaleMinDenomElem ); } - if ( !props.value( QStringLiteral( "scaleMaxDenom" ), QLatin1String( "" ) ).isEmpty() ) + if ( !props.value( QStringLiteral( "scaleMaxDenom" ), QString() ).isEmpty() ) { QDomElement scaleMaxDenomElem = doc.createElement( QStringLiteral( "se:MaxScaleDenominator" ) ); - scaleMaxDenomElem.appendChild( doc.createTextNode( props.value( QStringLiteral( "scaleMaxDenom" ), QLatin1String( "" ) ) ) ); + scaleMaxDenomElem.appendChild( doc.createTextNode( props.value( QStringLiteral( "scaleMaxDenom" ), QString() ) ) ); ruleElem.appendChild( scaleMaxDenomElem ); } } diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp index 4ce97336a15..6003e530dda 100644 --- a/src/gui/attributetable/qgsattributetableview.cpp +++ b/src/gui/attributetable/qgsattributetableview.cpp @@ -182,7 +182,7 @@ QWidget *QgsAttributeTableView::createActionWidget( QgsFeatureId fid ) if ( !mFilterModel->layer()->isEditable() && action.isEnabledOnlyWhenEditable() ) continue; - QString actionTitle = !action.shortTitle().isEmpty() ? action.shortTitle() : action.icon().isNull() ? action.name() : QLatin1String( "" ); + QString actionTitle = !action.shortTitle().isEmpty() ? action.shortTitle() : action.icon().isNull() ? action.name() : QString(); QAction *act = new QAction( action.icon(), actionTitle, container ); act->setToolTip( action.name() ); act->setData( "user_action" ); diff --git a/src/gui/auth/qgsauthcertificateinfo.cpp b/src/gui/auth/qgsauthcertificateinfo.cpp index 23170b2ad91..ab3782006a1 100644 --- a/src/gui/auth/qgsauthcertificateinfo.cpp +++ b/src/gui/auth/qgsauthcertificateinfo.cpp @@ -224,7 +224,7 @@ void QgsAuthCertInfo::setCertHierarchy() { QSslCertificate cert( it.previous() ); bool missingCA = cert.isNull(); - QString cert_source( QLatin1String( "" ) ); + QString cert_source; if ( missingCA && it.hasPrevious() ) { cert_source = QgsAuthCertUtils::resolvedCertName( it.peekPrevious(), true ); @@ -395,7 +395,7 @@ void QgsAuthCertInfo::addFieldItem( QTreeWidgetItem *parent, const QString &fiel QTreeWidgetItem *item = new QTreeWidgetItem( parent, - QStringList() << field << ( wdgt == NoWidget ? value : QLatin1String( "" ) ), + QStringList() << field << ( wdgt == NoWidget ? value : QString() ), ( int )DetailsField ); item->setTextAlignment( 0, Qt::AlignRight ); @@ -818,7 +818,7 @@ void QgsAuthCertInfo::populateInfoPemTextSection() QTreeWidgetItem *item = new QTreeWidgetItem( mSecPemText, - QStringList( QLatin1String( "" ) ), + QStringList( QString() ), ( int )DetailsField ); item->setFirstColumnSpanned( true ); diff --git a/src/gui/auth/qgsauthcerttrustpolicycombobox.cpp b/src/gui/auth/qgsauthcerttrustpolicycombobox.cpp index 3d28e9dcf13..d94707d547f 100644 --- a/src/gui/auth/qgsauthcerttrustpolicycombobox.cpp +++ b/src/gui/auth/qgsauthcerttrustpolicycombobox.cpp @@ -84,7 +84,7 @@ void QgsAuthCertTrustPolicyComboBox::setDefaultTrustPolicy( QgsAuthCertUtils::Ce void QgsAuthCertTrustPolicyComboBox::highlightCurrentIndex( int indx ) { QgsAuthCertUtils::CertTrustPolicy policy = ( QgsAuthCertUtils::CertTrustPolicy )itemData( indx ).toInt(); - QString ss( QLatin1String( "" ) ); + QString ss; // TODO: why are these widget state selectors backwards? switch ( policy ) diff --git a/src/gui/auth/qgsauthconfigedit.cpp b/src/gui/auth/qgsauthconfigedit.cpp index cd68905739c..8ff1a036f23 100644 --- a/src/gui/auth/qgsauthconfigedit.cpp +++ b/src/gui/auth/qgsauthconfigedit.cpp @@ -45,7 +45,7 @@ QgsAuthConfigEdit::QgsAuthConfigEdit( QWidget *parent, const QString &authcfg, c mAuthNotifyLayout = new QVBoxLayout; this->setLayout( mAuthNotifyLayout ); - QString msg( disabled ? QgsApplication::authManager()->disabledMessage() : QLatin1String( "" ) ); + QString msg( disabled ? QgsApplication::authManager()->disabledMessage() : QString() ); if ( !authcfg.isEmpty() ) { msg += "\n\n" + tr( "Authentication config id not loaded: %1" ).arg( authcfg ); diff --git a/src/gui/auth/qgsauthconfigidedit.cpp b/src/gui/auth/qgsauthconfigidedit.cpp index 8fe55278d7b..5a01f6dc066 100644 --- a/src/gui/auth/qgsauthconfigidedit.cpp +++ b/src/gui/auth/qgsauthconfigidedit.cpp @@ -93,8 +93,8 @@ void QgsAuthConfigIdEdit::clear() void QgsAuthConfigIdEdit::updateValidityStyle( bool valid ) { QString ss( QStringLiteral( "QLineEdit{" ) ); - ss += valid ? QLatin1String( "" ) : QStringLiteral( "color: %1;" ).arg( QgsAuthGuiUtils::redColor().name() ); - ss += !btnLock->isChecked() ? QLatin1String( "" ) : QStringLiteral( "background-color: %1;" ).arg( QgsAuthGuiUtils::yellowColor().name() ); + ss += valid ? QString() : QStringLiteral( "color: %1;" ).arg( QgsAuthGuiUtils::redColor().name() ); + ss += !btnLock->isChecked() ? QString() : QStringLiteral( "background-color: %1;" ).arg( QgsAuthGuiUtils::yellowColor().name() ); ss += '}'; leAuthCfg->setStyleSheet( ss ); diff --git a/src/gui/auth/qgsauthconfigselect.cpp b/src/gui/auth/qgsauthconfigselect.cpp index f4552cb6d9e..167c725b26d 100644 --- a/src/gui/auth/qgsauthconfigselect.cpp +++ b/src/gui/auth/qgsauthconfigselect.cpp @@ -56,10 +56,10 @@ QgsAuthConfigSelect::QgsAuthConfigSelect( QWidget *parent, const QString &datapr btnConfigEdit->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionToggleEditing.svg" ) ) ); btnConfigMsgClear->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconClose.svg" ) ) ); - btnConfigAdd->setText( QStringLiteral( "" ) ); - btnConfigRemove->setText( QStringLiteral( "" ) ); - btnConfigEdit->setText( QStringLiteral( "" ) ); - btnConfigMsgClear->setText( QStringLiteral( "" ) ); + btnConfigAdd->setText( QString() ); + btnConfigRemove->setText( QString() ); + btnConfigEdit->setText( QString() ); + btnConfigMsgClear->setText( QString() ); leConfigMsg->setStyleSheet( QStringLiteral( "QLineEdit{background-color: %1}" ) .arg( QgsAuthGuiUtils::yellowColor().name() ) ); @@ -121,7 +121,7 @@ void QgsAuthConfigSelect::loadConfig() void QgsAuthConfigSelect::clearConfig() { - cmbConfigSelect->setToolTip( QStringLiteral( "" ) ); + cmbConfigSelect->setToolTip( QString() ); btnConfigEdit->setEnabled( false ); btnConfigRemove->setEnabled( false ); } diff --git a/src/gui/auth/qgsauthguiutils.cpp b/src/gui/auth/qgsauthguiutils.cpp index 20d701f277c..21785f6dc36 100644 --- a/src/gui/auth/qgsauthguiutils.cpp +++ b/src/gui/auth/qgsauthguiutils.cpp @@ -245,8 +245,8 @@ void QgsAuthGuiUtils::fileFound( bool found, QWidget *widget ) } else { - widget->setStyleSheet( QLatin1String( "" ) ); - widget->setToolTip( QLatin1String( "" ) ); + widget->setStyleSheet( QString() ); + widget->setToolTip( QString() ); } } diff --git a/src/gui/auth/qgsauthimportcertdialog.cpp b/src/gui/auth/qgsauthimportcertdialog.cpp index f4a442a6493..8b9ad745969 100644 --- a/src/gui/auth/qgsauthimportcertdialog.cpp +++ b/src/gui/auth/qgsauthimportcertdialog.cpp @@ -147,7 +147,7 @@ void QgsAuthImportCertDialog::validateCertificates() { mCerts.clear(); teValidation->clear(); - teValidation->setStyleSheet( QLatin1String( "" ) ); + teValidation->setStyleSheet( QString() ); bool valid = false; QList<QSslCertificate> certs; diff --git a/src/gui/auth/qgsauthimportidentitydialog.cpp b/src/gui/auth/qgsauthimportidentitydialog.cpp index fd4203b8d87..05c40c5b300 100644 --- a/src/gui/auth/qgsauthimportidentitydialog.cpp +++ b/src/gui/auth/qgsauthimportidentitydialog.cpp @@ -145,7 +145,7 @@ bool QgsAuthImportIdentityDialog::validateBundle() void QgsAuthImportIdentityDialog::clearValidation() { teValidation->clear(); - teValidation->setStyleSheet( QLatin1String( "" ) ); + teValidation->setStyleSheet( QString() ); } void QgsAuthImportIdentityDialog::writeValidation( const QString &msg, @@ -431,8 +431,8 @@ void QgsAuthImportIdentityDialog::fileFound( bool found, QWidget *widget ) } else { - widget->setStyleSheet( QLatin1String( "" ) ); - widget->setToolTip( QLatin1String( "" ) ); + widget->setStyleSheet( QString() ); + widget->setToolTip( QString() ); } } diff --git a/src/gui/auth/qgsauthsslconfigwidget.cpp b/src/gui/auth/qgsauthsslconfigwidget.cpp index 1aea4e9170b..7dd1e6d25f6 100644 --- a/src/gui/auth/qgsauthsslconfigwidget.cpp +++ b/src/gui/auth/qgsauthsslconfigwidget.cpp @@ -132,7 +132,7 @@ void QgsAuthSslConfigWidget::setUpSslConfigTree() mProtocolCmbBx->setCurrentIndex( 0 ); QTreeWidgetItem *protocolitem = new QTreeWidgetItem( mProtocolItem, - QStringList() << QLatin1String( "" ), + QStringList() << QString(), ( int )ConfigItem ); protocolitem->setFlags( protocolitem->flags() & ~Qt::ItemIsSelectable ); treeSslConfig->setItemWidget( protocolitem, 0, mProtocolCmbBx ); @@ -148,7 +148,7 @@ void QgsAuthSslConfigWidget::setUpSslConfigTree() mVerifyPeerCmbBx->setCurrentIndex( 0 ); QTreeWidgetItem *peerverifycmbxitem = new QTreeWidgetItem( mVerifyModeItem, - QStringList() << QLatin1String( "" ), + QStringList() << QString(), ( int )ConfigItem ); peerverifycmbxitem->setFlags( peerverifycmbxitem->flags() & ~Qt::ItemIsSelectable ); treeSslConfig->setItemWidget( peerverifycmbxitem, 0, mVerifyPeerCmbBx ); @@ -162,7 +162,7 @@ void QgsAuthSslConfigWidget::setUpSslConfigTree() mVerifyDepthSpnBx->setAlignment( Qt::AlignHCenter ); QTreeWidgetItem *peerverifyspnbxitem = new QTreeWidgetItem( mVerifyDepthItem, - QStringList() << QLatin1String( "" ), + QStringList() << QString(), ( int )ConfigItem ); peerverifyspnbxitem->setFlags( peerverifyspnbxitem->flags() & ~Qt::ItemIsSelectable ); treeSslConfig->setItemWidget( peerverifyspnbxitem, 0, mVerifyDepthSpnBx ); @@ -322,7 +322,7 @@ void QgsAuthSslConfigWidget::resetSslCertConfig() mCert.clear(); mConnectionCAs.clear(); leCommonName->clear(); - leCommonName->setStyleSheet( QLatin1String( "" ) ); + leCommonName->setStyleSheet( QString() ); leHost->clear(); lblLoadedConfig->setVisible( false ); diff --git a/src/gui/auth/qgsauthsslimportdialog.cpp b/src/gui/auth/qgsauthsslimportdialog.cpp index d1d255ae2c1..b047bdd33db 100644 --- a/src/gui/auth/qgsauthsslimportdialog.cpp +++ b/src/gui/auth/qgsauthsslimportdialog.cpp @@ -145,7 +145,7 @@ void QgsAuthSslImportDialog::accept() void QgsAuthSslImportDialog::updateEnabledState() { - leServer->setStyleSheet( QLatin1String( "" ) ); + leServer->setStyleSheet( QString() ); bool unconnected = !mSocket || mSocket->state() == QAbstractSocket::UnconnectedState; @@ -170,7 +170,7 @@ void QgsAuthSslImportDialog::secureConnect() return; } - leServer->setStyleSheet( QLatin1String( "" ) ); + leServer->setStyleSheet( QString() ); clearStatusCertificateConfig(); if ( !mSocket ) @@ -416,7 +416,7 @@ void QgsAuthSslImportDialog::loadCertFromFile() } wdgtSslConfig->setEnabled( true ); - wdgtSslConfig->setSslHost( QLatin1String( "" ) ); + wdgtSslConfig->setSslHost( QString() ); wdgtSslConfig->setSslCertificate( cert ); if ( !mSslErrors.isEmpty() ) { diff --git a/src/gui/editorwidgets/qgstexteditwrapper.cpp b/src/gui/editorwidgets/qgstexteditwrapper.cpp index 25fd2245e62..945cad8bc3b 100644 --- a/src/gui/editorwidgets/qgstexteditwrapper.cpp +++ b/src/gui/editorwidgets/qgstexteditwrapper.cpp @@ -161,7 +161,7 @@ void QgsTextEditWrapper::showIndeterminateState() mLineEdit->setPlaceholderText( QString() ); } - setWidgetValue( QLatin1String( "" ) ); + setWidgetValue( QString() ); if ( mTextEdit ) mTextEdit->blockSignals( false ); diff --git a/src/gui/ogr/qgsnewogrconnection.cpp b/src/gui/ogr/qgsnewogrconnection.cpp index 4c39db942c7..d6327cc3a1b 100644 --- a/src/gui/ogr/qgsnewogrconnection.cpp +++ b/src/gui/ogr/qgsnewogrconnection.cpp @@ -145,8 +145,8 @@ void QgsNewOgrConnection::accept() settings.setValue( baseKey + "/host", txtHost->text() ); settings.setValue( baseKey + "/database", txtDatabase->text() ); settings.setValue( baseKey + "/port", txtPort->text() ); - settings.setValue( baseKey + "/username", mAuthSettingsDatabase->storeUsernameIsChecked() ? mAuthSettingsDatabase->username() : QLatin1String( "" ) ); - settings.setValue( baseKey + "/password", mAuthSettingsDatabase->storePasswordIsChecked() ? mAuthSettingsDatabase->password() : QLatin1String( "" ) ); + settings.setValue( baseKey + "/username", mAuthSettingsDatabase->storeUsernameIsChecked() ? mAuthSettingsDatabase->username() : QString() ); + settings.setValue( baseKey + "/password", mAuthSettingsDatabase->storePasswordIsChecked() ? mAuthSettingsDatabase->password() : QString() ); settings.setValue( baseKey + "/store_username", mAuthSettingsDatabase->storeUsernameIsChecked() ? "true" : "false" ); settings.setValue( baseKey + "/store_password", mAuthSettingsDatabase->storePasswordIsChecked() ? "true" : "false" ); settings.setValue( baseKey + "/configid", mAuthSettingsDatabase->configId() ); diff --git a/src/gui/qgscolorrampbutton.cpp b/src/gui/qgscolorrampbutton.cpp index 7ed5eba93a9..83fd4fd4e79 100644 --- a/src/gui/qgscolorrampbutton.cpp +++ b/src/gui/qgscolorrampbutton.cpp @@ -375,7 +375,7 @@ void QgsColorRampButton::createColorRamp() } else if ( rampType == tr( "Catalog: cpt-city" ) ) { - ramp = new QgsCptCityColorRamp( QLatin1String( "" ), QLatin1String( "" ) ); + ramp = new QgsCptCityColorRamp( QString(), QString() ); } else { diff --git a/src/gui/qgscredentialdialog.cpp b/src/gui/qgscredentialdialog.cpp index 23ded4b5e3d..45fbd872cef 100644 --- a/src/gui/qgscredentialdialog.cpp +++ b/src/gui/qgscredentialdialog.cpp @@ -231,11 +231,11 @@ void QgsCredentialDialog::requestCredentialsMasterPassword( QString *password, b void QgsCredentialDialog::leMasterPass_textChanged( const QString &pass ) { - leMasterPass->setStyleSheet( QLatin1String( "" ) ); + leMasterPass->setStyleSheet( QString() ); bool passok = !pass.isEmpty(); // regardless of new or comparing existing, empty password disallowed if ( leMasterPassVerify->isVisible() ) { - leMasterPassVerify->setStyleSheet( QLatin1String( "" ) ); + leMasterPassVerify->setStyleSheet( QString() ); passok = passok && ( leMasterPass->text() == leMasterPassVerify->text() ); } mOkButton->setEnabled( passok ); @@ -251,8 +251,8 @@ void QgsCredentialDialog::leMasterPassVerify_textChanged( const QString &pass ) { if ( leMasterPassVerify->isVisible() ) { - leMasterPass->setStyleSheet( QLatin1String( "" ) ); - leMasterPassVerify->setStyleSheet( QLatin1String( "" ) ); + leMasterPass->setStyleSheet( QString() ); + leMasterPassVerify->setStyleSheet( QString() ); // empty password disallowed bool passok = !pass.isEmpty() && ( leMasterPass->text() == leMasterPassVerify->text() ); diff --git a/src/gui/qgserrordialog.cpp b/src/gui/qgserrordialog.cpp index aaa59979643..a38781490c5 100644 --- a/src/gui/qgserrordialog.cpp +++ b/src/gui/qgserrordialog.cpp @@ -33,7 +33,7 @@ QgsErrorDialog::QgsErrorDialog( const QgsError &error, const QString &title, QWi setWindowTitle( title ); // QMessageBox has static standardIcon( Icon icon ), but it is marked as obsolete - QMessageBox messageBox( QMessageBox::Critical, QLatin1String( "" ), QLatin1String( "" ) ); + QMessageBox messageBox( QMessageBox::Critical, QString(), QString() ); mIconLabel->setPixmap( messageBox.iconPixmap() ); mSummaryTextBrowser->setOpenExternalLinks( true ); mDetailTextBrowser->setOpenExternalLinks( true ); diff --git a/src/gui/qgsfieldcombobox.cpp b/src/gui/qgsfieldcombobox.cpp index 0663eb9d587..fde130ce4df 100644 --- a/src/gui/qgsfieldcombobox.cpp +++ b/src/gui/qgsfieldcombobox.cpp @@ -77,7 +77,7 @@ QString QgsFieldComboBox::currentField() const const QModelIndex proxyIndex = mFieldProxyModel->index( i, 0 ); if ( !proxyIndex.isValid() ) { - return QLatin1String( "" ); + return QString(); } QString name = mFieldProxyModel->data( proxyIndex, QgsFieldModel::FieldNameRole ).toString(); diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp index e9717482d35..ed07384600b 100644 --- a/src/gui/qgsfieldexpressionwidget.cpp +++ b/src/gui/qgsfieldexpressionwidget.cpp @@ -298,7 +298,7 @@ void QgsFieldExpressionWidget::currentFieldChanged() } else { - mCombo->setToolTip( QLatin1String( "" ) ); + mCombo->setToolTip( QString() ); } emit fieldChanged( fieldName ); diff --git a/src/gui/qgsfieldvalidator.cpp b/src/gui/qgsfieldvalidator.cpp index 5ae4a432ffc..6f63d82deae 100644 --- a/src/gui/qgsfieldvalidator.cpp +++ b/src/gui/qgsfieldvalidator.cpp @@ -176,6 +176,6 @@ void QgsFieldValidator::fixup( QString &s ) const else if ( mField.type() == QVariant::Date ) { // invalid dates will also translate to NULL - s = QLatin1String( "" ); + s = QString(); } } diff --git a/src/gui/qgsformannotation.cpp b/src/gui/qgsformannotation.cpp index 9c4fcc7eb1e..6017e1ecb3c 100644 --- a/src/gui/qgsformannotation.cpp +++ b/src/gui/qgsformannotation.cpp @@ -154,7 +154,7 @@ void QgsFormAnnotation::writeXml( QDomElement &elem, QDomDocument &doc, const Qg void QgsFormAnnotation::readXml( const QDomElement &itemElem, const QgsReadWriteContext &context ) { - mDesignerForm = itemElem.attribute( QStringLiteral( "designerForm" ), QLatin1String( "" ) ); + mDesignerForm = itemElem.attribute( QStringLiteral( "designerForm" ), QString() ); QDomElement annotationElem = itemElem.firstChildElement( QStringLiteral( "AnnotationItem" ) ); if ( !annotationElem.isNull() ) { diff --git a/src/gui/qgskeyvaluewidget.cpp b/src/gui/qgskeyvaluewidget.cpp index 5b1ad4cec70..db57ef5c6de 100644 --- a/src/gui/qgskeyvaluewidget.cpp +++ b/src/gui/qgskeyvaluewidget.cpp @@ -123,7 +123,7 @@ bool QgsKeyValueModel::insertRows( int position, int rows, const QModelIndex &pa beginInsertRows( QModelIndex(), position, position + rows - 1 ); for ( int i = 0; i < rows; ++i ) { - mLines.insert( position, Line( QLatin1String( "" ), QVariant() ) ); + mLines.insert( position, Line( QString(), QVariant() ) ); } endInsertRows(); return true; diff --git a/src/gui/qgslegendfilterbutton.cpp b/src/gui/qgslegendfilterbutton.cpp index 965d053f589..1bd992a0a47 100644 --- a/src/gui/qgslegendfilterbutton.cpp +++ b/src/gui/qgslegendfilterbutton.cpp @@ -82,7 +82,7 @@ void QgsLegendFilterButton::onSetLegendFilterExpression() void QgsLegendFilterButton::onClearFilterExpression() { mClearExpressionAction->setEnabled( false ); - setExpressionText( QLatin1String( "" ) ); + setExpressionText( QString() ); setChecked( false ); } diff --git a/src/gui/qgsmaplayerstylemanagerwidget.cpp b/src/gui/qgsmaplayerstylemanagerwidget.cpp index bccdd567a8a..4845ed26684 100644 --- a/src/gui/qgsmaplayerstylemanagerwidget.cpp +++ b/src/gui/qgsmaplayerstylemanagerwidget.cpp @@ -197,7 +197,7 @@ void QgsMapLayerStyleManagerWidget::saveAsDefault() case 0: return; case 2: - layer->saveStyleToDatabase( QLatin1String( "" ), QLatin1String( "" ), true, QLatin1String( "" ), errorMsg ); + layer->saveStyleToDatabase( QString(), QString(), true, QString(), errorMsg ); if ( errorMsg.isNull() ) { return; diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp index d25e5e7eef2..b541a1782ad 100644 --- a/src/gui/qgsmaptoolidentify.cpp +++ b/src/gui/qgsmaptoolidentify.cpp @@ -754,7 +754,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QList<IdentifyResult> *results, Qg { QString value = it.value().toString(); attributes.clear(); - attributes.insert( QLatin1String( "" ), value ); + attributes.insert( QString(), value ); QString label = layer->subLayers().value( it.key() ); results->append( IdentifyResult( qobject_cast<QgsMapLayer *>( layer ), label, attributes, derivedAttributes ) ); diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp index 690f13367c9..6a8adced0d6 100644 --- a/src/gui/qgsnewvectorlayerdialog.cpp +++ b/src/gui/qgsnewvectorlayerdialog.cpp @@ -95,7 +95,7 @@ QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, Qt::WindowFla } mFileEncoding->setCurrentIndex( encindex ); - mAttributeView->addTopLevelItem( new QTreeWidgetItem( QStringList() << QStringLiteral( "id" ) << QStringLiteral( "Integer" ) << QStringLiteral( "10" ) << QLatin1String( "" ) ) ); + mAttributeView->addTopLevelItem( new QTreeWidgetItem( QStringList() << QStringLiteral( "id" ) << QStringLiteral( "Integer" ) << QStringLiteral( "10" ) << QString() ) ); connect( mNameEdit, &QLineEdit::textChanged, this, &QgsNewVectorLayerDialog::nameChanged ); connect( mAttributeView, &QTreeWidget::itemSelectionChanged, this, &QgsNewVectorLayerDialog::selectionChanged ); @@ -191,7 +191,7 @@ void QgsNewVectorLayerDialog::mAddAttributeButton_clicked() { QString myName = mNameEdit->text(); QString myWidth = mWidth->text(); - QString myPrecision = mPrecision->isEnabled() ? mPrecision->text() : QLatin1String( "" ); + QString myPrecision = mPrecision->isEnabled() ? mPrecision->text() : QString(); //use userrole to avoid translated type string QString myType = mTypeBox->currentData( Qt::UserRole ).toString(); mAttributeView->addTopLevelItem( new QTreeWidgetItem( QStringList() << myName << myType << myWidth << myPrecision ) ); @@ -258,7 +258,7 @@ QString QgsNewVectorLayerDialog::runAndCreateLayer( QWidget *parent, QString *pE geomDialog.setCrs( crs ); if ( geomDialog.exec() == QDialog::Rejected ) { - return QLatin1String( "" ); + return QString(); } QgsWkbTypes::Type geometrytype = geomDialog.selectedType(); diff --git a/src/gui/qgsorderbydialog.cpp b/src/gui/qgsorderbydialog.cpp index 52200ccedcd..da171edf54f 100644 --- a/src/gui/qgsorderbydialog.cpp +++ b/src/gui/qgsorderbydialog.cpp @@ -51,7 +51,7 @@ void QgsOrderByDialog::setOrderBy( const QgsFeatureRequest::OrderBy &orderBy ) } // Add an empty widget at the end - setRow( i, QgsFeatureRequest::OrderByClause( QLatin1String( "" ) ) ); + setRow( i, QgsFeatureRequest::OrderByClause( QString() ) ); } QgsFeatureRequest::OrderBy QgsOrderByDialog::orderBy() @@ -106,7 +106,7 @@ void QgsOrderByDialog::onExpressionChanged( const QString &expression ) else if ( !expression.isEmpty() && row == mOrderByTableWidget->rowCount() - 1 ) { mOrderByTableWidget->insertRow( mOrderByTableWidget->rowCount() ); - setRow( row + 1, QgsFeatureRequest::OrderByClause( QLatin1String( "" ) ) ); + setRow( row + 1, QgsFeatureRequest::OrderByClause( QString() ) ); } } diff --git a/src/gui/qgsprojectionselectiontreewidget.cpp b/src/gui/qgsprojectionselectiontreewidget.cpp index 6daf7940bdb..d9a3d3a5aad 100644 --- a/src/gui/qgsprojectionselectiontreewidget.cpp +++ b/src/gui/qgsprojectionselectiontreewidget.cpp @@ -342,7 +342,7 @@ QString QgsProjectionSelectionTreeWidget::selectedProj4String() // Get the selected node QTreeWidgetItem *item = lstCoordinateSystems->currentItem(); if ( !item || item->text( QgisCrsIdColumn ).isEmpty() ) - return QLatin1String( "" ); + return QString(); QString srsId = item->text( QgisCrsIdColumn ); @@ -372,7 +372,7 @@ QString QgsProjectionSelectionTreeWidget::selectedProj4String() if ( rc ) { showDBMissingWarning( databaseFileName ); - return QLatin1String( "" ); + return QString(); } // prepare the sql statement @@ -676,7 +676,7 @@ void QgsProjectionSelectionTreeWidget::loadCrsList( QSet<QString> *crsFilter ) QTreeWidgetItem *newItem = nullptr; // Cache some stuff to speed up creating of the list of projected // spatial reference systems - QString previousSrsType( QLatin1String( "" ) ); + QString previousSrsType; QTreeWidgetItem *previousSrsTypeNode = nullptr; while ( sqlite3_step( stmt ) == SQLITE_ROW ) diff --git a/src/gui/qgsquerybuilder.cpp b/src/gui/qgsquerybuilder.cpp index 6bfe26c854c..34605d8476c 100644 --- a/src/gui/qgsquerybuilder.cpp +++ b/src/gui/qgsquerybuilder.cpp @@ -177,7 +177,7 @@ void QgsQueryBuilder::btnSampleValues_clicked() QString prevSubsetString = mLayer->subsetString(); if ( mUseUnfilteredLayer->isChecked() && !prevSubsetString.isEmpty() ) { - mLayer->setSubsetString( QLatin1String( "" ) ); + mLayer->setSubsetString( QString() ); } //Clear and fill the mModelValues @@ -198,7 +198,7 @@ void QgsQueryBuilder::btnGetAllValues_clicked() QString prevSubsetString = mLayer->subsetString(); if ( mUseUnfilteredLayer->isChecked() && !prevSubsetString.isEmpty() ) { - mLayer->setSubsetString( QLatin1String( "" ) ); + mLayer->setSubsetString( QString() ); } //Clear and fill the mModelValues @@ -409,7 +409,7 @@ void QgsQueryBuilder::onTextChanged( const QString &text ) void QgsQueryBuilder::clear() { txtSQL->clear(); - mLayer->setSubsetString( QLatin1String( "" ) ); + mLayer->setSubsetString( QString() ); mUseUnfilteredLayer->setDisabled( true ); } diff --git a/src/gui/qgsrasterformatsaveoptionswidget.cpp b/src/gui/qgsrasterformatsaveoptionswidget.cpp index 4e23c32028a..dcdc79e2e9a 100644 --- a/src/gui/qgsrasterformatsaveoptionswidget.cpp +++ b/src/gui/qgsrasterformatsaveoptionswidget.cpp @@ -54,7 +54,7 @@ QgsRasterFormatSaveOptionsWidget::QgsRasterFormatSaveOptionsWidget( QWidget *par if ( sBuiltinProfiles.isEmpty() ) { // key=profileKey values=format,profileName,options - sBuiltinProfiles[ QStringLiteral( "z_adefault" )] = ( QStringList() << QLatin1String( "" ) << tr( "Default" ) << QLatin1String( "" ) ); + sBuiltinProfiles[ QStringLiteral( "z_adefault" )] = ( QStringList() << QString() << tr( "Default" ) << QString() ); // these GTiff profiles are based on Tim's benchmarks at // http://linfiniti.com/2011/05/gdal-efficiency-of-various-compression-algorithms/ @@ -378,7 +378,7 @@ QString QgsRasterFormatSaveOptionsWidget::validateOptions( bool gui, bool report } else if ( ! createOptions.isEmpty() ) { - QMessageBox::information( this, QLatin1String( "" ), tr( "Cannot validate creation options." ), QMessageBox::Close ); + QMessageBox::information( this, QString(), tr( "Cannot validate creation options." ), QMessageBox::Close ); if ( tmpLayer ) delete rasterLayer; return QString(); @@ -389,11 +389,11 @@ QString QgsRasterFormatSaveOptionsWidget::validateOptions( bool gui, bool report if ( message.isNull() ) { if ( reportOK ) - QMessageBox::information( this, QLatin1String( "" ), tr( "Valid" ), QMessageBox::Close ); + QMessageBox::information( this, QString(), tr( "Valid" ), QMessageBox::Close ); } else { - QMessageBox::warning( this, QLatin1String( "" ), tr( "Invalid %1:\n\n%2\n\nClick on help button to get valid creation options for this format." ).arg( mPyramids ? tr( "pyramid creation option" ) : tr( "creation option" ), message ), QMessageBox::Close ); + QMessageBox::warning( this, QString(), tr( "Invalid %1:\n\n%2\n\nClick on help button to get valid creation options for this format." ).arg( mPyramids ? tr( "pyramid creation option" ) : tr( "creation option" ), message ), QMessageBox::Close ); } } @@ -430,7 +430,7 @@ void QgsRasterFormatSaveOptionsWidget::mOptionsLineEdit_editingFinished() void QgsRasterFormatSaveOptionsWidget::mProfileNewButton_clicked() { - QString profileName = QInputDialog::getText( this, QLatin1String( "" ), tr( "Profile name:" ) ); + QString profileName = QInputDialog::getText( this, QString(), tr( "Profile name:" ) ); if ( ! profileName.isEmpty() ) { profileName = profileName.trimmed(); diff --git a/src/gui/qgsshortcutsmanager.cpp b/src/gui/qgsshortcutsmanager.cpp index 7f0f94ef7ca..d01ed674215 100644 --- a/src/gui/qgsshortcutsmanager.cpp +++ b/src/gui/qgsshortcutsmanager.cpp @@ -310,7 +310,7 @@ void QgsShortcutsManager::updateActionToolTip( QAction *action, const QString &s QString current = action->toolTip(); // Remove the old shortcut. QRegExp rx( "\\(.*\\)" ); - current.replace( rx, QLatin1String( "" ) ); + current.replace( rx, QString() ); if ( !sequence.isEmpty() ) { diff --git a/src/gui/qgssqlcomposerdialog.cpp b/src/gui/qgssqlcomposerdialog.cpp index 025fe771418..f8743aa3c8e 100644 --- a/src/gui/qgssqlcomposerdialog.cpp +++ b/src/gui/qgssqlcomposerdialog.cpp @@ -113,8 +113,8 @@ QgsSQLComposerDialog::QgsSQLComposerDialog( QWidget *parent, Qt::WindowFlags fl mRemoveJoinButton->setEnabled( false ); mTableJoins->setRowCount( 0 ); - mTableJoins->setItem( 0, 0, new QTableWidgetItem( QLatin1String( "" ) ) ); - mTableJoins->setItem( 0, 1, new QTableWidgetItem( QLatin1String( "" ) ) ); + mTableJoins->setItem( 0, 0, new QTableWidgetItem( QString() ) ); + mTableJoins->setItem( 0, 1, new QTableWidgetItem( QString() ) ); } QgsSQLComposerDialog::~QgsSQLComposerDialog() @@ -327,11 +327,11 @@ void QgsSQLComposerDialog::splitSQLIntoFields() if ( join->onExpr() ) mTableJoins->setItem( iRow, 1, new QTableWidgetItem( join->onExpr()->dump() ) ); else - mTableJoins->setItem( iRow, 1, new QTableWidgetItem( QLatin1String( "" ) ) ); + mTableJoins->setItem( iRow, 1, new QTableWidgetItem( QString() ) ); iRow ++; } - mTableJoins->setItem( iRow, 0, new QTableWidgetItem( QLatin1String( "" ) ) ); - mTableJoins->setItem( iRow, 1, new QTableWidgetItem( QLatin1String( "" ) ) ); + mTableJoins->setItem( iRow, 0, new QTableWidgetItem( QString() ) ); + mTableJoins->setItem( iRow, 1, new QTableWidgetItem( QString() ) ); mAlreadyModifyingFields = false; } @@ -718,8 +718,8 @@ void QgsSQLComposerDialog::mAddJoinButton_clicked() mTableJoins->setItem( row, 0, mTableJoins->takeItem( row - 1, 0 ) ); mTableJoins->setItem( row, 1, mTableJoins->takeItem( row - 1, 1 ) ); } - mTableJoins->setItem( ( insertRow == rowCount ) ? insertRow : insertRow + 1, 0, new QTableWidgetItem( QLatin1String( "" ) ) ); - mTableJoins->setItem( ( insertRow == rowCount ) ? insertRow : insertRow + 1, 1, new QTableWidgetItem( QLatin1String( "" ) ) ); + mTableJoins->setItem( ( insertRow == rowCount ) ? insertRow : insertRow + 1, 0, new QTableWidgetItem( QString() ) ); + mTableJoins->setItem( ( insertRow == rowCount ) ? insertRow : insertRow + 1, 1, new QTableWidgetItem( QString() ) ); } void QgsSQLComposerDialog::mRemoveJoinButton_clicked() diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp index 3992b3f1e2e..12856360dae 100644 --- a/src/gui/qgstextformatwidget.cpp +++ b/src/gui/qgstextformatwidget.cpp @@ -1179,7 +1179,7 @@ void QgsTextFormatWidget::mShapeTypeCmbBx_currentIndexChanged( int index ) mShapeSizeYLabel->setVisible( !isSVG ); mShapeSizeYSpnBx->setVisible( !isSVG ); mShapeSizeYDDBtn->setVisible( !isSVG && mWidgetMode == Labeling ); - mShapeSizeXLabel->setText( tr( "Size%1" ).arg( !isSVG ? tr( " X" ) : QLatin1String( "" ) ) ); + mShapeSizeXLabel->setText( tr( "Size%1" ).arg( !isSVG ? tr( " X" ) : QString() ) ); // SVG parameter setting doesn't support color's alpha component yet mShapeFillColorBtn->setAllowOpacity( !isSVG ); diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp index 16c6f21a77c..04f51b62a31 100644 --- a/src/gui/raster/qgsrasterhistogramwidget.cpp +++ b/src/gui/raster/qgsrasterhistogramwidget.cpp @@ -179,7 +179,7 @@ QgsRasterHistogramWidget::QgsRasterHistogramWidget( QgsRasterLayer *lyr, QWidget action->setSeparator( true ); menu->addAction( action ); // should we plot as histogram instead of line plot? (int data only) - action = new QAction( QLatin1String( "" ), group ); + action = new QAction( QString(), group ); action->setData( QVariant( "Draw lines" ) ); if ( isInt ) { @@ -993,7 +993,7 @@ void QgsRasterHistogramWidget::btnHistoMax_toggled() // this is sensitive and may not always be correct, needs more testing QString findClosestTickVal( double target, const QwtScaleDiv *scale, int div = 100 ) { - if ( !scale ) return QLatin1String( "" ); + if ( !scale ) return QString(); QList< double > minorTicks = scale->ticks( QwtScaleDiv::MinorTick ); QList< double > majorTicks = scale->ticks( QwtScaleDiv::MajorTick ); diff --git a/src/gui/raster/qgsrastertransparencywidget.cpp b/src/gui/raster/qgsrastertransparencywidget.cpp index 77ddcf5a13c..57d43c542f5 100644 --- a/src/gui/raster/qgsrastertransparencywidget.cpp +++ b/src/gui/raster/qgsrastertransparencywidget.cpp @@ -113,7 +113,7 @@ void QgsRasterTransparencyWidget::syncToLayer() } else { - leNoDataValue->insert( QLatin1String( "" ) ); + leNoDataValue->insert( QString() ); } populateTransparencyTable( mRasterLayer->renderer() ); diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp index 080b823352b..aba0df3f4aa 100644 --- a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp +++ b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp @@ -419,7 +419,7 @@ QgsCategorizedSymbolRendererWidget::QgsCategorizedSymbolRendererWidget( QgsVecto btnColorRamp->setShowRandomColorRamp( true ); // set project default color ramp - QString defaultColorRamp = QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/ColorRamp" ), QLatin1String( "" ) ); + QString defaultColorRamp = QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/ColorRamp" ), QString() ); if ( !defaultColorRamp.isEmpty() ) { btnColorRamp->setColorRampFromName( defaultColorRamp ); diff --git a/src/gui/symbology/qgscptcitycolorrampdialog.cpp b/src/gui/symbology/qgscptcitycolorrampdialog.cpp index 74eac545333..fd9b59d80eb 100644 --- a/src/gui/symbology/qgscptcitycolorrampdialog.cpp +++ b/src/gui/symbology/qgscptcitycolorrampdialog.cpp @@ -229,7 +229,7 @@ void QgsCptCityColorRampDialog::updateTreeView( QgsCptCityDataItem *item, bool r { if ( resetRamp ) { - mRamp.setName( QLatin1String( "" ), QLatin1String( "" ) ); + mRamp.setName( QString(), QString() ); QgsDebugMsg( QString( "variant= %1 - %2 variants" ).arg( mRamp.variantName() ).arg( mRamp.variantList().count() ) ); lblSchemeName->clear(); populateVariants(); @@ -280,7 +280,7 @@ void QgsCptCityColorRampDialog::mListWidget_itemSelectionChanged() { if ( mListWidget->selectedItems().isEmpty() ) { - mRamp.setName( QLatin1String( "" ), QLatin1String( "" ) ); + mRamp.setName( QString(), QString() ); } } @@ -638,7 +638,7 @@ bool QgsCptCityColorRampDialog::updateRamp() void QgsCptCityColorRampDialog::showAll() { - QModelIndex modelIndex = mModel->findPath( QLatin1String( "" ) ); + QModelIndex modelIndex = mModel->findPath( QString() ); if ( modelIndex != QModelIndex() ) { QModelIndex selIndex = mTreeFilter->mapFromSource( modelIndex ); diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp index 22814ffd2ed..90c888b0322 100644 --- a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp +++ b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp @@ -469,7 +469,7 @@ QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLay btnColorRamp->setShowRandomColorRamp( true ); // set project default color ramp - QString defaultColorRamp = QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/ColorRamp" ), QLatin1String( "" ) ); + QString defaultColorRamp = QgsProject::instance()->readEntry( QStringLiteral( "DefaultStyles" ), QStringLiteral( "/ColorRamp" ), QString() ); if ( !defaultColorRamp.isEmpty() ) { btnColorRamp->setColorRampFromName( defaultColorRamp ); diff --git a/src/gui/symbology/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology/qgspointdisplacementrendererwidget.cpp index 39f9c44a122..623dadec29f 100644 --- a/src/gui/symbology/qgspointdisplacementrendererwidget.cpp +++ b/src/gui/symbology/qgspointdisplacementrendererwidget.cpp @@ -222,7 +222,7 @@ void QgsPointDisplacementRendererWidget::mLabelFieldComboBox_currentIndexChanged { if ( text == tr( "None" ) ) { - mRenderer->setLabelAttributeName( QLatin1String( "" ) ); + mRenderer->setLabelAttributeName( QString() ); } else { diff --git a/src/gui/symbology/qgsstylegroupselectiondialog.cpp b/src/gui/symbology/qgsstylegroupselectiondialog.cpp index c095ecab083..6b3eb8a491c 100644 --- a/src/gui/symbology/qgsstylegroupselectiondialog.cpp +++ b/src/gui/symbology/qgsstylegroupselectiondialog.cpp @@ -37,7 +37,7 @@ QgsStyleGroupSelectionDialog::QgsStyleGroupSelectionDialog( QgsStyle *style, QWi setBold( allSymbols ); model->appendRow( allSymbols ); - QStandardItem *tags = new QStandardItem( QLatin1String( "" ) ); //require empty name to get first order groups + QStandardItem *tags = new QStandardItem( QString() ); //require empty name to get first order groups tags->setData( "tagsheader", Qt::UserRole + 2 ); tags->setEditable( false ); tags->setFlags( tags->flags() & ~Qt::ItemIsSelectable ); diff --git a/src/gui/symbology/qgsstylemanagerdialog.cpp b/src/gui/symbology/qgsstylemanagerdialog.cpp index e5ef74fe5b9..740a9c66397 100644 --- a/src/gui/symbology/qgsstylemanagerdialog.cpp +++ b/src/gui/symbology/qgsstylemanagerdialog.cpp @@ -525,7 +525,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget *parent, QgsStyle *st } else if ( rampType == tr( "Catalog: cpt-city" ) ) { - QgsCptCityColorRampDialog dlg( QgsCptCityColorRamp( QLatin1String( "" ), QLatin1String( "" ) ), parent ); + QgsCptCityColorRampDialog dlg( QgsCptCityColorRamp( QString(), QString() ), parent ); if ( !dlg.exec() ) { return QString(); @@ -912,7 +912,7 @@ void QgsStyleManagerDialog::populateGroups() setBold( allSymbols ); model->appendRow( allSymbols ); - QStandardItem *taggroup = new QStandardItem( QLatin1String( "" ) ); //require empty name to get first order groups + QStandardItem *taggroup = new QStandardItem( QString() ); //require empty name to get first order groups taggroup->setData( "tags" ); taggroup->setEditable( false ); QStringList tags = mStyle->tags(); diff --git a/src/gui/symbology/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology/qgsvectorfieldsymbollayerwidget.cpp index 97eb7f7a674..277ad9d3487 100644 --- a/src/gui/symbology/qgsvectorfieldsymbollayerwidget.cpp +++ b/src/gui/symbology/qgsvectorfieldsymbollayerwidget.cpp @@ -36,8 +36,8 @@ QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( QgsVectorLayer if ( vectorLayer() ) { - mXAttributeComboBox->addItem( QLatin1String( "" ) ); - mYAttributeComboBox->addItem( QLatin1String( "" ) ); + mXAttributeComboBox->addItem( QString() ); + mYAttributeComboBox->addItem( QString() ); int i = 0; Q_FOREACH ( const QgsField &f, vectorLayer()->fields() ) { diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp index 362c34b4fda..f933d560c13 100644 --- a/src/plugins/coordinate_capture/coordinatecapture.cpp +++ b/src/plugins/coordinate_capture/coordinatecapture.cpp @@ -145,7 +145,7 @@ void CoordinateCapture::initGui() connect( mpCaptureButton, &QAbstractButton::clicked, this, &CoordinateCapture::run ); // Set the icons - setCurrentTheme( QLatin1String( "" ) ); + setCurrentTheme( QString() ); mypLayout->addWidget( mypUserCrsToolButton, 0, 0 ); mypLayout->addWidget( mpUserCrsEdit, 0, 1 ); @@ -296,7 +296,7 @@ QString CoordinateCapture::getIconPath( const QString &name ) } else { - return QLatin1String( "" ); + return QString(); } } diff --git a/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp index 53b469b26da..9588c366172 100644 --- a/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp +++ b/src/plugins/geometry_checker/qgsgeometrycheckerresulttab.cpp @@ -155,7 +155,7 @@ void QgsGeometryCheckerResultTab::addError( QgsGeometryCheckError *error ) QTableWidgetItem *valueItem = new QTableWidgetItem(); valueItem->setData( Qt::EditRole, error->value() ); ui.tableWidgetErrors->setItem( row, 4, valueItem ); - ui.tableWidgetErrors->setItem( row, 5, new QTableWidgetItem( QLatin1String( "" ) ) ); + ui.tableWidgetErrors->setItem( row, 5, new QTableWidgetItem( QString() ) ); ui.tableWidgetErrors->item( row, 0 )->setData( Qt::UserRole, QVariant::fromValue( error ) ); ++mErrorCount; ui.labelErrorCount->setText( tr( "Total errors: %1, fixed errors: %2" ).arg( mErrorCount ).arg( mFixedCount ) ); diff --git a/src/plugins/georeferencer/qgsgeorefplugin.cpp b/src/plugins/georeferencer/qgsgeorefplugin.cpp index 0d16d3c68ad..ebb7f8fb340 100644 --- a/src/plugins/georeferencer/qgsgeorefplugin.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugin.cpp @@ -92,7 +92,7 @@ void QgsGeorefPlugin::initGui() // Connect the action to the run connect( mActionRunGeoref, &QAction::triggered, this, &QgsGeorefPlugin::run ); - setCurrentTheme( QLatin1String( "" ) ); + setCurrentTheme( QString() ); // this is called when the icon theme is changed connect( mQGisIface, &QgisInterface::currentThemeChanged, this, &QgsGeorefPlugin::setCurrentTheme ); diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp index dee0ee7421f..203ae98269f 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp @@ -593,7 +593,7 @@ void QgsGeorefPluginGui::showCoordDialog( const QgsPointXY &pixelCoords ) void QgsGeorefPluginGui::loadGCPsDialog() { - QString selectedFile = mRasterFileName.isEmpty() ? QLatin1String( "" ) : mRasterFileName + ".points"; + QString selectedFile = mRasterFileName.isEmpty() ? QString() : mRasterFileName + ".points"; mGCPpointsFileName = QFileDialog::getOpenFileName( this, tr( "Load GCP Points" ), selectedFile, tr( "GCP file" ) + " (*.points)" ); if ( mGCPpointsFileName.isEmpty() ) @@ -617,7 +617,7 @@ void QgsGeorefPluginGui::saveGCPsDialog() return; } - QString selectedFile = mRasterFileName.isEmpty() ? QLatin1String( "" ) : mRasterFileName + ".points"; + QString selectedFile = mRasterFileName.isEmpty() ? QString() : mRasterFileName + ".points"; mGCPpointsFileName = QFileDialog::getSaveFileName( this, tr( "Save GCP Points" ), selectedFile, tr( "GCP file" ) + " (*.points)" ); @@ -2056,7 +2056,7 @@ QString QgsGeorefPluginGui::convertResamplingEnumToString( QgsImageWarper::Resam case QgsImageWarper::Lanczos: return QStringLiteral( "lanczos" ); } - return QLatin1String( "" ); + return QString(); } int QgsGeorefPluginGui::polynomialOrder( QgsGeorefTransform::TransformParametrisation transform ) diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp index a5099b1d148..dc19244d307 100644 --- a/src/plugins/gps_importer/qgsgpsplugin.cpp +++ b/src/plugins/gps_importer/qgsgpsplugin.cpp @@ -86,7 +86,7 @@ void QgsGpsPlugin::initGui() mQActionPointer->setObjectName( QStringLiteral( "mQActionPointer" ) ); mCreateGPXAction = new QAction( QIcon(), tr( "&Create new GPX layer" ), this ); mCreateGPXAction->setObjectName( QStringLiteral( "mCreateGPXAction" ) ); - setCurrentTheme( QLatin1String( "" ) ); + setCurrentTheme( QString() ); mQActionPointer->setWhatsThis( tr( "Creates a new GPX layer and displays it on the map canvas" ) ); mCreateGPXAction->setWhatsThis( tr( "Creates a new GPX layer and displays it on the map canvas" ) ); diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp index 06fb237829d..119647e8a8c 100644 --- a/src/plugins/grass/qgsgrassmapcalc.cpp +++ b/src/plugins/grass/qgsgrassmapcalc.cpp @@ -445,7 +445,7 @@ void QgsGrassMapcalc::mouseReleaseEvent( QMouseEvent *e ) QStringList QgsGrassMapcalc::arguments() { - QString cmd = QLatin1String( "" ); + QString cmd; // Attention with quotes and spaces! //cmd.append("\""); diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp index 913b006be79..ab19c9442f2 100644 --- a/src/plugins/grass/qgsgrassmodule.cpp +++ b/src/plugins/grass/qgsgrassmodule.cpp @@ -771,7 +771,7 @@ void QgsGrassModule::readStdout() while ( mProcess.canReadLine() ) { QByteArray ba = mProcess.readLine(); - line = QString::fromLocal8Bit( ba ).replace( '\n', QLatin1String( "" ) ); + line = QString::fromLocal8Bit( ba ).replace( '\n', QString() ); // GRASS_INFO_PERCENT is caught here only because of bugs in GRASS, // normally it should be printed to stderr @@ -797,7 +797,7 @@ void QgsGrassModule::readStderr() while ( mProcess.canReadLine() ) { QByteArray ba = mProcess.readLine(); - line = QString::fromLocal8Bit( ba ).replace( '\n', QLatin1String( "" ) ); + line = QString::fromLocal8Bit( ba ).replace( '\n', QString() ); QString text, html; int percent; diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp index 1fc855e61d1..f24c341c4c8 100644 --- a/src/plugins/grass/qgsgrassmoduleinput.cpp +++ b/src/plugins/grass/qgsgrassmoduleinput.cpp @@ -207,7 +207,7 @@ void QgsGrassModuleInputModel::refreshMapset( QStandardItem *mapsetItem, const Q } Q_FOREACH ( QgsGrassObject::Type type, typesCopy ) { - QgsGrassObject mapsetObject( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), mapset, QLatin1String( "" ), QgsGrassObject::Mapset ); + QgsGrassObject mapsetObject( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), mapset, QString(), QgsGrassObject::Mapset ); QStringList maps = QgsGrass::grassObjects( mapsetObject, type ); QStringList mapNames; Q_FOREACH ( const QString &map, maps ) @@ -937,7 +937,7 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module, // TODO: implement region for multiple if ( mType == QgsGrassObject::Raster && region != QLatin1String( "no" ) && !mDirect && !multiple() ) { - mRegionButton = new QPushButton( QgsGrassPlugin::getThemeIcon( QStringLiteral( "grass_set_region.png" ) ), QLatin1String( "" ) ); + mRegionButton = new QPushButton( QgsGrassPlugin::getThemeIcon( QStringLiteral( "grass_set_region.png" ) ), QString() ); mRegionButton->setToolTip( tr( "Use region of this map" ) ); mRegionButton->setCheckable( true ); @@ -1015,7 +1015,7 @@ QgsGrassModuleInput::QgsGrassModuleInput( QgsGrassModule *module, mUsesRegion = true; } QgsDebugMsg( QString( "mUsesRegion = %1" ).arg( mUsesRegion ) ); - onChanged( QLatin1String( "" ) ); + onChanged( QString() ); } bool QgsGrassModuleInput::useRegion() @@ -1079,7 +1079,7 @@ QgsFields QgsGrassModuleInput::currentFields() QgsGrassObject QgsGrassModuleInput::currentGrassObject() { - QgsGrassObject grassObject( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), QLatin1String( "" ), QLatin1String( "" ), mType ); + QgsGrassObject grassObject( QgsGrass::getDefaultGisdbase(), QgsGrass::getDefaultLocation(), QString(), QString(), mType ); grassObject.setFullName( mComboBox->currentText() ); return grassObject; } diff --git a/src/plugins/grass/qgsgrassmoduleparam.cpp b/src/plugins/grass/qgsgrassmoduleparam.cpp index 1758d8ebb69..e80502f73f8 100644 --- a/src/plugins/grass/qgsgrassmoduleparam.cpp +++ b/src/plugins/grass/qgsgrassmoduleparam.cpp @@ -576,7 +576,7 @@ void QgsGrassModuleOption::browse( bool checked ) Q_UNUSED( checked ); QgsSettings settings; - QString lastDir = settings.value( QStringLiteral( "GRASS/lastDirectOutputDir" ), "" ).toString(); + QString lastDir = settings.value( QStringLiteral( "GRASS/lastDirectOutputDir" ), QString() ).toString(); QString fileName = QFileDialog::getSaveFileName( this, tr( "Output file" ), lastDir, tr( "GeoTIFF" ) + " (*.tif)" ); if ( !fileName.isEmpty() ) { @@ -751,7 +751,7 @@ QString QgsGrassModuleOption::ready() QgsGrassModuleFlag::QgsGrassModuleFlag( QgsGrassModule *module, QString key, QDomElement &qdesc, QDomElement &gdesc, QDomNode &gnode, bool direct, QWidget *parent ) - : QgsGrassModuleCheckBox( QLatin1String( "" ), parent ), QgsGrassModuleParam( module, key, qdesc, gdesc, gnode, direct ) + : QgsGrassModuleCheckBox( QString(), parent ), QgsGrassModuleParam( module, key, qdesc, gdesc, gnode, direct ) { if ( mHidden ) @@ -908,8 +908,8 @@ void QgsGrassModuleGdalInput::updateQgisLayers() { uri = items[0]; - ogrLayer = QLatin1String( "" ); - ogrWhere = QLatin1String( "" ); + ogrLayer.clear(); + ogrWhere.clear(); for ( int i = 1; i < items.size(); i++ ) { @@ -930,14 +930,14 @@ void QgsGrassModuleGdalInput::updateQgisLayers() if ( uri.endsWith( QLatin1String( ".shp" ), Qt::CaseInsensitive ) ) { - ogrLayer = QLatin1String( "" ); + ogrLayer.clear(); } } else { uri = items[0]; - ogrLayer = QLatin1String( "" ); - ogrWhere = QLatin1String( "" ); + ogrLayer.clear(); + ogrWhere.clear(); } } @@ -959,8 +959,8 @@ void QgsGrassModuleGdalInput::updateQgisLayers() if ( layer->name() == current ) mLayerComboBox->setItemText( mLayerComboBox->currentIndex(), current ); mUri.push_back( uri ); - mOgrLayers.push_back( QLatin1String( "" ) ); - mOgrWheres.push_back( QLatin1String( "" ) ); + mOgrLayers.push_back( QString() ); + mOgrWheres.push_back( QString() ); } } } diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp index 1ea3ba57a64..f0c5f88f591 100644 --- a/src/plugins/grass/qgsgrassnewmapset.cpp +++ b/src/plugins/grass/qgsgrassnewmapset.cpp @@ -1276,7 +1276,7 @@ void QgsGrassNewMapset::createMapset() setLocations(); mSelectLocationRadioButton->setChecked( true ); mLocationComboBox->setItemText( mLocationComboBox->currentIndex(), location ); - mLocationLineEdit->setText( QLatin1String( "" ) ); + mLocationLineEdit->setText( QString() ); locationRadioSwitched(); // calls also checkLocation() } else @@ -1344,7 +1344,7 @@ void QgsGrassNewMapset::setError( QLabel *line, const QString &err ) } else { - line->setText( QLatin1String( "" ) ); + line->setText( QString() ); line->hide(); } } diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp index 4ad6f14feb7..29bf9bf5cf2 100644 --- a/src/plugins/grass/qgsgrassplugin.cpp +++ b/src/plugins/grass/qgsgrassplugin.cpp @@ -236,7 +236,7 @@ void QgsGrassPlugin::initGui() connect( qGisInterface, &QgisInterface::newProject, this, &QgsGrassPlugin::newProject ); // Set icons to current theme - setCurrentTheme( QLatin1String( "" ) ); + setCurrentTheme( QString() ); // Connect theme change signal connect( qGisInterface, &QgisInterface::currentThemeChanged, this, &QgsGrassPlugin::setCurrentTheme ); @@ -565,7 +565,7 @@ void QgsGrassPlugin::newVector() QgsGrassElementDialog dialog( qGisInterface->mainWindow() ); name = dialog.getItem( QStringLiteral( "vector" ), tr( "New vector name" ), - tr( "New vector name" ), QLatin1String( "" ), QLatin1String( "" ), &ok ); + tr( "New vector name" ), QString(), QString(), &ok ); if ( !ok ) return; @@ -728,12 +728,12 @@ void QgsGrassPlugin::projectRead() bool ok; QString gisdbase = QgsProject::instance()->readPath( QgsProject::instance()->readEntry( - QStringLiteral( "GRASS" ), QStringLiteral( "/WorkingGisdbase" ), QLatin1String( "" ), &ok ).trimmed() + QStringLiteral( "GRASS" ), QStringLiteral( "/WorkingGisdbase" ), QString(), &ok ).trimmed() ); QString location = QgsProject::instance()->readEntry( - QStringLiteral( "GRASS" ), QStringLiteral( "/WorkingLocation" ), QLatin1String( "" ), &ok ).trimmed(); + QStringLiteral( "GRASS" ), QStringLiteral( "/WorkingLocation" ), QString(), &ok ).trimmed(); QString mapset = QgsProject::instance()->readEntry( - QStringLiteral( "GRASS" ), QStringLiteral( "/WorkingMapset" ), QLatin1String( "" ), &ok ).trimmed(); + QStringLiteral( "GRASS" ), QStringLiteral( "/WorkingMapset" ), QString(), &ok ).trimmed(); if ( gisdbase.isEmpty() || location.isEmpty() || mapset.isEmpty() ) { diff --git a/src/plugins/grass/qgsgrassshell.cpp b/src/plugins/grass/qgsgrassshell.cpp index 1f0326a8afd..dbe1b647b77 100644 --- a/src/plugins/grass/qgsgrassshell.cpp +++ b/src/plugins/grass/qgsgrassshell.cpp @@ -115,8 +115,8 @@ void QgsGrassShell::closeShell() void QgsGrassShell::initTerminal( QTermWidget *terminal ) { - QStringList env( QLatin1String( "" ) ); - QStringList args( QLatin1String( "" ) ); + QStringList env( ( QString() ) ); + QStringList args( ( QString() ) ); // GRASS Init.sh should not be started here, it is either run when GRASS is started if QGIS is run from GRASS shell or everything (set environment variables and lock mapset) is done in QgsGrass::openMapset //QString shellProgram = QString( "%1/etc/Init.sh" ).arg( ::getenv( "GISBASE" ) ); diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp index a127e9fb48f..1c551e9d9dd 100644 --- a/src/plugins/grass/qgsgrasstools.cpp +++ b/src/plugins/grass/qgsgrasstools.cpp @@ -230,7 +230,7 @@ void QgsGrassTools::runModule( QString name, bool direct ) QIcon is; is.addPixmap( pixmap ); - mTabWidget->addTab( m, is, QLatin1String( "" ) ); + mTabWidget->addTab( m, is, QString() ); } else { diff --git a/src/plugins/topology/rulesDialog.cpp b/src/plugins/topology/rulesDialog.cpp index 8072eedda98..98cf775da11 100644 --- a/src/plugins/topology/rulesDialog.cpp +++ b/src/plugins/topology/rulesDialog.cpp @@ -69,7 +69,7 @@ rulesDialog::rulesDialog( const QMap<QString, TopologyRule> &testMap, QgisInterf void rulesDialog::setHorizontalHeaderItems() { QStringList labels; - labels << tr( "Test" ) << tr( "Layer #1" ) << tr( "Layer #2" ) << QLatin1String( "" ) << QLatin1String( "" ); + labels << tr( "Test" ) << tr( "Layer #1" ) << tr( "Layer #2" ) << QString() << QString(); mRulesTable->setHorizontalHeaderLabels( labels ); } @@ -80,9 +80,9 @@ void rulesDialog::readTest( int index, QgsProject *project ) QString layer2Id; QString postfix = QStringLiteral( "%1" ).arg( index ); - testName = project->readEntry( QStringLiteral( "Topol" ), "/testname_" + postfix, QLatin1String( "" ) ); - layer1Id = project->readEntry( QStringLiteral( "Topol" ), "/layer1_" + postfix, QLatin1String( "" ) ); - layer2Id = project->readEntry( QStringLiteral( "Topol" ), "/layer2_" + postfix, QLatin1String( "" ) ); + testName = project->readEntry( QStringLiteral( "Topol" ), "/testname_" + postfix, QString() ); + layer1Id = project->readEntry( QStringLiteral( "Topol" ), "/layer1_" + postfix, QString() ); + layer2Id = project->readEntry( QStringLiteral( "Topol" ), "/layer2_" + postfix, QString() ); QgsVectorLayer *l1 = nullptr; if ( !( QgsVectorLayer * )project->mapLayers().contains( layer1Id ) ) diff --git a/src/providers/arcgisrest/qgsarcgisrestutils.cpp b/src/providers/arcgisrest/qgsarcgisrestutils.cpp index 5197574512b..89acc3c3052 100644 --- a/src/providers/arcgisrest/qgsarcgisrestutils.cpp +++ b/src/providers/arcgisrest/qgsarcgisrestutils.cpp @@ -399,7 +399,7 @@ QVariantMap QgsArcGisRestUtils::getObjects( const QString &layerurl, const QList QUrl queryUrl( layerurl + "/query" ); queryUrl.addQueryItem( QStringLiteral( "f" ), QStringLiteral( "json" ) ); queryUrl.addQueryItem( QStringLiteral( "objectIds" ), ids.join( QStringLiteral( "," ) ) ); - QString wkid = crs.indexOf( QLatin1String( ":" ) ) >= 0 ? crs.split( ':' )[1] : QLatin1String( "" ); + QString wkid = crs.indexOf( QLatin1String( ":" ) ) >= 0 ? crs.split( ':' )[1] : QString(); queryUrl.addQueryItem( QStringLiteral( "inSR" ), wkid ); queryUrl.addQueryItem( QStringLiteral( "outSR" ), wkid ); QString outFields = fetchAttributes.join( QStringLiteral( "," ) ); diff --git a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp index d377d718b7e..c9b9e20c6c1 100644 --- a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp +++ b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp @@ -174,7 +174,7 @@ QString QgsArcGisServiceSourceSelect::getPreferredCrs( const QSet<QString> &crsS { if ( crsSet.size() < 1 ) { - return QLatin1String( "" ); + return QString(); } //first: project CRS @@ -342,7 +342,7 @@ void QgsArcGisServiceSourceSelect::addButtonClicked() QString layerTitle = mModel->item( row, 0 )->text(); //layer title/id QString layerName = mModel->item( row, 1 )->text(); //layer name bool cacheFeatures = mServiceType == FeatureService ? mModel->item( row, 3 )->checkState() == Qt::Checked : false; - QString filter = mServiceType == FeatureService ? mModel->item( row, 4 )->text() : QLatin1String( "" ); //optional filter specified by user + QString filter = mServiceType == FeatureService ? mModel->item( row, 4 )->text() : QString(); //optional filter specified by user if ( cbxUseTitleLayerName->isChecked() && !layerTitle.isEmpty() ) { layerName = layerTitle; diff --git a/src/providers/db2/qgsdb2newconnection.cpp b/src/providers/db2/qgsdb2newconnection.cpp index d6750288fdb..385f33ab52f 100644 --- a/src/providers/db2/qgsdb2newconnection.cpp +++ b/src/providers/db2/qgsdb2newconnection.cpp @@ -115,8 +115,8 @@ void QgsDb2NewConnection::accept() settings.setValue( baseKey + "/port", txtPort->text() ); settings.setValue( baseKey + "/driver", txtDriver->text() ); settings.setValue( baseKey + "/database", txtDatabase->text() ); - settings.setValue( baseKey + "/username", mAuthSettings->storeUsernameIsChecked( ) ? mAuthSettings->username( ) : QLatin1String( "" ) ); - settings.setValue( baseKey + "/password", mAuthSettings->storePasswordIsChecked( ) && !hasAuthConfigID ? mAuthSettings->password( ) : QLatin1String( "" ) ); + settings.setValue( baseKey + "/username", mAuthSettings->storeUsernameIsChecked( ) ? mAuthSettings->username( ) : QString() ); + settings.setValue( baseKey + "/password", mAuthSettings->storePasswordIsChecked( ) && !hasAuthConfigID ? mAuthSettings->password( ) : QString() ); settings.setValue( baseKey + "/saveUsername", mAuthSettings->storeUsernameIsChecked() ? "true" : "false" ); settings.setValue( baseKey + "/savePassword", mAuthSettings->storePasswordIsChecked( ) && !hasAuthConfigID ? "true" : "false" ); settings.setValue( baseKey + "/authcfg", mAuthSettings->configId() ); diff --git a/src/providers/db2/qgsdb2sourceselect.cpp b/src/providers/db2/qgsdb2sourceselect.cpp index cd2998b2f9c..00e431a0274 100644 --- a/src/providers/db2/qgsdb2sourceselect.cpp +++ b/src/providers/db2/qgsdb2sourceselect.cpp @@ -331,7 +331,7 @@ void QgsDb2SourceSelect::mSearchGroupBox_toggled( bool checked ) if ( mSearchTableEdit->text().isEmpty() ) return; - mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QLatin1String( "" ) ); + mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QString() ); } void QgsDb2SourceSelect::mSearchTableEdit_textChanged( const QString &text ) @@ -695,7 +695,7 @@ void QgsDb2GeomColumnTypeThread::run() { QString table; table = QStringLiteral( "%1[%2]" ) - .arg( layerProperty.schemaName.isEmpty() ? QLatin1String( "" ) : QStringLiteral( "[%1]." ).arg( layerProperty.schemaName ), + .arg( layerProperty.schemaName.isEmpty() ? QString() : QStringLiteral( "[%1]." ).arg( layerProperty.schemaName ), layerProperty.tableName ); QString query = QString( "SELECT %3" diff --git a/src/providers/db2/qgsdb2tablemodel.cpp b/src/providers/db2/qgsdb2tablemodel.cpp index 111df2dc057..cd6addace4d 100644 --- a/src/providers/db2/qgsdb2tablemodel.cpp +++ b/src/providers/db2/qgsdb2tablemodel.cpp @@ -111,7 +111,7 @@ void QgsDb2TableModel::addTableEntry( const QgsDb2LayerProperty &layerProperty ) pkItem->setData( layerProperty.pkCols, Qt::UserRole + 1 ); pkItem->setData( pkCol, Qt::UserRole + 2 ); - QStandardItem *selItem = new QStandardItem( QLatin1String( "" ) ); + QStandardItem *selItem = new QStandardItem( QString() ); selItem->setFlags( selItem->flags() | Qt::ItemIsUserCheckable ); selItem->setCheckState( Qt::Checked ); selItem->setToolTip( tr( "Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views)." ) ); diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp index 3c9eb9685ab..d349a0b8a08 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp @@ -967,7 +967,7 @@ void QgsDelimitedTextProvider::reportErrors( const QStringList &messages, bool s bool QgsDelimitedTextProvider::setSubsetString( const QString &subset, bool updateFeatureCount ) { - QString nonNullSubset = subset.isNull() ? QLatin1String( "" ) : subset; + QString nonNullSubset = subset.isNull() ? QString() : subset; // If not changing string, then all OK, nothing to do if ( nonNullSubset == mSubsetString ) diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp index e215598e68b..d5ad9968942 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp @@ -470,7 +470,7 @@ void QgsDelimitedTextSourceSelect::updateFieldLists() for ( int i = 0; i < tblSample->columnCount(); i++ ) { - QString value = i < nv ? values[i] : QLatin1String( "" ); + QString value = i < nv ? values[i] : QString(); if ( value.length() > MAX_SAMPLE_LENGTH ) value = value.mid( 0, MAX_SAMPLE_LENGTH ) + QChar( 0x2026 ); QTableWidgetItem *item = new QTableWidgetItem( value ); @@ -677,7 +677,7 @@ bool QgsDelimitedTextSourceSelect::validate() { // Check that input data is valid - provide a status message if not.. - QString message( QLatin1String( "" ) ); + QString message; bool enabled = false; if ( mFileWidget->filePath().trimmed().isEmpty() ) diff --git a/src/providers/grass/qgis.v.in.cpp b/src/providers/grass/qgis.v.in.cpp index 5184930968e..e37bba7f75e 100644 --- a/src/providers/grass/qgis.v.in.cpp +++ b/src/providers/grass/qgis.v.in.cpp @@ -173,7 +173,7 @@ int main( int argc, char **argv ) QString key; while ( true ) { - key = "cat" + ( keyNum == 1 ? QLatin1String( "" ) : QString::number( keyNum ) ); + key = "cat" + ( keyNum == 1 ? QString() : QString::number( keyNum ) ); if ( srcFields.indexFromName( key ) == -1 ) { break; diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp index cf1bb2c6567..e0ff34aedcf 100644 --- a/src/providers/grass/qgsgrass.cpp +++ b/src/providers/grass/qgsgrass.cpp @@ -177,7 +177,7 @@ QString QgsGrassObject::elementShort( Type type ) else if ( type == Stds ) return QStringLiteral( "stds" ); else - return QLatin1String( "" ); + return QString(); } QString QgsGrassObject::elementName() const @@ -196,7 +196,7 @@ QString QgsGrassObject::elementName( Type type ) else if ( type == Region ) return QStringLiteral( "region" ); else - return QLatin1String( "" ); + return QString(); } QString QgsGrassObject::dirName() const @@ -215,7 +215,7 @@ QString QgsGrassObject::dirName( Type type ) else if ( type == Region ) return QStringLiteral( "windows" ); else - return QLatin1String( "" ); + return QString(); } QString QgsGrassObject::toString() const @@ -537,7 +537,7 @@ QString QgsGrass::getDefaultLocation() QgsGrassObject QgsGrass::getDefaultLocationObject() { - return QgsGrassObject( sDefaultGisdbase, sDefaultLocation, QLatin1String( "" ), QLatin1String( "" ), QgsGrassObject::Location ); + return QgsGrassObject( sDefaultGisdbase, sDefaultLocation, QString(), QString(), QgsGrassObject::Location ); } QString QgsGrass::getDefaultLocationPath() @@ -556,7 +556,7 @@ QString QgsGrass::getDefaultMapset() QgsGrassObject QgsGrass::getDefaultMapsetObject() { - return QgsGrassObject( sDefaultGisdbase, sDefaultLocation, sDefaultMapset, QLatin1String( "" ), QgsGrassObject::Mapset ); + return QgsGrassObject( sDefaultGisdbase, sDefaultLocation, sDefaultMapset, QString(), QgsGrassObject::Mapset ); } QString QgsGrass::getDefaultMapsetPath() @@ -1040,7 +1040,7 @@ QString QgsGrass::closeMapset() return QObject::tr( "Cannot remove mapset lock: %1" ).arg( sMapsetLock ); } #endif - sMapsetLock = QLatin1String( "" ); + sMapsetLock.clear(); putenv( ( char * ) "GISRC" ); @@ -1055,9 +1055,9 @@ QString QgsGrass::closeMapset() //G_setenv_nogisrc( "LOCATION_NAME", ( char * ) "" ); //G_setenv_nogisrc( "MAPSET", ( char * ) "" ); - sDefaultGisdbase = QLatin1String( "" ); - sDefaultLocation = QLatin1String( "" ); - sDefaultMapset = QLatin1String( "" ); + sDefaultGisdbase.clear(); + sDefaultLocation.clear(); + sDefaultMapset.clear(); sActive = 0; // Delete temporary dir @@ -1889,11 +1889,11 @@ QString QgsGrass::findModule( QString module ) extensions << ".bat" << ".py" << ".exe"; #endif // and then try if it's a module without extension (standard on UNIX) - extensions << QLatin1String( "" ); + extensions << QString(); QStringList paths; // Try first full path - paths << QLatin1String( "" ); + paths << QString(); paths << QgsGrass::grassModulesPaths(); // Extensions first to prefer .bat over .exe on Windows @@ -2040,7 +2040,7 @@ QString QgsGrass::getInfo( const QString &info, const QString &gisdbase, break; default: QgsDebugMsg( QString( "unexpected type:%1" ).arg( type ) ); - return QLatin1String( "" ); + return QString(); } arguments.append( opt + "=" + map + "@" + mapset ); } @@ -2060,7 +2060,7 @@ QString QgsGrass::getInfo( const QString &info, const QString &gisdbase, //QByteArray data = runModule( gisdbase, location, mapset, cmd, arguments, timeOut ); // Run module with empty mapset so that it tries to find a mapset owned by user - QByteArray data = runModule( gisdbase, location, QLatin1String( "" ), cmd, arguments, timeOut ); + QByteArray data = runModule( gisdbase, location, QString(), cmd, arguments, timeOut ); QgsDebugMsg( data ); return QString( data ); } diff --git a/src/providers/grass/qgsgrassimport.cpp b/src/providers/grass/qgsgrassimport.cpp index 3a4013c2a36..f1bfc7f8a0d 100644 --- a/src/providers/grass/qgsgrassimport.cpp +++ b/src/providers/grass/qgsgrassimport.cpp @@ -113,13 +113,13 @@ void QgsGrassImportProgress::setRange( int min, int max ) mProgressMin = min; mProgressMax = max; mProgressValue = min; - emit progressChanged( QLatin1String( "" ), mProgressHtml, mProgressMin, mProgressMax, mProgressValue ); + emit progressChanged( QString(), mProgressHtml, mProgressMin, mProgressMax, mProgressValue ); } void QgsGrassImportProgress::setValue( int value ) { mProgressValue = value; - emit progressChanged( QLatin1String( "" ), mProgressHtml, mProgressMin, mProgressMax, mProgressValue ); + emit progressChanged( QString(), mProgressHtml, mProgressMin, mProgressMax, mProgressValue ); } //------------------------------ QgsGrassImport ------------------------------------ @@ -492,7 +492,7 @@ QString QgsGrassRasterImport::srcDescription() const { if ( !mPipe || !mPipe->provider() ) { - return QLatin1String( "" ); + return QString(); } return mPipe->provider()->dataSourceUri(); } @@ -749,7 +749,7 @@ QString QgsGrassVectorImport::srcDescription() const { if ( !mProvider ) { - return QLatin1String( "" ); + return QString(); } return mProvider->dataSourceUri(); } diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp index 4f4b70a66b8..290db96d22c 100644 --- a/src/providers/grass/qgsgrassprovidermodule.cpp +++ b/src/providers/grass/qgsgrassprovidermodule.cpp @@ -133,7 +133,7 @@ void QgsGrassItemActions::newMapset() QgsDebugMsg( "existingNames = " + existingNames.join( "," ) ); QRegExp regExp = QgsGrassObject::newNameRegExp( QgsGrassObject::Mapset ); Qt::CaseSensitivity caseSensitivity = QgsGrass::caseSensitivity(); - QgsNewNameDialog dialog( QLatin1String( "" ), QLatin1String( "" ), QStringList(), existingNames, regExp, caseSensitivity ); + QgsNewNameDialog dialog( QString(), QString(), QStringList(), existingNames, regExp, caseSensitivity ); if ( dialog.exec() != QDialog::Accepted ) { @@ -245,7 +245,7 @@ QString QgsGrassItemActions::newVectorMap() QgsDebugMsg( "existingNames = " + existingNames.join( "," ) ); QRegExp regExp = QgsGrassObject::newNameRegExp( QgsGrassObject::Vector ); Qt::CaseSensitivity caseSensitivity = QgsGrass::caseSensitivity(); - QgsNewNameDialog dialog( QLatin1String( "" ), QLatin1String( "" ), QStringList(), existingNames, regExp, caseSensitivity ); + QgsNewNameDialog dialog( QString(), QString(), QStringList(), existingNames, regExp, caseSensitivity ); if ( dialog.exec() != QDialog::Accepted ) { @@ -264,7 +264,7 @@ QString QgsGrassItemActions::newVectorMap() if ( !error.isEmpty() ) { QgsGrass::warning( error ); - name = QLatin1String( "" ); + name.clear(); } return name; } @@ -330,7 +330,7 @@ QgsGrassObjectItemBase::QgsGrassObjectItemBase( const QgsGrassObject &grassObjec //----------------------- QgsGrassLocationItem ------------------------------ QgsGrassLocationItem::QgsGrassLocationItem( QgsDataItem *parent, QString dirPath, QString path ) - : QgsDirectoryItem( parent, QLatin1String( "" ), dirPath, path ) + : QgsDirectoryItem( parent, QString(), dirPath, path ) , QgsGrassObjectItemBase( QgsGrassObject() ) { // modify path to distinguish from directory, so that it can be expanded by path in browser @@ -340,7 +340,7 @@ QgsGrassLocationItem::QgsGrassLocationItem( QgsDataItem *parent, QString dirPath dir.cdUp(); QString gisdbase = dir.path(); - mGrassObject = QgsGrassObject( gisdbase, mName, QLatin1String( "" ), QLatin1String( "" ), QgsGrassObject::Location ); + mGrassObject = QgsGrassObject( gisdbase, mName, QString(), QString(), QgsGrassObject::Location ); #ifdef HAVE_GUI mActions = new QgsGrassItemActions( mGrassObject, true, this ); #endif @@ -382,7 +382,7 @@ QIcon QgsGrassLocationItem::icon() QList<QgsGrassImport *> QgsGrassMapsetItem::sImports; QgsGrassMapsetItem::QgsGrassMapsetItem( QgsDataItem *parent, QString dirPath, QString path ) - : QgsDirectoryItem( parent, QLatin1String( "" ), dirPath, path ) + : QgsDirectoryItem( parent, QString(), dirPath, path ) , QgsGrassObjectItemBase( QgsGrassObject() ) , mRefreshLater( false ) { @@ -393,7 +393,7 @@ QgsGrassMapsetItem::QgsGrassMapsetItem( QgsDataItem *parent, QString dirPath, QS dir.cdUp(); QString gisdbase = dir.path(); - mGrassObject = QgsGrassObject( gisdbase, location, mName, QLatin1String( "" ), QgsGrassObject::Mapset ); + mGrassObject = QgsGrassObject( gisdbase, location, mName, QString(), QgsGrassObject::Mapset ); #ifdef HAVE_GUI mActions = new QgsGrassItemActions( mGrassObject, true, this ); #endif diff --git a/src/providers/mssql/qgsmssqlgeomcolumntypethread.cpp b/src/providers/mssql/qgsmssqlgeomcolumntypethread.cpp index 3b761123005..0b8e0de19c5 100644 --- a/src/providers/mssql/qgsmssqlgeomcolumntypethread.cpp +++ b/src/providers/mssql/qgsmssqlgeomcolumntypethread.cpp @@ -52,7 +52,7 @@ void QgsMssqlGeomColumnTypeThread::run() { QString table; table = QStringLiteral( "%1[%2]" ) - .arg( layerProperty.schemaName.isEmpty() ? QLatin1String( "" ) : QStringLiteral( "[%1]." ).arg( layerProperty.schemaName ), + .arg( layerProperty.schemaName.isEmpty() ? QString() : QStringLiteral( "[%1]." ).arg( layerProperty.schemaName ), layerProperty.tableName ); QString query = QString( "SELECT %3" @@ -64,7 +64,7 @@ void QgsMssqlGeomColumnTypeThread::run() .arg( layerProperty.geometryColName, table, mUseEstimatedMetadata ? "TOP 1" : "", - layerProperty.sql.isEmpty() ? QLatin1String( "" ) : QStringLiteral( " AND %1" ).arg( layerProperty.sql ) ); + layerProperty.sql.isEmpty() ? QString() : QStringLiteral( " AND %1" ).arg( layerProperty.sql ) ); // issue the sql query QSqlDatabase db = QSqlDatabase::database( mConnectionName ); diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp index 4a5b921e9f7..7b1934d77a9 100644 --- a/src/providers/mssql/qgsmssqlnewconnection.cpp +++ b/src/providers/mssql/qgsmssqlnewconnection.cpp @@ -107,8 +107,8 @@ void QgsMssqlNewConnection::accept() settings.setValue( baseKey + "/service", txtService->text() ); settings.setValue( baseKey + "/host", txtHost->text() ); settings.setValue( baseKey + "/database", database ); - settings.setValue( baseKey + "/username", chkStoreUsername->isChecked() ? txtUsername->text() : QLatin1String( "" ) ); - settings.setValue( baseKey + "/password", chkStorePassword->isChecked() ? txtPassword->text() : QLatin1String( "" ) ); + settings.setValue( baseKey + "/username", chkStoreUsername->isChecked() ? txtUsername->text() : QString() ); + settings.setValue( baseKey + "/password", chkStorePassword->isChecked() ? txtPassword->text() : QString() ); settings.setValue( baseKey + "/saveUsername", chkStoreUsername->isChecked() ? "true" : "false" ); settings.setValue( baseKey + "/savePassword", chkStorePassword->isChecked() ? "true" : "false" ); settings.setValue( baseKey + "/geometryColumns", cb_geometryColumns->isChecked() ); diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp index 9c14062344c..f6c8b7ca5a2 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.cpp +++ b/src/providers/mssql/qgsmssqlsourceselect.cpp @@ -329,7 +329,7 @@ void QgsMssqlSourceSelect::mSearchGroupBox_toggled( bool checked ) if ( mSearchTableEdit->text().isEmpty() ) return; - mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QLatin1String( "" ) ); + mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QString() ); } void QgsMssqlSourceSelect::mSearchTableEdit_textChanged( const QString &text ) diff --git a/src/providers/mssql/qgsmssqltablemodel.cpp b/src/providers/mssql/qgsmssqltablemodel.cpp index 2d864366bb8..9565b73d5af 100644 --- a/src/providers/mssql/qgsmssqltablemodel.cpp +++ b/src/providers/mssql/qgsmssqltablemodel.cpp @@ -110,7 +110,7 @@ void QgsMssqlTableModel::addTableEntry( const QgsMssqlLayerProperty &layerProper pkItem->setData( layerProperty.pkCols, Qt::UserRole + 1 ); pkItem->setData( pkCol, Qt::UserRole + 2 ); - QStandardItem *selItem = new QStandardItem( QLatin1String( "" ) ); + QStandardItem *selItem = new QStandardItem( QString() ); selItem->setFlags( selItem->flags() | Qt::ItemIsUserCheckable ); selItem->setCheckState( Qt::Checked ); selItem->setToolTip( tr( "Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views)." ) ); diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp index 610f565bd75..f97aceb569c 100644 --- a/src/providers/ogr/qgsogrdataitems.cpp +++ b/src/providers/ogr/qgsogrdataitems.cpp @@ -258,7 +258,7 @@ QList<QgsOgrDbLayerInfo *> QgsOgrLayerItem::subLayers( const QString &path, cons QStringList pieces = uri.split( ':' ); QString name = pieces.value( pieces.length() - 1 ); QgsDebugMsgLevel( QStringLiteral( "Adding GeoPackage Raster item %1 %2 %3" ).arg( name, uri ), 3 ); - children.append( new QgsOgrDbLayerInfo( path, uri, name, QStringLiteral( "" ), QStringLiteral( "Raster" ), QgsLayerItem::LayerType::Raster ) ); + children.append( new QgsOgrDbLayerInfo( path, uri, name, QString(), QStringLiteral( "Raster" ), QgsLayerItem::LayerType::Raster ) ); } } else if ( rlayer.isValid( ) ) @@ -292,7 +292,7 @@ QList<QgsOgrDbLayerInfo *> QgsOgrLayerItem::subLayers( const QString &path, cons } QgsDebugMsgLevel( QStringLiteral( "Adding %1 Raster item %2 %3" ).arg( driver, name, path ), 3 ); - children.append( new QgsOgrDbLayerInfo( path, uri, name, QStringLiteral( "" ), QStringLiteral( "Raster" ), QgsLayerItem::LayerType::Raster ) ); + children.append( new QgsOgrDbLayerInfo( path, uri, name, QString(), QStringLiteral( "Raster" ), QgsLayerItem::LayerType::Raster ) ); } } return children; @@ -455,7 +455,7 @@ bool QgsOgrDataCollectionItem::storeConnection( const QString &path, const QStri connName = QInputDialog::getText( nullptr, tr( "Cannot add connection '%1'" ).arg( connName ), tr( "A connection with the same name already exists,\nplease provide a new name:" ), QLineEdit::Normal, - QLatin1String( "" ), &ok ); + QString(), &ok ); } if ( ok && ! connName.isEmpty() ) { @@ -470,7 +470,7 @@ bool QgsOgrDataCollectionItem::storeConnection( const QString &path, const QStri bool QgsOgrDataCollectionItem::createConnection( const QString &name, const QString &extensions, const QString &ogrDriverName ) { - QString path = QFileDialog::getOpenFileName( nullptr, tr( "Open %1" ).arg( name ), QLatin1String( "" ), extensions ); + QString path = QFileDialog::getOpenFileName( nullptr, tr( "Open %1" ).arg( name ), QString(), extensions ); return storeConnection( path, ogrDriverName ); } diff --git a/src/providers/ogr/qgsogrdbsourceselect.cpp b/src/providers/ogr/qgsogrdbsourceselect.cpp index 038eef5cd91..4c839ec2822 100644 --- a/src/providers/ogr/qgsogrdbsourceselect.cpp +++ b/src/providers/ogr/qgsogrdbsourceselect.cpp @@ -143,7 +143,7 @@ void QgsOgrDbSourceSelect::mSearchGroupBox_toggled( bool checked ) if ( mSearchTableEdit->text().isEmpty() ) return; - mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QLatin1String( "" ) ); + mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QString() ); } void QgsOgrDbSourceSelect::mSearchTableEdit_textChanged( const QString &text ) @@ -341,7 +341,7 @@ void QgsOgrDbSourceSelect::btnConnect_clicked() { if ( cbxAllowGeometrylessTables->isChecked() || table->geometryType() != QStringLiteral( "None" ) ) { - mTableModel.addTableEntry( table->layerType(), table->name(), table->uri(), table->geometryColumn(), table->geometryType(), QLatin1String( "" ) ); + mTableModel.addTableEntry( table->layerType(), table->name(), table->uri(), table->geometryColumn(), table->geometryType(), QString() ); } } diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp index 4ac168b7f9a..28f2a7d59a0 100644 --- a/src/providers/ogr/qgsogrprovider.cpp +++ b/src/providers/ogr/qgsogrprovider.cpp @@ -3017,7 +3017,7 @@ QString createFilters( const QString &type ) } else { - return QLatin1String( "" ); + return QString(); } } @@ -6000,7 +6000,7 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause ) QgsOgrLayerUniquePtr userLayer; if ( !LoadDataSourceLayerStylesAndLayer( uri, layerStyles, userLayer, errCause ) ) { - return QLatin1String( "" ); + return QString(); } QMutex *mutex1 = nullptr; @@ -6180,7 +6180,7 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e QgsOgrLayerUniquePtr userLayer; if ( !LoadDataSourceLayerStylesAndLayer( uri, layerStyles, userLayer, errCause ) ) { - return QLatin1String( "" ); + return QString(); } QMutex *mutex1 = nullptr; @@ -6192,14 +6192,14 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e if ( !ok ) { errCause = QObject::tr( "Invalid style identifier" ); - return QLatin1String( "" ); + return QString(); } gdal::ogr_feature_unique_ptr hFeature( OGR_L_GetFeature( hLayer, id ) ); if ( !hFeature ) { errCause = QObject::tr( "No style corresponding to style identifier" ); - return QLatin1String( "" ); + return QString(); } OGRFeatureDefnH hLayerDefn = OGR_L_GetLayerDefn( hLayer ); diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp index 79fcb58fdaf..fdaa23a7dca 100644 --- a/src/providers/postgres/qgspgnewconnection.cpp +++ b/src/providers/postgres/qgspgnewconnection.cpp @@ -146,8 +146,8 @@ void QgsPgNewConnection::accept() settings.setValue( baseKey + "/host", txtHost->text() ); settings.setValue( baseKey + "/port", txtPort->text() ); settings.setValue( baseKey + "/database", txtDatabase->text() ); - settings.setValue( baseKey + "/username", mAuthSettings->storeUsernameIsChecked( ) ? mAuthSettings->username() : QLatin1String( "" ) ); - settings.setValue( baseKey + "/password", mAuthSettings->storePasswordIsChecked( ) && !hasAuthConfigID ? mAuthSettings->password() : QLatin1String( "" ) ); + settings.setValue( baseKey + "/username", mAuthSettings->storeUsernameIsChecked( ) ? mAuthSettings->username() : QString() ); + settings.setValue( baseKey + "/password", mAuthSettings->storePasswordIsChecked( ) && !hasAuthConfigID ? mAuthSettings->password() : QString() ); settings.setValue( baseKey + "/authcfg", mAuthSettings->configId() ); settings.setValue( baseKey + "/publicOnly", cb_publicSchemaOnly->isChecked() ); settings.setValue( baseKey + "/geometryColumnsOnly", cb_geometryColumnsOnly->isChecked() ); diff --git a/src/providers/postgres/qgspgsourceselect.cpp b/src/providers/postgres/qgspgsourceselect.cpp index b76dbcc3316..bc31162eddc 100644 --- a/src/providers/postgres/qgspgsourceselect.cpp +++ b/src/providers/postgres/qgspgsourceselect.cpp @@ -391,7 +391,7 @@ void QgsPgSourceSelect::mSearchGroupBox_toggled( bool checked ) if ( mSearchTableEdit->text().isEmpty() ) return; - mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QLatin1String( "" ) ); + mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QString() ); } void QgsPgSourceSelect::mSearchTableEdit_textChanged( const QString &text ) diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp index b87d53fe11b..a512a25e4aa 100644 --- a/src/providers/postgres/qgspgtablemodel.cpp +++ b/src/providers/postgres/qgspgtablemodel.cpp @@ -81,7 +81,7 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty &layerProper QStandardItem *tableItem = new QStandardItem( layerProperty.tableName ); QStandardItem *commentItem = new QStandardItem( layerProperty.tableComment ); QStandardItem *geomItem = new QStandardItem( layerProperty.geometryColName ); - QStandardItem *sridItem = new QStandardItem( wkbType != QgsWkbTypes::NoGeometry ? QString::number( srid ) : QLatin1String( "" ) ); + QStandardItem *sridItem = new QStandardItem( wkbType != QgsWkbTypes::NoGeometry ? QString::number( srid ) : QString() ); sridItem->setEditable( wkbType != QgsWkbTypes::NoGeometry && srid == std::numeric_limits<int>::min() ); if ( sridItem->isEditable() ) { @@ -89,7 +89,7 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty &layerProper sridItem->setFlags( sridItem->flags() | Qt::ItemIsEditable ); } - QStandardItem *pkItem = new QStandardItem( QLatin1String( "" ) ); + QStandardItem *pkItem = new QStandardItem( QString() ); if ( !layerProperty.pkCols.isEmpty() ) { pkItem->setText( tr( "Select…" ) ); @@ -101,7 +101,7 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty &layerProper pkItem->setData( layerProperty.pkCols, Qt::UserRole + 1 ); pkItem->setData( "", Qt::UserRole + 2 ); - QStandardItem *selItem = new QStandardItem( QLatin1String( "" ) ); + QStandardItem *selItem = new QStandardItem( QString() ); selItem->setFlags( selItem->flags() | Qt::ItemIsUserCheckable ); selItem->setCheckState( Qt::Checked ); selItem->setToolTip( tr( "Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views)." ) ); @@ -126,7 +126,7 @@ void QgsPgTableModel::addTableEntry( const QgsPostgresLayerProperty &layerProper if ( tip.isEmpty() ) { item->setFlags( item->flags() | Qt::ItemIsSelectable ); - item->setToolTip( QLatin1String( "" ) ); + item->setToolTip( QString() ); } else { @@ -288,7 +288,7 @@ bool QgsPgTableModel::setData( const QModelIndex &idx, const QVariant &value, in } item->setFlags( item->flags() | Qt::ItemIsSelectable ); - item->setToolTip( QLatin1String( "" ) ); + item->setToolTip( QString() ); } else { diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp index adbd2a2d97f..7cda26642e7 100644 --- a/src/providers/postgres/qgspostgresconn.cpp +++ b/src/providers/postgres/qgspostgresconn.cpp @@ -1108,7 +1108,7 @@ bool QgsPostgresConn::openCursor( const QString &cursorName, const QString &sql } QgsDebugMsgLevel( QString( "Binary cursor %1 for %2" ).arg( cursorName, sql ), 3 ); return PQexecNR( QStringLiteral( "DECLARE %1 BINARY CURSOR%2 FOR %3" ). - arg( cursorName, !mTransaction ? QLatin1String( "" ) : QStringLiteral( " WITH HOLD" ), sql ) ); + arg( cursorName, !mTransaction ? QString() : QStringLiteral( " WITH HOLD" ), sql ) ); } bool QgsPostgresConn::closeCursor( const QString &cursorName ) @@ -1459,7 +1459,7 @@ void QgsPostgresConn::retrieveLayerTypes( QgsPostgresLayerProperty &layerPropert table = QStringLiteral( "(SELECT %1 FROM %2%3 LIMIT %4) AS t" ) .arg( quotedIdentifier( layerProperty.geometryColName ), table, - layerProperty.sql.isEmpty() ? QLatin1String( "" ) : QStringLiteral( " WHERE %1" ).arg( layerProperty.sql ) ) + layerProperty.sql.isEmpty() ? QString() : QStringLiteral( " WHERE %1" ).arg( layerProperty.sql ) ) .arg( GEOM_TYPE_SELECT_LIMIT ); } else if ( !layerProperty.sql.isEmpty() ) diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp index 5f15354d3aa..443732b1abf 100644 --- a/src/providers/postgres/qgspostgresfeatureiterator.cpp +++ b/src/providers/postgres/qgspostgresfeatureiterator.cpp @@ -507,7 +507,8 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString &whereClause, long } #endif - QString query( QStringLiteral( "SELECT " ) ), delim( QLatin1String( "" ) ); + QString query( QStringLiteral( "SELECT " ) ); + QString delim; if ( mFetchGeometry ) { diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index d36331aa188..b8f22f37837 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -596,7 +596,7 @@ QString QgsPostgresUtils::whereClause( const QgsFeatureIds &featureIds, const Qg { whereClauses << whereClause( featureId, fields, conn, pkType, pkAttrs, sharedData ); } - return whereClauses.isEmpty() ? QLatin1String( "" ) : whereClauses.join( QStringLiteral( " OR " ) ).prepend( '(' ).append( ')' ); + return whereClauses.isEmpty() ? QString() : whereClauses.join( QStringLiteral( " OR " ) ).prepend( '(' ).append( ')' ); } } return QString(); //avoid warning @@ -3559,14 +3559,14 @@ bool QgsPostgresProvider::getGeometryDetails() mSpatialColType = SctPcPatch; else { - detectedType = mRequestedGeomType == QgsWkbTypes::Unknown ? QLatin1String( "" ) : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType ); + detectedType = mRequestedGeomType == QgsWkbTypes::Unknown ? QString() : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType ); detectedSrid = mRequestedSrid; } } else { connectionRO()->PQexecNR( QStringLiteral( "COMMIT" ) ); - detectedType = mRequestedGeomType == QgsWkbTypes::Unknown ? QLatin1String( "" ) : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType ); + detectedType = mRequestedGeomType == QgsWkbTypes::Unknown ? QString() : QgsPostgresConn::postgisWkbTypeName( mRequestedGeomType ); } } else @@ -3718,7 +3718,7 @@ bool QgsPostgresProvider::convertField( QgsField &field, const QMap<QString, QVa case QVariant::List: { - QgsField sub( QLatin1String( "" ), field.subType(), QLatin1String( "" ), fieldSize, fieldPrec ); + QgsField sub( QString(), field.subType(), QString(), fieldSize, fieldPrec ); if ( !convertField( sub, nullptr ) ) return false; fieldType = "_" + sub.typeName(); fieldPrec = -1; @@ -4778,7 +4778,7 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause ) if ( !conn ) { errCause = QObject::tr( "Connection to database failed" ); - return QLatin1String( "" ); + return QString(); } if ( dsUri.database().isEmpty() ) // typically when a service file is used @@ -4789,7 +4789,7 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause ) if ( !tableExists( *conn, QStringLiteral( "layer_styles" ) ) ) { conn->unref(); - return QLatin1String( "" ); + return QString(); } QString selectQmlQuery = QString( "SELECT styleQML" @@ -4807,7 +4807,7 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause ) QgsPostgresResult result( conn->PQexec( selectQmlQuery ) ); - QString style = result.PQntuples() == 1 ? result.PQgetvalue( 0, 0 ) : QLatin1String( "" ); + QString style = result.PQntuples() == 1 ? result.PQgetvalue( 0, 0 ) : QString(); conn->unref(); return style; @@ -4931,7 +4931,7 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e if ( !conn ) { errCause = QObject::tr( "Connection to database failed using username: %1" ).arg( dsUri.username() ); - return QLatin1String( "" ); + return QString(); } QString style; diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp index ee3519ed444..37a7f3f4008 100644 --- a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp +++ b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp @@ -384,7 +384,7 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseFid() QString QgsSpatiaLiteFeatureIterator::whereClauseFids() { if ( mRequest.filterFids().isEmpty() ) - return QLatin1String( "" ); + return QString(); QString expr = QStringLiteral( "%1 IN (" ).arg( quotedPrimaryKey() ), delim; Q_FOREACH ( const QgsFeatureId featureId, mRequest.filterFids() ) diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp index 9a8f4a75eb6..c671c95d695 100644 --- a/src/providers/spatialite/qgsspatialiteprovider.cpp +++ b/src/providers/spatialite/qgsspatialiteprovider.cpp @@ -356,7 +356,7 @@ QgsSpatiaLiteProvider::createEmptyLayer( const QString &uri, } // use the provider to edit the table - dsUri.setDataSource( QLatin1String( "" ), tableName, geometryColumn, QString(), primaryKey ); + dsUri.setDataSource( QString(), tableName, geometryColumn, QString(), primaryKey ); QgsDataProvider::ProviderOptions providerOptions; QgsSpatiaLiteProvider *provider = new QgsSpatiaLiteProvider( dsUri.uri(), providerOptions ); @@ -704,7 +704,7 @@ void QgsSpatiaLiteProvider::loadFieldsAbstractInterface( gaiaVectorLayerPtr lyr fieldType = QVariant::Double; type = "DOUBLE"; } - mAttributeFields.append( QgsField( name, fieldType, type, 0, 0, QLatin1String( "" ) ) ); + mAttributeFields.append( QgsField( name, fieldType, type, 0, 0, QString() ) ); } fld = fld->Next; } @@ -5065,8 +5065,8 @@ bool QgsSpatiaLiteProvider::getQueryGeometryDetails() int columns; char *errMsg = nullptr; - QString fType( QLatin1String( "" ) ); - QString xSrid( QLatin1String( "" ) ); + QString fType; + QString xSrid; // get stuff from the relevant column instead. This may (will?) // fail if there is no data in the relevant table. @@ -5236,7 +5236,7 @@ bool QgsSpatiaLiteProvider::getTableSummary() char *errMsg = nullptr; QString sql = QStringLiteral( "SELECT Count(*)%1 FROM %2" ) - .arg( mGeometryColumn.isEmpty() ? QLatin1String( "" ) : QStringLiteral( ",Min(MbrMinX(%1)),Min(MbrMinY(%1)),Max(MbrMaxX(%1)),Max(MbrMaxY(%1))" ).arg( quotedIdentifier( mGeometryColumn ) ), + .arg( mGeometryColumn.isEmpty() ? QString() : QStringLiteral( ",Min(MbrMinX(%1)),Min(MbrMinY(%1)),Max(MbrMaxX(%1)),Max(MbrMaxY(%1))" ).arg( quotedIdentifier( mGeometryColumn ) ), mQuery ); if ( !mSubsetString.isEmpty() ) @@ -5785,7 +5785,7 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause ) return QString(); } - QString style = ( rows == 1 ) ? QString::fromUtf8( results[( rows * columns ) + 0 ] ) : QLatin1String( "" ); + QString style = ( rows == 1 ) ? QString::fromUtf8( results[( rows * columns ) + 0 ] ) : QString(); sqlite3_free_table( results ); QgsSqliteHandle::closeDb( handle ); @@ -5911,7 +5911,7 @@ QGISEXTERN QString getStyleById( const QString &uri, QString styleId, QString &e { QgsDebugMsg( "Connection to database failed. Save style aborted." ); errCause = QObject::tr( "Connection to database failed" ); - return QLatin1String( "" ); + return QString(); } sqlite3 *sqliteHandle = handle->handle(); diff --git a/src/providers/spatialite/qgsspatialitesourceselect.cpp b/src/providers/spatialite/qgsspatialitesourceselect.cpp index 5caf45974d3..a4f7ff8748e 100644 --- a/src/providers/spatialite/qgsspatialitesourceselect.cpp +++ b/src/providers/spatialite/qgsspatialitesourceselect.cpp @@ -189,7 +189,7 @@ void QgsSpatiaLiteSourceSelect::mSearchGroupBox_toggled( bool checked ) if ( mSearchTableEdit->text().isEmpty() ) return; - mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QLatin1String( "" ) ); + mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QString() ); } void QgsSpatiaLiteSourceSelect::mSearchTableEdit_textChanged( const QString &text ) @@ -298,7 +298,7 @@ bool QgsSpatiaLiteSourceSelect::newConnection( QWidget *parent ) bool ok; savedName = QInputDialog::getText( nullptr, tr( "Cannot add connection '%1'" ).arg( myName ), tr( "A connection with the same name already exists,\nplease provide a new name:" ), QLineEdit::Normal, - QLatin1String( "" ), &ok ); + QString(), &ok ); if ( !ok || savedName.isEmpty() ) { return false; @@ -351,7 +351,7 @@ QString QgsSpatiaLiteSourceSelect::layerURI( const QModelIndex &index ) } QgsDataSourceUri uri( connectionInfo() ); - uri.setDataSource( QLatin1String( "" ), tableName, geomColumnName, sql, QLatin1String( "" ) ); + uri.setDataSource( QString(), tableName, geomColumnName, sql, QString() ); return uri.uri(); } @@ -484,7 +484,7 @@ void QgsSpatiaLiteSourceSelect::btnConnect_clicked() QList<QgsSpatiaLiteConnection::TableEntry> tables = conn.tables(); Q_FOREACH ( const QgsSpatiaLiteConnection::TableEntry &table, tables ) { - mTableModel.addTableEntry( table.type, table.tableName, table.column, QLatin1String( "" ) ); + mTableModel.addTableEntry( table.type, table.tableName, table.column, QString() ); } if ( cmbConnections->count() > 0 ) diff --git a/src/providers/spatialite/qgsspatialitetablemodel.cpp b/src/providers/spatialite/qgsspatialitetablemodel.cpp index e918063aac7..b87925648f4 100644 --- a/src/providers/spatialite/qgsspatialitetablemodel.cpp +++ b/src/providers/spatialite/qgsspatialitetablemodel.cpp @@ -153,7 +153,7 @@ void QgsSpatiaLiteTableModel::setGeometryTypesForTable( const QString &table, co for ( int j = 1; j < typeList.size(); ++j ) { //todo: add correct type - addTableEntry( typeList.at( j ), table, geomColText + " AS " + typeList.at( j ), QLatin1String( "" ) ); + addTableEntry( typeList.at( j ), table, geomColText + " AS " + typeList.at( j ), QString() ); } } } diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp index 681c0a31516..67e98f6d44c 100644 --- a/src/providers/virtual/qgsvirtuallayerprovider.cpp +++ b/src/providers/virtual/qgsvirtuallayerprovider.cpp @@ -543,9 +543,9 @@ QgsRectangle QgsVirtualLayerProvider::extent() const void QgsVirtualLayerProvider::updateStatistics() const { bool hasGeometry = mDefinition.geometryWkbType() != QgsWkbTypes::NoGeometry; - QString subset = mSubset.isEmpty() ? QLatin1String( "" ) : " WHERE " + mSubset; + QString subset = mSubset.isEmpty() ? QString() : " WHERE " + mSubset; QString sql = QStringLiteral( "SELECT Count(*)%1 FROM %2%3" ) - .arg( hasGeometry ? QStringLiteral( ",Min(MbrMinX(%1)),Min(MbrMinY(%1)),Max(MbrMaxX(%1)),Max(MbrMaxY(%1))" ).arg( quotedColumn( mDefinition.geometryField() ) ) : QLatin1String( "" ), + .arg( hasGeometry ? QStringLiteral( ",Min(MbrMinX(%1)),Min(MbrMinY(%1)),Max(MbrMaxX(%1)),Max(MbrMaxY(%1))" ).arg( quotedColumn( mDefinition.geometryField() ) ) : QString(), mTableName, subset ); Sqlite::Query q( mSqlite.get(), sql ); diff --git a/src/providers/wcs/qgswcsdataitems.cpp b/src/providers/wcs/qgswcsdataitems.cpp index 9a658d3a0bf..3f105fbb0d4 100644 --- a/src/providers/wcs/qgswcsdataitems.cpp +++ b/src/providers/wcs/qgswcsdataitems.cpp @@ -148,7 +148,7 @@ QgsWCSLayerItem::QgsWCSLayerItem( QgsDataItem *parent, QString name, QString pat QString QgsWCSLayerItem::createUri() { if ( mCoverageSummary.identifier.isEmpty() ) - return QLatin1String( "" ); // layer collection + return QString(); // layer collection // Number of styles must match number of layers mDataSourceUri.setParam( QStringLiteral( "identifier" ), mCoverageSummary.identifier ); diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp index 13fbcaf2797..0a1a5fd7bc7 100644 --- a/src/providers/wcs/qgswcsprovider.cpp +++ b/src/providers/wcs/qgswcsprovider.cpp @@ -1283,7 +1283,7 @@ QString QgsWcsProvider::htmlMetadata() metadata += htmlRow( tr( "Image Formats" ), mCapabilities.capability.request.getMap.format.join( "<br />" ) ); metadata += htmlRow( tr( "GetCapabilitiesUrl" ), mBaseUrl ); #endif - metadata += htmlRow( tr( "Get Coverage Url" ), mCapabilities.getCoverageUrl() + ( mIgnoreGetCoverageUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QLatin1String( "" ) ) ); + metadata += htmlRow( tr( "Get Coverage Url" ), mCapabilities.getCoverageUrl() + ( mIgnoreGetCoverageUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QString() ) ); // Close the nested table metadata += QLatin1String( "</table>" ); // End nested table 2 diff --git a/src/providers/wfs/qgswfscapabilities.cpp b/src/providers/wfs/qgswfscapabilities.cpp index 2cd6eef0eeb..2bc9131d363 100644 --- a/src/providers/wfs/qgswfscapabilities.cpp +++ b/src/providers/wfs/qgswfscapabilities.cpp @@ -83,7 +83,7 @@ QString QgsWfsCapabilities::Capabilities::addPrefixIfNeeded( const QString &name if ( name.contains( ':' ) ) return name; if ( setAmbiguousUnprefixedTypename.contains( name ) ) - return QLatin1String( "" ); + return QString(); return mapUnprefixedTypenameToPrefixedTypename[name]; } diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp index 4b75660e851..6fe0cbceae6 100644 --- a/src/providers/wfs/qgswfsfeatureiterator.cpp +++ b/src/providers/wfs/qgswfsfeatureiterator.cpp @@ -55,7 +55,7 @@ void QgsWFSFeatureHitsAsyncRequest::hitsReplyFinished() if ( mErrorCode == NoError ) { QByteArray data = response(); - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), QgsFields() ); + QgsGmlStreamingParser gmlParser( ( QString() ), ( QString() ), QgsFields() ); QString errorMsg; if ( gmlParser.processData( data, true, errorMsg ) ) { diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp index 472c79b6564..ed269e087dd 100644 --- a/src/providers/wfs/qgswfsprovider.cpp +++ b/src/providers/wfs/qgswfsprovider.cpp @@ -299,7 +299,7 @@ bool QgsWFSProvider::processSQL( const QString &sqlString, QString &errorMsg, QS parserErrorString += QLatin1String( " " ); parserErrorString += newPart; } - parserErrorString.replace( QLatin1String( " or " ), tr( "%1 or %2" ).arg( QLatin1String( "" ), QLatin1String( "" ) ) ); + parserErrorString.replace( QLatin1String( " or " ), tr( "%1 or %2" ).arg( QString(), QString() ) ); parserErrorString.replace( QLatin1String( "COMMA" ), tr( "comma" ) ); parserErrorString.replace( QLatin1String( "IDENTIFIER" ), tr( "an identifier" ) ); errorMsg = tr( "SQL query is invalid: %1" ).arg( parserErrorString ); diff --git a/src/providers/wfs/qgswfssourceselect.cpp b/src/providers/wfs/qgswfssourceselect.cpp index b50d1c7c10a..49f35a47c8a 100644 --- a/src/providers/wfs/qgswfssourceselect.cpp +++ b/src/providers/wfs/qgswfssourceselect.cpp @@ -172,7 +172,7 @@ QString QgsWFSSourceSelect::getPreferredCrs( const QSet<QString> &crsSet ) const { if ( crsSet.size() < 1 ) { - return QLatin1String( "" ); + return QString(); } //first: project CRS @@ -480,7 +480,7 @@ void QgsWFSTableSelectedCallback::tableSelected( const QString &name ) QString fieldName( fieldNamePrefix + QgsSQLStatement::quotedIdentifierIfNeeded( p.geometryAttribute() ) ); fieldList << QgsSQLComposerDialog::PairNameType( fieldName, QStringLiteral( "geometry" ) ); } - fieldList << QgsSQLComposerDialog::PairNameType( fieldNamePrefix + "*", QLatin1String( "" ) ); + fieldList << QgsSQLComposerDialog::PairNameType( fieldNamePrefix + "*", QString() ); mDialog->addColumnNames( fieldList, name ); } @@ -609,7 +609,7 @@ void QgsWFSSourceSelect::buildQuery( const QModelIndex &index ) QString fieldName( fieldNamePrefix + QgsSQLStatement::quotedIdentifierIfNeeded( p.geometryAttribute() ) ); fieldList << QgsSQLComposerDialog::PairNameType( fieldName, QStringLiteral( "geometry" ) ); } - fieldList << QgsSQLComposerDialog::PairNameType( fieldNamePrefix + "*", QLatin1String( "" ) ); + fieldList << QgsSQLComposerDialog::PairNameType( fieldNamePrefix + "*", QString() ); d->addColumnNames( fieldList, QgsSQLStatement::quotedIdentifierIfNeeded( displayedTypeName ) ); diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp index 4cfadc4dc13..466ae9dcf31 100644 --- a/src/providers/wms/qgswmsdataitems.cpp +++ b/src/providers/wms/qgswmsdataitems.cpp @@ -269,11 +269,11 @@ QgsWMSLayerItem::QgsWMSLayerItem( QgsDataItem *parent, QString name, QString pat QString QgsWMSLayerItem::createUri() { if ( mLayerProperty.name.isEmpty() ) - return QLatin1String( "" ); // layer collection + return QString(); // layer collection // Number of styles must match number of layers mDataSourceUri.setParam( QStringLiteral( "layers" ), mLayerProperty.name ); - QString style = !mLayerProperty.style.isEmpty() ? mLayerProperty.style.at( 0 ).name : QLatin1String( "" ); + QString style = !mLayerProperty.style.isEmpty() ? mLayerProperty.style.at( 0 ).name : QString(); mDataSourceUri.setParam( QStringLiteral( "styles" ), style ); QString format; diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index 9e1d6a47a4c..9519c221a47 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -939,9 +939,9 @@ QUrl QgsWmsProvider::createRequestUrlWMS( const QgsRectangle &viewExtent, int pi } QString layers = visibleLayers.join( QStringLiteral( "," ) ); - layers = layers.isNull() ? QLatin1String( "" ) : layers; + layers = layers.isNull() ? QString() : layers; QString styles = visibleStyles.join( QStringLiteral( "," ) ); - styles = styles.isNull() ? QLatin1String( "" ) : styles; + styles = styles.isNull() ? QString() : styles; QgsDebugMsg( "Visible layer list of " + layers + " and style list of " + styles ); @@ -1987,21 +1987,21 @@ QString QgsWmsProvider::htmlMetadata() metadata += tr( "GetMapUrl" ); metadata += QLatin1String( "</td>" ); metadata += QLatin1String( "<td>" ); - metadata += getMapUrl() + ( mSettings.mIgnoreGetMapUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QLatin1String( "" ) ); + metadata += getMapUrl() + ( mSettings.mIgnoreGetMapUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QString() ); metadata += QLatin1String( "</td></tr>" ); metadata += QLatin1String( "<tr><td>" ); metadata += tr( "GetFeatureInfoUrl" ); metadata += QLatin1String( "</td>" ); metadata += QLatin1String( "<td>" ); - metadata += getFeatureInfoUrl() + ( mSettings.mIgnoreGetFeatureInfoUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QLatin1String( "" ) ); + metadata += getFeatureInfoUrl() + ( mSettings.mIgnoreGetFeatureInfoUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QString() ); metadata += QLatin1String( "</td></tr>" ); metadata += QLatin1String( "<tr><td>" ); metadata += tr( "GetLegendGraphic" ); metadata += QLatin1String( "</td>" ); metadata += QLatin1String( "<td>" ); - metadata += getLegendGraphicUrl() + ( mSettings.mIgnoreGetMapUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QLatin1String( "" ) ); + metadata += getLegendGraphicUrl() + ( mSettings.mIgnoreGetMapUrl ? tr( " <font color=\"red\">(advertised but ignored)</font>" ) : QString() ); metadata += QLatin1String( "</td></tr>" ); if ( mSettings.mTiled ) diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp index 7da008c422c..29afc184fdc 100644 --- a/src/providers/wms/qgswmssourceselect.cpp +++ b/src/providers/wms/qgswmssourceselect.cpp @@ -771,7 +771,7 @@ void QgsWMSSourceSelect::collectNamedLayers( QTreeWidgetItem *item, QStringList { // named layers layers << layerName; - styles << QLatin1String( "" ); + styles << QString(); titles << titleName; if ( mCRSs.isEmpty() ) @@ -817,7 +817,7 @@ void QgsWMSSourceSelect::lstLayers_itemSelectionChanged() { // named layer: add using default style layers << layerName; - styles << QLatin1String( "" ); + styles << QString(); titles << titleName; if ( mCRSs.isEmpty() ) mCRSs = item->data( 0, Qt::UserRole + 2 ).toStringList().toSet(); @@ -1024,7 +1024,7 @@ QString QgsWMSSourceSelect::selectedImageEncoding() int id = mImageFormatGroup->checkedId(); if ( id < 0 ) { - return QLatin1String( "" ); + return QString(); } else { diff --git a/src/server/services/wfs/qgswfsdescribefeaturetype.cpp b/src/server/services/wfs/qgswfsdescribefeaturetype.cpp index 164970d5311..1d62a3f832b 100644 --- a/src/server/services/wfs/qgswfsdescribefeaturetype.cpp +++ b/src/server/services/wfs/qgswfsdescribefeaturetype.cpp @@ -261,7 +261,7 @@ namespace QgsWfs //xsd:element QDomElement attElem = doc.createElement( QStringLiteral( "element" )/*xsd:element*/ ); - attElem.setAttribute( QStringLiteral( "name" ), attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QLatin1String( "" ) ) ); + attElem.setAttribute( QStringLiteral( "name" ), attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) ); QVariant::Type attributeType = fields.at( idx ).type(); if ( attributeType == QVariant::Int ) attElem.setAttribute( QStringLiteral( "type" ), QStringLiteral( "integer" ) ); diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp index 45c1000c159..031211b9464 100644 --- a/src/server/services/wfs/qgswfsgetfeature.cpp +++ b/src/server/services/wfs/qgswfsgetfeature.cpp @@ -253,7 +253,7 @@ namespace QgsWfs for ( int idx = 0; idx < fields.count(); ++idx ) { fieldnames.append( fields[idx].name() ); - propertynames.append( fields.field( idx ).name().replace( ' ', '_' ).replace( cleanTagNameRegExp, QLatin1String( "" ) ) ); + propertynames.append( fields.field( idx ).name().replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) ); } QString fieldName; for ( plstIt = propertyList.begin(); plstIt != propertyList.end(); ++plstIt ) @@ -884,7 +884,7 @@ namespace QgsWfs getFeatureQuery parseQueryElement( QDomElement &queryElem, const QgsProject *project ) { - QString typeName = queryElem.attribute( QStringLiteral( "typeName" ), QLatin1String( "" ) ); + QString typeName = queryElem.attribute( QStringLiteral( "typeName" ), QString() ); if ( typeName.contains( ':' ) ) { typeName = typeName.section( ':', 1, 1 ); @@ -929,7 +929,7 @@ namespace QgsWfs } // srsName attribute - QString srsName = queryElem.attribute( QStringLiteral( "srsName" ), QLatin1String( "" ) ); + QString srsName = queryElem.attribute( QStringLiteral( "srsName" ), QString() ); getFeatureQuery query; query.typeName = typeName; @@ -1337,7 +1337,7 @@ namespace QgsWfs } QString attributeName = fields.at( idx ).name(); - QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QLatin1String( "" ) ) ); + QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) ); QDomText fieldText = doc.createTextNode( featureAttributes[idx].toString() ); fieldElem.appendChild( fieldText ); typeNameElement.appendChild( fieldElem ); @@ -1432,7 +1432,7 @@ namespace QgsWfs } QString attributeName = fields.at( idx ).name(); - QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QLatin1String( "" ) ) ); + QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) ); QDomText fieldText = doc.createTextNode( featureAttributes[idx].toString() ); fieldElem.appendChild( fieldText ); typeNameElement.appendChild( fieldElem ); diff --git a/tests/code_layout/test_banned_keywords.sh b/tests/code_layout/test_banned_keywords.sh index e0444a74007..ada3e93d893 100755 --- a/tests/code_layout/test_banned_keywords.sh +++ b/tests/code_layout/test_banned_keywords.sh @@ -116,6 +116,15 @@ HINTS[30]="Use std::ceil instead" KEYWORDS[31]="qSqrt" HINTS[31]="Use std::sqrt instead" +KEYWORDS[32]="QStringLiteral()" +HINTS[32]="Use QString() instead" + +KEYWORDS[33]="QStringLiteral( \"\" )" +HINTS[33]="Use QString() instead" + +KEYWORDS[34]="QLatin1String( \"\" )" +HINTS[34]="Use QString() instead" + RES= DIR=$(git rev-parse --show-toplevel) diff --git a/tests/src/analysis/testqgszonalstatistics.cpp b/tests/src/analysis/testqgszonalstatistics.cpp index a4ae0edaf1a..b73dca82498 100644 --- a/tests/src/analysis/testqgszonalstatistics.cpp +++ b/tests/src/analysis/testqgszonalstatistics.cpp @@ -81,7 +81,7 @@ void TestQgsZonalStatistics::cleanupTestCase() void TestQgsZonalStatistics::testStatistics() { - QgsZonalStatistics zs( mVectorLayer, mRasterLayer, QLatin1String( "" ), 1, QgsZonalStatistics::All ); + QgsZonalStatistics zs( mVectorLayer, mRasterLayer, QString(), 1, QgsZonalStatistics::All ); zs.calculateStatistics( nullptr ); QgsFeature f; diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp index 0272a605d3e..12ff8cb295a 100644 --- a/tests/src/app/testqgsmaptoolidentifyaction.cpp +++ b/tests/src/app/testqgsmaptoolidentifyaction.cpp @@ -497,7 +497,7 @@ QString TestQgsMapToolIdentifyAction::testIdentifyRaster( QgsRasterLayer *layer, QgsPointXY mapPoint = canvas->getCoordinateTransform()->transform( xGeoref, yGeoref ); QList<QgsMapToolIdentify::IdentifyResult> result = action->identify( mapPoint.x(), mapPoint.y(), QList<QgsMapLayer *>() << layer ); if ( result.length() != 1 ) - return QLatin1String( "" ); + return QString(); return result[0].mAttributes[QStringLiteral( "Band 1" )]; } diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp index bcb58ccfac4..74eece271bc 100644 --- a/tests/src/core/testqgscoordinatereferencesystem.cpp +++ b/tests/src/core/testqgscoordinatereferencesystem.cpp @@ -349,7 +349,7 @@ QString TestQgsCoordinateReferenceSystem::testESRIWkt( int i, QgsCoordinateRefer return QStringLiteral( "test %1 AUTHID = [%2] expecting [%3]" ).arg( i ).arg( myCrs.authid(), myAuthIdStrings[i] ); - return QLatin1String( "" ); + return QString(); } void TestQgsCoordinateReferenceSystem::createFromESRIWkt() { @@ -369,7 +369,7 @@ void TestQgsCoordinateReferenceSystem::createFromESRIWkt() // this example file taken from bug #5598 - geographic CRS only, supported since gdal 1.9 myWktStrings << QStringLiteral( "GEOGCS[\"GCS_Indian_1960\",DATUM[\"D_Indian_1960\",SPHEROID[\"Everest_Adjustment_1937\",6377276.345,300.8017]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]]" ); - myFiles << QLatin1String( "" ); + myFiles << QString(); myGdalVersionOK << 1900; myProj4Strings << QStringLiteral( "+proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs84=198,881,317,0,0,0,0 +no_defs" ); myTOWGS84Strings << QStringLiteral( "+towgs84=198,881,317,0,0,0,0" ); @@ -377,7 +377,7 @@ void TestQgsCoordinateReferenceSystem::createFromESRIWkt() // SAD69 geographic CRS, supported since gdal 1.9 myWktStrings << QStringLiteral( "GEOGCS[\"GCS_South_American_1969\",DATUM[\"D_South_American_1969\",SPHEROID[\"GRS_1967_Truncated\",6378160.0,298.25]],PRIMEM[\"Greenwich\",0.0],UNIT[\"Degree\",0.0174532925199433]]" ); - myFiles << QLatin1String( "" ); + myFiles << QString(); myGdalVersionOK << 1900; //proj definition for EPSG:4618 was updated in GDAL 2.0 - see https://github.com/OSGeo/proj.4/issues/241 @@ -412,7 +412,7 @@ void TestQgsCoordinateReferenceSystem::createFromESRIWkt() QString fileStr = QStringLiteral( TEST_DATA_DIR ) + '/' + myFiles[i]; QgsDebugMsg( QString( "i=%1 file=%2" ).arg( i ).arg( fileStr ) ); - QgsVectorLayer *myLayer = new QgsVectorLayer( fileStr, QLatin1String( "" ), QStringLiteral( "ogr" ) ); + QgsVectorLayer *myLayer = new QgsVectorLayer( fileStr, QString(), QStringLiteral( "ogr" ) ); if ( !myLayer || ! myLayer->isValid() ) { qWarning() << QStringLiteral( "test %1 did not get valid vector layer from %2" ).arg( i ).arg( fileStr ); @@ -503,7 +503,7 @@ void TestQgsCoordinateReferenceSystem::fromProj4() debugPrint( myCrs ); QVERIFY( myCrs.isValid() ); QCOMPARE( myCrs.srsid(), GEOCRS_ID ); - myCrs = QgsCoordinateReferenceSystem::fromProj4( QLatin1String( "" ) ); + myCrs = QgsCoordinateReferenceSystem::fromProj4( QString() ); QVERIFY( !myCrs.isValid() ); } diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp index 5dac9106eab..b2698c24388 100644 --- a/tests/src/core/testqgsdataitem.cpp +++ b/tests/src/core/testqgsdataitem.cpp @@ -104,7 +104,7 @@ void TestQgsDataItem::testDirItemChildren() { QgsSettings settings; QStringList tmpSettings; - tmpSettings << QLatin1String( "" ) << QStringLiteral( "contents" ) << QStringLiteral( "extension" ); + tmpSettings << QString() << QStringLiteral( "contents" ) << QStringLiteral( "extension" ); Q_FOREACH ( const QString &tmpSetting, tmpSettings ) { settings.setValue( QStringLiteral( "/qgis/scanItemsInBrowser2" ), tmpSetting ); diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp index 81dc90c2392..2b81bc6a0bb 100644 --- a/tests/src/core/testqgsexpression.cpp +++ b/tests/src/core/testqgsexpression.cpp @@ -1684,7 +1684,7 @@ class TestQgsExpression: public QObject mMemoryLayer->selectByIds( selectedFeatures ); QgsExpression exp( expression ); - QCOMPARE( exp.parserErrorString(), QLatin1String( "" ) ); + QCOMPARE( exp.parserErrorString(), QString() ); exp.prepare( &context ); QVariant res = exp.evaluate( &context ); QCOMPARE( res, result ); diff --git a/tests/src/core/testqgsfields.cpp b/tests/src/core/testqgsfields.cpp index 081f8e15929..c271ea72681 100644 --- a/tests/src/core/testqgsfields.cpp +++ b/tests/src/core/testqgsfields.cpp @@ -334,10 +334,10 @@ void TestQgsFields::indexFromName() QgsField field2( QStringLiteral( "testfield2" ) ); fields.append( field2 ); QgsField field3( QStringLiteral( "testfield3" ) ); - field3.setAlias( QStringLiteral( "" ) ); + field3.setAlias( QString() ); fields.append( field3 ); - QCOMPARE( fields.lookupField( QLatin1String( "" ) ), -1 ); + QCOMPARE( fields.lookupField( QString() ), -1 ); QCOMPARE( fields.lookupField( QString() ), -1 ); QCOMPARE( fields.indexFromName( QString( "bad" ) ), -1 ); diff --git a/tests/src/core/testqgsgml.cpp b/tests/src/core/testqgsgml.cpp index 5637ee3c8a7..55a6f42ddea 100644 --- a/tests/src/core/testqgsgml.cpp +++ b/tests/src/core/testqgsgml.cpp @@ -827,7 +827,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() QgsFields fields; // No attribute { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), fields ); + QgsGmlStreamingParser gmlParser( QString(), QString(), fields ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "xmlns:wfs='http://wfs' " "xmlns:gml='http://www.opengis.net/gml'>" @@ -837,7 +837,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() } // Valid numberOfFeatures { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), fields ); + QgsGmlStreamingParser gmlParser( QString(), QString(), fields ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "numberOfFeatures='1' " "xmlns:wfs='http://wfs' " @@ -847,7 +847,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() } // Invalid numberOfFeatures { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), fields ); + QgsGmlStreamingParser gmlParser( QString(), QString(), fields ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "numberOfFeatures='invalid' " "xmlns:wfs='http://wfs' " @@ -857,7 +857,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() } // Valid numberReturned { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), fields ); + QgsGmlStreamingParser gmlParser( QString(), QString(), fields ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "numberReturned='1' " "xmlns:wfs='http://wfs' " @@ -867,7 +867,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() } // Invalid numberReturned { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), fields ); + QgsGmlStreamingParser gmlParser( QString(), QString(), fields ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "numberReturned='invalid' " "xmlns:wfs='http://wfs' " @@ -877,7 +877,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() } // Valid numberMatched { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), fields ); + QgsGmlStreamingParser gmlParser( QString(), QString(), fields ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "numberMatched='1' " "xmlns:wfs='http://wfs' " @@ -887,7 +887,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() } // numberMatched=unknown { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), fields ); + QgsGmlStreamingParser gmlParser( QString(), QString(), fields ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "numberMatched='unknown' " "xmlns:wfs='http://wfs' " @@ -899,7 +899,7 @@ void TestQgsGML::testNumberMatchedNumberReturned() void TestQgsGML::testException() { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), QgsFields() ); + QgsGmlStreamingParser gmlParser( ( QString() ), ( QString() ), QgsFields() ); QCOMPARE( gmlParser.processData( QByteArray( "<ows:ExceptionReport xmlns:ows='http://www.opengis.net/ows/1.1' version='2.0.0'>" " <ows:Exception exceptionCode='NoApplicableCode'>" " <ows:ExceptionText>my_exception</ows:ExceptionText>" @@ -1006,7 +1006,7 @@ void TestQgsGML::testRenamedFields() void TestQgsGML::testTruncatedResponse() { - QgsGmlStreamingParser gmlParser( QLatin1String( "" ), QLatin1String( "" ), QgsFields() ); + QgsGmlStreamingParser gmlParser( ( QString() ), ( QString() ), QgsFields() ); QCOMPARE( gmlParser.processData( QByteArray( "<wfs:FeatureCollection " "xmlns:wfs='http://wfs' " "xmlns:gml='http://www.opengis.net/gml'>" diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp index ade284812f6..8a7201576c9 100644 --- a/tests/src/core/testqgsogcutils.cpp +++ b/tests/src/core/testqgsogcutils.cpp @@ -102,9 +102,9 @@ void TestQgsOgcUtils::testGeometryFromGML() static bool compareElements( QDomElement &element1, QDomElement &element2 ) { QString tag1 = element1.tagName(); - tag1.replace( QRegExp( ".*:" ), QLatin1String( "" ) ); + tag1.replace( QRegExp( ".*:" ), QString() ); QString tag2 = element2.tagName(); - tag2.replace( QRegExp( ".*:" ), QLatin1String( "" ) ); + tag2.replace( QRegExp( ".*:" ), QString() ); if ( tag1 != tag2 ) { qDebug( "Different tag names: %s, %s", tag1.toAscii().data(), tag2.toAscii().data() ); diff --git a/tests/src/core/testqgsogrutils.cpp b/tests/src/core/testqgsogrutils.cpp index 228862f936f..17fe6789393 100644 --- a/tests/src/core/testqgsogrutils.cpp +++ b/tests/src/core/testqgsogrutils.cpp @@ -321,7 +321,7 @@ void TestQgsOgrUtils::stringToFeatureList() fields.append( QgsField( QStringLiteral( "name" ), QVariant::String ) ); //empty string - QgsFeatureList features = QgsOgrUtils::stringToFeatureList( QLatin1String( "" ), fields, QTextCodec::codecForName( "System" ) ); + QgsFeatureList features = QgsOgrUtils::stringToFeatureList( QString(), fields, QTextCodec::codecForName( "System" ) ); QVERIFY( features.isEmpty() ); // bad string features = QgsOgrUtils::stringToFeatureList( QStringLiteral( "asdasdas" ), fields, QTextCodec::codecForName( "System" ) ); @@ -361,7 +361,7 @@ void TestQgsOgrUtils::stringToFeatureList() void TestQgsOgrUtils::stringToFields() { //empty string - QgsFields fields = QgsOgrUtils::stringToFields( QLatin1String( "" ), QTextCodec::codecForName( "System" ) ); + QgsFields fields = QgsOgrUtils::stringToFields( QString(), QTextCodec::codecForName( "System" ) ); QCOMPARE( fields.count(), 0 ); // bad string fields = QgsOgrUtils::stringToFields( QStringLiteral( "asdasdas" ), QTextCodec::codecForName( "System" ) ); diff --git a/tests/src/core/testqgsproperty.cpp b/tests/src/core/testqgsproperty.cpp index 73e8adee993..5c91de302df 100644 --- a/tests/src/core/testqgsproperty.cpp +++ b/tests/src/core/testqgsproperty.cpp @@ -881,7 +881,7 @@ void TestQgsProperty::genericNumericTransformerFromExpression() QVERIFY( !QgsGenericNumericTransformer::fromExpression( QStringLiteral( "coalesce(scale_exp(column, 1, 7, a, 10, 0.5), 0)" ), baseExpression, fieldName ) ); QVERIFY( !QgsGenericNumericTransformer::fromExpression( QStringLiteral( "coalesce(scale_exp(column, 1, 7), 0)" ), baseExpression, fieldName ) ); QVERIFY( !QgsGenericNumericTransformer::fromExpression( QStringLiteral( "1+2" ), baseExpression, fieldName ) ); - QVERIFY( !QgsGenericNumericTransformer::fromExpression( QStringLiteral( "" ), baseExpression, fieldName ) ); + QVERIFY( !QgsGenericNumericTransformer::fromExpression( QString(), baseExpression, fieldName ) ); } void TestQgsProperty::sizeScaleTransformer() @@ -1116,7 +1116,7 @@ void TestQgsProperty::sizeScaleTransformerFromExpression() QVERIFY( !QgsSizeScaleTransformer::fromExpression( QStringLiteral( "coalesce(scale_exp(column, 1, 7, a, 10, 0.5), 0)" ), baseExpression, fieldName ) ); QVERIFY( !QgsSizeScaleTransformer::fromExpression( QStringLiteral( "coalesce(scale_exp(column, 1, 7), 0)" ), baseExpression, fieldName ) ); QVERIFY( !QgsSizeScaleTransformer::fromExpression( QStringLiteral( "1+2" ), baseExpression, fieldName ) ); - QVERIFY( !QgsSizeScaleTransformer::fromExpression( QStringLiteral( "" ), baseExpression, fieldName ) ); + QVERIFY( !QgsSizeScaleTransformer::fromExpression( QString(), baseExpression, fieldName ) ); } void TestQgsProperty::colorRampTransformer() diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp index 7da08530a1d..f330f068a9d 100644 --- a/tests/src/core/testqgsrasterlayer.cpp +++ b/tests/src/core/testqgsrasterlayer.cpp @@ -341,7 +341,7 @@ void TestQgsRasterLayer::colorRamp3() void TestQgsRasterLayer::colorRamp4() { // cpt-city ramp, continuous - QgsCptCityColorRamp ramp( QStringLiteral( "grass/elevation" ), QLatin1String( "" ) ); + QgsCptCityColorRamp ramp( QStringLiteral( "grass/elevation" ), QString() ); QVERIFY( testColorRamp( "raster_colorRamp4", &ramp, QgsColorRampShader::Discrete, 10 ) ); diff --git a/tests/src/core/testqgsstyle.cpp b/tests/src/core/testqgsstyle.cpp index d370a4b8069..d40f33222c5 100644 --- a/tests/src/core/testqgsstyle.cpp +++ b/tests/src/core/testqgsstyle.cpp @@ -164,13 +164,13 @@ void TestStyle::testCreateColorRamps() QVERIFY( mStyle->addColorRamp( "test_cb2", cb2Ramp, true ) ); // discrete ramp with no variant - QgsCptCityColorRamp *cc1Ramp = new QgsCptCityColorRamp( QStringLiteral( "cb/seq/PuBuGn_06" ), QLatin1String( "" ) ); + QgsCptCityColorRamp *cc1Ramp = new QgsCptCityColorRamp( QStringLiteral( "cb/seq/PuBuGn_06" ), QString() ); QVERIFY( mStyle->addColorRamp( "test_cc1", cc1Ramp, true ) ); // discrete ramp with variant QgsCptCityColorRamp *cc2Ramp = new QgsCptCityColorRamp( QStringLiteral( "cb/div/PiYG" ), QStringLiteral( "_10" ) ); QVERIFY( mStyle->addColorRamp( "test_cc2", cc2Ramp, true ) ); // continuous ramp - QgsCptCityColorRamp *cc3Ramp = new QgsCptCityColorRamp( QStringLiteral( "grass/byr" ), QLatin1String( "" ) ); + QgsCptCityColorRamp *cc3Ramp = new QgsCptCityColorRamp( QStringLiteral( "grass/byr" ), QString() ); QVERIFY( mStyle->addColorRamp( "test_cc3", cc3Ramp, true ) ); } diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp index b5eaa020d10..4409dfd5ea5 100644 --- a/tests/src/core/testziplayer.cpp +++ b/tests/src/core/testziplayer.cpp @@ -124,7 +124,7 @@ QgsMapLayer *TestZipLayer::getLayer( const QString &myPath, const QString &myNam QgsMapLayer *TestZipLayer::getZipLayer( const QString &myPath, const QString &myName ) { QgsMapLayer *myLayer = nullptr; - QgsDirectoryItem *dirItem = new QgsDirectoryItem( nullptr, QStringLiteral( "/" ), QLatin1String( "" ) ); + QgsDirectoryItem *dirItem = new QgsDirectoryItem( nullptr, QStringLiteral( "/" ), QString() ); QgsDataItem *myItem = QgsZipItem::itemFromPath( dirItem, myPath, myName ); if ( myItem ) { @@ -139,7 +139,7 @@ QgsMapLayer *TestZipLayer::getZipLayer( const QString &myPath, const QString &my bool TestZipLayer::testZipItemPassthru( const QString &myFileName, const QString &myProviderKey ) { - QgsMapLayer *myLayer = getLayer( myFileName, QLatin1String( "" ), myProviderKey ); + QgsMapLayer *myLayer = getLayer( myFileName, QString(), myProviderKey ); bool ok = myLayer && myLayer->isValid(); if ( myLayer ) delete myLayer; @@ -238,9 +238,9 @@ int TestZipLayer::getLayerTransparency( const QString &myFileName, const QString QgsMapLayer *myLayer = nullptr; if ( myFileName.endsWith( QLatin1String( ".gz" ), Qt::CaseInsensitive ) ) - myLayer = getLayer( myFileName, QLatin1String( "" ), myProviderKey ); + myLayer = getLayer( myFileName, QString(), myProviderKey ); else - myLayer = getZipLayer( myFileName, QLatin1String( "" ) ); + myLayer = getZipLayer( myFileName, QString() ); if ( myLayer && myLayer->isValid() ) { // myTransparency = myLayer->getTransparency(); @@ -300,7 +300,7 @@ void TestZipLayer::initTestCase() QgsSettings settings; mSettingsKey = QStringLiteral( "/qgis/scanZipInBrowser2" ); mScanZipSetting = settings.value( mSettingsKey, "" ).toString(); - mScanZipSettings << QLatin1String( "" ) << QStringLiteral( "basic" ) << QStringLiteral( "full" ); + mScanZipSettings << QString() << QStringLiteral( "basic" ) << QStringLiteral( "full" ); } void TestZipLayer::cleanupTestCase() diff --git a/tests/src/gui/testqgsfiledownloader.cpp b/tests/src/gui/testqgsfiledownloader.cpp index 1b7273a3894..71861c52fde 100644 --- a/tests/src/gui/testqgsfiledownloader.cpp +++ b/tests/src/gui/testqgsfiledownloader.cpp @@ -204,7 +204,7 @@ void TestQgsFileDownloader::testInvalidUrl() void TestQgsFileDownloader::testBlankUrl() { QVERIFY( ! mTempFile->fileName().isEmpty() ); - makeCall( QUrl( QLatin1String( "" ) ), mTempFile->fileName() ); + makeCall( QUrl( QString() ), mTempFile->fileName() ); QVERIFY( mExited ); QVERIFY( !mCompleted ); QVERIFY( mError ); diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp index ab5669264a2..5c79907e8af 100644 --- a/tests/src/gui/testqgsscalecombobox.cpp +++ b/tests/src/gui/testqgsscalecombobox.cpp @@ -176,7 +176,7 @@ void TestQgsScaleComboBox::toDouble() //bad QgsScaleComboBox::toDouble( QStringLiteral( "abc" ), &ok ); QVERIFY( !ok ); - QgsScaleComboBox::toDouble( QStringLiteral( "" ), &ok ); + QgsScaleComboBox::toDouble( QString(), &ok ); QVERIFY( !ok ); QgsScaleComboBox::toDouble( QStringLiteral( "1:" ), &ok ); QVERIFY( !ok ); diff --git a/tests/src/gui/testqgssqlcomposerdialog.cpp b/tests/src/gui/testqgssqlcomposerdialog.cpp index c5532339a9a..aedf56c9b3a 100644 --- a/tests/src/gui/testqgssqlcomposerdialog.cpp +++ b/tests/src/gui/testqgssqlcomposerdialog.cpp @@ -225,7 +225,7 @@ void TestQgsSQLComposerDialog::testSelectColumn() return; QgsSQLComposerDialog d; d.addColumnNames( QList<QgsSQLComposerDialog::PairNameType>() << - QgsSQLComposerDialog::PairNameType( QStringLiteral( "a" ), QLatin1String( "" ) ) << + QgsSQLComposerDialog::PairNameType( QStringLiteral( "a" ), QString() ) << QgsSQLComposerDialog::PairNameType( QStringLiteral( "b" ), QStringLiteral( "type" ) ), QStringLiteral( "my_table" ) ); QCOMPARE( getColumnsCombo( d )->itemText( 1 ), QString( "a" ) ); @@ -313,7 +313,7 @@ void TestQgsSQLComposerDialog::testSelectFunction() { QgsSQLComposerDialog::Function f; f.name = QStringLiteral( "sixth_func" ); - f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "arg1" ), QLatin1String( "" ) ); + f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "arg1" ), QString() ); f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "arg2" ), QStringLiteral( "xs:double" ) ); f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "arg3" ), QStringLiteral( "gml:AbstractGeometryType" ) ); f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "number" ), QStringLiteral( "xs:int" ) ); @@ -322,7 +322,7 @@ void TestQgsSQLComposerDialog::testSelectFunction() { QgsSQLComposerDialog::Function f; f.name = QStringLiteral( "seventh_func" ); - f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "arg1" ), QLatin1String( "" ) ); + f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "arg1" ), QString() ); f.argumentList << QgsSQLComposerDialog::Argument( QStringLiteral( "arg2" ), QStringLiteral( "xs:double" ) ); f.minArgs = 1; functions << f; diff --git a/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp b/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp index 178b5b6bb68..8a2399465c0 100644 --- a/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp +++ b/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp @@ -200,7 +200,7 @@ void TestQgsValueRelationWidgetWrapper::testDrillDown() // Check null is selected QCOMPARE( w_municipality.mComboBox->count(), 3 ); QCOMPARE( w_municipality.mComboBox->itemText( 0 ), QStringLiteral( "(no selection)" ) ); - QCOMPARE( w_municipality.value().toString(), QStringLiteral( "" ) ); + QCOMPARE( w_municipality.value().toString(), QString() ); // Check order by value false cfg_municipality[QStringLiteral( "AllowNull" )] = false; diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp index 43408bfc06b..00e8dd33530 100644 --- a/tests/src/providers/testqgswcspublicservers.cpp +++ b/tests/src/providers/testqgswcspublicservers.cpp @@ -634,7 +634,7 @@ void TestQgsWcsPublicServers::report() QStringList myValues; myValues << QStringLiteral( "<a href='%1'>%2</a>" ).arg( myLog.value( QStringLiteral( "describeCoverageUrl" ) ), myLog.value( QStringLiteral( "identifier" ) ) ); //myValues << myLog.value( "hasSize" ); - myVersionReport += cells( myValues, QLatin1String( "" ), 1, 2 ); + myVersionReport += cells( myValues, QString(), 1, 2 ); myValues.clear(); QStringList issues = issueDescriptions( myServerLog.value( QStringLiteral( "server" ) ), myLog.value( QStringLiteral( "identifier" ) ), myLog.value( QStringLiteral( "version" ) ) ); @@ -725,7 +725,7 @@ void TestQgsWcsPublicServers::report() } else { - myValues << QLatin1String( "" ); + myValues << QString(); cls = QStringLiteral( "cell-empty" ); } myVersionReport += cells( myValues, cls, 24 );