author | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
commit | 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 (patch) (unidiff) | |
tree | 0701eae15aa606a0211a2fccfde0eafdac69357c /noncore/net/opietooth/lib | |
parent | 8d2d2664e5f544b8292806e617deb7a0e4170dc0 (diff) | |
download | opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.zip opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.gz opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.bz2 |
convert to Opie Debugging Framework
-rw-r--r-- | noncore/net/opietooth/lib/startdunconnection.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index 09b19d2..37f2ae7 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp | |||
@@ -36,25 +36,25 @@ StartConnection::ConnectionType StartDunConnection::type() { | |||
36 | return m_connectionType; | 36 | return m_connectionType; |
37 | } | 37 | } |
38 | 38 | ||
39 | void StartDunConnection::start() { | 39 | void StartDunConnection::start() { |
40 | m_dunConnect = new OProcess(); | 40 | m_dunConnect = new OProcess(); |
41 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; | 41 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; |
42 | 42 | ||
43 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 43 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
44 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 44 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
45 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 45 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
46 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 46 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
47 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 47 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
48 | qWarning( "could not start" ); | 48 | owarn << "could not start" << oendl; |
49 | delete m_dunConnect; | 49 | delete m_dunConnect; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | 53 | ||
54 | void StartDunConnection::slotExited( OProcess* proc ) { | 54 | void StartDunConnection::slotExited( OProcess* proc ) { |
55 | delete m_dunConnect; | 55 | delete m_dunConnect; |
56 | } | 56 | } |
57 | 57 | ||
58 | void StartDunConnection::slotStdOut(OProcess* proc, char* chars, int len) | 58 | void StartDunConnection::slotStdOut(OProcess* proc, char* chars, int len) |
59 | {} | 59 | {} |
60 | 60 | ||
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index 24ac530..50afc9f 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -30,55 +30,55 @@ QString StartPanConnection::name() { | |||
30 | } | 30 | } |
31 | 31 | ||
32 | void StartPanConnection::setConnectionType() { | 32 | void StartPanConnection::setConnectionType() { |
33 | m_connectionType = Pan; | 33 | m_connectionType = Pan; |
34 | } | 34 | } |
35 | 35 | ||
36 | StartConnection::ConnectionType StartPanConnection::type() { | 36 | StartConnection::ConnectionType StartPanConnection::type() { |
37 | return m_connectionType; | 37 | return m_connectionType; |
38 | } | 38 | } |
39 | 39 | ||
40 | void StartPanConnection::start() { | 40 | void StartPanConnection::start() { |
41 | m_panConnect = new OProcess(); | 41 | m_panConnect = new OProcess(); |
42 | qDebug( "IM START " + m_mac ); | 42 | odebug << "IM START " + m_mac << oendl; |
43 | *m_panConnect << "pand" << "--connect" << m_mac; | 43 | *m_panConnect << "pand" << "--connect" << m_mac; |
44 | 44 | ||
45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
46 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 46 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
48 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 48 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
50 | qWarning( "could not start" ); | 50 | owarn << "could not start" << oendl; |
51 | delete m_panConnect; | 51 | delete m_panConnect; |
52 | } | 52 | } |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | void StartPanConnection::slotExited( OProcess* proc ) { | 56 | void StartPanConnection::slotExited( OProcess* proc ) { |
57 | delete m_panConnect; | 57 | delete m_panConnect; |
58 | m_panConnect = 0l; | 58 | m_panConnect = 0l; |
59 | } | 59 | } |
60 | 60 | ||
61 | void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) | 61 | void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) |
62 | {} | 62 | {} |
63 | 63 | ||
64 | 64 | ||
65 | void StartPanConnection::stop() { | 65 | void StartPanConnection::stop() { |
66 | if ( m_panConnect ) { | 66 | if ( m_panConnect ) { |
67 | delete m_panConnect; | 67 | delete m_panConnect; |
68 | m_panConnect = 0l; | 68 | m_panConnect = 0l; |
69 | } | 69 | } |
70 | m_panConnect = new OProcess(); | 70 | m_panConnect = new OProcess(); |
71 | qDebug("IM STOP " + m_mac); | 71 | odebug << "IM STOP " + m_mac << oendl; |
72 | 72 | ||
73 | *m_panConnect << "pand" << "--kill" << m_mac; | 73 | *m_panConnect << "pand" << "--kill" << m_mac; |
74 | 74 | ||
75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
76 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); | 76 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
78 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); | 78 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
80 | qWarning( "could not stop" ); | 80 | owarn << "could not stop" << oendl; |
81 | delete m_panConnect; | 81 | delete m_panConnect; |
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||