- Connection -> ConnectionState

 - Factory adjustments
 - Factory function
 - Refactoring the QListViewItem derived class
     BTListItem
        |
    	- BTDeviceItem for RemoteDevices
	|
	- BTServiceItem for Services
	|
	- BTConnectionItem for ConnectionState
 - misc bug fixes

1 files changed, 51 insertions, 33 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 85c6717..9cfeaa2 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -46,2 +46,4 @@
 
+#include "btconnectionitem.h"
+
 using namespace OpieTooth;
@@ -89,6 +91,9 @@ using namespace OpieTooth;
 
-        BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" );
+        BTDeviceItem *topLV2 = new BTDeviceItem( ListView2, RemoteDevice("xx:", "Siemens S45" ) );
         topLV2->setPixmap( 1, m_onPix );
-        (void) new BTListItem( topLV2, "Serial" ,"", "service" );
-        (void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
+	Services s1;
+	s1.setServiceName( "Serial" );
+        (void) new BTServiceItem( topLV2, s1 );
+	s1.setServiceName( "BlueNic" );
+        (void) new BTServiceItem( topLV2, s1 );
 
@@ -186,9 +191,15 @@ using namespace OpieTooth;
         QListViewItemIterator it( ListView2 );
+	BTListItem* item;
+	BTDeviceItem* device;
 
         for ( ; it.current(); ++it ) {
+	    item = (BTListItem*)it.current();
+	    if(item->typeId() != BTListItem::Device )
+		continue;
+	    device = (BTDeviceItem*)item;
             // seperate config file for each device, to store more information in future.
-            qDebug( "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf");
-            Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf", Config::File );
+            qDebug( "/Settings/bluetooth/" + device->mac() + ".conf");
+            Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + device->mac() + ".conf", Config::File );
             conf.setGroup( "Info" );
-            conf.writeEntry( "name", ((BTListItem*)it.current())->name() );
+            conf.writeEntry( "name", device->name() );
         }
@@ -247,3 +258,3 @@ using namespace OpieTooth;
     void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
-        BTListItem * deviceItem;
+        BTDeviceItem * deviceItem;
         QValueList<RemoteDevice>::ConstIterator it;
@@ -251,3 +262,4 @@ using namespace OpieTooth;
         for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
-            deviceItem = new BTListItem( ListView2 , (*it).name(), (*it).mac(), "device" );
+
+            deviceItem = new BTDeviceItem( ListView2 , (*it) );
             deviceItem->setExpandable ( true );
@@ -328,6 +340,6 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
      */
-    void BlueBase::addServicesToDevice( BTListItem * item ) {
+    void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
         qDebug("addServicesToDevice");
         // row of mac adress text(3)
-        RemoteDevice device( item->mac(),  item->name() );
+        RemoteDevice device = item->remoteDevice();
         m_deviceList.insert( item->mac() ,  item );
@@ -346,14 +358,13 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
-        QMap<QString,BTListItem*>::Iterator it;
-        BTListItem* deviceItem = 0;
+        QMap<QString,BTDeviceItem*>::Iterator it;
+        BTDeviceItem* deviceItem = 0;
 
         // get the right devices which requested the search
-        for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) {
-            if ( it.key() == device ) {
-                deviceItem = it.data();
-            }
-        }
+	it = m_deviceList.find( device );
+	if( it == m_deviceList.end() )
+	    return;
+        deviceItem = it.data();
 
         QValueList<OpieTooth::Services>::Iterator it2;
-        BTListItem * serviceItem;
+        BTServiceItem * serviceItem;
 
@@ -362,3 +373,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
             for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
-                serviceItem = new BTListItem( deviceItem  ,  (*it2).serviceName() , "" , "service"  );
+                serviceItem = new BTServiceItem( deviceItem  , (*it2)  );
                 serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( (*it2).classIdList() ) );
@@ -366,4 +377,8 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         } else {
-            serviceItem = new BTListItem( deviceItem  , tr("no services found"), "" , "service"  );
+    	    Services s1;
+	    s1.setServiceName( tr("no serives found") );
+            serviceItem = new BTServiceItem( deviceItem, s1 );
         }
+	// now remove them from the  list
+	m_deviceList.remove( it );
     }
@@ -380,5 +395,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
-    void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) {
-        QValueList<OpieTooth::Connection>::Iterator it;
-        BTListItem * connectionItem;
+    void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) {
+        QValueList<OpieTooth::ConnectionState>::Iterator it;
+        BTConnectionItem * connectionItem;
 
@@ -387,6 +402,8 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
             for (it = connectionList.begin(); it != connectionList.end(); ++it) {
-                connectionItem = new BTListItem( ListView4 , (*it).mac() , (*it).mac() , "connection" );
+                connectionItem = new BTConnectionItem( ListView4 , (*it) );
             }
         } else {
-            connectionItem = new BTListItem( ListView4 , tr("No connections found"), "", "connection" );
+	    ConnectionState con;
+	    con.setMac( tr("No connections found") );
+            connectionItem = new BTConnectionItem( ListView4 , con );
         }
@@ -402,2 +419,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         // 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() );
@@ -413,11 +431,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
-        QMap<QString,BTListItem*>::Iterator it;
-        BTListItem* deviceItem = 0;
+        QMap<QString,BTDeviceItem*>::Iterator it;
+
+	it = m_deviceList.find( device );
+	if( it == m_deviceList.end() )
+	    return;
+
+        BTDeviceItem* deviceItem = it.data();
 
-        // get the right devices which requested the search
-        for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) {
-            if ( it.key() == device ) {
-                deviceItem = it.data();
-            }
-        }
 
@@ -428,2 +445,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         }
+	m_deviceList.remove( it );
     }