summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-19 20:36:50 (UTC)
committer harlekin <harlekin>2002-06-19 20:36:50 (UTC)
commit6afbacb8353e539b9e6d279d20220445614b42c2 (patch) (side-by-side diff)
tree54f0c631c596c743e793cd25ae548c5bc17827e0
parentdd53a68602f625e02188411d4469f2ec13e1dae8 (diff)
downloadopie-6afbacb8353e539b9e6d279d20220445614b42c2.zip
opie-6afbacb8353e539b9e6d279d20220445614b42c2.tar.gz
opie-6afbacb8353e539b9e6d279d20220445614b42c2.tar.bz2
update
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp76
-rw-r--r--noncore/net/opietooth/manager/bluebase.h5
2 files changed, 60 insertions, 21 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 22b16d2..c7e1fe4 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -50,11 +50,13 @@ namespace OpieTooth {
+ localDevice = new Manager( "hci0" );
- QObject::connect( (QObject*)PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
- QObject::connect( (QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
- QObject::connect( (QObject*)ListView2, SIGNAL( expanded( QListViewItem * item ) ),
+ QObject::connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
+ QObject::connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
+ QObject::connect( ListView2, SIGNAL( expanded( QListViewItem * item ) ),
this, SLOT( addServicesToDevice( QListViewItem * item ) ) );
- QObject::connect( (QObject*)ListView2, SIGNAL( clicked( QListViewItem * )),
+ QObject::connect( ListView2, SIGNAL( clicked( QListViewItem * )),
this, SLOT( startServiceActionClicked( QListViewItem * item ) ) );
+ connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ),
+ this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) );
- //
// QObject::connect( (QObject*) Manager, SIGNAL (foundServices( const QString& device, Services::ValueList ), this () ) );
@@ -142,3 +144,3 @@ namespace OpieTooth {
- Config deviceList( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
+ Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
@@ -159,14 +161,7 @@ namespace OpieTooth {
- // one top conf file with all decices (by mac adress)
- Config deviceList( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
-
for ( ; it.current(); ++it ) {
- // MAC adress as group
- deviceList.setGroup( it.current()->text(1) );
- deviceList.writeEntry("inList", 1);
-
// seperate config file for each device, to store more information in future.
- Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(1)) + ".conf", Config::File );
+ Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(3)) + ".conf", Config::File );
conf.setGroup("Info");
@@ -249,8 +244,8 @@ namespace OpieTooth {
if (deviceActive( dev ) ) {
- deviceItem->setPixmap(0, onPix);
+ deviceItem->setPixmap( 1 , onPix );
} else {
- deviceItem->setPixmap(0, offPix);
+ deviceItem->setPixmap( 1, offPix );
}
- deviceItem->setText(1, dev->mac() );
+ deviceItem->setText( 3, dev->mac() );
}
@@ -280,6 +275,10 @@ namespace OpieTooth {
void BlueBase::addServicesToDevice( QListViewItem * item ) {
+
// row of mac adress
- RemoteDevice *device = new RemoteDevice(item->text(1), item->text(0));
- //dann nen manager und darauf dann searchServises, das liefert nen signal, das wieder connected
- // werden muss.
+ RemoteDevice *device = new RemoteDevice(item->text(3), item->text(0));
+
+ deviceList.insert( item->text(3) , item );
+
+// and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
+ localDevice->searchServices( *device );
@@ -288,2 +287,37 @@ namespace OpieTooth {
+
+ /**
+ * Overloaded. This one it the one that is connected to the foundServices signal
+ * @param device the mac address of the remote device
+ * @param servicesList the list with the service the device has.
+ */
+ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) {
+
+ qDebug("fill services list");
+
+
+ QMap<QString,QListViewItem*>::Iterator it;
+
+ QListViewItem* deviceItem;
+
+ for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
+ if (it.key() == device ) {
+ deviceItem = it.data();
+ }
+ }
+
+ QValueList<OpieTooth::Services>::Iterator it2;
+
+
+
+ QListViewItem * serviceItem;
+
+ for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
+ it2.serviceName()
+ serviceItem = new QListViewItem( deviceItem , it2.serviceName() );
+ }
+
+ }
+
+
/*
@@ -292,3 +326,2 @@ namespace OpieTooth {
bool BlueBase::deviceActive( RemoteDevice *device ) {
-
return true;
@@ -296,2 +329,3 @@ namespace OpieTooth {
+
/**
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 7b03f82..dcb7681 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -13,3 +13,5 @@
+
#include <remotedevice.h>
+#include <manager.h>
@@ -50,2 +52,4 @@ namespace OpieTooth {
void setInfo();
+ Manager *localDevice;
+ QMap<QString,QListViewItem*> deviceList;
@@ -66,2 +70,3 @@ namespace OpieTooth {
void addServicesToDevice( QListViewItem * item );
+ void addServicesToDevice( const QString& device, Services::ValueList );
void startServiceActionClicked( QListViewItem * item );