- Connection -> ConnectionState

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

11 files changed, 109 insertions, 148 deletions

diff --git a/noncore/net/opietooth/lib/connection.cpp b/noncore/net/opietooth/lib/connection.cpp
index 1f9baaf..ef7d925 100644
--- a/noncore/net/opietooth/lib/connection.cpp
+++ b/noncore/net/opietooth/lib/connection.cpp
@@ -4,5 +4,5 @@
 using namespace OpieTooth;
 
-Connection::Connection() {
+ConnectionState::ConnectionState() {
     m_direction = Incoming;
     m_handle = -1;
@@ -11,10 +11,10 @@ Connection::Connection() {
 };
 
-Connection::Connection( const Connection& con1 ) {
+ConnectionState::ConnectionState( const ConnectionState& con1 ) {
     (*this) = con1;
 }
 
 
-Connection::Connection( bool in,
+ConnectionState::ConnectionState( bool in,
                         const QString& conType,
                         const QString& mac,
@@ -31,53 +31,53 @@ Connection::Connection( bool in,
 }
 
-void Connection::setDirection( bool incoming ) {
+void ConnectionState::setDirection( bool incoming ) {
     m_direction = incoming;
 }
 
-bool Connection::direction() const {
+bool ConnectionState::direction() const {
     return m_direction;
 }
 
-void Connection::setConnectionMode( const QString& conType ) {
+void ConnectionState::setConnectionMode( const QString& conType ) {
     m_contype = conType;
 }
 
-QString Connection::connectionMode() const {
+QString ConnectionState::connectionMode() const {
     return m_contype;
 }
 
-void Connection::setMac( const QString& mac ) {
+void ConnectionState::setMac( const QString& mac ) {
     m_mac = mac;
 }
 
-QString Connection::mac() const{
+QString ConnectionState::mac() const{
     return m_mac;
 }
 
-void Connection::setHandle( int handle ) {
+void ConnectionState::setHandle( int handle ) {
     m_handle = handle;
 }
 
-int Connection::handle() const{
+int ConnectionState::handle() const{
     return m_handle;
 }
 
-void Connection::setState( int state ) {
+void ConnectionState::setState( int state ) {
     m_state = state;
 }
 
-int Connection::state()const {
+int ConnectionState::state()const {
     return m_state;
 }
 
-void Connection::setLinkMode( int linkMode ) {
+void ConnectionState::setLinkMode( int linkMode ) {
     m_linkMode = linkMode;
 }
 
-int Connection::linkMode()const{
+int ConnectionState::linkMode()const{
     return m_linkMode;
 }
 
-Connection &Connection::operator=( const Connection& con1 ) {
+ConnectionState &ConnectionState::operator=( const ConnectionState& con1 ) {
     m_direction = con1.m_direction;
     m_contype = con1.m_contype;
diff --git a/noncore/net/opietooth/lib/connection.h b/noncore/net/opietooth/lib/connection.h
index 37090ce..76e5dad 100644
--- a/noncore/net/opietooth/lib/connection.h
+++ b/noncore/net/opietooth/lib/connection.h
@@ -18,5 +18,5 @@ namespace OpieTooth {
      */
 
-    class Connection {
+    class ConnectionState {
     public:
         /**
@@ -24,10 +24,10 @@ namespace OpieTooth {
          * Connections
          */
-        typedef QValueList<Connection> ValueList;
+        typedef QValueList<ConnectionState> ValueList;
 
         /**
          * Copy c'tor.
          */
-        Connection( const Connection& );
+        ConnectionState( const ConnectionState& );
 
         /**
@@ -45,5 +45,5 @@ namespace OpieTooth {
          *
          */
-        Connection( bool in,
+        ConnectionState( bool in,
                     const QString& conType,
                     const QString& mac,
@@ -56,5 +56,5 @@ namespace OpieTooth {
          * QValueList needs this c'tor.
          */
-        Connection();
+        ConnectionState();
 
         /**
@@ -132,9 +132,9 @@ namespace OpieTooth {
          * copy c'tor
          */
-        Connection &operator=( const Connection& );
+        ConnectionState &operator=( const ConnectionState& );
 
     private:
-        class ConnectionPrivate;
-        ConnectionPrivate *d;
+        class ConnectionStatePrivate;
+        ConnectionStatePrivate *d;
         bool m_direction : 1;
         QString m_contype;
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index e07f9da..1281116 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -255,5 +255,5 @@ void Manager::searchConnections() {
 
     if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-        Connection::ValueList list;
+        ConnectionState::ValueList list;
         emit connections( list  );
         delete proc;
@@ -262,5 +262,5 @@ void Manager::searchConnections() {
 void Manager::slotConnectionExited( OProcess* /*proc*/ ) {
     qWarning("exited");
-    Connection::ValueList list;
+    ConnectionState::ValueList list;
     list = parseConnections( m_hcitoolCon );
     emit connections(list );
@@ -271,6 +271,6 @@ void Manager::slotConnectionOutput(OProcess* proc, char* cha, int len) {
     delete proc;
 }
-Connection::ValueList Manager::parseConnections( const QString& out ) {
-    Connection::ValueList list2;
+ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
+    ConnectionState::ValueList list2;
     QStringList list = QStringList::split('\n',  out );
     QStringList::Iterator it;
@@ -287,5 +287,5 @@ Connection::ValueList Manager::parseConnections( const QString& out ) {
         qWarning("7: %s", value[7].latin1() );
         qWarning("8: %s", value[8].latin1() );
-        Connection con;
+        ConnectionState con;
         con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming );
         con.setConnectionMode( value[1] );
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h
index b32327c..0ebe1b3 100644
--- a/noncore/net/opietooth/lib/manager.h
+++ b/noncore/net/opietooth/lib/manager.h
@@ -138,5 +138,5 @@ namespace OpieTooth {
         void foundServices( const QString& device, Services::ValueList );
         void foundDevices( const QString& device, RemoteDevice::ValueList );
-        void connections( Connection::ValueList );
+        void connections( ConnectionState::ValueList );
 
 private slots:
@@ -154,5 +154,5 @@ private slots:
         Services::ValueList parseSDPOutput( const QString& );
         RemoteDevice::ValueList parseHCIOutput( const QString& );
-        Connection::ValueList parseConnections( const QString& );
+        ConnectionState::ValueList parseConnections( const QString& );
         OProcess *m_hcitool;
         OProcess *m_sdp; // not only one
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
@@ -45,4 +45,6 @@
 #include <services.h>
 
+#include "btconnectionitem.h"
+
 using namespace OpieTooth;
 
@@ -88,8 +90,11 @@ using namespace OpieTooth;
         ListView2->setRootIsDecorated(true);
 
-        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 );
 
         writeToHciConfig();
@@ -185,11 +190,17 @@ using namespace OpieTooth;
     void BlueBase::writeSavedDevices() {
         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() );
         }
     }
@@ -246,9 +257,10 @@ using namespace OpieTooth;
      */
     void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
-        BTListItem * deviceItem;
+        BTDeviceItem * deviceItem;
         QValueList<RemoteDevice>::ConstIterator it;
 
         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 );
 
@@ -327,8 +339,8 @@ 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 );
         // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
@@ -345,26 +357,29 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         qDebug("fill services list");
 
-        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;
 
         if (!servicesList.isEmpty() ) {
             // add services
             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() ) );
             }
         } 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 );
     }
 
@@ -379,15 +394,17 @@ 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;
 
         if ( !connectionList.isEmpty() ) {
 
             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 );
         }
 
@@ -401,4 +418,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
     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() );
     }
@@ -412,13 +430,12 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         qDebug("deviceActive slot");
 
-        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();
-            }
-        }
 
         if ( connected ) {
@@ -427,4 +444,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
             deviceItem->setPixmap( 1, m_offPix );
         }
+	m_deviceList.remove( it );
     }
 
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 73fac97..a8f4fe4 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -11,5 +11,8 @@
 
 #include "bluetoothbase.h"
-#include "btlistitem.h"
+
+#include "btserviceitem.h"
+#include "btdeviceitem.h"
+
 #include "bticonloader.h"
 
@@ -52,5 +55,5 @@ namespace OpieTooth {
         void setInfo();
         Manager *m_localDevice;
-        QMap<QString,BTListItem*> m_deviceList;
+        QMap<QString,BTDeviceItem*> m_deviceList;
 
         void deviceActive( const RemoteDevice &device );
@@ -70,8 +73,8 @@ namespace OpieTooth {
 	private slots:
         void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
-        void addServicesToDevice( BTListItem *item );
+        void addServicesToDevice( BTDeviceItem *item );
         void addServicesToDevice( const QString& device, Services::ValueList );
         void addConnectedDevices();
-        void addConnectedDevices( Connection::ValueList );
+        void addConnectedDevices( ConnectionState::ValueList );
         void startServiceActionClicked( QListViewItem *item );
         void startServiceActionHold( QListViewItem *, const QPoint &, int );
diff --git a/noncore/net/opietooth/manager/btlistitem.cpp b/noncore/net/opietooth/manager/btlistitem.cpp
index 82e7c00..36816f8 100644
--- a/noncore/net/opietooth/manager/btlistitem.cpp
+++ b/noncore/net/opietooth/manager/btlistitem.cpp
@@ -2,60 +2,10 @@
 #include "btlistitem.h"
 
-namespace OpieTooth {
+using namespace OpieTooth;
 
 
-    BTListItem::BTListItem( QListView * parent  ) : QListViewItem( parent ) {
-    }
+BTListItem::BTListItem( QListView * parent  ) : QListViewItem( parent ) {
+}
 
-    BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) {
-    }
-
-
-    // name, and then mac and then servicetype
-    BTListItem::BTListItem( QListView * parent,  const QString &name , const QString& mac, const QString& type   )
-        : QListViewItem( parent, name ){
-
-        m_name = name;
-        m_mac = mac;
-        m_type = type;
-
-    }
-
-    BTListItem::BTListItem( QListViewItem * parent , const QString& name, const QString& mac, const QString& type   )
-        : QListViewItem( parent, name ){
-
-        m_name = name;
-        m_mac = mac;
-        m_type = type;
-    }
-
-
-    void BTListItem::setMac( const QString& mac ) {
-        m_mac = mac;
-    }
-
-    QString BTListItem::mac() const {
-        return m_mac;
-    }
-
-    void BTListItem::setName( const QString& name ) {
-        m_name = name;
-    }
-
-    QString BTListItem::name() const {
-        return m_name;
-    }
-
-    void BTListItem::setType( const QString& type ) {
-        m_type = type;
-    }
-
-    QString BTListItem::type() const {
-        return m_type;
-    }
-
-
-    BTListItem::~BTListItem() {
-    }
-
-};
+BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) {
+}
diff --git a/noncore/net/opietooth/manager/btlistitem.h b/noncore/net/opietooth/manager/btlistitem.h
index d7ce03b..6b529d1 100644
--- a/noncore/net/opietooth/manager/btlistitem.h
+++ b/noncore/net/opietooth/manager/btlistitem.h
@@ -7,25 +7,10 @@ namespace OpieTooth {
 
     class BTListItem : public QListViewItem {
-
     public:
+        enum Types { Device =0, Service, Connection };
         BTListItem( QListView * parent  );
         BTListItem( QListViewItem * parent );
-
-        // name, and then mac and then servicetype
-        BTListItem( QListView * ,  const QString&, const QString&, const QString&  );
-        BTListItem( QListViewItem * parent , const QString&, const QString& , const QString& );
-        ~BTListItem();
-
-        void setMac( const QString& );
-        QString mac()const;
-        void setName( const QString& );
-        QString name()const;
-        void setType( const QString& );
-        QString type()const;
-    private:
-        QString m_name;
-        QString m_mac;
-        QString m_type;
-
+        virtual QString type() const = 0;
+        virtual int typeId() const = 0;
     };
 };
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 4f0ea60..d36b8df2 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -2,6 +2,6 @@ TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG          = qt warn_on release
-HEADERS         = popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h
-SOURCES         = popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp
+HEADERS         = btconnectionitem.h btdeviceitem.h btserviceitem.h stdpopups.h popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h
+SOURCES         = btconnectionitem.cpp btdeviceitem.cpp btserviceitem.h stdpopups.cpp popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
index 2a6dad0..d8404d6 100644
--- a/noncore/net/opietooth/manager/popuphelper.cpp
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -1,3 +1,5 @@
 
+#include "stdpopups.h"
+
 #include "popuphelper.h"
 
@@ -13,13 +15,14 @@ void PopupHelper::insert( int id, popupFactory fact ) {
     m_map.insert(id, fact );
 }
-QPopupMenu* PopupHelper::find( int id ) {
+QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) {
     FactoryMap::Iterator it = m_map.find(id );
     if ( it != m_map.end() ) {
         popupFactory fact = it.data();
-        return (*fact)();
+        return (*fact)(ser,  item);
     }
     return 0l;
 }
 void PopupHelper::init() {
-
+    insert( 1,  newRfcComPopup );
+    insert(2, newObexPushPopup );
 }
diff --git a/noncore/net/opietooth/manager/popuphelper.h b/noncore/net/opietooth/manager/popuphelper.h
index 7485f71..7541ac5 100644
--- a/noncore/net/opietooth/manager/popuphelper.h
+++ b/noncore/net/opietooth/manager/popuphelper.h
@@ -3,10 +3,12 @@
 #define OPIE_TOOTH_POPUP_HELPER
 
+#include <qlistview.h>
 #include <qpopupmenu.h>
 #include <qmap.h>
 
+#include <services.h>
 
 namespace OpieTooth {
-    typedef QPopupMenu* (*popupFactory)(void);
+    typedef QPopupMenu* (*popupFactory)(const Services&, QListViewItem*);
     typedef QMap<int,  popupFactory> FactoryMap;
     class PopupHelper {
@@ -15,5 +17,5 @@ namespace OpieTooth {
         ~PopupHelper();
         void insert( int id, popupFactory fact );
-        QPopupMenu* find( int id );
+        QPopupMenu* find( int id, const Services&, QListViewItem* );
     private:
         void init();