author | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
commit | 0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44 (patch) (unidiff) | |
tree | f6a68afa76a9be4099c3de7a286caeadd250c966 /noncore/net/opietooth/lib | |
parent | d9d68663164078b8dbdbfe70d291291b9fd5aacf (diff) | |
download | opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.zip opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.tar.gz opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.tar.bz2 |
Convert net to ODP and QtAUX
-rw-r--r-- | noncore/net/opietooth/lib/device.cc | 12 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/device.h | 12 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.cc | 22 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/manager.h | 26 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startdunconnection.cpp | 6 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startdunconnection.h | 8 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.cpp | 10 | ||||
-rw-r--r-- | noncore/net/opietooth/lib/startpanconnection.h | 8 |
8 files changed, 56 insertions, 48 deletions
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index bae1c47..d913853 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc | |||
@@ -1,12 +1,14 @@ | |||
1 | 1 | ||
2 | #include <signal.h> | 2 | #include <signal.h> |
3 | 3 | ||
4 | #include <opie/oprocess.h> | 4 | #include <opie2/oprocess.h> |
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; | ||
11 | using namespace Opie::Core; | ||
10 | namespace { | 12 | namespace { |
11 | int parsePid( const QCString& par ){ | 13 | int parsePid( const QCString& par ){ |
12 | int id=0; | 14 | int id=0; |
@@ -47,11 +49,11 @@ void Device::attach(){ | |||
47 | *m_process << "hciattach"; | 49 | *m_process << "hciattach"; |
48 | *m_process << "-p"; | 50 | *m_process << "-p"; |
49 | *m_process << m_device << m_mode << m_speed; | 51 | *m_process << m_device << m_mode << m_speed; |
50 | connect(m_process, SIGNAL( processExited(OProcess*) ), | 52 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), |
51 | this, SLOT( slotExited(OProcess* ) ) ); | 53 | this, SLOT( slotExited(OProcess* ) ) ); |
52 | connect(m_process, SIGNAL( receivedStdout(OProcess*, char*, int) ), | 54 | connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ), |
53 | this, SLOT(slotStdOut(OProcess*,char*,int ) ) ); | 55 | this, SLOT(slotStdOut(OProcess*,char*,int ) ) ); |
54 | connect(m_process, SIGNAL(receivedStderr(OProcess*, char*, int ) ), | 56 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), |
55 | this, SLOT(slotStdErr(OProcess*,char*,int) ) ); | 57 | this, SLOT(slotStdErr(OProcess*,char*,int) ) ); |
56 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ | 58 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ |
57 | qWarning("Could not start" ); | 59 | qWarning("Could not start" ); |
@@ -96,7 +98,7 @@ void Device::slotExited( OProcess* proc) | |||
96 | m_hci = new OProcess( ); | 98 | m_hci = new OProcess( ); |
97 | *m_hci << "hciconfig"; | 99 | *m_hci << "hciconfig"; |
98 | *m_hci << "hci0 up"; | 100 | *m_hci << "hci0 up"; |
99 | connect(m_hci, SIGNAL( processExited(OProcess*) ), | 101 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), |
100 | this, SLOT( slotExited(OProcess* ) ) ); | 102 | this, SLOT( slotExited(OProcess* ) ) ); |
101 | if(!m_hci->start() ){ | 103 | if(!m_hci->start() ){ |
102 | qWarning("could not start" ); | 104 | qWarning("could not start" ); |
diff --git a/noncore/net/opietooth/lib/device.h b/noncore/net/opietooth/lib/device.h index ce7fccc..f3339fc 100644 --- a/noncore/net/opietooth/lib/device.h +++ b/noncore/net/opietooth/lib/device.h | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #include <sys/types.h> | 9 | #include <sys/types.h> |
10 | 10 | ||
11 | class OProcess; | 11 | namespace Opie {namespace Core {class Opie::Core::OProcess;}} |
12 | namespace OpieTooth { | 12 | namespace OpieTooth { |
13 | /** | 13 | /** |
14 | * Device takes care of attaching serial | 14 | * Device takes care of attaching serial |
@@ -67,16 +67,16 @@ namespace OpieTooth { | |||
67 | */ | 67 | */ |
68 | void device(const QString& device, bool up ); | 68 | void device(const QString& device, bool up ); |
69 | private slots: | 69 | private slots: |
70 | virtual void slotExited( OProcess* ); | 70 | virtual void slotExited( Opie::Core::OProcess* ); |
71 | virtual void slotStdOut(OProcess*, char*, int ); | 71 | virtual void slotStdOut(Opie::Core::OProcess*, char*, int ); |
72 | virtual void slotStdErr(OProcess*, char*, int ); | 72 | virtual void slotStdErr(Opie::Core::OProcess*, char*, int ); |
73 | private: | 73 | private: |
74 | class Private; | 74 | class Private; |
75 | Private *d; | 75 | Private *d; |
76 | QString m_device; | 76 | QString m_device; |
77 | bool m_attached:1; | 77 | bool m_attached:1; |
78 | OProcess* m_hci; | 78 | Opie::Core::OProcess* m_hci; |
79 | OProcess* m_process; | 79 | Opie::Core::OProcess* m_process; |
80 | QString m_devId; | 80 | QString m_devId; |
81 | QString m_mode; | 81 | QString m_mode; |
82 | QString m_speed; | 82 | QString m_speed; |
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,6 +1,6 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #include <opie/oprocess.h> | 3 | #include <opie2/oprocess.h> |
4 | 4 | ||
5 | #include "parser.h" | 5 | #include "parser.h" |
6 | #include "manager.h" | 6 | #include "manager.h" |
@@ -8,6 +8,8 @@ | |||
8 | 8 | ||
9 | using namespace OpieTooth; | 9 | using namespace OpieTooth; |
10 | 10 | ||
11 | using namespace Opie::Core; | ||
12 | using namespace Opie::Core; | ||
11 | Manager::Manager( const QString& dev ) | 13 | Manager::Manager( const QString& dev ) |
12 | : QObject() | 14 | : QObject() |
13 | { | 15 | { |
@@ -42,7 +44,7 @@ void Manager::isAvailable( const QString& device ){ | |||
42 | OProcess* l2ping = new OProcess(); | 44 | OProcess* l2ping = new OProcess(); |
43 | l2ping->setName( device.latin1() ); | 45 | l2ping->setName( device.latin1() ); |
44 | *l2ping << "l2ping" << "-c1" << device; | 46 | *l2ping << "l2ping" << "-c1" << device; |
45 | connect(l2ping, SIGNAL(processExited(OProcess* ) ), | 47 | connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ), |
46 | this, SLOT(slotProcessExited(OProcess*) ) ); | 48 | this, SLOT(slotProcessExited(OProcess*) ) ); |
47 | if (!l2ping->start() ) { | 49 | if (!l2ping->start() ) { |
48 | emit available( device, false ); | 50 | emit available( device, false ); |
@@ -60,9 +62,9 @@ void Manager::searchDevices( const QString& device ){ | |||
60 | OProcess* hcitool = new OProcess(); | 62 | OProcess* hcitool = new OProcess(); |
61 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); | 63 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); |
62 | *hcitool << "hcitool" << "scan"; | 64 | *hcitool << "hcitool" << "scan"; |
63 | connect( hcitool, SIGNAL(processExited(OProcess*) ) , | 65 | connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , |
64 | this, SLOT(slotHCIExited(OProcess* ) ) ); | 66 | this, SLOT(slotHCIExited(OProcess* ) ) ); |
65 | connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 67 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
66 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); | 68 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); |
67 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 69 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
68 | qWarning("could not start"); | 70 | qWarning("could not start"); |
@@ -107,9 +109,9 @@ void Manager::searchServices( const QString& remDevice ){ | |||
107 | *m_sdp << "sdptool" << "browse" << remDevice; | 109 | *m_sdp << "sdptool" << "browse" << remDevice; |
108 | m_sdp->setName( remDevice.latin1() ); | 110 | m_sdp->setName( remDevice.latin1() ); |
109 | qWarning("search Services for %s", remDevice.latin1() ); | 111 | qWarning("search Services for %s", remDevice.latin1() ); |
110 | connect(m_sdp, SIGNAL(processExited(OProcess*) ), | 112 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), |
111 | this, SLOT(slotSDPExited(OProcess* ) ) ); | 113 | this, SLOT(slotSDPExited(OProcess* ) ) ); |
112 | connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 114 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
113 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); | 115 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); |
114 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 116 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
115 | qWarning("could not start sdptool" ); | 117 | qWarning("could not start sdptool" ); |
@@ -246,9 +248,9 @@ void Manager::searchConnections() { | |||
246 | OProcess* proc = new OProcess(); | 248 | OProcess* proc = new OProcess(); |
247 | m_hcitoolCon = QString::null; | 249 | m_hcitoolCon = QString::null; |
248 | 250 | ||
249 | connect(proc, SIGNAL(processExited(OProcess*) ), | 251 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
250 | this, SLOT(slotConnectionExited( OProcess*) ) ); | 252 | this, SLOT(slotConnectionExited( OProcess*) ) ); |
251 | connect(proc, SIGNAL(receivedStdout(OProcess*, char*, int) ), | 253 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
252 | this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); | 254 | this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); |
253 | *proc << "hcitool"; | 255 | *proc << "hcitool"; |
254 | *proc << "con"; | 256 | *proc << "con"; |
@@ -305,9 +307,9 @@ void Manager::signalStrength( const QString &mac ) { | |||
305 | 307 | ||
306 | OProcess* sig_proc = new OProcess(); | 308 | OProcess* sig_proc = new OProcess(); |
307 | 309 | ||
308 | connect(sig_proc, SIGNAL(processExited(OProcess*) ), | 310 | connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
309 | this, SLOT(slotSignalStrengthExited( OProcess*) ) ); | 311 | this, SLOT(slotSignalStrengthExited( OProcess*) ) ); |
310 | connect(sig_proc, SIGNAL(receivedStdout(OProcess*, char*, int) ), | 312 | connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
311 | this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) ); | 313 | this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) ); |
312 | *sig_proc << "hcitool"; | 314 | *sig_proc << "hcitool"; |
313 | *sig_proc << "lq"; | 315 | *sig_proc << "lq"; |
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h index abc8ba1..9b1c714 100644 --- a/noncore/net/opietooth/lib/manager.h +++ b/noncore/net/opietooth/lib/manager.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #include "remotedevice.h" | 11 | #include "remotedevice.h" |
12 | #include "services.h" | 12 | #include "services.h" |
13 | 13 | ||
14 | class OProcess; | 14 | namespace Opie {namespace Core {class Opie::Core::OProcess;}} |
15 | namespace OpieTooth { | 15 | namespace OpieTooth { |
16 | class Device; | 16 | class Device; |
17 | /** Manager manages a blueZ device (hci0 for example) | 17 | /** Manager manages a blueZ device (hci0 for example) |
@@ -142,30 +142,30 @@ namespace OpieTooth { | |||
142 | void signalStrength( const QString& mac, const QString& strengh ); | 142 | void signalStrength( const QString& mac, const QString& strengh ); |
143 | 143 | ||
144 | private slots: | 144 | private slots: |
145 | void slotProcessExited(OProcess* ); | 145 | void slotProcessExited(Opie::Core::OProcess* ); |
146 | 146 | ||
147 | void slotSDPExited(OProcess*); | 147 | void slotSDPExited(Opie::Core::OProcess*); |
148 | void slotSDPOut(OProcess*, char*, int); | 148 | void slotSDPOut(Opie::Core::OProcess*, char*, int); |
149 | 149 | ||
150 | void slotHCIExited(OProcess* ); | 150 | void slotHCIExited(Opie::Core::OProcess* ); |
151 | void slotHCIOut(OProcess*, char*, int ); | 151 | void slotHCIOut(Opie::Core::OProcess*, char*, int ); |
152 | 152 | ||
153 | void slotConnectionExited(OProcess* ); | 153 | void slotConnectionExited(Opie::Core::OProcess* ); |
154 | void slotConnectionOutput(OProcess*, char*, int ); | 154 | void slotConnectionOutput(Opie::Core::OProcess*, char*, int ); |
155 | 155 | ||
156 | void slotSignalStrengthOutput( OProcess*, char*, int ); | 156 | void slotSignalStrengthOutput( Opie::Core::OProcess*, char*, int ); |
157 | void slotSignalStrengthExited( OProcess* ); | 157 | void slotSignalStrengthExited( Opie::Core::OProcess* ); |
158 | private: | 158 | private: |
159 | Services::ValueList parseSDPOutput( const QString& ); | 159 | Services::ValueList parseSDPOutput( const QString& ); |
160 | RemoteDevice::ValueList parseHCIOutput( const QString& ); | 160 | RemoteDevice::ValueList parseHCIOutput( const QString& ); |
161 | ConnectionState::ValueList parseConnections( const QString& ); | 161 | ConnectionState::ValueList parseConnections( const QString& ); |
162 | OProcess *m_hcitool; | 162 | Opie::Core::OProcess *m_hcitool; |
163 | OProcess *m_sdp; // not only one | 163 | Opie::Core::OProcess *m_sdp; // not only one |
164 | QString m_device; | 164 | QString m_device; |
165 | QMap<QString, int> m_signalStrength; | 165 | QMap<QString, int> m_signalStrength; |
166 | QMap<QString, QString> m_out; | 166 | QMap<QString, QString> m_out; |
167 | QMap<QString, QString> m_devices; | 167 | QMap<QString, QString> m_devices; |
168 | QMap<OProcess*, QString> m_signalMac; | 168 | QMap<Opie::Core::OProcess*, QString> m_signalMac; |
169 | QString m_hcitoolCon; | 169 | QString m_hcitoolCon; |
170 | }; | 170 | }; |
171 | }; | 171 | }; |
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index c3850eb..90ef04a 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp | |||
@@ -4,6 +4,8 @@ | |||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | ||
8 | using namespace Opie::Core; | ||
7 | StartDunConnection::StartDunConnection() { | 9 | StartDunConnection::StartDunConnection() { |
8 | m_dunConnect = 0l; | 10 | m_dunConnect = 0l; |
9 | setConnectionType(); | 11 | setConnectionType(); |
@@ -39,9 +41,9 @@ void StartDunConnection::start() { | |||
39 | m_dunConnect = new OProcess(); | 41 | m_dunConnect = new OProcess(); |
40 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; | 42 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; |
41 | 43 | ||
42 | connect( m_dunConnect, SIGNAL( processExited(OProcess*) ) , | 44 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
43 | this, SLOT( slotExited(OProcess*) ) ); | 45 | this, SLOT( slotExited(OProcess*) ) ); |
44 | connect( m_dunConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 46 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
45 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 47 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); |
46 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 48 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
47 | qWarning( "could not start" ); | 49 | qWarning( "could not start" ); |
diff --git a/noncore/net/opietooth/lib/startdunconnection.h b/noncore/net/opietooth/lib/startdunconnection.h index 43a852a..f6107f6 100644 --- a/noncore/net/opietooth/lib/startdunconnection.h +++ b/noncore/net/opietooth/lib/startdunconnection.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | #include "connection.h" | 5 | #include "connection.h" |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | namespace OpieTooth { | 8 | namespace OpieTooth { |
9 | 9 | ||
@@ -27,11 +27,11 @@ namespace OpieTooth { | |||
27 | QString m_name; | 27 | QString m_name; |
28 | QString m_mac; | 28 | QString m_mac; |
29 | ConnectionType m_connectionType; | 29 | ConnectionType m_connectionType; |
30 | OProcess* m_dunConnect; | 30 | Opie::Core::OProcess* m_dunConnect; |
31 | 31 | ||
32 | private slots: | 32 | private slots: |
33 | void slotExited( OProcess* proc ); | 33 | void slotExited( Opie::Core::OProcess* proc ); |
34 | void slotStdOut( OProcess* proc, char* chars, int len ); | 34 | void slotStdOut( Opie::Core::OProcess* proc, char* chars, int len ); |
35 | }; | 35 | }; |
36 | 36 | ||
37 | 37 | ||
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 | |||
@@ -4,6 +4,8 @@ | |||
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(); |
@@ -40,9 +42,9 @@ void StartPanConnection::start() { | |||
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" ); |
@@ -70,9 +72,9 @@ void StartPanConnection::stop() { | |||
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" ); |
diff --git a/noncore/net/opietooth/lib/startpanconnection.h b/noncore/net/opietooth/lib/startpanconnection.h index 7e5bd95..e12dad0 100644 --- a/noncore/net/opietooth/lib/startpanconnection.h +++ b/noncore/net/opietooth/lib/startpanconnection.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | #include "connection.h" | 5 | #include "connection.h" |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | namespace OpieTooth { | 8 | namespace OpieTooth { |
9 | 9 | ||
@@ -27,11 +27,11 @@ namespace OpieTooth { | |||
27 | QString m_name; | 27 | QString m_name; |
28 | QString m_mac; | 28 | QString m_mac; |
29 | ConnectionType m_connectionType; | 29 | ConnectionType m_connectionType; |
30 | OProcess* m_panConnect; | 30 | Opie::Core::OProcess* m_panConnect; |
31 | 31 | ||
32 | private slots: | 32 | private slots: |
33 | void slotExited( OProcess* proc ); | 33 | void slotExited( Opie::Core::OProcess* proc ); |
34 | void slotStdOut( OProcess* proc, char* chars, int len ); | 34 | void slotStdOut( Opie::Core::OProcess* proc, char* chars, int len ); |
35 | }; | 35 | }; |
36 | 36 | ||
37 | 37 | ||