Make use of QgsDataItemGuiProvider::notify in HANA provider

qgis · Dec 7, 2020 · 2526d4b · 2526d4b
1 parent 3885fe6
commit 2526d4b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/providers/hana/qgshanadataitemguiprovider.cpp b/src/providers/hana/qgshanadataitemguiprovider.cpp
@@ -61,7 +61,7 @@ void QgsHanaDataItemGuiProvider::populateContextMenu(
   }
 }
 
-bool QgsHanaDataItemGuiProvider::deleteLayer( QgsLayerItem *item, QgsDataItemGuiContext )
+bool QgsHanaDataItemGuiProvider::deleteLayer( QgsLayerItem *item, QgsDataItemGuiContext context )
 {
   if ( QgsHanaLayerItem *layerItem = qobject_cast<QgsHanaLayerItem *>( item ) )
   {
@@ -86,13 +86,13 @@ bool QgsHanaDataItemGuiProvider::deleteLayer( QgsLayerItem *item, QgsDataItemGui
     bool res = conn->execute( sql, &errMessage );
     if ( !res )
     {
-      QMessageBox::warning( nullptr, tr( "Delete %1" ).arg( typeName ), errMessage );
+      notify( tr( "Delete %1" ).arg( typeName ), errMessage, context, Qgis::MessageLevel::Warning );
     }
     else
     {
-      QMessageBox::information( nullptr,
-                                tr( "Delete %1" ).arg( typeName ),
-                                tr( "%1 %2 deleted successfully." ).arg( typeName, objectName ) );
+      notify( tr( "Delete %1" ).arg( typeName ), tr( "%1 %2 deleted successfully." ).arg( typeName, objectName ),
+              context, Qgis::MessageLevel::Success );
+
       if ( layerItem->parent() )
         layerItem->parent()->refresh();
     }

diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -309,8 +309,8 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
     limitAtProvider = false;
 
   bool subsetOfAttributes = mRequest.flags() & QgsFeatureRequest::SubsetOfAttributes;
-  QgsAttributeIds attrIds = subsetOfAttributes ?
-                            request.subsetOfAttributes().toSet() : mSource->mFields.allAttributesList().toSet();
+  QgsAttributeIds attrIds = qgis::listToSet( subsetOfAttributes ?
+                            request.subsetOfAttributes() : mSource->mFields.allAttributesList() );
 
   if ( subsetOfAttributes )
   {

diff --git a/src/providers/hana/qgshanatablemodel.cpp b/src/providers/hana/qgshanatablemodel.cpp
@@ -245,8 +245,8 @@ bool QgsHanaTableModel::setData( const QModelIndex &idx, const QVariant &value,
     QStringList pkCols = idx.sibling( idx.row(), DbtmPkCol ).data( Qt::UserRole + 1 ).toStringList();
     if ( tip.isEmpty() && !pkCols.isEmpty() )
     {
-      QSet<QString> s0( idx.sibling( idx.row(), DbtmPkCol ).data( Qt::UserRole + 2 ).toStringList().toSet() );
-      QSet<QString> s1( pkCols.toSet() );
+      QSet<QString> s0( qgis::listToSet( idx.sibling( idx.row(), DbtmPkCol ).data( Qt::UserRole + 2 ).toStringList() ) );
+      QSet<QString> s1( qgis::listToSet( pkCols ) );
       if ( s0.intersect( s1 ).isEmpty() )
         tip = tr( "Select columns in the '%1' column that uniquely identify features of this layer" ).arg( tr( "Feature ID" ) );
     }