update

2 files changed, 11 insertions, 11 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 6328b59..7a92dc3 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -31,87 +31,87 @@
 #include <qvbox.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qdir.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() ) );
-        connect( ListView2, SIGNAL( expanded ( QListViewItem *item ) ),
-                          this, SLOT( addServicesToDevice( QListViewItem *item ) ) );
+        connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
+                          this, SLOT( addServicesToDevice( QListViewItem * ) ) );
         connect( ListView2, SIGNAL( clicked( QListViewItem* )),
-                          this, SLOT( startServiceActionClicked( QListViewItem *item ) ) );
-        connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ),
-                this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) );
+                          this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
+        connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
+                this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
 
 
         //Load all icons needed
 
 
-        QPixmap offPix = Resource::loadPixmap( "editdelete" );
-        QPixmap onPix = Resource::loadPixmap( "installed" );
+        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);
 
         QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes");
-        topLV->setPixmap( 0, offPix );
+        topLV->setPixmap( 1, offPix );
         //  (void) new QListViewItem( topLV, "on" );
         //(void) new QListViewItem( topLV, "off"  );
 
         QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
-        topLV2->setPixmap( 0, onPix );
+        topLV2->setPixmap( 1, onPix );
         (void) new QListViewItem( topLV2, "on"  );
         (void) new QListViewItem( topLV2, "off" );
 
     }
 
 
     /**
      * 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 );
 
     }
 
@@ -236,49 +236,49 @@ namespace OpieTooth {
 
         for( ; it.current() ; ++it ) {
 
 
             RemoteDevice *dev = it.current();
             deviceItem = new QListViewItem( ListView2 , dev->name() );
 
             if ( deviceActive( dev ) ) {
                 deviceItem->setPixmap( 1 , onPix );
             } else {
                 deviceItem->setPixmap( 1, offPix );
             }
 
             deviceItem->setText( 3, dev->mac() );
 
             // ggf auch hier?
             addServicesToDevice( deviceItem );
         }
     }
 
 
     /*
      * Action that is toggled on entrys on click
      */
-    void BlueBase::startServiceActionClicked( QListViewItem * item ) {
+    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 ) {
 
 
     }
 
     /*
      * Search and display avail. services for a device (on expand from device listing)
      *
      */
     void BlueBase::addServicesToDevice( QListViewItem * item ) {
 
         qDebug("addServicesToDevice");
         // row of mac adress
         RemoteDevice *device = new RemoteDevice(item->text(3),  item->text(0));
 
         deviceList.insert( item->text(3) ,  item );
 
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index ec8df82..9520e73 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -80,49 +80,49 @@ namespace OpieTooth {
 
         //ListView1->addColumn( tr( "Add" ) );
         ListView1->addColumn( tr( "Add Device" ) );
         //ListView1->addColumn( tr( "Type" ) );
 
         Layout11->addWidget( ListView1);
         Layout11->addWidget(progress);
         Layout11->addWidget( buttonFrame);
 
         localDevice = new Manager( "hci0" );
 
         connect( StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) );
         connect( StopButton, SIGNAL( clicked() ),  this,  SLOT( stopSearch() ) );
         connect( localDevice, SIGNAL( foundDevices( const QString& , RemoteDevice::ValueList ) ),
                  this, SLOT(fillList(const QString& , RemoteDevice::ValueList ) ) ) ;
         //     connect( this, SIGNAL( accept() ), this, SLOT( emitToManager() ));
         progressStat = 0;
     }
 
 // hack, make cleaner later
     void ScanDialog::progressTimer() {
 
         progressStat++;
             if (progressStat++ < 20) {
-                QTimer::singleShot( 1000, this, SLOT(progressTimer() ) );
+                QTimer::singleShot( 2000, this, SLOT(progressTimer() ) );
             }
             progress->setProgress(progressStat++);
 
     }
 
     void ScanDialog::accept() {
         emitToManager();
         QDialog::accept();
     }
 
 
     void ScanDialog::startSearch() {
         progress->setProgress(0);
         progressStat = 0;
 
         QCheckListItem  *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox );
         deviceItem2->setText(1, "BLAH" );
 
         progressTimer();
         // when finished, it emmite foundDevices()
         // checken ob initialisiert , qcop ans applet.
         localDevice->searchDevices();
 
     }