Skip to content

Commit

Permalink
Format the code of HANA provider
Browse files Browse the repository at this point in the history
  • Loading branch information
Maksim Rylov authored and mrylov committed Dec 7, 2020
1 parent 9909079 commit 94fa08e
Show file tree
Hide file tree
Showing 32 changed files with 2,741 additions and 2,729 deletions.
44 changes: 22 additions & 22 deletions src/providers/hana/qgshanacolumntypethread.cpp
Expand Up @@ -20,10 +20,10 @@
#include "qgslogger.h"
#include "qgsmessagelog.h"

QgsHanaColumnTypeThread::QgsHanaColumnTypeThread(const QgsHanaSettings& settings)
: mSettings(settings)
QgsHanaColumnTypeThread::QgsHanaColumnTypeThread( const QgsHanaSettings &settings )
: mSettings( settings )
{
qRegisterMetaType<QgsHanaLayerProperty>("QgsHanaLayerProperty");
qRegisterMetaType<QgsHanaLayerProperty>( "QgsHanaLayerProperty" );
}

void QgsHanaColumnTypeThread::stop()
Expand All @@ -36,45 +36,45 @@ void QgsHanaColumnTypeThread::run()
mStopped = false;

QgsDataSourceUri uri = mSettings.toDataSourceUri();
QgsHanaConnectionRef conn(uri);
if (conn.isNull())
QgsHanaConnectionRef conn( uri );
if ( conn.isNull() )
{
QgsDebugMsg("Connection failed - " + uri.connectionInfo(false));
QgsDebugMsg( "Connection failed - " + uri.connectionInfo( false ) );
mStopped = true;
return;
}

emit progressMessage(tr("Retrieving tables of %1 .").arg(mSettings.getName()));
emit progressMessage( tr( "Retrieving tables of %1 ." ).arg( mSettings.getName() ) );
QVector<QgsHanaLayerProperty> layerProperties = conn->getLayers(
mSettings.getSchema(),
mSettings.getAllowGeometrylessTables(),
mSettings.getUserTablesOnly());
mSettings.getSchema(),
mSettings.getAllowGeometrylessTables(),
mSettings.getUserTablesOnly() );

if (layerProperties.isEmpty())
if ( layerProperties.isEmpty() )
{
QgsMessageLog::logMessage(
QObject::tr("Unable to get list of spatially enabled tables from the database"), tr("HANA"));
QObject::tr( "Unable to get list of spatially enabled tables from the database" ), tr( "HANA" ) );
return;
}

int i = 0;
for (QgsHanaLayerProperty& layerProperty : layerProperties)
for ( QgsHanaLayerProperty &layerProperty : layerProperties )
{
if (!mStopped)
if ( !mStopped )
{
emit progress(i++, layerProperties.size());
emit progressMessage(tr("Scanning column %1.%2.%3…")
.arg(layerProperty.schemaName, layerProperty.tableName, layerProperty.geometryColName));
conn->readLayerInfo(layerProperty);
emit progress( i++, layerProperties.size() );
emit progressMessage( tr( "Scanning column %1.%2.%3…" )
.arg( layerProperty.schemaName, layerProperty.tableName, layerProperty.geometryColName ) );
conn->readLayerInfo( layerProperty );
}

// Signal about new layer.
emit setLayerType(layerProperty);
emit setLayerType( layerProperty );
}

if (!mStopped)
if ( !mStopped )
mLayerProperties = layerProperties;

emit progress(0, 0);
emit progressMessage(tr("Table retrieval finished."));
emit progress( 0, 0 );
emit progressMessage( tr( "Table retrieval finished." ) );
}
16 changes: 8 additions & 8 deletions src/providers/hana/qgshanacolumntypethread.h
Expand Up @@ -21,14 +21,14 @@
#include "qgshanasettings.h"
#include <QThread>

// A class that determines the geometry type of a given database
// schema.table.column, with the option of doing so in a separate
// thread.
// A class that determines the geometry type of a given database
// schema.table.column, with the option of doing so in a separate
// thread.
class QgsHanaColumnTypeThread : public QThread
{
Q_OBJECT
public:
QgsHanaColumnTypeThread(const QgsHanaSettings& settings);
QgsHanaColumnTypeThread( const QgsHanaSettings &settings );

// These functions get the layer types and pass that information out
// by emitting the setLayerType() signal.
Expand All @@ -38,11 +38,11 @@ class QgsHanaColumnTypeThread : public QThread
QVector<QgsHanaLayerProperty> layerProperties() const { return mLayerProperties; }

signals:
void setLayerType(QgsHanaLayerProperty layerProperty);
void progress(int, int);
void progressMessage( const QString&);
void setLayerType( QgsHanaLayerProperty layerProperty );
void progress( int, int );
void progressMessage( const QString & );

public slots:
public slots:
void stop();

private:
Expand Down

0 comments on commit 94fa08e

Please sign in to comment.