-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 29 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 8 |
2 files changed, 20 insertions, 17 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 | |||
@@ -52,12 +52,11 @@ namespace OpieTooth { | |||
52 | 52 | ||
53 | QObject::connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); | 53 | connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); |
54 | QObject::connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); | 54 | connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); |
55 | QObject::connect( ListView2, SIGNAL( expanded( QListViewItem * item ) ), | 55 | connect( ListView2, SIGNAL( expanded ( QListViewItem *item ) ), |
56 | this, SLOT( addServicesToDevice( QListViewItem * item ) ) ); | 56 | this, SLOT( addServicesToDevice( QListViewItem *item ) ) ); |
57 | QObject::connect( ListView2, SIGNAL( clicked( QListViewItem * )), | 57 | connect( ListView2, SIGNAL( clicked( QListViewItem* )), |
58 | this, SLOT( startServiceActionClicked( QListViewItem * item ) ) ); | 58 | this, SLOT( startServiceActionClicked( QListViewItem *item ) ) ); |
59 | connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ), | 59 | connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ), |
60 | this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) ); | 60 | this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) ); |
61 | 61 | ||
62 | // QObject::connect( (QObject*) Manager, SIGNAL (foundServices( const QString& device, Services::ValueList ), this () ) ); | ||
63 | 62 | ||
@@ -89,4 +88,4 @@ namespace OpieTooth { | |||
89 | topLV->setPixmap( 0, offPix ); | 88 | topLV->setPixmap( 0, offPix ); |
90 | (void) new QListViewItem( topLV, "on" ); | 89 | // (void) new QListViewItem( topLV, "on" ); |
91 | (void) new QListViewItem( topLV, "off" ); | 90 | //(void) new QListViewItem( topLV, "off" ); |
92 | 91 | ||
@@ -241,3 +240,3 @@ namespace OpieTooth { | |||
241 | RemoteDevice *dev = it.current(); | 240 | RemoteDevice *dev = it.current(); |
242 | deviceItem = new QListViewItem( ListView2, dev->name() ); | 241 | deviceItem = new QListViewItem( ListView2 , dev->name() ); |
243 | 242 | ||
@@ -250,2 +249,5 @@ namespace OpieTooth { | |||
250 | deviceItem->setText( 3, dev->mac() ); | 249 | deviceItem->setText( 3, dev->mac() ); |
250 | |||
251 | // ggf auch hier? | ||
252 | addServicesToDevice( deviceItem ); | ||
251 | } | 253 | } |
@@ -276,2 +278,3 @@ namespace OpieTooth { | |||
276 | 278 | ||
279 | qDebug("addServicesToDevice"); | ||
277 | // row of mac adress | 280 | // row of mac adress |
@@ -315,4 +318,4 @@ namespace OpieTooth { | |||
315 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { | 318 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { |
316 | it2.serviceName() | 319 | // it2.serviceName() |
317 | serviceItem = new QListViewItem( deviceItem , it2.serviceName() ); | 320 | serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() ); |
318 | } | 321 | } |
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 | |||
@@ -67,8 +67,8 @@ namespace OpieTooth { | |||
67 | 67 | ||
68 | private slots: | 68 | public slots: |
69 | void addSearchedDevices( QList<RemoteDevice> &newDevices ); | 69 | void addSearchedDevices( QList<RemoteDevice> &newDevices ); |
70 | void addServicesToDevice( QListViewItem * item ); | 70 | void addServicesToDevice( QListViewItem *item ); |
71 | void addServicesToDevice( const QString& device, Services::ValueList ); | 71 | void addServicesToDevice( const QString& device, Services::ValueList ); |
72 | void startServiceActionClicked( QListViewItem * item ); | 72 | void startServiceActionClicked( QListViewItem *item ); |
73 | void startServiceActionHold( QListViewItem * item, const QPoint & point, int column); | 73 | void startServiceActionHold( QListViewItem *item, const QPoint &point, int column); |
74 | void applyConfigChanges(); | 74 | void applyConfigChanges(); |