summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp22
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
@@ -315,42 +315,38 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ )
void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ )
{
if (!item )
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:
// deletes childs too
delete item;
break;
}
- delete groups;
-
+ // delete groups;
}
/*
* We got service sensitive PopupMenus in our factory
* We will create one through the factory and will insert
* our Separator + ShowInfo into the menu or create a new
@@ -383,13 +379,13 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
{
owarn << "factory returned 0l" << oendl;
popup = new QPopupMenu();
}
int test1 = popup->insertItem( tr("Test1:"), 2);
- ret = popup->exec( point );
+ int ret = popup->exec( point );
owarn << "returned from exec() " << oendl;
if ( ret == -1 )
{
;
}
else if ( ret == test1 )