Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix spell_check warnings in HANA plugin
  • Loading branch information
mrylov committed Dec 7, 2020
1 parent 26352f1 commit b9ab4c2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions src/providers/hana/qgshanaconnection.cpp
Expand Up @@ -77,10 +77,10 @@ QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &
return createConnection( uri, nullptr, nullptr );
}

QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &uri, bool *cancelled )
QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &uri, bool *canceled )
{
QString errorMessage;
QgsHanaConnection *conn = createConnection( uri, cancelled, &errorMessage );
QgsHanaConnection *conn = createConnection( uri, canceled, &errorMessage );

if ( !errorMessage.isEmpty() )
{
Expand All @@ -92,10 +92,10 @@ QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &
return conn;
}

QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &uri, bool *cancelled, QString *errorMessage )
QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &uri, bool *canceled, QString *errorMessage )
{
if ( cancelled != nullptr )
*cancelled = false;
if ( canceled != nullptr )
*canceled = false;

try
{
Expand Down Expand Up @@ -138,8 +138,8 @@ QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &
bool ok = QgsCredentials::instance()->get( conninfo, username, password, message );
if ( !ok )
{
if ( cancelled != nullptr )
*cancelled = true;
if ( canceled != nullptr )
*canceled = true;
break;
}

Expand Down
4 changes: 2 additions & 2 deletions src/providers/hana/qgshanaconnection.h
Expand Up @@ -70,8 +70,8 @@ class QgsHanaConnection : public QObject
QgsHanaResultSetRef getColumns( const QString &schemaName, const QString &tableName, const QString &fieldName );

static QgsHanaConnection *createConnection( const QgsDataSourceUri &uri );
static QgsHanaConnection *createConnection( const QgsDataSourceUri &uri, bool *cancelled );
static QgsHanaConnection *createConnection( const QgsDataSourceUri &uri, bool *cancelled, QString *errorMessage );
static QgsHanaConnection *createConnection( const QgsDataSourceUri &uri, bool *canceled );
static QgsHanaConnection *createConnection( const QgsDataSourceUri &uri, bool *canceled, QString *errorMessage );

static QStringList connectionList();

Expand Down
6 changes: 3 additions & 3 deletions src/providers/hana/qgshanasourceselect.cpp
Expand Up @@ -545,12 +545,12 @@ void QgsHanaSourceSelect::btnConnect_clicked()
settings.setAllowGeometrylessTables( cbxAllowGeometrylessTables->isChecked() );

const QgsDataSourceUri uri = settings.toDataSourceUri();
bool cancelled = false;
bool canceled = false;

unique_ptr<QgsHanaConnection> conn( QgsHanaConnection::createConnection( uri, &cancelled, nullptr ) );
unique_ptr<QgsHanaConnection> conn( QgsHanaConnection::createConnection( uri, &canceled, nullptr ) );
if ( !conn )
{
if ( !cancelled )
if ( !canceled )
QMessageBox::warning( this, tr( "HANA" ), tr( "Unable to connect to a database" ) );
return;
}
Expand Down

0 comments on commit b9ab4c2

Please sign in to comment.