- sanitize 'ret' scoping

- fix orthography in popupmenu
- remove 'add to group', since groups seem unfinished :/

1 files changed, 9 insertions, 13 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 7954cc3..af1cd23 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -318,27 +318,24 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         return;
 
     QPopupMenu *menu = new QPopupMenu();
-    int ret=0;
 
-    if ( ((BTListItem*)item)->type() == "device")
+    if ( static_cast<BTListItem*>( item )->type() == "device")
     {
-
         QPopupMenu *groups = new QPopupMenu();
 
-        menu->insertItem( ((BTDeviceItem*)item)->name(),0 );
+        menu->insertItem( static_cast<BTDeviceItem*>( item )->name(), 0 );
         menu->insertSeparator(1);
-        menu->insertItem( tr("rescan sevices"),  2);
-        menu->insertItem( tr("to group"), groups , 3);
-        menu->insertItem( tr("delete"),  4);
-
-        ret = menu->exec( point  , 0);
+        menu->insertItem( tr( "&Rescan services" ), 2);
+        // menu->insertItem( tr( "&Add to group" ), groups, 3);
+        menu->insertItem( tr( "&Delete"),  4);
+        int ret = menu->exec( point, 0);
 
         switch(ret)
         {
         case -1:
             break;
         case 2:
-            addServicesToDevice( (BTDeviceItem*)item );
+                addServicesToDevice( static_cast<BTDeviceItem*>( item ) );
             break;
 
         case 4:
@@ -346,8 +343,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
             delete item;
             break;
         }
-        delete groups;
-
+        // delete groups;
     }
 
     /*
@@ -386,7 +382,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         }
         int test1 = popup->insertItem( tr("Test1:"),  2);
 
-        ret = popup->exec( point );
+        int ret = popup->exec( point );
         owarn << "returned from exec() " << oendl; 
         if ( ret == -1 )
         {