nicer refresh handling for connections

1 files changed, 33 insertions, 7 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 9663b52..b5a09e5 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -446,65 +446,91 @@ void BlueBase::addSignalStrength() {
 void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) {
 
 	QListViewItemIterator it( ListView4 );
 	for ( ; it.current(); ++it ) {
 		if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) {
 			((BTConnectionItem*)it.current() )->setSignalStrength( strength );
 		}
 	}
 }
 
 /**
  * Add the existing connections (pairs) to the connections tab.
  * This one triggers the search
  */
 void BlueBase::addConnectedDevices() {
         m_localDevice->searchConnections();
 }
 
 /**
  * This adds the found connections to the connection tab.
  * @param connectionList the ValueList with all current connections
  */
 void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) {
 
-    // clear the ListView first
-    ListView4->clear();
-
     QValueList<OpieTooth::ConnectionState>::Iterator it;
     BTConnectionItem * connectionItem;
 
     if ( !connectionList.isEmpty() ) {
 
         for (it = connectionList.begin(); it != connectionList.end(); ++it) {
-            connectionItem = new BTConnectionItem( ListView4, (*it) );
 
- 	    if( m_deviceList.find((*it).mac()).data() ) {
+            QListViewItemIterator it2( ListView4 );
+	    bool found = false;
+            for ( ; it2.current(); ++it2 ) {
+	        if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) {
+		    found = true;
+	        }
+	    }
+
+	    if ( found == false ) {
+                 connectionItem = new BTConnectionItem( ListView4, (*it) );
+
+ 	         if( m_deviceList.find((*it).mac()).data() ) {
+	               connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
+                 }
+	    }
 
-	        connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
-             }
 	}
+
+        QListViewItemIterator it2( ListView4 );
+        for ( ; it2.current(); ++it2 ) {
+	    bool found = false;
+    	    for (it = connectionList.begin(); it != connectionList.end(); ++it) {
+                if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() )  {
+			found = true;
+	        }
+            }
+
+	    if ( !found ) {
+		delete it2.current();
+	    }
+
+        }
+
+
     } else {
+        ListView4->clear();
         ConnectionState con;
         con.setMac( tr("No connections found") );
         connectionItem = new BTConnectionItem( ListView4 , con );
     }
 
     //  recall connection search after some time
     QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) );
 }
 
 
 /**
  * Find out if a device can  currently be reached
  * @param device
  */
 void BlueBase::deviceActive( const RemoteDevice &device ) {
     // search by mac, async, gets a signal back
     // We should have a BTDeviceItem there or where does it get added to the map -zecke
     m_localDevice->isAvailable( device.mac() );
 }
 
 
 /**
  * The signal catcher. Set the avail. status on device.
  * @param device - the mac address