summaryrefslogtreecommitdiff
path: root/noncore
authormickeyl <mickeyl>2005-07-09 13:42:36 (UTC)
committer mickeyl <mickeyl>2005-07-09 13:42:36 (UTC)
commit5dbfa604bcc5dd32401d862372af806bfe674e89 (patch) (side-by-side diff)
tree38abbfa6cf68bca36ce397e5e1e69c12f8674dc2 /noncore
parent7bccb3143fbfb4dd70cc22d5233e6275245d0285 (diff)
downloadopie-5dbfa604bcc5dd32401d862372af806bfe674e89.zip
opie-5dbfa604bcc5dd32401d862372af806bfe674e89.tar.gz
opie-5dbfa604bcc5dd32401d862372af806bfe674e89.tar.bz2
- sanitize 'ret' scoping
- fix orthography in popupmenu - remove 'add to group', since groups seem unfinished :/
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp58
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
@@ -154,13 +154,13 @@ void BlueBase::writeConfig()
/**
* Modify the hcid.conf file to our needs
*/
void BlueBase::writeToHciConfig()
{
- owarn << "writeToHciConfig" << oendl;
+ owarn << "writeToHciConfig" << oendl;
HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
hciconf.load();
hciconf.setPinHelper( QPEApplication::qpeDir() + "bin/bluepin" );
hciconf.setName( m_deviceName );
hciconf.setEncrypt( m_useEncryption );
hciconf.setAuth( m_enableAuthentification );
@@ -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->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);
switch(ret)
{
- 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;
}
/*
* 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
@@ -366,31 +362,31 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
BTServiceItem* service = (BTServiceItem*)item;
QMap<int, QString> list = service->services().classIdList();
QMap<int, QString>::Iterator it = list.begin();
QPopupMenu *popup =0l;
if ( it != list.end() )
{
- owarn << "Searching id " << it.key() << " " << it.data().latin1() << "" << oendl;
+ owarn << "Searching id " << it.key() << " " << it.data().latin1() << "" << oendl;
popup = m_popHelper.find( it.key(),
service->services(),
(BTDeviceItem*)service->parent() );
}
else
{
- owarn << "Empty" << oendl;
+ owarn << "Empty" << oendl;
}
if ( popup == 0l )
{
- owarn << "factory returned 0l" << oendl;
+ owarn << "factory returned 0l" << oendl;
popup = new QPopupMenu();
}
int test1 = popup->insertItem( tr("Test1:"), 2);
- ret = popup->exec( point );
- owarn << "returned from exec() " << oendl;
+ int ret = popup->exec( point );
+ owarn << "returned from exec() " << oendl;
if ( ret == -1 )
{
;
}
else if ( ret == test1 )
{
@@ -405,13 +401,13 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
/**
* Search and display avail. services for a device (on expand from device listing)
* @param item the service item returned
*/
void BlueBase::addServicesToDevice( BTDeviceItem * item )
{
- odebug << "addServicesToDevice" << oendl;
+ odebug << "addServicesToDevice" << oendl;
// row of mac adress text(3)
RemoteDevice device = item->remoteDevice();
m_deviceList.insert( item->mac() , item );
// and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
m_localDevice->searchServices( device );
}
@@ -422,13 +418,13 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item )
ted to the foundServices signal
* @param device the mac address of the remote device
* @param servicesList the list with the service the device has.
*/
void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList )
{
- odebug << "fill services list" << oendl;
+ odebug << "fill services list" << oendl;
QMap<QString,BTDeviceItem*>::Iterator it;
BTDeviceItem* deviceItem = 0;
// get the right devices which requested the search
it = m_deviceList.find( device );
@@ -606,13 +602,13 @@ void BlueBase::deviceActive( const RemoteDevice &device )
* The signal catcher. Set the avail. status on device.
* @param device - the mac address
* @param connected - if it is avail. or not
*/
void BlueBase::deviceActive( const QString& device, bool connected )
{
- odebug << "deviceActive slot" << oendl;
+ odebug << "deviceActive slot" << oendl;
QMap<QString,BTDeviceItem*>::Iterator it;
it = m_deviceList.find( device );
if( it == m_deviceList.end() )
return;