Diffstat (limited to 'noncore/net/opietooth/lib/device.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/device.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index d913853..18d26e4 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc | |||
@@ -5,13 +5,12 @@ | |||
5 | 5 | ||
6 | #include "device.h" | 6 | #include "device.h" |
7 | 7 | ||
8 | using namespace OpieTooth; | 8 | using namespace OpieTooth; |
9 | 9 | ||
10 | using namespace Opie::Core; | 10 | using namespace Opie::Core; |
11 | using namespace Opie::Core; | ||
12 | namespace { | 11 | namespace { |
13 | int parsePid( const QCString& par ){ | 12 | int parsePid( const QCString& par ){ |
14 | int id=0; | 13 | int id=0; |
15 | QString string( par ); | 14 | QString string( par ); |
16 | QStringList list = QStringList::split( '\n', string ); | 15 | QStringList list = QStringList::split( '\n', string ); |
17 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ | 16 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ |
@@ -47,17 +46,17 @@ void Device::attach(){ | |||
47 | qWarning("new process to create" ); | 46 | qWarning("new process to create" ); |
48 | m_process = new OProcess(); | 47 | m_process = new OProcess(); |
49 | *m_process << "hciattach"; | 48 | *m_process << "hciattach"; |
50 | *m_process << "-p"; | 49 | *m_process << "-p"; |
51 | *m_process << m_device << m_mode << m_speed; | 50 | *m_process << m_device << m_mode << m_speed; |
52 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), | 51 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), |
53 | this, SLOT( slotExited(OProcess* ) ) ); | 52 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); |
54 | connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ), | 53 | connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ), |
55 | this, SLOT(slotStdOut(OProcess*,char*,int ) ) ); | 54 | this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int ) ) ); |
56 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), | 55 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), |
57 | this, SLOT(slotStdErr(OProcess*,char*,int) ) ); | 56 | this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) ); |
58 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ | 57 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ |
59 | qWarning("Could not start" ); | 58 | qWarning("Could not start" ); |
60 | delete m_process; | 59 | delete m_process; |
61 | m_process = 0; | 60 | m_process = 0; |
62 | } | 61 | } |
63 | }; | 62 | }; |
@@ -96,13 +95,13 @@ void Device::slotExited( OProcess* proc) | |||
96 | // and call hciconfig hci0 up | 95 | // and call hciconfig hci0 up |
97 | // FIXME hardcoded to hci0 now :( | 96 | // FIXME hardcoded to hci0 now :( |
98 | m_hci = new OProcess( ); | 97 | m_hci = new OProcess( ); |
99 | *m_hci << "hciconfig"; | 98 | *m_hci << "hciconfig"; |
100 | *m_hci << "hci0 up"; | 99 | *m_hci << "hci0 up"; |
101 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), | 100 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), |
102 | this, SLOT( slotExited(OProcess* ) ) ); | 101 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); |
103 | if(!m_hci->start() ){ | 102 | if(!m_hci->start() ){ |
104 | qWarning("could not start" ); | 103 | qWarning("could not start" ); |
105 | m_attached = false; | 104 | m_attached = false; |
106 | emit device("hci0", false ); | 105 | emit device("hci0", false ); |
107 | } | 106 | } |
108 | }else{ | 107 | }else{ |