-rw-r--r-- | pwmanager/pwmanager/ipc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pwmanager/pwmanager/ipc.cpp b/pwmanager/pwmanager/ipc.cpp index 643b022..4c65f1d 100644 --- a/pwmanager/pwmanager/ipc.cpp +++ b/pwmanager/pwmanager/ipc.cpp | |||
@@ -19,25 +19,25 @@ | |||
19 | 19 | ||
20 | #include "ipc.h" | 20 | #include "ipc.h" |
21 | #include "pwmexception.h" | 21 | #include "pwmexception.h" |
22 | 22 | ||
23 | #include <qsocketnotifier.h> | 23 | #include <qsocketnotifier.h> |
24 | #ifndef _WIN32_ | 24 | #ifndef _WIN32_ |
25 | #include <sys/socket.h> | 25 | #include <sys/socket.h> |
26 | #endif | 26 | #endif |
27 | #ifndef PWM_EMBEDDED | 27 | #ifndef PWM_EMBEDDED |
28 | #include <sys/types.h> | 28 | #include <sys/types.h> |
29 | #include <stdio.h> | 29 | #include <stdio.h> |
30 | #else | 30 | #else |
31 | #include <qsocket.h> | 31 | #include <q3socket.h> |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #define END_OF_LINE '\n' | 34 | #define END_OF_LINE '\n' |
35 | #define INIT_LINEBUF_LEN64 /* byte */ | 35 | #define INIT_LINEBUF_LEN64 /* byte */ |
36 | 36 | ||
37 | #ifndef PWM_EMBEDDED | 37 | #ifndef PWM_EMBEDDED |
38 | 38 | ||
39 | Ipc::Ipc() | 39 | Ipc::Ipc() |
40 | : stream (0) | 40 | : stream (0) |
41 | , notifier (0) | 41 | , notifier (0) |
42 | , rdBuf (0) | 42 | , rdBuf (0) |
43 | { | 43 | { |
@@ -68,36 +68,36 @@ Ipc::Ipc() | |||
68 | host = true; | 68 | host = true; |
69 | } | 69 | } |
70 | #else | 70 | #else |
71 | Ipc::Ipc() | 71 | Ipc::Ipc() |
72 | : notifier (0) | 72 | : notifier (0) |
73 | , rdBuf (0) | 73 | , rdBuf (0) |
74 | { | 74 | { |
75 | #ifndef _WIN32_ | 75 | #ifndef _WIN32_ |
76 | if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sock)) { | 76 | if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sock)) { |
77 | qDebug("Ipc: socketpair() failed"); | 77 | qDebug("Ipc: socketpair() failed"); |
78 | } | 78 | } |
79 | #endif | 79 | #endif |
80 | QSocket* qsock = new QSocket(); | 80 | Q3Socket* qsock = new Q3Socket(); |
81 | qsock->setSocket(sock[0]); | 81 | qsock->setSocket(sock[0]); |
82 | 82 | ||
83 | rdBufSize = INIT_LINEBUF_LEN; | 83 | rdBufSize = INIT_LINEBUF_LEN; |
84 | rdBuf = (char *)(malloc(rdBufSize)); | 84 | rdBuf = (char *)(malloc(rdBufSize)); |
85 | if (!rdBuf) { | 85 | if (!rdBuf) { |
86 | close(sock[0]); | 86 | close(sock[0]); |
87 | close(sock[1]); | 87 | close(sock[1]); |
88 | qDebug("Ipc: OOM"); | 88 | qDebug("Ipc: OOM"); |
89 | } | 89 | } |
90 | 90 | ||
91 | qsock = new QSocket(); | 91 | qsock = new Q3Socket(); |
92 | qsock->setSocket(sock[0]); | 92 | qsock->setSocket(sock[0]); |
93 | 93 | ||
94 | /*US | 94 | /*US |
95 | stream = fdopen(sock[0], "r"); | 95 | stream = fdopen(sock[0], "r"); |
96 | if (!stream) { | 96 | if (!stream) { |
97 | close(sock[0]); | 97 | close(sock[0]); |
98 | close(sock[1]); | 98 | close(sock[1]); |
99 | free(rdBuf); | 99 | free(rdBuf); |
100 | qDebug("Ipc: fdopen() failed"); | 100 | qDebug("Ipc: fdopen() failed"); |
101 | } | 101 | } |
102 | */ | 102 | */ |
103 | 103 | ||
@@ -143,25 +143,25 @@ Ipc::Ipc(const Ipc *ipc) | |||
143 | Ipc::Ipc(const Ipc *ipc) | 143 | Ipc::Ipc(const Ipc *ipc) |
144 | : notifier (0) | 144 | : notifier (0) |
145 | , rdBuf (0) | 145 | , rdBuf (0) |
146 | { | 146 | { |
147 | rdBufSize = INIT_LINEBUF_LEN; | 147 | rdBufSize = INIT_LINEBUF_LEN; |
148 | rdBuf = (char *)(malloc(rdBufSize)); | 148 | rdBuf = (char *)(malloc(rdBufSize)); |
149 | if (!rdBuf) { | 149 | if (!rdBuf) { |
150 | qDebug("Ipc: OOM"); | 150 | qDebug("Ipc: OOM"); |
151 | } | 151 | } |
152 | sock[0] = ipc->sock[1]; | 152 | sock[0] = ipc->sock[1]; |
153 | sock[1] = ipc->sock[0]; | 153 | sock[1] = ipc->sock[0]; |
154 | 154 | ||
155 | qSock = new QSocket(); | 155 | qSock = new Q3Socket(); |
156 | qSock->setSocket(sock[0]); | 156 | qSock->setSocket(sock[0]); |
157 | 157 | ||
158 | /*US | 158 | /*US |
159 | stream = fdopen(sock[0], "r"); | 159 | stream = fdopen(sock[0], "r"); |
160 | if (!stream) { | 160 | if (!stream) { |
161 | free(rdBuf); | 161 | free(rdBuf); |
162 | qDebug("Ipc: fdopen() failed"); | 162 | qDebug("Ipc: fdopen() failed"); |
163 | } | 163 | } |
164 | */ | 164 | */ |
165 | 165 | ||
166 | notifier = new QSocketNotifier(sock[0], QSocketNotifier::Read); | 166 | notifier = new QSocketNotifier(sock[0], QSocketNotifier::Read); |
167 | connect(notifier, SIGNAL(activated(int)), | 167 | connect(notifier, SIGNAL(activated(int)), |
@@ -203,15 +203,15 @@ void Ipc::receiveData(int s) | |||
203 | } | 203 | } |
204 | #else | 204 | #else |
205 | int rd; | 205 | int rd; |
206 | rd = qSock->readLine(rdBuf, rdBufSize); | 206 | rd = qSock->readLine(rdBuf, rdBufSize); |
207 | if (rd > 0) { | 207 | if (rd > 0) { |
208 | emit lineAvailable(rdBuf, rd); | 208 | emit lineAvailable(rdBuf, rd); |
209 | } | 209 | } |
210 | #endif | 210 | #endif |
211 | qDebug("void Ipc::receiveData(int s) has to be implemented."); | 211 | qDebug("void Ipc::receiveData(int s) has to be implemented."); |
212 | 212 | ||
213 | } | 213 | } |
214 | 214 | ||
215 | #ifndef PWM_EMBEDDED | 215 | #ifndef PWM_EMBEDDED_ |
216 | #include "ipc.moc" | 216 | #include "moc_ipc.cpp" |
217 | #endif | 217 | #endif |