Diffstat (limited to 'noncore/net/opietooth/manager/scandialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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(); |