autopopulate services list, use odebug where appropriate instead of owarn

3 files changed, 54 insertions, 57 deletions

diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 53122c1..83100f1 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -14,5 +14,5 @@ Manager::Manager( const QString& dev )
   : QObject()
 {
-    owarn << "created" << oendl;
+    odebug << "Manager: created" << oendl;
     m_device = dev;
     m_hcitool = 0;
@@ -59,5 +59,5 @@ void Manager::isAvailable( Device* /*dev*/ ){
 }
 void Manager::searchDevices( const QString& device ){
-    owarn << "search devices" << oendl;
+    odebug << "Manager: search devices" << oendl;
     OProcess* hcitool = new OProcess();
     hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
@@ -68,5 +68,5 @@ void Manager::searchDevices( const QString& device ){
              this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) );
     if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        owarn << "could not start" << oendl;
+        odebug << "Manager: could not start" << oendl;
         RemoteDevice::ValueList list;
         emit foundDevices( device, list );
@@ -109,5 +109,5 @@ void Manager::searchServices( const QString& remDevice ){
     *m_sdp << "sdptool" << "browse" << remDevice;
     m_sdp->setName( remDevice.latin1() );
-    owarn << "search Services for " << remDevice.latin1() << oendl;
+    odebug << "Manager: search Services for " << remDevice.latin1() << oendl;
     connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
             this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) );
@@ -115,5 +115,5 @@ void Manager::searchServices( const QString& remDevice ){
             this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
-        owarn << "could not start sdptool" << oendl;
+        odebug << "Manager: could not start sdptool" << oendl;
         delete m_sdp;
         Services::ValueList list;
@@ -142,5 +142,5 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
 {
     QCString str(ch,  len+1 );
-    owarn << "SDP:" << str.data() << oendl;
+    odebug << "Manager: SDP:" << str.data() << oendl;
     QMap<QString, QString>::Iterator it;
     it = m_out.find(proc->name() );
@@ -155,10 +155,10 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
 void Manager::slotSDPExited( OProcess* proc)
 {
-    owarn << "proc name " << proc->name() << oendl;
+    odebug << "Manager: proc name " << proc->name() << oendl;
     Services::ValueList  list;
     if (proc->normalExit()  ) {
         QMap<QString, QString>::Iterator it = m_out.find( proc->name() );
         if ( it != m_out.end() ) {
-        owarn << "found process" << oendl;
+        odebug << "Manager: found process" << oendl;
             list = parseSDPOutput( it.data() );
             m_out.remove( it );
@@ -170,5 +170,5 @@ void Manager::slotSDPExited( OProcess* proc)
 Services::ValueList Manager::parseSDPOutput( const QString& out ) {
     Services::ValueList list;
-    owarn << "parsing output" << oendl;
+    odebug << "Manager: parsing output" << oendl;
     Parser parser( out );
     list = parser.services();
@@ -177,11 +177,11 @@ Services::ValueList Manager::parseSDPOutput( const QString& out ) {
 
 void Manager::slotHCIExited(OProcess* proc ) {
-    owarn << "process exited" << oendl;
+    odebug << "Manager: process exited" << oendl;
     RemoteDevice::ValueList list;
     if (proc->normalExit() ) {
-        owarn << "normalExit " << proc->name() << oendl;
+        odebug << "Manager: normalExit " << proc->name() << oendl;
         QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
         if (it != m_devices.end() ) {
-            owarn << "!= end ;)" << oendl;
+            odebug << "Manager: != end ;)" << oendl;
             list = parseHCIOutput( it.data() );
             m_devices.remove( it );
@@ -193,11 +193,11 @@ void Manager::slotHCIExited(OProcess* proc ) {
 void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
     QCString str( ch, len+1 );
-    owarn << "hci: " << str.data() << oendl;
+    odebug << "Manager: hci: " << str.data() << oendl;
     QMap<QString, QString>::Iterator it;
     it = m_devices.find( proc->name() );
-    owarn << "proc->name " << proc->name() << oendl;
+    odebug << "Manager: proc->name " << proc->name() << oendl;
     QString string;
     if (it != m_devices.end() ) {
-        owarn << "slotHCIOut " << oendl;
+        odebug << "Manager: slotHCIOut " << oendl;
         string = it.data();
     }
@@ -207,5 +207,5 @@ void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
 }
 RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
-    owarn << "parseHCI " << output.latin1() << oendl;
+    odebug << "Manager: parseHCI " << output.latin1() << oendl;
     RemoteDevice::ValueList list;
     QStringList strList = QStringList::split('\n',  output );
@@ -214,11 +214,11 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
     for ( it = strList.begin(); it != strList.end(); ++it ) {
         str = (*it).stripWhiteSpace();
-        owarn << "OpieTooth " << str.latin1() << oendl;
+        odebug << "Manager: OpieTooth " << str.latin1() << oendl;
         int pos = str.findRev(':' );
         if ( pos > 0 ) {
             QString mac = str.left(17 );
             str.remove( 0,  17 );
-            owarn << "mac " << mac.latin1() << oendl;
-            owarn << "rest: " << str.latin1() << oendl;
+            odebug << "Manager: mac " << mac.latin1() << oendl;
+            odebug << "Manager: rest: " << str.latin1() << oendl;
             RemoteDevice rem( mac , str.stripWhiteSpace() );
             list.append( rem );
@@ -245,5 +245,5 @@ void Manager::connectTo( const QString& mac) {
 
 void Manager::searchConnections() {
-    owarn << "searching connections?" << oendl;
+    odebug << "Manager: searchConnections()" << oendl;
     OProcess* proc = new OProcess();
     m_hcitoolCon = QString::null;
@@ -283,13 +283,13 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
         QString row = (*it).stripWhiteSpace();
         QStringList value = QStringList::split(' ', row );
-        owarn << "0: %s" << value[0].latin1() << oendl;
-        owarn << "1: %s" << value[1].latin1() << oendl;
-        owarn << "2: %s" << value[2].latin1() << oendl;
-        owarn << "3: %s" << value[3].latin1() << oendl;
-        owarn << "4: %s" << value[4].latin1() << oendl;
-        owarn << "5: %s" << value[5].latin1() << oendl;
-        owarn << "6: %s" << value[6].latin1() << oendl;
-        owarn << "7: %s" << value[7].latin1() << oendl;
-        owarn << "8: %s" << value[8].latin1() << oendl;
+        odebug << "Manager: 0: " << value[0].latin1() << oendl;
+        odebug << "Manager: 1: " << value[1].latin1() << oendl;
+        odebug << "Manager: 2: " << value[2].latin1() << oendl;
+        odebug << "Manager: 3: " << value[3].latin1() << oendl;
+        odebug << "Manager: 4: " << value[4].latin1() << oendl;
+        odebug << "Manager: 5: " << value[5].latin1() << oendl;
+        odebug << "Manager: 6: " << value[6].latin1() << oendl;
+        odebug << "Manager: 7: " << value[7].latin1() << oendl;
+        odebug << "Manager: 8: " << value[8].latin1() << oendl;
         ConnectionState con;
         con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming );
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index af1cd23..0649514 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -60,5 +60,4 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
         : BluetoothBase( parent, name, fl )
 {
-
     m_localDevice = new Manager( "hci0" );
 
@@ -67,7 +66,5 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
 
     connect( rfcommBindButton,  SIGNAL( clicked() ),  this,  SLOT( rfcommDialog() ) );
-    // not good since lib is async
-    //       connect( devicesView, SIGNAL( expanded(QListViewItem*) ),
-    //                  this, SLOT( addServicesToDevice(QListViewItem*) ) );
+
     connect( devicesView, SIGNAL( clicked(QListViewItem*)),
              this, SLOT( startServiceActionClicked(QListViewItem*) ) );
@@ -83,5 +80,4 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
              this, SLOT( addSignalStrength(const QString&,const QString&) ) );
 
-
     // let hold be rightButtonClicked()
     QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold);
@@ -107,12 +103,10 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
 
     devicesView->setRootIsDecorated(true);
-
-
+    m_iconLoader = new BTIconLoader();
     writeToHciConfig();
-    // search conncetions
     addConnectedDevices();
-    addSignalStrength();
-    m_iconLoader = new BTIconLoader();
     readSavedDevices();
+    addServicesToDevices();
+    QTimer::singleShot( 3000, this, SLOT( addServicesToDevices() ) );
 }
 
@@ -172,5 +166,5 @@ void BlueBase::writeToHciConfig()
 
 /**
- * Read the list of allready known devices
+ * Read the list of already known devices
  */
 void BlueBase::readSavedDevices()
@@ -186,5 +180,5 @@ void BlueBase::readSavedDevices()
 
 /**
- * Write the list of allready known devices
+ * Write the list of already known devices
  */
 void BlueBase::writeSavedDevices()
@@ -296,7 +290,4 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
         // look if device is avail. atm, async
         deviceActive( (*it) );
-
-        // ggf auch hier?
-        addServicesToDevice( deviceItem );
     }
 }
@@ -399,4 +390,15 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
 
+void BlueBase::addServicesToDevices()
+{
+    odebug << "BlueBase::addServicesToDevices()" << oendl;
+    BTDeviceItem* item = (BTDeviceItem*) devicesView->firstChild();
+    while ( item )
+    {
+        addServicesToDevice( item );
+        item = (BTDeviceItem*) static_cast<QListViewItem*>( item )->nextSibling();
+    }
+}
+
 /**
  * Search and display avail. services for a device (on expand from device listing)
@@ -405,5 +407,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 void BlueBase::addServicesToDevice( BTDeviceItem * item )
 {
-    odebug << "addServicesToDevice" << oendl;
+    odebug << "BlueBase::addServicesToDevice" << oendl;
     // row of mac adress text(3)
     RemoteDevice device = item->remoteDevice();
@@ -415,6 +417,4 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item )
 
 /**
- * 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.
@@ -422,5 +422,5 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item )
 void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList )
 {
-    odebug << "fill services list" << oendl;
+    odebug << "BlueBase::fill services list" << oendl;
 
     QMap<QString,BTDeviceItem*>::Iterator it;
@@ -477,8 +477,4 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
 }
 
-
-
-
-
 void BlueBase::addSignalStrength()
 {
@@ -513,4 +509,5 @@ void BlueBase::addConnectedDevices()
 {
     m_localDevice->searchConnections();
+    QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
 }
 
@@ -616,5 +613,4 @@ void BlueBase::deviceActive( const QString& device, bool connected  )
     BTDeviceItem* deviceItem = it.data();
 
-
     if ( connected )
     {
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index a8ab3db..48883d2 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -41,6 +41,6 @@ namespace OpieTooth {
         BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~BlueBase();
-	
-       static QString appName() { return QString::fromLatin1("bluetooth-manager"); }	
+
+       static QString appName() { return QString::fromLatin1("bluetooth-manager"); }
 
     protected:
@@ -49,6 +49,6 @@ namespace OpieTooth {
     private slots:
         void startScan();
-    
-    
+
+
     private:
         bool find( const RemoteDevice& device );
@@ -83,4 +83,5 @@ namespace OpieTooth {
 	private slots:
         void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
+        void addServicesToDevices();
         void addServicesToDevice( BTDeviceItem *item );
         void addServicesToDevice( const QString& device, Services::ValueList );