author | zecke <zecke> | 2004-03-14 16:13:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 16:13:28 (UTC) |
commit | f3d284849df36ef281dcb5aa2d00f613e3a354d8 (patch) (unidiff) | |
tree | 65406b10a839ffa1ba683f59e61ef7227a0093d1 /noncore/net/opietooth/lib/manager.cc | |
parent | f12af18557c8f376f0c6c30e80a85737ff6c592e (diff) | |
download | opie-f3d284849df36ef281dcb5aa2d00f613e3a354d8.zip opie-f3d284849df36ef281dcb5aa2d00f613e3a354d8.tar.gz opie-f3d284849df36ef281dcb5aa2d00f613e3a354d8.tar.bz2 |
Fix up depends on LIBOPIE1
Proper signature for signal and slots and namespaces
Diffstat (limited to 'noncore/net/opietooth/lib/manager.cc') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 56156a8..7c9ea5b 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -42,13 +42,13 @@ void Manager::setDevice( Device* /*dev*/ ){ | |||
42 | } | 42 | } |
43 | void Manager::isAvailable( const QString& device ){ | 43 | void Manager::isAvailable( const QString& device ){ |
44 | OProcess* l2ping = new OProcess(); | 44 | OProcess* l2ping = new OProcess(); |
45 | l2ping->setName( device.latin1() ); | 45 | l2ping->setName( device.latin1() ); |
46 | *l2ping << "l2ping" << "-c1" << device; | 46 | *l2ping << "l2ping" << "-c1" << device; |
47 | connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ), | 47 | connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ), |
48 | this, SLOT(slotProcessExited(OProcess*) ) ); | 48 | this, SLOT(slotProcessExited(Opie::Core::OProcess*) ) ); |
49 | if (!l2ping->start() ) { | 49 | if (!l2ping->start() ) { |
50 | emit available( device, false ); | 50 | emit available( device, false ); |
51 | delete l2ping; | 51 | delete l2ping; |
52 | } | 52 | } |
53 | 53 | ||
54 | } | 54 | } |
@@ -60,15 +60,15 @@ void Manager::isAvailable( Device* /*dev*/ ){ | |||
60 | void Manager::searchDevices( const QString& device ){ | 60 | void Manager::searchDevices( const QString& device ){ |
61 | qWarning("search devices"); | 61 | qWarning("search devices"); |
62 | OProcess* hcitool = new OProcess(); | 62 | OProcess* hcitool = new OProcess(); |
63 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); | 63 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); |
64 | *hcitool << "hcitool" << "scan"; | 64 | *hcitool << "hcitool" << "scan"; |
65 | connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , | 65 | connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , |
66 | this, SLOT(slotHCIExited(OProcess* ) ) ); | 66 | this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) ); |
67 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), | 67 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
68 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); | 68 | this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) ); |
69 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 69 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
70 | qWarning("could not start"); | 70 | qWarning("could not start"); |
71 | RemoteDevice::ValueList list; | 71 | RemoteDevice::ValueList list; |
72 | emit foundDevices( device, list ); | 72 | emit foundDevices( device, list ); |
73 | delete hcitool; | 73 | delete hcitool; |
74 | } | 74 | } |
@@ -107,15 +107,15 @@ void Manager::removeServices( const QStringList& list){ | |||
107 | void Manager::searchServices( const QString& remDevice ){ | 107 | void Manager::searchServices( const QString& remDevice ){ |
108 | OProcess *m_sdp =new OProcess(); | 108 | OProcess *m_sdp =new OProcess(); |
109 | *m_sdp << "sdptool" << "browse" << remDevice; | 109 | *m_sdp << "sdptool" << "browse" << remDevice; |
110 | m_sdp->setName( remDevice.latin1() ); | 110 | m_sdp->setName( remDevice.latin1() ); |
111 | qWarning("search Services for %s", remDevice.latin1() ); | 111 | qWarning("search Services for %s", remDevice.latin1() ); |
112 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), | 112 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), |
113 | this, SLOT(slotSDPExited(OProcess* ) ) ); | 113 | this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) ); |
114 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), | 114 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
115 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); | 115 | this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) ); |
116 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 116 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
117 | qWarning("could not start sdptool" ); | 117 | qWarning("could not start sdptool" ); |
118 | delete m_sdp; | 118 | delete m_sdp; |
119 | Services::ValueList list; | 119 | Services::ValueList list; |
120 | emit foundServices( remDevice, list ); | 120 | emit foundServices( remDevice, list ); |
121 | } | 121 | } |
@@ -246,15 +246,15 @@ void Manager::connectTo( const QString& mac) { | |||
246 | void Manager::searchConnections() { | 246 | void Manager::searchConnections() { |
247 | qWarning("searching connections?"); | 247 | qWarning("searching connections?"); |
248 | OProcess* proc = new OProcess(); | 248 | OProcess* proc = new OProcess(); |
249 | m_hcitoolCon = QString::null; | 249 | m_hcitoolCon = QString::null; |
250 | 250 | ||
251 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), | 251 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
252 | this, SLOT(slotConnectionExited( OProcess*) ) ); | 252 | this, SLOT(slotConnectionExited( Opie::Core::OProcess*) ) ); |
253 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), | 253 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
254 | this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); | 254 | this, SLOT(slotConnectionOutput(Opie::Core::OProcess*, char*, int) ) ); |
255 | *proc << "hcitool"; | 255 | *proc << "hcitool"; |
256 | *proc << "con"; | 256 | *proc << "con"; |
257 | 257 | ||
258 | if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 258 | if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
259 | ConnectionState::ValueList list; | 259 | ConnectionState::ValueList list; |
260 | emit connections( list ); | 260 | emit connections( list ); |
@@ -305,15 +305,15 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) { | |||
305 | 305 | ||
306 | void Manager::signalStrength( const QString &mac ) { | 306 | void Manager::signalStrength( const QString &mac ) { |
307 | 307 | ||
308 | OProcess* sig_proc = new OProcess(); | 308 | OProcess* sig_proc = new OProcess(); |
309 | 309 | ||
310 | connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ), | 310 | connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
311 | this, SLOT(slotSignalStrengthExited( OProcess*) ) ); | 311 | this, SLOT(slotSignalStrengthExited( Opie::Core::OProcess*) ) ); |
312 | connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), | 312 | connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
313 | this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) ); | 313 | this, SLOT(slotSignalStrengthOutput(Opie::Core::OProcess*, char*, int) ) ); |
314 | *sig_proc << "hcitool"; | 314 | *sig_proc << "hcitool"; |
315 | *sig_proc << "lq"; | 315 | *sig_proc << "lq"; |
316 | *sig_proc << mac; | 316 | *sig_proc << mac; |
317 | 317 | ||
318 | sig_proc->setName( mac.latin1() ); | 318 | sig_proc->setName( mac.latin1() ); |
319 | 319 | ||