summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp19
-rw-r--r--noncore/net/opietooth/manager/bluebase.h2
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp10
-rw-r--r--noncore/net/opietooth/manager/scandialog.h4
4 files changed, 23 insertions, 12 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 71da82e..c993c7c 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -34,6 +34,7 @@
34#include <qapplication.h> 34#include <qapplication.h>
35#include <qcheckbox.h> 35#include <qcheckbox.h>
36#include <qlineedit.h> 36#include <qlineedit.h>
37#include <qlistview.h>
37 38
38#include <qpe/resource.h> 39#include <qpe/resource.h>
39#include <qpe/config.h> 40#include <qpe/config.h>
@@ -41,7 +42,8 @@
41 42
42namespace OpieTooth { 43namespace OpieTooth {
43 44
44 class RemoteDevices; 45
46 #include <remotedevice.h>
45 47
46 BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) 48 BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
47 : BluetoothBase( parent, name, fl ) { 49 : BluetoothBase( parent, name, fl ) {
@@ -153,10 +155,19 @@ namespace OpieTooth {
153} 155}
154 156
155 157
156 void BlueBase::addSearchedDevices( QList<RemoteDevices> &newDevices ) { 158 void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
159
160 QListViewItem * deviceItem;
161
162 QListIterator<RemoteDevice> it(newDevices);
157 163
164 for( ; it.current(); ++it ) {
158 165
159 166
167 RemoteDevice *dev = it.current();
168 deviceItem = new QListViewItem( ListView4, dev->name() );
169 deviceItem->setText(1, dev->mac() );
170 }
160 } 171 }
161 172
162 173
@@ -165,8 +176,8 @@ namespace OpieTooth {
165 */ 176 */
166 void BlueBase::startScan() { 177 void BlueBase::startScan() {
167 ScanDialog *scan = new ScanDialog( this, "", true); 178 ScanDialog *scan = new ScanDialog( this, "", true);
168 QObject::connect((QObject*)scan, SIGNAL( selectedDevices(QList<RemoteDevices>&) ), 179 QObject::connect((QObject*)scan, SIGNAL( selectedDevices(QList<RemoteDevice>&) ),
169 this, SLOT( addSearchedDevices(QList<RemoteDevices>& ) )); 180 this, SLOT( addSearchedDevices(QList<RemoteDevice>& ) ));
170 181
171 scan->showMaximized(); 182 scan->showMaximized();
172 } 183 }
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 5364e51..c8ceed2 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -53,7 +53,7 @@ namespace OpieTooth {
53 int enableInquiryscan; 53 int enableInquiryscan;
54 54
55 private slots: 55 private slots:
56 void addSearchedDevices( QList<RemoteDevices> &newDevices ); 56 void addSearchedDevices( QList<RemoteDevice> &newDevices );
57 void applyConfigChanges(); 57 void applyConfigChanges();
58 58
59 }; 59 };
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 8a7ea01..bd7d23c 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -124,11 +124,11 @@ namespace OpieTooth {
124 124
125 } 125 }
126 126
127 void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) { 127 void ScanDialog::fillList(const QString& device, RemoteDevice::ValueList deviceList) {
128 128
129 QCheckListItem * deviceItem; 129 QCheckListItem * deviceItem;
130 130
131 RemoteDevices::ValueList::Iterator it; 131 RemoteDevice::ValueList::Iterator it;
132 for( it = deviceList.begin(); it != deviceList.end(); ++it ) { 132 for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
133 133
134 deviceItem = new QCheckListItem( ListView1, (*it).name() ); 134 deviceItem = new QCheckListItem( ListView1, (*it).name() );
@@ -146,13 +146,13 @@ namespace OpieTooth {
146 return; 146 return;
147 } 147 }
148 148
149 QList<RemoteDevices> *deviceList = new QList<RemoteDevices>; 149 QList<RemoteDevice> *deviceList = new QList<RemoteDevice>;
150 150
151 QListViewItemIterator it( ListView1 ); 151 QListViewItemIterator it( ListView1 );
152 for ( ; it.current(); ++it ) { 152 for ( ; it.current(); ++it ) {
153 if ( ((QCheckListItem*)it.current())->isOn() ) { 153 if ( ((QCheckListItem*)it.current())->isOn() ) {
154 RemoteDevices* device = new RemoteDevices( it.current()->text(1), it.current()->text(0)); 154 RemoteDevice * device = new RemoteDevice( it.current()->text(1), it.current()->text(0));
155 deviceList->append( device ); 155 deviceList->append( device );
156 } 156 }
157 } 157 }
158 emit selectedDevices( *deviceList ); 158 emit selectedDevices( *deviceList );
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index 0ca302a..adc960c 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -60,7 +60,7 @@ class Device;
60 void stopSearch(); 60 void stopSearch();
61 void startSearch(); 61 void startSearch();
62 void progressTimer(); 62 void progressTimer();
63 void fillList(const QString& device, RemoteDevices::ValueList list); 63 void fillList(const QString& device, RemoteDevice::ValueList list);
64 64
65 private: 65 private:
66 void emitToManager(); 66 void emitToManager();
@@ -68,7 +68,7 @@ class Device;
68 int progressStat; 68 int progressStat;
69 69
70 signals: 70 signals:
71 void selectedDevices(QList<RemoteDevices>&); 71 void selectedDevices(QList<RemoteDevice>&);
72 }; 72 };
73 73
74 74