Avoid using 'using namespace' in HANA header files

qgis · Dec 7, 2020 · 06f3ddf · 06f3ddf
1 parent 6cd4070
commit 06f3ddf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/src/providers/hana/qgshanaconnection.h b/src/providers/hana/qgshanaconnection.h
@@ -74,7 +74,7 @@ class QgsHanaConnection : public QObject
     int getLayerSRID( const QgsHanaLayerProperty &layerProperty );
     QStringList getLayerPrimaryeKeys( const QgsHanaLayerProperty &layerProperty );
 
-    PreparedStatementRef createPreparedStatement( const QString &sql, const QVariantList &args );
+    odbc::PreparedStatementRef createPreparedStatement( const QString &sql, const QVariantList &args );
 
   private:
     odbc::ConnectionRef mConnection;

diff --git a/src/providers/hana/qgshanaproviderconnection.cpp b/src/providers/hana/qgshanaproviderconnection.cpp
@@ -189,15 +189,14 @@ QList<QVariantList> QgsHanaProviderConnection::executeSql( const QString &sql )
 
   const QgsDataSourceUri dsUri { uri() };
   QgsHanaConnectionRef conn( dsUri );
-
   if ( conn.isNull() )
     throw QgsProviderConnectionException( QObject::tr( "Connection failed: %1" ).arg( uri() ) );
 
   bool isQuery = false;
 
   try
   {
-    PreparedStatementRef stmt = conn->prepareStatement( sql );
+    odbc::PreparedStatementRef stmt = conn->prepareStatement( sql );
     isQuery = stmt->getMetaDataUnicode()->getColumnCount() > 0;
   }
   catch ( const QgsHanaException &ex )
@@ -265,18 +264,17 @@ void QgsHanaProviderConnection::executeSqlStatement( const QString &sql ) const
 QList<QgsHanaProviderConnection::TableProperty> QgsHanaProviderConnection::tables( const QString &schema, const TableFlags &flags ) const
 {
   checkCapability( Capability::Tables );
-  QList<QgsHanaProviderConnection::TableProperty> tables;
 
   const QgsDataSourceUri dsUri { uri() };
   QgsHanaConnectionRef conn( dsUri );
   if ( conn.isNull() )
     throw QgsProviderConnectionException( QObject::tr( "Connection failed: %1" ).arg( uri() ) );
 
-  QVector<QgsHanaLayerProperty> layers;
+  QList<QgsHanaProviderConnection::TableProperty> tables;
+
   try
   {
-    layers = conn->getLayers( schema, flags.testFlag( TableFlag::Aspatial ), false );
-
+    QVector<QgsHanaLayerProperty> layers = conn->getLayers( schema, flags.testFlag( TableFlag::Aspatial ), false );
     for ( auto &layerInfo : layers )
       conn->readLayerInfo( layerInfo );
 
@@ -324,7 +322,6 @@ QStringList QgsHanaProviderConnection::schemas( ) const
 
   const QgsDataSourceUri dsUri { uri() };
   QgsHanaConnectionRef conn( dsUri );
-
   if ( conn.isNull() )
     throw QgsProviderConnectionException( QObject::tr( "Connection failed: %1" ).arg( uri() ) );
 
@@ -347,10 +344,8 @@ void QgsHanaProviderConnection::store( const QString &name ) const
   // delete the original entry first
   remove( name );
 
-  const QgsDataSourceUri dsUri { uri() };
-
   QgsHanaSettings settings( name );
-  settings.setFromDataSourceUri( dsUri );
+  settings.setFromDataSourceUri( uri() );
   settings.setSaveUserName( true );
   settings.setSavePassword( true );
   settings.save();

diff --git a/src/providers/hana/qgshanaresultset.h b/src/providers/hana/qgshanaresultset.h
@@ -29,8 +29,6 @@
 #include "odbc/ResultSet.h"
 #include "odbc/ResultSetMetaDataUnicode.h"
 
-using namespace odbc;
-
 class QgsHanaResultSet;
 typedef std::unique_ptr<QgsHanaResultSet> QgsHanaResultSetRef;
 
@@ -40,11 +38,11 @@ class QgsHanaResultSet
     friend class QgsHanaConnection;
 
   private:
-    QgsHanaResultSet( ResultSetRef &&resultSet );
+    QgsHanaResultSet( odbc::ResultSetRef &&resultSet );
 
   public:
-    static QgsHanaResultSetRef create( PreparedStatementRef &stmt );
-    static QgsHanaResultSetRef create( StatementRef &stmt, const QString &sql );
+    static QgsHanaResultSetRef create( odbc::PreparedStatementRef &stmt );
+    static QgsHanaResultSetRef create( odbc::StatementRef &stmt, const QString &sql );
 
     void close();
     bool next();
@@ -54,11 +52,11 @@ class QgsHanaResultSet
     QVariant getValue( unsigned short columnIndex );
     QgsGeometry getGeometry( unsigned short columnIndex );
 
-    ResultSetMetaDataUnicode &getMetadata() { return *mMetadata; }
+    odbc::ResultSetMetaDataUnicode &getMetadata() { return *mMetadata; }
 
   private:
-    ResultSetRef mResultSet;
-    ResultSetMetaDataUnicodeRef mMetadata;
+    odbc::ResultSetRef mResultSet;
+    odbc::ResultSetMetaDataUnicodeRef mMetadata;
     std::vector<char> mBuffer;
 };