autopopulate services list, use odebug where appropriate instead of owarn

2 files changed, 25 insertions, 28 deletions

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
@@ -61,3 +61,2 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
 {
-
     m_localDevice = new Manager( "hci0" );
@@ -68,5 +67,3 @@ 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*)),
@@ -84,3 +81,2 @@ BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
 
-
     // let hold be rightButtonClicked()
@@ -108,10 +104,8 @@ 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() ) );
 }
@@ -173,3 +167,3 @@ void BlueBase::writeToHciConfig()
 /**
- * Read the list of allready known devices
+ * Read the list of already known devices
  */
@@ -187,3 +181,3 @@ void BlueBase::readSavedDevices()
 /**
- * Write the list of allready known devices
+ * Write the list of already known devices
  */
@@ -297,5 +291,2 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
         deviceActive( (*it) );
-
-        // ggf auch hier?
-        addServicesToDevice( deviceItem );
     }
@@ -400,2 +391,13 @@ 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();
+    }
+}
+
 /**
@@ -406,3 +408,3 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item )
 {
-    odebug << "addServicesToDevice" << oendl;
+    odebug << "BlueBase::addServicesToDevice" << oendl;
     // row of mac adress text(3)
@@ -416,4 +418,2 @@ 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
@@ -423,3 +423,3 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
 {
-    odebug << "fill services list" << oendl;
+    odebug << "BlueBase::fill services list" << oendl;
 
@@ -478,6 +478,2 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
 
-
-
-
-
 void BlueBase::addSignalStrength()
@@ -514,2 +510,3 @@ void BlueBase::addConnectedDevices()
     m_localDevice->searchConnections();
+    QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
 }
@@ -617,3 +614,2 @@ void BlueBase::deviceActive( const QString& device, bool connected  )
 
-
     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
@@ -42,4 +42,4 @@ namespace OpieTooth {
         ~BlueBase();
-        
-               static QString appName() { return QString::fromLatin1("bluetooth-manager"); }
+
+       static QString appName() { return QString::fromLatin1("bluetooth-manager"); }
 
@@ -50,4 +50,4 @@ namespace OpieTooth {
         void startScan();
-    
-    
+
+
     private:
@@ -84,2 +84,3 @@ namespace OpieTooth {
         void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
+        void addServicesToDevices();
         void addServicesToDevice( BTDeviceItem *item );