Skip to content

Commit

Permalink
Replace with QString() in HANA
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrylov
mrylov committed Dec 7, 2020
1 parent 77e574a commit dad0763
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 46 deletions.
40 changes: 20 additions & 20 deletions src/gui/qgsmanageconnectionsdialog.cpp
View file
Expand Up @@ -702,34 +702,34 @@ QDomDocument QgsManageConnectionsDialog::saveHanaConnections( const QStringList
path = "/HANA/connections/" + connections[i];
QDomElement el = doc.createElement( QStringLiteral( "hana" ) );
el.setAttribute( QStringLiteral( "name" ), connections[i] );
el.setAttribute( QStringLiteral( "driver" ), settings.value( path + "/driver", "" ).toString() );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host", "" ).toString() );
el.setAttribute( QStringLiteral( "identifierType" ), settings.value( path + "/identifierType", "" ).toString() );
el.setAttribute( QStringLiteral( "identifier" ), settings.value( path + "/identifier", "" ).toString() );
el.setAttribute( QStringLiteral( "multitenant" ), settings.value( path + "/multitenant", "" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database", "" ).toString() );
el.setAttribute( QStringLiteral( "schema" ), settings.value( path + "/schema", "" ).toString() );
el.setAttribute( QStringLiteral( "userTablesOnly" ), settings.value( path + "/userTablesOnly", "0" ).toString() );
el.setAttribute( QStringLiteral( "allowGeometrylessTables" ), settings.value( path + "/allowGeometrylessTables", "0" ).toString() );

el.setAttribute( QStringLiteral( "saveUsername" ), settings.value( path + "/saveUsername", "false" ).toString() );
el.setAttribute( QStringLiteral( "driver" ), settings.value( path + "/driver", QString() ).toString() );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host", QString() ).toString() );
el.setAttribute( QStringLiteral( "identifierType" ), settings.value( path + "/identifierType", QString() ).toString() );
el.setAttribute( QStringLiteral( "identifier" ), settings.value( path + "/identifier", QString() ).toString() );
el.setAttribute( QStringLiteral( "multitenant" ), settings.value( path + "/multitenant", QString() ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database", QString() ).toString() );
el.setAttribute( QStringLiteral( "schema" ), settings.value( path + "/schema", QString() ).toString() );
el.setAttribute( QStringLiteral( "userTablesOnly" ), settings.value( path + "/userTablesOnly", QStringLiteral( "0" ) ).toString() );
el.setAttribute( QStringLiteral( "allowGeometrylessTables" ), settings.value( path + "/allowGeometrylessTables", QStringLiteral( "0" ) ).toString() );

el.setAttribute( QStringLiteral( "saveUsername" ), settings.value( path + "/saveUsername", QStringLiteral( "false" ) ).toString() );
if ( settings.value( path + "/saveUsername", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username", QString() ).toString() );
}

el.setAttribute( QStringLiteral( "savePassword" ), settings.value( path + "/savePassword", "false" ).toString() );
el.setAttribute( QStringLiteral( "savePassword" ), settings.value( path + "/savePassword", QStringLiteral( "false" ) ).toString() );
if ( settings.value( path + "/savePassword", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password", QString() ).toString() );
}

el.setAttribute( QStringLiteral( "sslEnabled" ), settings.value( path + "/sslEnabled", "false" ).toString() );
el.setAttribute( QStringLiteral( "sslCryptoProvider" ), settings.value( path + "/sslCryptoProvider", "openssl" ).toString() );
el.setAttribute( QStringLiteral( "sslKeyStore" ), settings.value( path + "/sslKeyStore", "" ).toString() );
el.setAttribute( QStringLiteral( "sslTrustStore" ), settings.value( path + "/sslTrustStore", "" ).toString() );
el.setAttribute( QStringLiteral( "sslValidateCertificate" ), settings.value( path + "/sslValidateCertificate", "false" ).toString() );
el.setAttribute( QStringLiteral( "sslHostNameInCertificate" ), settings.value( path + "/sslHostNameInCertificate", "" ).toString() );
el.setAttribute( QStringLiteral( "sslEnabled" ), settings.value( path + "/sslEnabled", QStringLiteral( "false" ) ).toString() );
el.setAttribute( QStringLiteral( "sslCryptoProvider" ), settings.value( path + "/sslCryptoProvider", QStringLiteral( "openssl" ) ).toString() );
el.setAttribute( QStringLiteral( "sslKeyStore" ), settings.value( path + "/sslKeyStore", QString() ).toString() );
el.setAttribute( QStringLiteral( "sslTrustStore" ), settings.value( path + "/sslTrustStore", QString() ).toString() );
el.setAttribute( QStringLiteral( "sslValidateCertificate" ), settings.value( path + "/sslValidateCertificate", QStringLiteral( "false" ) ).toString() );
el.setAttribute( QStringLiteral( "sslHostNameInCertificate" ), settings.value( path + "/sslHostNameInCertificate", QString() ).toString() );

root.appendChild( el );
}
Expand Down
8 changes: 3 additions & 5 deletions src/providers/hana/qgshanaconnection.cpp
View file
Expand Up @@ -48,8 +48,6 @@ static const int GEOMETRIES_SELECT_LIMIT = 10;
QgsHanaConnection::QgsHanaConnection( odbc::ConnectionRef connection, const QgsDataSourceUri &uri )
: mConnection( connection )
, mUri( uri )
, mDatabaseVersion( "" )
, mUserName( "" )
{
}

Expand Down Expand Up @@ -91,7 +89,7 @@ QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &
{
ConnectionRef conn = QgsHanaDriver::instance()->createConnection();
conn->setAutoCommit( false );
QString message = "";
QString message;

auto connect = []( odbc::ConnectionRef & conn,
const QgsDataSourceUri & uri,
Expand All @@ -101,7 +99,7 @@ QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &
{
QgsHanaConnectionStringBuilder sb( uri );
conn->connect( sb.toString().toStdString().c_str() );
errorMessage = "";
errorMessage = QString();
}
catch ( const Exception &ex )
{
Expand Down Expand Up @@ -486,7 +484,7 @@ QVector<QgsHanaLayerProperty> QgsHanaConnection::getLayers(
layer.tableName = rsLayers->getString( 2 );
QString geomColumnType = rsLayers->getString( 4 );
bool isGeometryColumn = ( geomColumnType == "ST_GEOMETRY" || geomColumnType == "ST_POINT" );
layer.geometryColName = isGeometryColumn ? rsLayers->getString( 3 ) : "";
layer.geometryColName = isGeometryColumn ? rsLayers->getString( 3 ) : QString();
layer.tableComment = rsLayers->getString( 5 );
layer.isView = isView;

Expand Down
4 changes: 2 additions & 2 deletions src/providers/hana/qgshanadataitems.cpp
View file
Expand Up @@ -41,7 +41,7 @@ QgsHanaConnectionItem::QgsHanaConnectionItem(
mIconName = QStringLiteral( "mIconConnect.svg" );
mCapabilities |= Collapse;

updateToolTip( QString( "" ), QString( "" ) );
updateToolTip( QString( ), QString( ) );
}

QVector<QgsDataItem *> QgsHanaConnectionItem::createChildren()
Expand All @@ -61,7 +61,7 @@ QVector<QgsDataItem *> QgsHanaConnectionItem::createChildren()
{
QgsHanaSettings settings( mName, true );
QVector<QgsHanaSchemaProperty> schemas =
conn->getSchemas( settings.getUserTablesOnly() ? settings.getUserName() : "" );
conn->getSchemas( settings.getUserTablesOnly() ? settings.getUserName() : QString() );

if ( schemas.isEmpty() )
{
Expand Down
4 changes: 2 additions & 2 deletions src/providers/hana/qgshanadriver.cpp
View file
Expand Up @@ -53,9 +53,9 @@ QgsHanaDriver::QgsHanaDriver()
QgsDebugCall;
#if defined(Q_OS_WIN)
#if defined(Q_OS_WIN64)
mDriver = mEnv->isDriverInstalled( "HDBODBC" ) ? "HDBODBC" : "";
mDriver = mEnv->isDriverInstalled( "HDBODBC" ) ? "HDBODBC" : QString();
#else
mDriver = mEnv->isDriverInstalled( "HDBODBC32" ) ? "HDBODBC32" : "";
mDriver = mEnv->isDriverInstalled( "HDBODBC32" ) ? "HDBODBC32" : QString();
#endif
#elif defined(Q_OS_MAC)
mDriver = detectDriverPath( mEnv, "libodbcHDB.dylib", "/Applications/sap/hdbclient" );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/hana/qgshanafeatureiterator.h
View file
Expand Up @@ -82,7 +82,7 @@ class QgsHanaFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsHa
const QVersionNumber mDatabaseVersion;
QgsHanaConnectionRef mConnection;
QgsHanaResultSetRef mResultSet;
QString mSqlQuery = QString( "" );
QString mSqlQuery;
QgsRectangle mFilterRect;
const QgsRectangle mSrsExtent;
QgsAttributeList mAttributesToFetch;
Expand Down
8 changes: 4 additions & 4 deletions src/providers/hana/qgshananewconnection.cpp
View file
Expand Up @@ -30,7 +30,7 @@ namespace
{
bool isStringEmpty( const QString &input )
{
return ( input.isEmpty() || QString( input ).replace( " ", "" ).isEmpty() );
return ( input.isEmpty() || QString( input ).replace( " ", QString() ).isEmpty() );
}
}

Expand Down Expand Up @@ -145,9 +145,9 @@ void QgsHanaNewConnection::accept()

readSettingsFromControls( settings );
if ( !mAuthSettings->storeUsernameIsChecked() )
settings.setUserName( QString( "" ) );
settings.setUserName( QString( ) );
if ( !( mAuthSettings->storePasswordIsChecked() && !hasAuthConfigID ) )
settings.setPassword( QString( "" ) );
settings.setPassword( QString( ) );
settings.setSaveUserName( mAuthSettings->storeUsernameIsChecked() );
settings.setSavePassword( mAuthSettings->storePasswordIsChecked() && !hasAuthConfigID );

Expand Down Expand Up @@ -341,7 +341,7 @@ QString QgsHanaNewConnection::getDatabaseName() const
return QStringLiteral( "SYSTEMDB" );
}
else
return QString( "" );
return QString( );
}

void QgsHanaNewConnection::showHelp()
Expand Down
14 changes: 7 additions & 7 deletions src/providers/hana/qgshanasettings.cpp
View file
Expand Up @@ -60,11 +60,11 @@ void QgsHanaSettings::setFromDataSourceUri( const QgsDataSourceUri &uri )
mPassword = uri.password();

mSslEnabled = false;
mSslCryptoProvider = "";
mSslCryptoProvider = QString();
mSslValidateCertificate = false;
mSslHostNameInCertificate = "";
mSslKeyStore = "";
mSslTrustStore = "";
mSslHostNameInCertificate = QString();
mSslKeyStore = QString();
mSslTrustStore = QString();
if ( uri.hasParam( QStringLiteral( "sslEnabled" ) ) )
mSslEnabled = QVariant( uri.param( "sslEnabled" ) ).toBool();
if ( uri.hasParam( QStringLiteral( "sslCryptoProvider" ) ) )
Expand All @@ -82,7 +82,7 @@ void QgsHanaSettings::setFromDataSourceUri( const QgsDataSourceUri &uri )
mAllowGeometrylessTables = false;
mSaveUserName = false;
mSavePassword = false;
mAuthcfg = "";
mAuthcfg = QString();

if ( uri.hasParam( QStringLiteral( "userTablesOnly" ) ) )
mUserTablesOnly = QVariant( uri.param( QStringLiteral( "userTablesOnly" ) ) ).toBool();
Expand Down Expand Up @@ -160,9 +160,9 @@ void QgsHanaSettings::save()
settings.setValue( key + "/schema", mSchema );
settings.setValue( key + "/authcfg", mAuthcfg );
settings.setValue( key + "/saveUsername", mSaveUserName );
settings.setValue( key + "/username", mSaveUserName ? mUserName : QString( "" ) );
settings.setValue( key + "/username", mSaveUserName ? mUserName : QString( ) );
settings.setValue( key + "/savePassword", mSavePassword );
settings.setValue( key + "/password", mSavePassword ? mPassword : QString( "" ) );
settings.setValue( key + "/password", mSavePassword ? mPassword : QString( ) );
settings.setValue( key + "/userTablesOnly", mUserTablesOnly );
settings.setValue( key + "/allowGeometrylessTables", mAllowGeometrylessTables );
settings.setValue( key + "/sslEnabled", mSslEnabled );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/hana/qgshanasourceselect.cpp
View file
Expand Up @@ -400,7 +400,7 @@ void QgsHanaSourceSelect::mSearchGroupBox_toggled( bool checked )
if ( mSearchTableEdit->text().isEmpty() )
return;

mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QString( "" ) );
mSearchTableEdit_textChanged( checked ? mSearchTableEdit->text() : QString( ) );
}

void QgsHanaSourceSelect::mSearchTableEdit_textChanged( const QString &text )
Expand Down
8 changes: 4 additions & 4 deletions src/providers/hana/qgshanatablemodel.cpp
View file
Expand Up @@ -62,7 +62,7 @@ void QgsHanaTableModel::addTableEntry( const QgsHanaLayerProperty &layerProperty
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 ) : "" );
QStandardItem *sridItem = new QStandardItem( wkbType != QgsWkbTypes::NoGeometry ? QString::number( srid ) : QString() );
sridItem->setEditable( wkbType != QgsWkbTypes::NoGeometry && srid < 0 );
if ( sridItem->isEditable() )
{
Expand Down Expand Up @@ -91,7 +91,7 @@ void QgsHanaTableModel::addTableEntry( const QgsHanaLayerProperty &layerProperty
pkItem->setData( layerProperty.pkCols, Qt::UserRole + 1 );
pkItem->setData( pkCol, Qt::UserRole + 2 );

QStandardItem *selItem = new QStandardItem( QString( "" ) );
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 "
Expand All @@ -116,7 +116,7 @@ void QgsHanaTableModel::addTableEntry( const QgsHanaLayerProperty &layerProperty
if ( tip.isEmpty() )
{
item->setFlags( item->flags() | Qt::ItemIsSelectable );
item->setToolTip( QString( "" ) );
item->setToolTip( QString( ) );
}
else
{
Expand Down Expand Up @@ -262,7 +262,7 @@ bool QgsHanaTableModel::setData( const QModelIndex &idx, const QVariant &value,
}

item->setFlags( item->flags() | Qt::ItemIsSelectable );
item->setToolTip( QString( "" ) );
item->setToolTip( QString( ) );
}
else
{
Expand Down

0 comments on commit dad0763

Please sign in to comment.