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
@@ -144,33 +144,33 @@ void BlueBase::writeConfig()
 
     cfg.writeEntry( "name" , m_deviceName );
     cfg.writeEntryCrypt( "passkey" , m_defaultPasskey );
     cfg.writeEntry( "useEncryption" , m_useEncryption );
     cfg.writeEntry( "enableAuthentification" , m_enableAuthentification );
     cfg.writeEntry( "enablePagescan" , m_enablePagescan );
     cfg.writeEntry( "enableInquiryscan" , m_enableInquiryscan );
 
     writeToHciConfig();
 }
 
 /**
  * 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 );
     hciconf.setPscan( m_enablePagescan );
     hciconf.setIscan( m_enableInquiryscan );
     hciconf.save();
 }
 
 
 /**
  * Read the list of allready known devices
  */
 void BlueBase::readSavedDevices()
@@ -305,140 +305,136 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
 /**
  * Action that is toggled on entrys on click
  */
 void BlueBase::startServiceActionClicked( QListViewItem */*item*/ )
 {}
 
 
 /**
  * Action that are toggled on hold (mostly QPopups i guess)
  */
 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
      * one if the factory returns 0
      * PopupMenu deletion is kind of weird.
      * If escaped( -1 ) or any of our items were chosen we'll
      * delete the PopupMenu otherwise it's the responsibility of
      * the PopupMenu to delete itself
      *
      */
     else if ( ((BTListItem*)item)->type() == "service")
     {
         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 )
         {
             ;
         }
         delete popup;
     }
     delete menu;
 }
 
 
 /**
  * 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 );
 }
 
 
 /**
  * Overloaded. This one it the one that is
  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 );
     if( it == m_deviceList.end() )
         return;
     deviceItem = it.data();
 
     // remove previous entries
     QList<QListViewItem> tempList;
     tempList.setAutoDelete( true );
     QListViewItem * child = deviceItem->firstChild();
     while( child )
     {
@@ -596,33 +592,33 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
  */
 void BlueBase::deviceActive( const RemoteDevice &device )
 {
     // search by mac, async, gets a signal back
     // We should have a BTDeviceItem there or where does it get added to the map -zecke
     m_localDevice->isAvailable( device.mac() );
 }
 
 
 /**
  * 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;
 
     BTDeviceItem* deviceItem = it.data();
 
 
     if ( connected )
     {
         deviceItem->setPixmap( 1, m_onPix );
     }
     else
     {