summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/lib/manager.cc12
-rw-r--r--noncore/net/opietooth/lib/manager.h6
-rw-r--r--noncore/net/opietooth/lib/remotedevice.cc22
-rw-r--r--noncore/net/opietooth/lib/remotedevice.h16
-rw-r--r--noncore/net/opietooth/manager/bluebase.h2
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp3
-rw-r--r--noncore/net/opietooth/manager/scandialog.h4
7 files changed, 33 insertions, 32 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 40c1f0a..c454588 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -41,49 +41,49 @@ void Manager::isConnected( const QString& device ){
41 *l2ping << "l2ping" << "-c1" << device; 41 *l2ping << "l2ping" << "-c1" << device;
42 connect(l2ping, SIGNAL(processExited(OProcess* ) ), 42 connect(l2ping, SIGNAL(processExited(OProcess* ) ),
43 this, SLOT(slotProcessExited(OProcess*) ) ); 43 this, SLOT(slotProcessExited(OProcess*) ) );
44 if (!l2ping->start() ) { 44 if (!l2ping->start() ) {
45 emit connected( device, false ); 45 emit connected( device, false );
46 delete l2ping; 46 delete l2ping;
47 } 47 }
48 48
49} 49}
50void Manager::isConnected( Device* dev ){ 50void Manager::isConnected( Device* dev ){
51 51
52 52
53} 53}
54void Manager::searchDevices( const QString& device ){ 54void Manager::searchDevices( const QString& device ){
55 qWarning("search devices"); 55 qWarning("search devices");
56 OProcess* hcitool = new OProcess(); 56 OProcess* hcitool = new OProcess();
57 hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); 57 hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() );
58 *hcitool << "hcitool" << "scan"; 58 *hcitool << "hcitool" << "scan";
59 connect( hcitool, SIGNAL(processExited(OProcess*) ) , 59 connect( hcitool, SIGNAL(processExited(OProcess*) ) ,
60 this, SLOT(slotHCIExited(OProcess* ) ) ); 60 this, SLOT(slotHCIExited(OProcess* ) ) );
61 connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ), 61 connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ),
62 this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); 62 this, SLOT(slotHCIOut(OProcess*, char*, int ) ) );
63 if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { 63 if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
64 qWarning("could not start"); 64 qWarning("could not start");
65 RemoteDevices::ValueList list; 65 RemoteDevice::ValueList list;
66 emit foundDevices( device, list ); 66 emit foundDevices( device, list );
67 delete hcitool; 67 delete hcitool;
68 } 68 }
69} 69}
70 70
71void Manager::searchDevices(Device* d ){ 71void Manager::searchDevices(Device* d ){
72 72
73 73
74} 74}
75void Manager::addService(const QString& name ){ 75void Manager::addService(const QString& name ){
76 OProcess proc; 76 OProcess proc;
77 proc << "sdptool" << "add" << name; 77 proc << "sdptool" << "add" << name;
78 bool bo = true; 78 bool bo = true;
79 if (!proc.start(OProcess::DontCare ) ) 79 if (!proc.start(OProcess::DontCare ) )
80 bo = false; 80 bo = false;
81 emit addedService( name, bo ); 81 emit addedService( name, bo );
82} 82}
83void Manager::addServices(const QStringList& list){ 83void Manager::addServices(const QStringList& list){
84 QStringList::ConstIterator it; 84 QStringList::ConstIterator it;
85 for (it = list.begin(); it != list.end(); ++it ) 85 for (it = list.begin(); it != list.end(); ++it )
86 addService( (*it) ); 86 addService( (*it) );
87} 87}
88void Manager::removeService( const QString& name ){ 88void Manager::removeService( const QString& name ){
89 OProcess prc; 89 OProcess prc;
@@ -91,49 +91,49 @@ void Manager::removeService( const QString& name ){
91 bool bo = true; 91 bool bo = true;
92 if (!prc.start(OProcess::DontCare ) ) 92 if (!prc.start(OProcess::DontCare ) )
93 bo = false; 93 bo = false;
94 emit removedService( name, bo ); 94 emit removedService( name, bo );
95} 95}
96void Manager::removeServices( const QStringList& list){ 96void Manager::removeServices( const QStringList& list){
97 QStringList::ConstIterator it; 97 QStringList::ConstIterator it;
98 for (it = list.begin(); it != list.end(); ++it ) 98 for (it = list.begin(); it != list.end(); ++it )
99 removeService( (*it) ); 99 removeService( (*it) );
100} 100}
101void Manager::searchServices( const QString& remDevice ){ 101void Manager::searchServices( const QString& remDevice ){
102 OProcess *m_sdp =new OProcess(); 102 OProcess *m_sdp =new OProcess();
103 *m_sdp << "sdptool" << "browse" << remDevice; 103 *m_sdp << "sdptool" << "browse" << remDevice;
104 m_sdp->setName( remDevice.latin1() ); 104 m_sdp->setName( remDevice.latin1() );
105 connect(m_sdp, SIGNAL(processExited(OProcess*) ), 105 connect(m_sdp, SIGNAL(processExited(OProcess*) ),
106 this, SLOT(slotSDPExited(OProcess* ) ) ); 106 this, SLOT(slotSDPExited(OProcess* ) ) );
107 connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ), 107 connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ),
108 this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); 108 this, SLOT(slotSDPOut(OProcess*, char*, int) ) );
109 if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { 109 if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
110 delete m_sdp; 110 delete m_sdp;
111 Services::ValueList list; 111 Services::ValueList list;
112 emit foundServices( remDevice, list ); 112 emit foundServices( remDevice, list );
113 } 113 }
114} 114}
115void Manager::searchServices( const RemoteDevices& dev){ 115void Manager::searchServices( const RemoteDevice& dev){
116 searchServices( dev.mac() ); 116 searchServices( dev.mac() );
117} 117}
118QString Manager::toDevice( const QString& mac ){ 118QString Manager::toDevice( const QString& mac ){
119 119
120} 120}
121QString Manager::toMac( const QString &device ){ 121QString Manager::toMac( const QString &device ){
122 122
123} 123}
124void Manager::slotProcessExited(OProcess* proc ) { 124void Manager::slotProcessExited(OProcess* proc ) {
125 bool conn= false; 125 bool conn= false;
126 if (proc->normalExit() && proc->exitStatus() == 0 ) 126 if (proc->normalExit() && proc->exitStatus() == 0 )
127 conn = true; 127 conn = true;
128 128
129 QString name = QString::fromLatin1(proc->name() ); 129 QString name = QString::fromLatin1(proc->name() );
130 emit connected( name, conn ); 130 emit connected( name, conn );
131 delete proc; 131 delete proc;
132} 132}
133void Manager::slotSDPOut(OProcess* proc, char* ch, int len) 133void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
134{ 134{
135 QCString str(ch, len+1 ); 135 QCString str(ch, len+1 );
136 QMap<QString, QString>::Iterator it; 136 QMap<QString, QString>::Iterator it;
137 it = m_out.find(proc->name() ); 137 it = m_out.find(proc->name() );
138 if ( it != m_out.end() ) { 138 if ( it != m_out.end() ) {
139 QString string = it.data(); 139 QString string = it.data();
@@ -141,73 +141,73 @@ void Manager::slotSDPOut(OProcess* proc, char* ch, int len)
141 m_out.replace( proc->name(), string ); 141 m_out.replace( proc->name(), string );
142 } 142 }
143 143
144} 144}
145void Manager::slotSDPExited( OProcess* proc) 145void Manager::slotSDPExited( OProcess* proc)
146{ 146{
147 Services::ValueList list; 147 Services::ValueList list;
148 if (proc->normalExit() ) { 148 if (proc->normalExit() ) {
149 QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); 149 QMap<QString, QString>::Iterator it = m_out.find( proc->name() );
150 if ( it != m_out.end() ) { 150 if ( it != m_out.end() ) {
151 list = parseSDPOutput( it.data() ); 151 list = parseSDPOutput( it.data() );
152 m_out.remove( it ); 152 m_out.remove( it );
153 } 153 }
154 } 154 }
155 emit foundServices( proc->name(), list ); 155 emit foundServices( proc->name(), list );
156 delete proc; 156 delete proc;
157} 157}
158Services::ValueList Manager::parseSDPOutput( const QString& out ) { 158Services::ValueList Manager::parseSDPOutput( const QString& out ) {
159 Services::ValueList list; 159 Services::ValueList list;
160 return list; 160 return list;
161} 161}
162 162
163void Manager::slotHCIExited(OProcess* proc ) { 163void Manager::slotHCIExited(OProcess* proc ) {
164 qWarning("process exited"); 164 qWarning("process exited");
165 RemoteDevices::ValueList list; 165 RemoteDevice::ValueList list;
166 if (proc->normalExit() ) { 166 if (proc->normalExit() ) {
167 qWarning("normalExit %s", proc->name() ); 167 qWarning("normalExit %s", proc->name() );
168 QMap<QString, QString>::Iterator it = m_devices.find(proc->name() ); 168 QMap<QString, QString>::Iterator it = m_devices.find(proc->name() );
169 if (it != m_devices.end() ) { 169 if (it != m_devices.end() ) {
170 qWarning("!= end ;)"); 170 qWarning("!= end ;)");
171 list = parseHCIOutput( it.data() ); 171 list = parseHCIOutput( it.data() );
172 m_devices.remove( it ); 172 m_devices.remove( it );
173 } 173 }
174 } 174 }
175 emit foundDevices( proc->name(), list ); 175 emit foundDevices( proc->name(), list );
176 delete proc; 176 delete proc;
177} 177}
178void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { 178void Manager::slotHCIOut(OProcess* proc, char* ch, int len) {
179 QCString str( ch, len+1 ); 179 QCString str( ch, len+1 );
180 qWarning("hci: %s", str.data() ); 180 qWarning("hci: %s", str.data() );
181 QMap<QString, QString>::Iterator it; 181 QMap<QString, QString>::Iterator it;
182 it = m_devices.find( proc->name() ); 182 it = m_devices.find( proc->name() );
183 qWarning("proc->name %s", proc->name() ); 183 qWarning("proc->name %s", proc->name() );
184 QString string; 184 QString string;
185 if (it != m_devices.end() ) { 185 if (it != m_devices.end() ) {
186 qWarning("slotHCIOut "); 186 qWarning("slotHCIOut ");
187 string = it.data(); 187 string = it.data();
188 } 188 }
189 string.append( str ); 189 string.append( str );
190 190
191 m_devices.replace( proc->name(), string ); 191 m_devices.replace( proc->name(), string );
192} 192}
193RemoteDevices::ValueList Manager::parseHCIOutput(const QString& output ) { 193RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
194 qWarning("parseHCI %s", output.latin1() ); 194 qWarning("parseHCI %s", output.latin1() );
195 RemoteDevices::ValueList list; 195 RemoteDevice::ValueList list;
196 QStringList strList = QStringList::split('\n', output ); 196 QStringList strList = QStringList::split('\n', output );
197 QStringList::Iterator it; 197 QStringList::Iterator it;
198 QString str; 198 QString str;
199 for ( it = strList.begin(); it != strList.end(); ++it ) { 199 for ( it = strList.begin(); it != strList.end(); ++it ) {
200 str = (*it).stripWhiteSpace(); 200 str = (*it).stripWhiteSpace();
201 qWarning("OpieTooth %s", str.latin1() ); 201 qWarning("OpieTooth %s", str.latin1() );
202 int pos = str.findRev(':' ); 202 int pos = str.findRev(':' );
203 if ( pos > 0 ) { 203 if ( pos > 0 ) {
204 QString mac = str.left(17 ); 204 QString mac = str.left(17 );
205 str.remove( 0, 17 ); 205 str.remove( 0, 17 );
206 qWarning("mac %s", mac.latin1() ); 206 qWarning("mac %s", mac.latin1() );
207 qWarning("rest:%s", str.latin1() ); 207 qWarning("rest:%s", str.latin1() );
208 RemoteDevices rem( mac , str.stripWhiteSpace() ); 208 RemoteDevice rem( mac , str.stripWhiteSpace() );
209 list.append( rem ); 209 list.append( rem );
210 } 210 }
211 } 211 }
212 return list; 212 return list;
213} 213}
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h
index 95e4306..aba70f7 100644
--- a/noncore/net/opietooth/lib/manager.h
+++ b/noncore/net/opietooth/lib/manager.h
@@ -77,55 +77,55 @@ Q_OBJECT
77 void addService(const QString &name ); 77 void addService(const QString &name );
78 /** 78 /**
79 * This will add the services @param names 79 * This will add the services @param names
80 * to the sdpd daemon 80 * to the sdpd daemon
81 * It will start the daemon if necessary 81 * It will start the daemon if necessary
82 */ 82 */
83 void addServices( const QStringList& names ); 83 void addServices( const QStringList& names );
84 /** 84 /**
85 * This removes a service from the sdps 85 * This removes a service from the sdps
86 */ 86 */
87 void removeService(const QString &name ); 87 void removeService(const QString &name );
88 /** 88 /**
89 * Removes a list from the sdpd 89 * Removes a list from the sdpd
90 */ 90 */
91 void removeServices(const QStringList& ); 91 void removeServices(const QStringList& );
92 92
93 /** 93 /**
94 * search for services on a remote device 94 * search for services on a remote device
95 * 95 *
96 */ 96 */
97 void searchServices( const QString& remDevice ); 97 void searchServices( const QString& remDevice );
98 /** 98 /**
99 * search for services on a remote device 99 * search for services on a remote device
100 */ 100 */
101 void searchServices( const RemoteDevices& ); 101 void searchServices( const RemoteDevice& );
102 /*static*/ QString toDevice( const QString& mac ); 102 /*static*/ QString toDevice( const QString& mac );
103 /*static*/ QString toMac( const QString &device ); 103 /*static*/ QString toMac( const QString &device );
104 104
105 signals: 105 signals:
106 // device either mac or dev name 106 // device either mac or dev name
107 // the first device is the device which you access 107 // the first device is the device which you access
108 void connected( const QString& device, bool connected ); 108 void connected( const QString& device, bool connected );
109 void addedService( const QString& service, bool added ); 109 void addedService( const QString& service, bool added );
110 void removedService( const QString& service, bool removed ); 110 void removedService( const QString& service, bool removed );
111 void foundServices( const QString& device, Services::ValueList ); 111 void foundServices( const QString& device, Services::ValueList );
112 void foundDevices( const QString& device, RemoteDevices::ValueList ); 112 void foundDevices( const QString& device, RemoteDevice::ValueList );
113 113
114private slots: 114private slots:
115 void slotProcessExited(OProcess* ); 115 void slotProcessExited(OProcess* );
116 void slotSDPExited(OProcess*); 116 void slotSDPExited(OProcess*);
117 void slotSDPOut(OProcess*, char*, int); 117 void slotSDPOut(OProcess*, char*, int);
118 void slotHCIExited(OProcess* ); 118 void slotHCIExited(OProcess* );
119 void slotHCIOut(OProcess*, char*, int ); 119 void slotHCIOut(OProcess*, char*, int );
120 private: 120 private:
121 Services::ValueList parseSDPOutput( const QString& ); 121 Services::ValueList parseSDPOutput( const QString& );
122 RemoteDevices::ValueList parseHCIOutput( const QString& ); 122 RemoteDevice::ValueList parseHCIOutput( const QString& );
123 OProcess *m_hcitool; 123 OProcess *m_hcitool;
124 OProcess *m_sdp; // not only one 124 OProcess *m_sdp; // not only one
125 QString m_device; 125 QString m_device;
126 QMap<QString, QString> m_out; 126 QMap<QString, QString> m_out;
127 QMap<QString, QString> m_devices; 127 QMap<QString, QString> m_devices;
128 }; 128 };
129}; 129};
130 130
131#endif 131#endif
diff --git a/noncore/net/opietooth/lib/remotedevice.cc b/noncore/net/opietooth/lib/remotedevice.cc
index 0045904..08fb397 100644
--- a/noncore/net/opietooth/lib/remotedevice.cc
+++ b/noncore/net/opietooth/lib/remotedevice.cc
@@ -1,48 +1,48 @@
1 1
2#include "remotedevice.h" 2#include "remotedevice.h"
3 3
4using namespace OpieTooth; 4using namespace OpieTooth;
5 5
6bool operator==(const RemoteDevices& rem1, const RemoteDevices& rem2){ 6bool operator==(const RemoteDevice& rem1, const RemoteDevice& rem2){
7 if( ( rem1.mac() == rem2.mac() ) && (rem1.name() == rem2.name() ) ) 7 if( ( rem1.mac() == rem2.mac() ) && (rem1.name() == rem2.name() ) )
8 return true; 8 return true;
9 9
10 return false; 10 return false;
11} 11}
12 12
13RemoteDevices::RemoteDevices(){ 13RemoteDevice::RemoteDevice(){
14 14
15} 15}
16RemoteDevices::RemoteDevices(const RemoteDevices& ole ){ 16RemoteDevice::RemoteDevice(const RemoteDevice& ole ){
17 (*this) = ole; 17 (*this) = ole;
18} 18}
19RemoteDevices::RemoteDevices(const QString &mac, const QString& name ){ 19RemoteDevice::RemoteDevice(const QString &mac, const QString& name ){
20 m_mac = mac; 20 m_mac = mac;
21 m_name = name; 21 m_name = name;
22} 22}
23RemoteDevices::~RemoteDevices(){ 23RemoteDevice::~RemoteDevice(){
24 24
25} 25}
26bool RemoteDevices::isEmpty() const { 26bool RemoteDevice::isEmpty() const {
27 if( m_name.isEmpty() && m_mac.isEmpty() ) 27 if( m_name.isEmpty() && m_mac.isEmpty() )
28 return true; 28 return true;
29 return false; 29 return false;
30}; 30};
31RemoteDevices& RemoteDevices::operator=( const RemoteDevices& rem1){ 31RemoteDevice& RemoteDevice::operator=( const RemoteDevice& rem1){
32 m_name = rem1.m_name; 32 m_name = rem1.m_name;
33 m_mac = rem1.m_mac; 33 m_mac = rem1.m_mac;
34 return *this; 34 return *this;
35 35
36} 36}
37QString RemoteDevices::mac() const { 37QString RemoteDevice::mac() const {
38 return m_mac; 38 return m_mac;
39} 39}
40void RemoteDevices::setMac( const QString& mac ){ 40void RemoteDevice::setMac( const QString& mac ){
41 m_mac = mac; 41 m_mac = mac;
42} 42}
43QString RemoteDevices::name() const{ 43QString RemoteDevice::name() const{
44 return m_name; 44 return m_name;
45} 45}
46void RemoteDevices::setName( const QString& name ){ 46void RemoteDevice::setName( const QString& name ){
47 m_name = name; 47 m_name = name;
48} 48}
diff --git a/noncore/net/opietooth/lib/remotedevice.h b/noncore/net/opietooth/lib/remotedevice.h
index 96a27de..23f98bd 100644
--- a/noncore/net/opietooth/lib/remotedevice.h
+++ b/noncore/net/opietooth/lib/remotedevice.h
@@ -1,28 +1,28 @@
1 1
2#ifndef OpieToothRemoteDevice 2#ifndef OpieToothRemoteDevice
3#define OpieToothRemoteDevice 3#define OpieToothRemoteDevice
4 4
5#include <qvaluelist.h> 5#include <qvaluelist.h>
6 6
7namespace OpieTooth{ 7namespace OpieTooth{
8 class RemoteDevices { 8 class RemoteDevice {
9 public: 9 public:
10 typedef QValueList<RemoteDevices> ValueList; 10 typedef QValueList<RemoteDevice> ValueList;
11 RemoteDevices(); 11 RemoteDevice();
12 RemoteDevices(const RemoteDevices& ); 12 RemoteDevice(const RemoteDevice& );
13 RemoteDevices(const QString &mac, const QString &name ); 13 RemoteDevice(const QString &mac, const QString &name );
14 ~RemoteDevices(); 14 ~RemoteDevice();
15 friend bool operator==(const RemoteDevices&, const RemoteDevices&); 15 friend bool operator==(const RemoteDevice&, const RemoteDevice&);
16 RemoteDevices &operator=(const RemoteDevices& ); 16 RemoteDevice &operator=(const RemoteDevice& );
17 bool isEmpty()const; 17 bool isEmpty()const;
18 QString mac()const; 18 QString mac()const;
19 void setMac(const QString& mac ); 19 void setMac(const QString& mac );
20 QString name()const; 20 QString name()const;
21 void setName( const QString& name ); 21 void setName( const QString& name );
22 private: 22 private:
23 QString m_name; 23 QString m_name;
24 QString m_mac; 24 QString m_mac;
25 }; 25 };
26}; 26};
27 27
28#endif 28#endif
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,36 +1,38 @@
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
13class QVBox; 15class QVBox;
14class QHBoxLayout; 16class QHBoxLayout;
15class QGridLayout; 17class QGridLayout;
16class QFrame; 18class QFrame;
17class QLabel; 19class QLabel;
18class QPushButton; 20class QPushButton;
19class QTabWidget; 21class QTabWidget;
20class QCheckBox; 22class QCheckBox;
21 23
22namespace OpieTooth { 24namespace OpieTooth {
23 25
24 26
25 27
26 class BlueBase : public BluetoothBase { 28 class BlueBase : public BluetoothBase {
27 Q_OBJECT 29 Q_OBJECT
28 30
29 public: 31 public:
30 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 32 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
31 ~BlueBase(); 33 ~BlueBase();
32 34
33 protected: 35 protected:
34 36
35 37
36 private slots: 38 private slots:
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
@@ -113,58 +113,57 @@ namespace OpieTooth {
113 QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox ); 113 QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox );
114 deviceItem2->setText(1, "BLAH" ); 114 deviceItem2->setText(1, "BLAH" );
115 115
116 progressTimer(); 116 progressTimer();
117 // when finished, it emmite foundDevices() 117 // when finished, it emmite foundDevices()
118 // checken ob initialisiert , qcop ans applet. 118 // checken ob initialisiert , qcop ans applet.
119 localDevice->searchDevices(); 119 localDevice->searchDevices();
120 120
121 } 121 }
122 122
123 void ScanDialog::stopSearch() { 123 void ScanDialog::stopSearch() {
124 124
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();
167 delete localDevice; 166 delete localDevice;
168 } 167 }
169 168
170} 169}
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
@@ -1,62 +1,62 @@
1/* main.cpp 1/* main.cpp
2 * 2 *
3 * copyright : (c) 2002 by Maximilian Reiß 3 * copyright : (c) 2002 by Maximilian Reiß
4 * email : max.reiss@gmx.de 4 * email : max.reiss@gmx.de
5 * 5 *
6 */ 6 */
7/*************************************************************************** 7/***************************************************************************
8 * * 8 * *
9 * This program is free software; you can redistribute it and/or modify * 9 * This program is free software; you can redistribute it and/or modify *
10 * it under the terms of the GNU General Public License as published by * 10 * it under the terms of the GNU General Public License as published by *
11 * the Free Software Foundation; either version 2 of the License, or * 11 * the Free Software Foundation; either version 2 of the License, or *
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>
25class QVBoxLayout; 25class QVBoxLayout;
26class QHBoxLayout; 26class QHBoxLayout;
27class QGridLayout; 27class QGridLayout;
28class QFrame; 28class QFrame;
29class QLabel; 29class QLabel;
30class QListView; 30class QListView;
31class QListViewItem; 31class QListViewItem;
32class QPushButton; 32class QPushButton;
33class QProgressBar; 33class QProgressBar;
34 34
35 35
36namespace OpieTooth { 36namespace OpieTooth {
37 37
38#include <remotedevices.h> 38
39class Manager; 39class Manager;
40class Device; 40class 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;
51 QPushButton* StartButton; 51 QPushButton* StartButton;
52 QPushButton* StopButton; 52 QPushButton* StopButton;
53 QListView* ListView1; 53 QListView* ListView1;
54 54
55 55
56 protected: 56 protected:
57 QVBoxLayout* Layout11; 57 QVBoxLayout* Layout11;
58 58
59 private slots: 59 private slots:
60 void stopSearch(); 60 void stopSearch();
61 void startSearch(); 61 void startSearch();
62 void progressTimer(); 62 void progressTimer();