Diffstat (limited to 'noncore/net/opietooth/lib/manager.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index c89d325..56156a8 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc @@ -1,14 +1,16 @@ -#include <opie/oprocess.h> +#include <opie2/oprocess.h> #include "parser.h" #include "manager.h" using namespace OpieTooth; +using namespace Opie::Core; +using namespace Opie::Core; Manager::Manager( const QString& dev ) : QObject() { qWarning("created"); @@ -41,9 +43,9 @@ void Manager::setDevice( Device* /*dev*/ ){ void Manager::isAvailable( const QString& device ){ OProcess* l2ping = new OProcess(); l2ping->setName( device.latin1() ); *l2ping << "l2ping" << "-c1" << device; - connect(l2ping, SIGNAL(processExited(OProcess* ) ), + connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ), this, SLOT(slotProcessExited(OProcess*) ) ); if (!l2ping->start() ) { emit available( device, false ); delete l2ping; @@ -59,11 +61,11 @@ void Manager::searchDevices( const QString& device ){ qWarning("search devices"); OProcess* hcitool = new OProcess(); hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); *hcitool << "hcitool" << "scan"; - connect( hcitool, SIGNAL(processExited(OProcess*) ) , + connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , this, SLOT(slotHCIExited(OProcess* ) ) ); - connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ), + connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { qWarning("could not start"); RemoteDevice::ValueList list; @@ -106,11 +108,11 @@ void Manager::searchServices( const QString& remDevice ){ OProcess *m_sdp =new OProcess(); *m_sdp << "sdptool" << "browse" << remDevice; m_sdp->setName( remDevice.latin1() ); qWarning("search Services for %s", remDevice.latin1() ); - connect(m_sdp, SIGNAL(processExited(OProcess*) ), + connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotSDPExited(OProcess* ) ) ); - connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ), + connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { qWarning("could not start sdptool" ); delete m_sdp; @@ -245,11 +247,11 @@ void Manager::searchConnections() { qWarning("searching connections?"); OProcess* proc = new OProcess(); m_hcitoolCon = QString::null; - connect(proc, SIGNAL(processExited(OProcess*) ), + connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotConnectionExited( OProcess*) ) ); - connect(proc, SIGNAL(receivedStdout(OProcess*, char*, int) ), + connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); *proc << "hcitool"; *proc << "con"; @@ -304,11 +306,11 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) { void Manager::signalStrength( const QString &mac ) { OProcess* sig_proc = new OProcess(); - connect(sig_proc, SIGNAL(processExited(OProcess*) ), + connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ), this, SLOT(slotSignalStrengthExited( OProcess*) ) ); - connect(sig_proc, SIGNAL(receivedStdout(OProcess*, char*, int) ), + connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) ); *sig_proc << "hcitool"; *sig_proc << "lq"; *sig_proc << mac; |