| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 40 |
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 @@ -468,7 +468,4 @@ void BlueBase::addConnectedDevices() { void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) { - // clear the ListView first - ListView4->clear(); - QValueList<OpieTooth::ConnectionState>::Iterator it; BTConnectionItem * connectionItem; @@ -477,12 +474,41 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) 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") ); |