usual fault in connect .-(

1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 910bb8c..af65f14 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -1,322 +1,322 @@
 /*
  * bluebase.cpp *
  * ---------------------
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bluebase.h"
 #include "scandialog.h"
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qtabwidget.h>
 #include <qscrollview.h>
 #include <qvbox.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qdir.h>
 #include <qpopupmenu.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <remotedevice.h>
 
 
 namespace OpieTooth {
 
 
     BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
         : BluetoothBase( parent, name, fl ) {
 
         localDevice = new Manager( "hci0" );
 
         connect( PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan() ) );
         connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
         // not good since lib is async
         //       connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
         //                  this, SLOT( addServicesToDevice( QListViewItem * ) ) );
         connect( ListView2, SIGNAL( clicked( QListViewItem* )),
                           this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
         connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
                  this,  SLOT(startServiceActionHold( BTListItem *, const QPoint &, int) ) );
         connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
                  this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
-        connect( localDevice, SIGNAL( available( const QString& device, bool connected ) ),
-                 this, SLOT( deviceActive( const QString& mac, bool connected  ) ) );
+        connect( localDevice, SIGNAL( available( const QString&, bool ) ),
+                 this, SLOT( deviceActive( const QString& , bool ) ) );
 
         //Load all icons needed
 
         offPix = Resource::loadPixmap( "editdelete" );
         onPix = Resource::loadPixmap( "installed" );
 
         QPalette pal = this->palette();
         QColor col = pal.color( QPalette::Active, QColorGroup::Background );
         pal.setColor( QPalette::Active, QColorGroup::Button, col );
         pal.setColor( QPalette::Inactive, QColorGroup::Button, col );
         pal.setColor( QPalette::Normal, QColorGroup::Button, col );
         pal.setColor( QPalette::Disabled, QColorGroup::Button, col );
         this->setPalette( pal );
 
         setCaption( tr( "Bluetooth Manager" ) );
 
         readConfig();
         initGui();
 
         //TESTING
         ListView2->setRootIsDecorated(true);
 
         BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" );
         topLV2->setPixmap( 1, onPix );
         (void) new BTListItem( topLV2, "Serial" ,"", "service" );
         (void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
     }
 
 
     /**
      * Reads all options from the config file
      */
     void BlueBase::readConfig() {
 
         Config cfg( "bluetoothmanager" );
         cfg.setGroup( "bluezsettings" );
 
 
         deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with
         defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak
         useEncryption = cfg.readNumEntry( "useEncryption" , 1 );
         enableAuthentification = cfg.readNumEntry( "enableAuthentification" , 1 );
         enablePagescan = cfg.readNumEntry( "enablePagescan" , 1 );
         enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 );
 
     }
 
     /**
      * Writes all options to the config file
      */
     void BlueBase::writeConfig() {
 
 
         Config cfg( "bluetoothmanager" );
         cfg.setGroup( "bluezsettings" );
 
         cfg.writeEntry( "name" , deviceName );
         cfg.writeEntryCrypt( "passkey" , defaultPasskey );
         cfg.writeEntry( "useEncryption" , useEncryption );
         cfg.writeEntry( "enableAuthentification" , enableAuthentification );
         cfg.writeEntry( "enablePagescan" , enablePagescan );
         cfg.writeEntry( "enableInquiryscan" , enableInquiryscan );
 }
 
 
     /**
      * Read the list of allready known devices
      *
      */
     void BlueBase::readSavedDevices() {
 
         QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>;
 
         QDir deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/");
         // list of .conf files
         QStringList devicesFileList = deviceListSave.entryList();
 
         // cut .conf of to get the mac and also read the name entry in it.
 
         for ( QStringList::Iterator it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) {
 
             QString name;
             QString mac;
             qDebug((*it).latin1() );
             Config conf((*it));
             conf.setGroup("Info");
             name = conf.readEntry("name", "Error");
             qDebug("MAC: " + mac);
             qDebug("NAME: " + name);
             RemoteDevice currentDevice = RemoteDevice( mac , name  );
             loadedDevices->append( &currentDevice );
         }
         addSearchedDevices( *loadedDevices );
     }
 
     /**
      * Write the list of allready known devices
      *
      */
     void BlueBase::writeSavedDevices() {
 
         QListViewItemIterator it( ListView2 );
 
         for ( ; it.current(); ++it ) {
 
             // seperate config file for each device, to store more information in future.
 // TO FIX: BTLISTITEM!!!
 
             //  Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem)it.current())->mac()) + ".conf", Config::File );
             // conf.setGroup( "Info" );
             //  conf.writeEntry( "name", it.current()->name() );
         }
     }
 
 
     /**
      * Set up the gui
      */
     void BlueBase::initGui() {
 
         StatusLabel->setText( getStatus() ); // maybe move it to getStatus()
 
         cryptCheckBox->setChecked( useEncryption );
         authCheckBox->setChecked( enableAuthentification );
         pagescanCheckBox->setChecked( enablePagescan );
         inquiryscanCheckBox->setChecked( enableInquiryscan );
         deviceNameLine->setText( deviceName );
         passkeyLine->setText( defaultPasskey );
         // set info tab
         setInfo();
     }
 
 
     /**
      * Get the status informations and returns it
      * @return QString the status informations gathered
      */
     QString BlueBase::getStatus(){
 
         QString infoString = tr( "<b>Device name : </b> Ipaq" );
         infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
         infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" );
 
         return (infoString);
     }
 
 
     /**
      * Read the current values from the gui and invoke writeConfig()
      */
     void BlueBase::applyConfigChanges() {
 
         deviceName =  deviceNameLine->text();
         defaultPasskey = passkeyLine->text();
         useEncryption = cryptCheckBox->isChecked();
         enableAuthentification = authCheckBox->isChecked();
         enablePagescan = pagescanCheckBox->isChecked();
         enableInquiryscan = inquiryscanCheckBox->isChecked();
 
         writeConfig();
 
         QMessageBox*  box = new QMessageBox( this, "Test" );
         box->setText( tr( "Changes applied" ) );
         box->show();
   // falls nötig hcid killhupen - die funktionalität adden
     }
 
 
     /**
      * Add fresh found devices from scan dialog to the listing
      *
      */
     void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
 
         BTListItem * deviceItem;
 
         QListIterator<RemoteDevice> it( newDevices );
 
         for( ; it.current() ; ++it ) {
 
 
             RemoteDevice *dev = it.current();
             deviceItem = new BTListItem( ListView2 , dev->name(), dev->mac(), "device" );
             deviceItem->setExpandable ( true );
 
             // look if device is avail. atm, async
             deviceActive( dev );
 
             // move into the c'tor
             // deviceItem->setMac( dev->mac() );
             // what kind of entry is it.
             //deviceItem->setType( "device");
 
             // ggf auch hier?
             addServicesToDevice( deviceItem );
         }
     }
 
 
     /**
      * 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( BTListItem * item, const QPoint & point, int column ) {
 
           QPopupMenu *menu = new QPopupMenu();
 
           int ret=0;
 
           //QSize s = menu->sizeHint ( );
 
           if ( item->type() == "device") {
 
               QPopupMenu *groups = new QPopupMenu();
 
               menu->insertItem( tr("rescan sevices:"),  0);
               menu->insertItem( tr("to group"), groups ,  1);
               menu->insertItem( tr("delete"),  2);
 
 
               ret = menu->exec( point  , 0);
 
               switch(ret) {
               case 0:
                   break;
               case 1:
                   break;
               case 2:
                   // delete childs too
                   delete item;
                   break;
               }
               delete groups;
 
           } else if ( item->type() == "service") {
               menu->insertItem( tr("Test1:"),  0);
               menu->insertItem( tr("connect"), 1);
               menu->insertItem( tr("delete"),  2);
 
               ret = menu->exec( point  , 0);
 
               switch(ret) {
               case 0:
                   break;
               case 1:
                   break;
               case 2:
                   // delete childs too
                   delete item;