| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 20 |
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 @@ -42,8 +42,9 @@ #include <qlistview.h> #include <qdir.h> #include <qpopupmenu.h> #include <qtimer.h> +#include <qlist.h> #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/config.h> @@ -384,17 +385,28 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s if( it == m_deviceList.end() ) return; deviceItem = it.data(); + // 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; + if (!servicesList.isEmpty() ) { // add services QMap<int, QString> list; QMap<int, QString>::Iterator classIt; for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { - serviceItem = new BTServiceItem( deviceItem , (*it2) ); + serviceItem = new BTServiceItem( deviceItem, (*it2) ); list = (*it2).classIdList(); classIt = list.begin(); int classId=0; if ( classIt != list.end() ) { @@ -404,9 +416,9 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) ); } } else { Services s1; - s1.setServiceName( tr("no serives found") ); + s1.setServiceName( tr("no services found") ); serviceItem = new BTServiceItem( deviceItem, s1 ); } // now remove them from the list m_deviceList.remove( it ); @@ -445,9 +457,9 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) connectionItem = new BTConnectionItem( ListView4 , con ); } // recall connection search after some time - QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) ); + QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) ); } /** |