summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-19 22:24:52 (UTC)
committer harlekin <harlekin>2002-06-19 22:24:52 (UTC)
commit3cff4da41a61679e0222be190af8a98682f07393 (patch) (side-by-side diff)
tree6b791ffc929c1347826b949935d37e046e8a9930
parent6afbacb8353e539b9e6d279d20220445614b42c2 (diff)
downloadopie-3cff4da41a61679e0222be190af8a98682f07393.zip
opie-3cff4da41a61679e0222be190af8a98682f07393.tar.gz
opie-3cff4da41a61679e0222be190af8a98682f07393.tar.bz2
update
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp21
-rw-r--r--noncore/net/opietooth/manager/bluebase.h2
2 files changed, 13 insertions, 10 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index c7e1fe4..6328b59 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -50,16 +50,15 @@ namespace OpieTooth {
localDevice = new Manager( "hci0" );
- QObject::connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
- QObject::connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
- QObject::connect( ListView2, SIGNAL( expanded( QListViewItem * item ) ),
+ connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
+ connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
+ connect( ListView2, SIGNAL( expanded ( QListViewItem *item ) ),
this, SLOT( addServicesToDevice( QListViewItem * item ) ) );
- QObject::connect( ListView2, SIGNAL( clicked( QListViewItem * )),
+ 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 () ) );
//Load all icons needed
@@ -87,8 +86,8 @@ namespace OpieTooth {
QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes");
topLV->setPixmap( 0, offPix );
- (void) new QListViewItem( topLV, "on" );
- (void) new QListViewItem( topLV, "off" );
+ // (void) new QListViewItem( topLV, "on" );
+ //(void) new QListViewItem( topLV, "off" );
QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
topLV2->setPixmap( 0, onPix );
@@ -248,6 +247,9 @@ namespace OpieTooth {
}
deviceItem->setText( 3, dev->mac() );
+
+ // ggf auch hier?
+ addServicesToDevice( deviceItem );
}
}
@@ -274,6 +276,7 @@ namespace OpieTooth {
*/
void BlueBase::addServicesToDevice( QListViewItem * item ) {
+ qDebug("addServicesToDevice");
// row of mac adress
RemoteDevice *device = new RemoteDevice(item->text(3), item->text(0));
@@ -313,8 +316,8 @@ namespace OpieTooth {
QListViewItem * serviceItem;
for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
- it2.serviceName()
- serviceItem = new QListViewItem( deviceItem , it2.serviceName() );
+// it2.serviceName()
+ serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() );
}
}
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index dcb7681..d20d05c 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -65,7 +65,7 @@ namespace OpieTooth {
QPixmap offPix;
QPixmap onPix;
- private slots:
+ public slots:
void addSearchedDevices( QList<RemoteDevice> &newDevices );
void addServicesToDevice( QListViewItem * item );
void addServicesToDevice( const QString& device, Services::ValueList );