Skip to content

Commit

Permalink
Make use of QLatin1String where appropriate in HANA
Browse files Browse the repository at this point in the history
  • Loading branch information
mrylov committed Dec 7, 2020
1 parent e171007 commit ba25523
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/providers/hana/qgshanaconnectionstringbuilder.cpp
Expand Up @@ -28,9 +28,9 @@ QgsHanaConnectionStringBuilder::QgsHanaConnectionStringBuilder( const QgsDataSou
if ( !uri.hasParam( QStringLiteral( "sslEnabled" ) ) )
return;

mSslEnabled = ( uri.param( QStringLiteral( "sslEnabled" ) ) == QStringLiteral( "true" ) ) ? true : false;
mSslEnabled = ( uri.param( QLatin1String( "sslEnabled" ) ) == QLatin1String( "true" ) ) ? true : false;
mSslCryptoProvider = uri.param( QStringLiteral( "sslCryptoProvider" ) );
mSslValidateCertificate = uri.param( QStringLiteral( "sslValidateCertificate" ) ) == QStringLiteral( "true" ) ? true : false;
mSslValidateCertificate = uri.param( QLatin1String( "sslValidateCertificate" ) ) == QLatin1String( "true" ) ? true : false;
if ( mSslValidateCertificate )
mSslHostNameInCertificate = uri.param( QStringLiteral( "sslHostNameInCertificate" ) );
mSslKeyStore = uri.param( QStringLiteral( "sslKeyStore" ) );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/hana/qgshananewconnection.cpp
Expand Up @@ -257,7 +257,7 @@ void QgsHanaNewConnection::updateControlsFromSettings( const QgsHanaSettings &se
else
{
rbtnMultipleContainers->setChecked( true );
if ( settings.getDatabase() == QStringLiteral( "SYSTEMDB" ) )
if ( settings.getDatabase() == QLatin1String( "SYSTEMDB" ) )
rbtnSystemDatabase->setChecked( true );
else
txtTenantDatabaseName->setText( settings.getDatabase() );
Expand Down
10 changes: 5 additions & 5 deletions src/providers/hana/qgshanaprovider.cpp
Expand Up @@ -1057,7 +1057,7 @@ bool QgsHanaProvider::checkPermissionsAndSetCapabilities()
QString objType = rsPrivileges->getString( 2 );
QString privType = rsPrivileges->getString( 3 );

if ( privType == QStringLiteral( "ALL PRIVILEGES" ) || privType == QStringLiteral( "CREATE ANY" ) )
if ( privType == QLatin1String( "ALL PRIVILEGES" ) || privType == QLatin1String( "CREATE ANY" ) )
{
mCapabilities |= QgsVectorDataProvider::AddAttributes
| QgsVectorDataProvider::RenameAttributes
Expand All @@ -1071,16 +1071,16 @@ bool QgsHanaProvider::checkPermissionsAndSetCapabilities()
}
else
{
if ( privType == QStringLiteral( "ALTER" ) )
if ( privType == QLatin1String( "ALTER" ) )
mCapabilities |= QgsVectorDataProvider::DeleteAttributes
| QgsVectorDataProvider::RenameAttributes;
else if ( privType == QStringLiteral( "DELETE" ) )
else if ( privType == QLatin1String( "DELETE" ) )
mCapabilities |= QgsVectorDataProvider::DeleteFeatures
| QgsVectorDataProvider::FastTruncate;
else if ( privType == QStringLiteral( "INSERT" ) )
else if ( privType == QLatin1String( "INSERT" ) )
mCapabilities |= QgsVectorDataProvider::AddAttributes
| QgsVectorDataProvider::AddFeatures;
else if ( privType == QStringLiteral( "UPDATE" ) )
else if ( privType == QLatin1String( "UPDATE" ) )
mCapabilities |= QgsVectorDataProvider::ChangeAttributeValues
| QgsVectorDataProvider::ChangeFeatures
| QgsVectorDataProvider::ChangeGeometries;
Expand Down
4 changes: 2 additions & 2 deletions src/providers/hana/qgshanaproviderconnection.cpp
Expand Up @@ -78,9 +78,9 @@ void QgsHanaProviderConnection::setCapabilities()
while ( rsPrivileges->next() )
{
QString privType = rsPrivileges->getString( 1 );
if ( privType == QStringLiteral( "CREATE SCHEMA" ) )
if ( privType == QLatin1String( "CREATE SCHEMA" ) )
mCapabilities |= Capability::CreateSchema | Capability::DropSchema | Capability::RenameSchema;
else if ( privType == QStringLiteral( "CATALOG READ" ) || privType == QStringLiteral( "DATA ADMIN" ) )
else if ( privType == QLatin1String( "CATALOG READ" ) || privType == QLatin1String( "DATA ADMIN" ) )
mCapabilities |= Capability::Schemas | Capability::Tables | Capability::TableExists;
}
rsPrivileges->close();
Expand Down

0 comments on commit ba25523

Please sign in to comment.