...

[cpPlugins.git] / lib / cpBaseQtApplication / Canvas.cxx

diff --git a/lib/cpBaseQtApplication/Canvas.cxx b/lib/cpBaseQtApplication/Canvas.cxx
index c873b342b3f74d44c01d0b912049c22f040dd18b..85e7bfb1a9bf7bc592bdb0dd947b9a494836fc3e 100644 (file)
--- a/lib/cpBaseQtApplication/Canvas.cxx
+++ b/lib/cpBaseQtApplication/Canvas.cxx
@@ -49,7 +49,10 @@ void cpBaseQtApplication::Canvas::
 keyPressEvent( QKeyEvent* event )
 {
   static const int del_key = 16777223;
-  if( event->key( ) == del_key )
+
+  switch( event->key( ) )
+  {
+  case del_key:
   {
     auto _items = this->items( );
     auto i = _items.begin( );
@@ -83,8 +86,11 @@ keyPressEvent( QKeyEvent* event )
         i++;
 
     } // elihw
-
-  } // fi
+  }
+  break;
+  default:
+    break;
+  } // hctiws
 }
 
 // -------------------------------------------------------------------------
@@ -124,22 +130,23 @@ dropEvent( QDropEvent* event )
   const QMimeData* mime = event->mimeData( );
   if( !( mime->hasFormat( "application/x-qabstractitemmodeldatalist" ) ) )
     return;
-
   event->acceptProposedAction( );
   auto tree = dynamic_cast< QTreeWidget* >( event->source( ) );
   if( tree == NULL )
     return;
 
+  QPointF p = this->mapToScene( event->pos( ) );
   QList< QTreeWidgetItem* > items = tree->selectedItems( );
   for( auto iIt = items.begin( ); iIt != items.end( ); ++iIt )
   {
     auto parent = ( *iIt )->parent( );
     if( parent != NULL )
-      this->m_Editor->createFilter(
-        parent->text( 0 ).toStdString( ),
-        ( *iIt )->text( 0 ).toStdString( ),
-        this->mapToScene( event->pos( ) )
-        );
+    {
+      std::string category = parent->text( 0 ).toStdString( );
+      std::string filter = ( *iIt )->text( 0 ).toStdString( );
+      this->m_Editor->createFilter( category, filter, p );
+
+    } // fi
 
   } // rof
 }