remove previous found services on rescan

1 files changed, 16 insertions, 4 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 5c5f069..8b15c4f 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -45,2 +45,3 @@
 #include <qtimer.h>
+#include <qlist.h>
 
@@ -387,4 +388,15 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
 
+    // remove previous entries
+    QList<QListViewItem> tempList;
+    tempList.setAutoDelete( true );
+    QListViewItem * child = deviceItem->firstChild();
+    while( child ) {
+        tempList.append( child );
+        child = child->nextSibling();
+    }
+    tempList.clear();
+
     QValueList<OpieTooth::Services>::Iterator it2;
-    BTServiceItem * serviceItem;
+    BTServiceItem* serviceItem;
+
 
@@ -395,3 +407,3 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
         for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
-            serviceItem = new BTServiceItem( deviceItem  , (*it2)  );
+            serviceItem = new BTServiceItem( deviceItem, (*it2)  );
             list = (*it2).classIdList();
@@ -407,3 +419,3 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
         Services s1;
-        s1.setServiceName( tr("no serives found") );
+        s1.setServiceName( tr("no services found") );
         serviceItem = new BTServiceItem( deviceItem, s1 );
@@ -448,3 +460,3 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
     //  recall connection search after some time
-    QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) );
+    QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) );
 }