-rw-r--r-- | core/launcher/qcopbridge.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp index 9cb56ce..b45f0cc 100644 --- a/core/launcher/qcopbridge.cpp +++ b/core/launcher/qcopbridge.cpp | |||
@@ -18,17 +18,19 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "qcopbridge.h" | 21 | #include "qcopbridge.h" |
22 | #include "transferserver.h" | 22 | #include "transferserver.h" |
23 | 23 | ||
24 | #include <opie2/oglobal.h> | ||
25 | |||
24 | #ifdef Q_WS_QWS | 26 | #ifdef Q_WS_QWS |
25 | #include <qtopia/qcopenvelope_qws.h> | 27 | #include <qtopia/qcopenvelope_qws.h> |
26 | #endif | 28 | #endif |
27 | #include <qtopia/qpeapplication.h> | 29 | #include <qtopia/qpeapplication.h> |
28 | #include <qtopia/global.h> | 30 | |
29 | #include <qtopia/version.h> | 31 | #include <qtopia/version.h> |
30 | #include <qtopia/config.h> | 32 | #include <qtopia/config.h> |
31 | 33 | ||
32 | #include <qdir.h> | 34 | #include <qdir.h> |
33 | #include <qfile.h> | 35 | #include <qfile.h> |
34 | #include <qtextstream.h> | 36 | #include <qtextstream.h> |
@@ -52,13 +54,12 @@ | |||
52 | #endif | 54 | #endif |
53 | 55 | ||
54 | #if defined(_OS_LINUX_) | 56 | #if defined(_OS_LINUX_) |
55 | #include <shadow.h> | 57 | #include <shadow.h> |
56 | #endif | 58 | #endif |
57 | 59 | ||
58 | #include "launcherglobal.h" | ||
59 | 60 | ||
60 | //#define INSECURE | 61 | //#define INSECURE |
61 | 62 | ||
62 | const int block_size = 51200; | 63 | const int block_size = 51200; |
63 | 64 | ||
64 | QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent, | 65 | QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent, |
@@ -322,13 +323,13 @@ void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& da | |||
322 | return; | 323 | return; |
323 | 324 | ||
324 | const char hdr[]="CALLB QPE/Desktop "; | 325 | const char hdr[]="CALLB QPE/Desktop "; |
325 | writeBlock(hdr,sizeof(hdr)-1); | 326 | writeBlock(hdr,sizeof(hdr)-1); |
326 | writeBlock(msg,msg.length()); | 327 | writeBlock(msg,msg.length()); |
327 | writeBlock(" ",1); | 328 | writeBlock(" ",1); |
328 | QByteArray b64 = Opie::Global::encodeBase64(data); | 329 | QByteArray b64 = OGlobal::encodeBase64(data); |
329 | writeBlock(b64.data(),b64.size()); | 330 | writeBlock(b64.data(),b64.size()); |
330 | writeBlock("\r\n",2); | 331 | writeBlock("\r\n",2); |
331 | 332 | ||
332 | } | 333 | } |
333 | 334 | ||
334 | 335 | ||