summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp34
1 files changed, 30 insertions, 4 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
@@ -469,5 +469,2 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
469 469
470 // clear the ListView first
471 ListView4->clear();
472
473 QValueList<OpieTooth::ConnectionState>::Iterator it; 470 QValueList<OpieTooth::ConnectionState>::Iterator it;
@@ -478,2 +475,12 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
478 for (it = connectionList.begin(); it != connectionList.end(); ++it) { 475 for (it = connectionList.begin(); it != connectionList.end(); ++it) {
476
477 QListViewItemIterator it2( ListView4 );
478 bool found = false;
479 for ( ; it2.current(); ++it2 ) {
480 if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) {
481 found = true;
482 }
483 }
484
485 if ( found == false ) {
479 connectionItem = new BTConnectionItem( ListView4, (*it) ); 486 connectionItem = new BTConnectionItem( ListView4, (*it) );
@@ -481,3 +488,2 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
481 if( m_deviceList.find((*it).mac()).data() ) { 488 if( m_deviceList.find((*it).mac()).data() ) {
482
483 connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() ); 489 connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
@@ -485,3 +491,23 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
485 } 491 }
492
493 }
494
495 QListViewItemIterator it2( ListView4 );
496 for ( ; it2.current(); ++it2 ) {
497 bool found = false;
498 for (it = connectionList.begin(); it != connectionList.end(); ++it) {
499 if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) {
500 found = true;
501 }
502 }
503
504 if ( !found ) {
505 delete it2.current();
506 }
507
508 }
509
510
486 } else { 511 } else {
512 ListView4->clear();
487 ConnectionState con; 513 ConnectionState con;