| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 58 |
1 files changed, 27 insertions, 31 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 @@ -159,3 +159,3 @@ void BlueBase::writeToHciConfig() { - owarn << "writeToHciConfig" << oendl; + owarn << "writeToHciConfig" << oendl; HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); @@ -320,16 +320,13 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin 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->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( static_cast<BTDeviceItem*>( item )->name(), 0 ); + menu->insertSeparator( 1 ); + 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); @@ -337,15 +334,14 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin { - case -1: - break; - case 2: - addServicesToDevice( (BTDeviceItem*)item ); - break; - - case 4: - // deletes childs too - delete item; - break; + case -1: + break; + case 2: + addServicesToDevice( static_cast<BTDeviceItem*>( item ) ); + break; + + case 4: + // deletes childs too + delete item; + break; } - delete groups; - + // delete groups; } @@ -371,3 +367,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin { - owarn << "Searching id " << it.key() << " " << it.data().latin1() << "" << oendl; + owarn << "Searching id " << it.key() << " " << it.data().latin1() << "" << oendl; popup = m_popHelper.find( it.key(), @@ -378,3 +374,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin { - owarn << "Empty" << oendl; + owarn << "Empty" << oendl; } @@ -383,3 +379,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin { - owarn << "factory returned 0l" << oendl; + owarn << "factory returned 0l" << oendl; popup = new QPopupMenu(); @@ -388,4 +384,4 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin - ret = popup->exec( point ); - owarn << "returned from exec() " << oendl; + int ret = popup->exec( point ); + owarn << "returned from exec() " << oendl; if ( ret == -1 ) @@ -410,3 +406,3 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) { - odebug << "addServicesToDevice" << oendl; + odebug << "addServicesToDevice" << oendl; // row of mac adress text(3) @@ -427,3 +423,3 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s { - odebug << "fill services list" << oendl; + odebug << "fill services list" << oendl; @@ -611,3 +607,3 @@ void BlueBase::deviceActive( const QString& device, bool connected ) { - odebug << "deviceActive slot" << oendl; + odebug << "deviceActive slot" << oendl; |