Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index ae5ce67..5364e51 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h | |||
@@ -1,24 +1,26 @@ | |||
1 | 1 | ||
2 | #ifndef BLUEBASE_H | 2 | #ifndef BLUEBASE_H |
3 | #define BLUEBASE_H | 3 | #define BLUEBASE_H |
4 | 4 | ||
5 | #include <qvariant.h> | 5 | #include <qvariant.h> |
6 | #include <qwidget.h> | 6 | #include <qwidget.h> |
7 | #include <qscrollview.h> | 7 | #include <qscrollview.h> |
8 | #include <qsplitter.h> | 8 | #include <qsplitter.h> |
9 | #include <qlist.h> | 9 | #include <qlist.h> |
10 | 10 | ||
11 | #include "bluetoothbase.h" | 11 | #include "bluetoothbase.h" |
12 | 12 | ||
13 | #include <remotedevice.h> | ||
14 | |||
13 | class QVBox; | 15 | class QVBox; |
14 | class QHBoxLayout; | 16 | class QHBoxLayout; |
15 | class QGridLayout; | 17 | class QGridLayout; |
16 | class QFrame; | 18 | class QFrame; |
17 | class QLabel; | 19 | class QLabel; |
18 | class QPushButton; | 20 | class QPushButton; |
19 | class QTabWidget; | 21 | class QTabWidget; |
20 | class QCheckBox; | 22 | class QCheckBox; |
21 | 23 | ||
22 | namespace OpieTooth { | 24 | namespace OpieTooth { |
23 | 25 | ||
24 | 26 | ||
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index 70ea77a..8a7ea01 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp | |||
@@ -125,42 +125,41 @@ namespace OpieTooth { | |||
125 | } | 125 | } |
126 | 126 | ||
127 | void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) { | 127 | void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) { |
128 | 128 | ||
129 | QCheckListItem * deviceItem; | 129 | QCheckListItem * deviceItem; |
130 | 130 | ||
131 | RemoteDevices::ValueList::Iterator it; | 131 | RemoteDevices::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() ); |
135 | deviceItem->setText(1, (*it).mac() ); | 135 | deviceItem->setText(1, (*it).mac() ); |
136 | } | 136 | } |
137 | |||
138 | } | 137 | } |
139 | 138 | ||
140 | /* | 139 | /* |
141 | * Iterates trough the items, and collects the checked items. | 140 | * Iterates trough the items, and collects the checked items. |
142 | * Then it emits it, so the manager can connect to the signal to fill the listing. | 141 | * Then it emits it, so the manager can connect to the signal to fill the listing. |
143 | */ | 142 | */ |
144 | void ScanDialog::emitToManager() { | 143 | void ScanDialog::emitToManager() { |
145 | 144 | ||
146 | if (!ListView1) { | 145 | if (!ListView1) { |
147 | return; | 146 | return; |
148 | } | 147 | } |
149 | 148 | ||
150 | QList<RemoteDevices> *deviceList = new QList<RemoteDevices>; | 149 | QList<RemoteDevices> *deviceList = new QList<RemoteDevices>; |
151 | 150 | ||
152 | QListViewItemIterator it( ListView1 ); | 151 | QListViewItemIterator it( ListView1 ); |
153 | for ( ; it.current(); ++it ) { | 152 | for ( ; it.current(); ++it ) { |
154 | if ( it.current()->isSelected() ) { | 153 | if ( ((QCheckListItem*)it.current())->isOn() ) { |
155 | RemoteDevices* device = new RemoteDevices( it.current()->text(1), it.current()->text(0)); | 154 | RemoteDevices* device = new RemoteDevices( it.current()->text(1), it.current()->text(0)); |
156 | deviceList->append( device ); | 155 | deviceList->append( device ); |
157 | } | 156 | } |
158 | } | 157 | } |
159 | emit selectedDevices( *deviceList ); | 158 | emit selectedDevices( *deviceList ); |
160 | } | 159 | } |
161 | 160 | ||
162 | /* | 161 | /* |
163 | * Cleanup | 162 | * Cleanup |
164 | */ | 163 | */ |
165 | ScanDialog::~ScanDialog() { | 164 | ScanDialog::~ScanDialog() { |
166 | emitToManager(); | 165 | emitToManager(); |
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h index 4785a62..0ca302a 100644 --- a/noncore/net/opietooth/manager/scandialog.h +++ b/noncore/net/opietooth/manager/scandialog.h | |||
@@ -12,39 +12,39 @@ | |||
12 | * (at your option) any later version. * | 12 | * (at your option) any later version. * |
13 | * * | 13 | * * |
14 | ***************************************************************************/ | 14 | ***************************************************************************/ |
15 | 15 | ||
16 | 16 | ||
17 | #ifndef SCANDIALOG_H | 17 | #ifndef SCANDIALOG_H |
18 | #define SCANDIALOG_H | 18 | #define SCANDIALOG_H |
19 | 19 | ||
20 | #include <qvariant.h> | 20 | #include <qvariant.h> |
21 | #include <qdialog.h> | 21 | #include <qdialog.h> |
22 | #include <qlist.h> | 22 | #include <qlist.h> |
23 | 23 | ||
24 | 24 | #include <remotedevice.h> | |
25 | class QVBoxLayout; | 25 | class QVBoxLayout; |
26 | class QHBoxLayout; | 26 | class QHBoxLayout; |
27 | class QGridLayout; | 27 | class QGridLayout; |
28 | class QFrame; | 28 | class QFrame; |
29 | class QLabel; | 29 | class QLabel; |
30 | class QListView; | 30 | class QListView; |
31 | class QListViewItem; | 31 | class QListViewItem; |
32 | class QPushButton; | 32 | class QPushButton; |
33 | class QProgressBar; | 33 | class QProgressBar; |
34 | 34 | ||
35 | 35 | ||
36 | namespace OpieTooth { | 36 | namespace OpieTooth { |
37 | 37 | ||
38 | #include <remotedevices.h> | 38 | |
39 | class Manager; | 39 | class Manager; |
40 | class Device; | 40 | class Device; |
41 | 41 | ||
42 | class ScanDialog : public QDialog { | 42 | class ScanDialog : public QDialog { |
43 | Q_OBJECT | 43 | Q_OBJECT |
44 | 44 | ||
45 | public: | 45 | public: |
46 | ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 46 | ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); |
47 | ~ScanDialog(); | 47 | ~ScanDialog(); |
48 | 48 | ||
49 | QFrame* Frame7; | 49 | QFrame* Frame7; |
50 | QProgressBar* progress; | 50 | QProgressBar* progress; |