Diffstat (limited to 'noncore/net/opietooth/lib/startpanconnection.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index a42b407..fef35d9 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -1,18 +1,20 @@ | |||
1 | 1 | ||
2 | #include "startpanconnection.h" | 2 | #include "startpanconnection.h" |
3 | 3 | ||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | ||
8 | using namespace Opie::Core; | ||
7 | StartPanConnection::StartPanConnection() { | 9 | StartPanConnection::StartPanConnection() { |
8 | m_panConnect = 0l; | 10 | m_panConnect = 0l; |
9 | setConnectionType(); | 11 | setConnectionType(); |
10 | } | 12 | } |
11 | 13 | ||
12 | StartPanConnection::~StartPanConnection() { | 14 | StartPanConnection::~StartPanConnection() { |
13 | delete m_panConnect; | 15 | delete m_panConnect; |
14 | } | 16 | } |
15 | 17 | ||
16 | StartPanConnection::StartPanConnection( QString mac ) { | 18 | StartPanConnection::StartPanConnection( QString mac ) { |
17 | m_panConnect = 0l; | 19 | m_panConnect = 0l; |
18 | m_mac = mac; | 20 | m_mac = mac; |
@@ -31,27 +33,27 @@ void StartPanConnection::setConnectionType() { | |||
31 | m_connectionType = Pan; | 33 | m_connectionType = Pan; |
32 | } | 34 | } |
33 | 35 | ||
34 | StartConnection::ConnectionType StartPanConnection::type() { | 36 | StartConnection::ConnectionType StartPanConnection::type() { |
35 | return m_connectionType; | 37 | return m_connectionType; |
36 | } | 38 | } |
37 | 39 | ||
38 | void StartPanConnection::start() { | 40 | void StartPanConnection::start() { |
39 | m_panConnect = new OProcess(); | 41 | m_panConnect = new OProcess(); |
40 | qDebug( "IM START " + m_mac ); | 42 | qDebug( "IM START " + m_mac ); |
41 | *m_panConnect << "pand" << "--connect" << m_mac; | 43 | *m_panConnect << "pand" << "--connect" << m_mac; |
42 | 44 | ||
43 | connect( m_panConnect, SIGNAL( processExited(OProcess*) ) , | 45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
44 | this, SLOT( slotExited(OProcess*) ) ); | 46 | this, SLOT( slotExited(OProcess*) ) ); |
45 | connect( m_panConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
46 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 48 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); |
47 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
48 | qWarning( "could not start" ); | 50 | qWarning( "could not start" ); |
49 | delete m_panConnect; | 51 | delete m_panConnect; |
50 | } | 52 | } |
51 | } | 53 | } |
52 | 54 | ||
53 | 55 | ||
54 | void StartPanConnection::slotExited( OProcess* proc ) { | 56 | void StartPanConnection::slotExited( OProcess* proc ) { |
55 | delete m_panConnect; | 57 | delete m_panConnect; |
56 | m_panConnect = 0l; | 58 | m_panConnect = 0l; |
57 | } | 59 | } |
@@ -61,22 +63,22 @@ void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) | |||
61 | 63 | ||
62 | 64 | ||
63 | void StartPanConnection::stop() { | 65 | void StartPanConnection::stop() { |
64 | if ( m_panConnect ) { | 66 | if ( m_panConnect ) { |
65 | delete m_panConnect; | 67 | delete m_panConnect; |
66 | m_panConnect = 0l; | 68 | m_panConnect = 0l; |
67 | } | 69 | } |
68 | m_panConnect = new OProcess(); | 70 | m_panConnect = new OProcess(); |
69 | qDebug("IM STOP " + m_mac); | 71 | qDebug("IM STOP " + m_mac); |
70 | 72 | ||
71 | *m_panConnect << "pand" << "--kill" << m_mac; | 73 | *m_panConnect << "pand" << "--kill" << m_mac; |
72 | 74 | ||
73 | connect( m_panConnect, SIGNAL( processExited(OProcess*) ) , | 75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
74 | this, SLOT( slotExited(OProcess*) ) ); | 76 | this, SLOT( slotExited(OProcess*) ) ); |
75 | connect( m_panConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
76 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 78 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); |
77 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
78 | qWarning( "could not stop" ); | 80 | qWarning( "could not stop" ); |
79 | delete m_panConnect; | 81 | delete m_panConnect; |
80 | } | 82 | } |
81 | } | 83 | } |
82 | 84 | ||