-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 22 |
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 | |||
318 | return; | 318 | return; |
319 | 319 | ||
320 | QPopupMenu *menu = new QPopupMenu(); | 320 | QPopupMenu *menu = new QPopupMenu(); |
321 | int ret=0; | ||
322 | 321 | ||
323 | if ( ((BTListItem*)item)->type() == "device") | 322 | if ( static_cast<BTListItem*>( item )->type() == "device") |
324 | { | 323 | { |
325 | |||
326 | QPopupMenu *groups = new QPopupMenu(); | 324 | QPopupMenu *groups = new QPopupMenu(); |
327 | 325 | ||
328 | menu->insertItem( ((BTDeviceItem*)item)->name(),0 ); | 326 | menu->insertItem( static_cast<BTDeviceItem*>( item )->name(), 0 ); |
329 | menu->insertSeparator(1); | 327 | menu->insertSeparator(1); |
330 | menu->insertItem( tr("rescan sevices"), 2); | 328 | menu->insertItem( tr( "&Rescan services" ), 2); |
331 | menu->insertItem( tr("to group"), groups , 3); | 329 | // menu->insertItem( tr( "&Add to group" ), groups, 3); |
332 | menu->insertItem( tr("delete"), 4); | 330 | menu->insertItem( tr( "&Delete"), 4); |
333 | 331 | int ret = menu->exec( point, 0); | |
334 | ret = menu->exec( point , 0); | ||
335 | 332 | ||
336 | switch(ret) | 333 | switch(ret) |
337 | { | 334 | { |
338 | case -1: | 335 | case -1: |
339 | break; | 336 | break; |
340 | case 2: | 337 | case 2: |
341 | addServicesToDevice( (BTDeviceItem*)item ); | 338 | addServicesToDevice( static_cast<BTDeviceItem*>( item ) ); |
342 | break; | 339 | break; |
343 | 340 | ||
344 | case 4: | 341 | case 4: |
@@ -346,8 +343,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
346 | delete item; | 343 | delete item; |
347 | break; | 344 | break; |
348 | } | 345 | } |
349 | delete groups; | 346 | // delete groups; |
350 | |||
351 | } | 347 | } |
352 | 348 | ||
353 | /* | 349 | /* |
@@ -386,7 +382,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
386 | } | 382 | } |
387 | int test1 = popup->insertItem( tr("Test1:"), 2); | 383 | int test1 = popup->insertItem( tr("Test1:"), 2); |
388 | 384 | ||
389 | ret = popup->exec( point ); | 385 | int ret = popup->exec( point ); |
390 | owarn << "returned from exec() " << oendl; | 386 | owarn << "returned from exec() " << oendl; |
391 | if ( ret == -1 ) | 387 | if ( ret == -1 ) |
392 | { | 388 | { |