-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 19 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 8 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 4 |
4 files changed, 22 insertions, 11 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 | |||
@@ -36,2 +36,3 @@ | |||
36 | #include <qlineedit.h> | 36 | #include <qlineedit.h> |
37 | #include <qlistview.h> | ||
37 | 38 | ||
@@ -43,3 +44,4 @@ namespace OpieTooth { | |||
43 | 44 | ||
44 | class RemoteDevices; | 45 | |
46 | #include <remotedevice.h> | ||
45 | 47 | ||
@@ -155,6 +157,15 @@ namespace OpieTooth { | |||
155 | 157 | ||
156 | void BlueBase::addSearchedDevices( QList<RemoteDevices> &newDevices ) { | 158 | void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) { |
159 | |||
160 | QListViewItem * deviceItem; | ||
157 | 161 | ||
162 | QListIterator<RemoteDevice> it(newDevices); | ||
158 | 163 | ||
164 | for( ; it.current(); ++it ) { | ||
159 | 165 | ||
166 | |||
167 | RemoteDevice *dev = it.current(); | ||
168 | deviceItem = new QListViewItem( ListView4, dev->name() ); | ||
169 | deviceItem->setText(1, dev->mac() ); | ||
170 | } | ||
160 | } | 171 | } |
@@ -167,4 +178,4 @@ namespace OpieTooth { | |||
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 | ||
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 | |||
@@ -55,3 +55,3 @@ namespace OpieTooth { | |||
55 | private slots: | 55 | private slots: |
56 | void addSearchedDevices( QList<RemoteDevices> &newDevices ); | 56 | void addSearchedDevices( QList<RemoteDevice> &newDevices ); |
57 | void applyConfigChanges(); | 57 | void applyConfigChanges(); |
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 | |||
@@ -126,3 +126,3 @@ namespace OpieTooth { | |||
126 | 126 | ||
127 | void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) { | 127 | void ScanDialog::fillList(const QString& device, RemoteDevice::ValueList deviceList) { |
128 | 128 | ||
@@ -130,3 +130,3 @@ namespace OpieTooth { | |||
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 ) { |
@@ -148,3 +148,3 @@ namespace OpieTooth { | |||
148 | 148 | ||
149 | QList<RemoteDevices> *deviceList = new QList<RemoteDevices>; | 149 | QList<RemoteDevice> *deviceList = new QList<RemoteDevice>; |
150 | 150 | ||
@@ -153,3 +153,3 @@ namespace OpieTooth { | |||
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 ); |
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 | |||
@@ -62,3 +62,3 @@ class Device; | |||
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 | ||
@@ -70,3 +70,3 @@ class Device; | |||
70 | signals: | 70 | signals: |
71 | void selectedDevices(QList<RemoteDevices>&); | 71 | void selectedDevices(QList<RemoteDevice>&); |
72 | }; | 72 | }; |