Skip to content

Commit

Permalink
HANA: remove 'get' prefix from getters
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrylov
mrylov committed Dec 7, 2020
1 parent 43270a1 commit bf8c711
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 76 deletions.
26 changes: 13 additions & 13 deletions src/providers/hana/qgshanaconnectionstringbuilder.h
View file
Expand Up @@ -25,43 +25,43 @@ class QgsHanaConnectionStringBuilder
QgsHanaConnectionStringBuilder() = default;
explicit QgsHanaConnectionStringBuilder( const QgsDataSourceUri &uri );

const QString &getDriver() const { return mDriver; }
const QString &driver() const { return mDriver; }
void setDriver( const QString &driver ) { mDriver = driver; }

const QString &getHost() const { return mHost; }
const QString &host() const { return mHost; }
void setHost( const QString &host ) { mHost = host; }

const QString &getPort() const { return mPort; }
const QString &port() const { return mPort; }
void setPort( const QString &port ) { mPort = port; }

const QString &getDatabase() const { return mDatabase; }
const QString &database() const { return mDatabase; }
void setDatabase( const QString &database ) { mDatabase = database; }

const QString &getSchema() const { return mSchema; }
const QString &schema() const { return mSchema; }
void setSchema( const QString &schema ) { mSchema = schema; }

const QString &getUserName() const { return mUserName; }
const QString &userName() const { return mUserName; }
void setUserName( const QString &userName ) { mUserName = userName; }

const QString &getPassword() const { return mPassword; }
const QString &password() const { return mPassword; }
void setPassword( const QString &password ) { mPassword = password; }

bool getEnableSsl() const { return mSslEnabled; }
bool enableSsl() const { return mSslEnabled; }
void setEnableSsl( bool value ) { mSslEnabled = value; }

const QString &getCryptoProvider() const { return mSslCryptoProvider; }
const QString &cryptoProvider() const { return mSslCryptoProvider; }
void setCryptoProvider( const QString &value ) { mSslCryptoProvider = value; }

const QString &getSslKeyStore() const { return mSslKeyStore; }
const QString &sslKeyStore() const { return mSslKeyStore; }
void setSslKeyStore( const QString &value ) { mSslKeyStore = value; }

const QString &getSslTrustStore() const { return mSslTrustStore; }
const QString &sslTrustStore() const { return mSslTrustStore; }
void setSslTrustStore( const QString &value ) { mSslTrustStore = value; }

bool getSslValidateCertificate() const { return mSslValidateCertificate; }
bool sslValidateCertificate() const { return mSslValidateCertificate; }
void setSslValidateCertificate( bool value ) { mSslValidateCertificate = value; }

const QString &getSslHostNameInCertificate() const { return mSslHostNameInCertificate; }
const QString &sslHostNameInCertificate() const { return mSslHostNameInCertificate; }
void setSslHostNameInCertificate( const QString &value ) { mSslHostNameInCertificate = value; }

QString toString() const;
Expand Down
18 changes: 9 additions & 9 deletions src/providers/hana/qgshanadataitems.cpp
View file
Expand Up @@ -61,7 +61,7 @@ QVector<QgsDataItem *> QgsHanaConnectionItem::createChildren()
{
QgsHanaSettings settings( mName, true );
QVector<QgsHanaSchemaProperty> schemas =
conn->getSchemas( settings.getUserTablesOnly() ? settings.getUserName() : QString() );
conn->getSchemas( settings.userTablesOnly() ? settings.userName() : QString() );

if ( schemas.isEmpty() )
{
Expand Down Expand Up @@ -109,20 +109,20 @@ void QgsHanaConnectionItem::updateToolTip( const QString &userName, const QStrin
{
QgsHanaSettings settings( mName, true );
QString tip;
if ( !settings.getDatabase().isEmpty() )
tip = QStringLiteral( "Database: " ) + settings.getDatabase();
if ( !settings.database().isEmpty() )
tip = QStringLiteral( "Database: " ) + settings.database();
if ( !tip.isEmpty() )
tip += '\n';
tip += QStringLiteral( "Host: " ) + settings.getHost() + QStringLiteral( " " );
if ( QgsHanaIdentifierType::fromInt( settings.getIdentifierType() ) == QgsHanaIdentifierType::INSTANCE_NUMBER )
tip += settings.getIdentifier();
tip += QStringLiteral( "Host: " ) + settings.host() + QStringLiteral( " " );
if ( QgsHanaIdentifierType::fromInt( settings.identifierType() ) == QgsHanaIdentifierType::INSTANCE_NUMBER )
tip += settings.identifier();
else
tip += settings.getPort();
tip += settings.port();
tip += '\n';
if ( !dbmsVersion.isEmpty() )
tip += QStringLiteral( "DB Version: " ) + dbmsVersion + '\n';
tip += QStringLiteral( "User: " ) + userName + '\n';
tip += QStringLiteral( "Encrypted: " ) + QString( settings.getEnableSsl() ? QStringLiteral( "yes" ) : QStringLiteral( "no" ) );
tip += QStringLiteral( "Encrypted: " ) + QString( settings.enableSsl() ? QStringLiteral( "yes" ) : QStringLiteral( "no" ) );
setToolTip( tip );
}

Expand Down Expand Up @@ -287,7 +287,7 @@ QVector<QgsDataItem *> QgsHanaSchemaItem::createChildren()

QgsHanaSettings settings( mConnectionName, true );
QVector<QgsHanaLayerProperty> layers = conn->getLayers( mSchemaName,
settings.getAllowGeometrylessTables(), settings.getUserTablesOnly() );
settings.allowGeometrylessTables(), settings.userTablesOnly() );

for ( auto &layerProperty : layers )
{
Expand Down
2 changes: 1 addition & 1 deletion src/providers/hana/qgshanadriver.cpp
View file
Expand Up @@ -80,7 +80,7 @@ ConnectionRef QgsHanaDriver::createConnection()
return mEnv->createConnection();
}

const QString &QgsHanaDriver::getDriver() const
const QString &QgsHanaDriver::driver() const
{
return mDriver;
}
2 changes: 1 addition & 1 deletion src/providers/hana/qgshanadriver.h
View file
Expand Up @@ -29,7 +29,7 @@ class QgsHanaDriver

public:
odbc::ConnectionRef createConnection();
const QString &getDriver() const;
const QString &driver() const;

static QgsHanaDriver *instance();

Expand Down
46 changes: 23 additions & 23 deletions src/providers/hana/qgshananewconnection.cpp
View file
Expand Up @@ -55,7 +55,7 @@ QgsHanaNewConnection::QgsHanaNewConnection(
connect( btnConnect, &QPushButton::clicked, this, &QgsHanaNewConnection::btnConnect_clicked );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsHanaNewConnection::showHelp );

txtDriver->setText( QgsHanaDriver::instance()->getDriver() );
txtDriver->setText( QgsHanaDriver::instance()->driver() );

cbxCryptoProvider->addItem( tr( "openssl" ), QStringLiteral( "openssl" ) );
cbxCryptoProvider->addItem( tr( "commoncrypto" ), QStringLiteral( "commoncrypto" ) );
Expand Down Expand Up @@ -244,53 +244,53 @@ void QgsHanaNewConnection::readSettingsFromControls( QgsHanaSettings &settings )

void QgsHanaNewConnection::updateControlsFromSettings( const QgsHanaSettings &settings )
{
txtDriver->setText( settings.getDriver() );
txtHost->setText( settings.getHost() );
txtDriver->setText( settings.driver() );
txtHost->setText( settings.host() );
cmbIdentifierType->setCurrentIndex( QgsHanaIdentifierType::INSTANCE_NUMBER );
cmbIdentifierType->setCurrentIndex( static_cast<int>( settings.getIdentifierType() ) );
txtIdentifier->setText( settings.getIdentifier() );
if ( !settings.getMultitenant() )
cmbIdentifierType->setCurrentIndex( static_cast<int>( settings.identifierType() ) );
txtIdentifier->setText( settings.identifier() );
if ( !settings.multitenant() )
{
rbtnSingleContainer->setChecked( true );
frmMultitenantSettings->setEnabled( false );
}
else
{
rbtnMultipleContainers->setChecked( true );
if ( settings.getDatabase() == QLatin1String( "SYSTEMDB" ) )
if ( settings.database() == QLatin1String( "SYSTEMDB" ) )
rbtnSystemDatabase->setChecked( true );
else
txtTenantDatabaseName->setText( settings.getDatabase() );
txtTenantDatabaseName->setText( settings.database() );
}
txtSchema->setText( settings.getSchema() );
chkUserTablesOnly->setChecked( settings.getUserTablesOnly() );
chkAllowGeometrylessTables->setChecked( settings.getAllowGeometrylessTables() );
txtSchema->setText( settings.schema() );
chkUserTablesOnly->setChecked( settings.userTablesOnly() );
chkAllowGeometrylessTables->setChecked( settings.allowGeometrylessTables() );

chkEnableSSL->setChecked( settings.getEnableSsl() );
int idx = cbxCryptoProvider->findData( settings.getSslCryptoProvider() );
chkEnableSSL->setChecked( settings.enableSsl() );
int idx = cbxCryptoProvider->findData( settings.sslCryptoProvider() );
if ( idx >= 0 )
cbxCryptoProvider->setCurrentIndex( idx );

chkValidateCertificate->setChecked( settings.getSslValidateCertificate() );
txtOverrideHostName->setText( settings.getSslHostNameInCertificate() );
txtKeyStore->setText( settings.getSslKeyStore() );
txtTrustStore->setText( settings.getSslTrustStore() );
chkValidateCertificate->setChecked( settings.sslValidateCertificate() );
txtOverrideHostName->setText( settings.sslHostNameInCertificate() );
txtKeyStore->setText( settings.sslKeyStore() );
txtTrustStore->setText( settings.sslTrustStore() );

if ( settings.getSaveUserName() )
if ( settings.saveUserName() )
{
mAuthSettings->setUsername( settings.getUserName() );
mAuthSettings->setUsername( settings.userName() );
mAuthSettings->setStoreUsernameChecked( true );
}

if ( settings.getSavePassword() )
if ( settings.savePassword() )
{
mAuthSettings->setPassword( settings.getPassword() );
mAuthSettings->setPassword( settings.password() );
mAuthSettings->setStorePasswordChecked( true );
}

mAuthSettings->setConfigId( settings.getAuthCfg() );
mAuthSettings->setConfigId( settings.authCfg() );

txtName->setText( settings.getName() );
txtName->setText( settings.name() );
}

void QgsHanaNewConnection::testConnection()
Expand Down
8 changes: 4 additions & 4 deletions src/providers/hana/qgshanasettings.cpp
View file
Expand Up @@ -35,7 +35,7 @@ QgsHanaSettings::QgsHanaSettings( const QString &name, bool autoLoad )
load();
}

QString QgsHanaSettings::getPort() const
QString QgsHanaSettings::port() const
{
if ( QgsHanaIdentifierType::fromInt( mIdentifierType ) == QgsHanaIdentifierType::INSTANCE_NUMBER )
{
Expand Down Expand Up @@ -99,7 +99,7 @@ void QgsHanaSettings::setFromDataSourceUri( const QgsDataSourceUri &uri )
QgsDataSourceUri QgsHanaSettings::toDataSourceUri() const
{
QgsDataSourceUri uri;
uri.setConnection( mHost, getPort(), mDatabase, mUserName, mPassword );
uri.setConnection( mHost, port(), mDatabase, mUserName, mPassword );
uri.setDriver( mDriver );
uri.setSchema( mSchema );
if ( mSslEnabled )
Expand All @@ -122,7 +122,7 @@ QgsDataSourceUri QgsHanaSettings::toDataSourceUri() const
void QgsHanaSettings::load()
{
QgsSettings settings;
QString key = getPath();
QString key = path();
mDriver = settings.value( key + "/driver" ).toString();
mHost = settings.value( key + "/host" ).toString();
mIdentifierType = settings.value( key + "/identifierType" ).toUInt();
Expand All @@ -149,7 +149,7 @@ void QgsHanaSettings::load()

void QgsHanaSettings::save()
{
QString key( getPath() );
QString key( path() );
QgsSettings settings;
settings.setValue( key + "/driver", mDriver );
settings.setValue( key + "/host", mHost );
Expand Down
46 changes: 23 additions & 23 deletions src/providers/hana/qgshanasettings.h
View file
Expand Up @@ -37,69 +37,69 @@ class QgsHanaSettings
public:
QgsHanaSettings( const QString &name, bool autoLoad = false );

const QString &getName() const { return mName; }
const QString &name() const { return mName; }

const QString &getDriver() const { return mDriver; }
const QString &driver() const { return mDriver; }
void setDriver( const QString &driver ) { mDriver = driver; }

const QString &getHost() const { return mHost; }
const QString &host() const { return mHost; }
void setHost( const QString &host ) { mHost = host; }

uint getIdentifierType() const { return mIdentifierType; }
uint identifierType() const { return mIdentifierType; }
void setIdentifierType( uint identifierType ) { mIdentifierType = identifierType; }

const QString &getIdentifier() const { return mIdentifier; }
const QString &identifier() const { return mIdentifier; }
void setIdentifier( const QString &identifier ) { mIdentifier = identifier; }

const QString &getDatabase() const { return mDatabase; }
const QString &database() const { return mDatabase; }
void setDatabase( const QString &database ) { mDatabase = database; }

bool getMultitenant() const { return mMultitenant; }
bool multitenant() const { return mMultitenant; }
void setMultitenant( bool value ) { mMultitenant = value; }

const QString &getSchema() const { return mSchema; }
const QString &schema() const { return mSchema; }
void setSchema( const QString &schema ) { mSchema = schema; }

const QString &getAuthCfg() const { return mAuthcfg; }
const QString &authCfg() const { return mAuthcfg; }
void setAuthCfg( const QString &authcfg ) { mAuthcfg = authcfg; }

const QString &getUserName() const { return mUserName; }
const QString &userName() const { return mUserName; }
void setUserName( const QString &userName ) { mUserName = userName; }

bool getSaveUserName() const { return mSaveUserName; }
bool saveUserName() const { return mSaveUserName; }
void setSaveUserName( bool saveUserName ) { mSaveUserName = saveUserName; }

const QString &getPassword() const { return mPassword; }
const QString &password() const { return mPassword; }
void setPassword( const QString &password ) { mPassword = password; }

bool getSavePassword() const { return mSavePassword; }
bool savePassword() const { return mSavePassword; }
void setSavePassword( bool savePassword ) { mSavePassword = savePassword; }

bool getUserTablesOnly() const { return mUserTablesOnly; }
bool userTablesOnly() const { return mUserTablesOnly; }
void setUserTablesOnly( bool userTablesOnly ) { mUserTablesOnly = userTablesOnly; }

bool getAllowGeometrylessTables() const { return mAllowGeometrylessTables; }
bool allowGeometrylessTables() const { return mAllowGeometrylessTables; }
void setAllowGeometrylessTables( bool allowGeometrylessTables )
{
mAllowGeometrylessTables = allowGeometrylessTables;
}

bool getEnableSsl() const { return mSslEnabled; }
bool enableSsl() const { return mSslEnabled; }
void setEnableSsl( bool value ) { mSslEnabled = value; }

const QString &getSslCryptoProvider() const { return mSslCryptoProvider; }
const QString &sslCryptoProvider() const { return mSslCryptoProvider; }
void setSslCryptoProvider( const QString &value ) { mSslCryptoProvider = value; }

const QString &getSslKeyStore() const { return mSslKeyStore; }
const QString &sslKeyStore() const { return mSslKeyStore; }
void setSslKeyStore( const QString &value ) { mSslKeyStore = value; }

const QString &getSslTrustStore() const { return mSslTrustStore; }
const QString &sslTrustStore() const { return mSslTrustStore; }
void setSslTrustStore( const QString &value ) { mSslTrustStore = value; }

bool getSslValidateCertificate() const { return mSslValidateCertificate; }
bool sslValidateCertificate() const { return mSslValidateCertificate; }
void setSslValidateCertificate( bool value ) { mSslValidateCertificate = value; }

const QString &getSslHostNameInCertificate() const
const QString &sslHostNameInCertificate() const
{
return mSslHostNameInCertificate;
}
Expand All @@ -108,7 +108,7 @@ class QgsHanaSettings
mSslHostNameInCertificate = value;
}

QString getPort() const;
QString port() const;
void setFromDataSourceUri( const QgsDataSourceUri &uri );
QgsDataSourceUri toDataSourceUri() const ;

Expand All @@ -121,7 +121,7 @@ class QgsHanaSettings
static void removeConnection( const QString &name );

private:
QString getPath() const { return getBaseKey() + mName; }
QString path() const { return getBaseKey() + mName; }
static QString getBaseKey() { return "/HANA/connections/"; }

private:
Expand Down
4 changes: 2 additions & 2 deletions src/providers/hana/qgshanasourceselect.cpp
View file
Expand Up @@ -367,7 +367,7 @@ void QgsHanaSourceSelect::cmbConnections_activated( int )
cbxAllowGeometrylessTables->blockSignals( true );
QgsHanaSettings settings( cmbConnections->currentText() );
settings.load();
cbxAllowGeometrylessTables->setChecked( settings.getAllowGeometrylessTables() );
cbxAllowGeometrylessTables->setChecked( settings.allowGeometrylessTables() );
cbxAllowGeometrylessTables->blockSignals( false );
}

Expand Down Expand Up @@ -559,7 +559,7 @@ void QgsHanaSourceSelect::btnConnect_clicked()

QApplication::setOverrideCursor( Qt::BusyCursor );

mColumnTypeThread = qgis::make_unique<QgsHanaColumnTypeThread>( settings.getName(), uri, settings.getAllowGeometrylessTables(), settings.getUserTablesOnly() );
mColumnTypeThread = qgis::make_unique<QgsHanaColumnTypeThread>( settings.name(), uri, settings.allowGeometrylessTables(), settings.userTablesOnly() );
mColumnTypeTask = qgis::make_unique<QgsProxyProgressTask>( tr( "Scanning tables for %1" ).arg( cmbConnections->currentText() ) );
QgsApplication::taskManager()->addTask( mColumnTypeTask.get() );

Expand Down

0 comments on commit bf8c711

Please sign in to comment.