-rw-r--r-- | library/qcopenvelope_qws.cpp | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/library/qcopenvelope_qws.cpp b/library/qcopenvelope_qws.cpp index 10d1567..81bb0f5 100644 --- a/library/qcopenvelope_qws.cpp +++ b/library/qcopenvelope_qws.cpp | |||
@@ -1,6 +1,6 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
@@ -19,5 +19,7 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef QT_NO_COP | ||
21 | #include "qcopenvelope_qws.h" | 22 | #include "qcopenvelope_qws.h" |
23 | #endif | ||
22 | #include "global.h" | 24 | #include "global.h" |
23 | #include <qbuffer.h> | 25 | #include <qbuffer.h> |
@@ -35,8 +37,9 @@ | |||
35 | /*! | 37 | /*! |
36 | \class QCopEnvelope qcopenvelope_qws.h | 38 | \class QCopEnvelope qcopenvelope_qws.h |
37 | \brief The QCopEnvelope class encapsulates QCop message sending. | 39 | \brief The QCopEnvelope class encapsulates and sends QCop messages |
40 | over QCopChannels. | ||
38 | 41 | ||
39 | QCop messages allow applications to communicate with each other. | 42 | QCop messages allow applications to communicate with each other. |
40 | These messages are send using QCopEnvelope, and received by connecting | 43 | These messages are sent using QCopEnvelope, and received by connecting |
41 | to a QCopChannel. | 44 | to a QCopChannel. |
42 | 45 | ||
@@ -48,21 +51,21 @@ | |||
48 | \endcode | 51 | \endcode |
49 | 52 | ||
50 | For messages without parameters, you can simply use: | 53 | For messages without parameters, simply use: |
51 | 54 | ||
52 | \code | 55 | \code |
53 | QCopEnvelope (channelname, messagename); | 56 | QCopEnvelope e(channelname, messagename); |
54 | \endcode | 57 | \endcode |
55 | 58 | ||
56 | Do not try to simplify further as some compilers may not do | 59 | (Do not try to simplify this further as it may confuse some |
57 | as you expect. | 60 | compilers.) |
58 | 61 | ||
59 | The <tt>channelname</tt> of channels within Qtopia all start with "QPE/". | 62 | The \c{channelname} of channels within Qtopia all start with "QPE/". |
60 | The <tt>messagename</tt> is a function identifier followed by a list of types | 63 | The \c{messagename} is a function identifier followed by a list of types |
61 | in parentheses. There are no spaces in the message name. | 64 | in parentheses. There is no whitespace in the message name. |
62 | 65 | ||
63 | To receive a message, you will generally just use your applications | 66 | To receive a message, you will generally just use your application's |
64 | predefined QPE/Application/<i>appname</i> channel | 67 | predefined QPE/Application/\e{appname} channel |
65 | (see QPEApplication::appMessage()), but you can make another channel | 68 | (see QPEApplication::appMessage()), but you can make another channel |
66 | and connect it to a slot with: | 69 | and connect it to a slot like this: |
67 | 70 | ||
68 | \code | 71 | \code |
@@ -77,6 +80,6 @@ | |||
77 | /*! | 80 | /*! |
78 | Constructs a QCopEnvelope that will write \a message to \a channel. | 81 | Constructs a QCopEnvelope that will write \a message to \a channel. |
79 | If \a message has parameters, you must then user operator<<() to | 82 | If \a message has parameters, you must then use operator<<() to |
80 | write the parameters. | 83 | add these parameters to the envelope. |
81 | */ | 84 | */ |
82 | QCopEnvelope::QCopEnvelope( const QCString& channel, const QCString& message ) : | 85 | QCopEnvelope::QCopEnvelope( const QCString& channel, const QCString& message ) : |
@@ -88,5 +91,5 @@ QCopEnvelope::QCopEnvelope( const QCString& channel, const QCString& message ) : | |||
88 | 91 | ||
89 | /*! | 92 | /*! |
90 | Writes the completed message and destroys the QCopEnvelope. | 93 | Writes the message and then destroys the QCopEnvelope. |
91 | */ | 94 | */ |
92 | QCopEnvelope::~QCopEnvelope() | 95 | QCopEnvelope::~QCopEnvelope() |
@@ -112,5 +115,5 @@ QCopEnvelope::~QCopEnvelope() | |||
112 | if (!fstat(qcopfile.handle(), &buf) && (time(&t) != (time_t)-1) ) { | 115 | if (!fstat(qcopfile.handle(), &buf) && (time(&t) != (time_t)-1) ) { |
113 | // success on fstat, lets compare times | 116 | // success on fstat, lets compare times |
114 | if (buf.st_mtime + 60 < t) { | 117 | if (buf.st_ctime + 60 < t) { |
115 | qWarning("stale file " + qcopfn + " found. Truncating"); | 118 | qWarning("stale file " + qcopfn + " found. Truncating"); |
116 | ftruncate(qcopfile.handle(), 0); | 119 | ftruncate(qcopfile.handle(), 0); |
@@ -130,6 +133,5 @@ QCopEnvelope::~QCopEnvelope() | |||
130 | if (fsize == 0) { | 133 | if (fsize == 0) { |
131 | QString cmd = ch.mid(pref); | 134 | QString cmd = ch.mid(pref); |
132 | cmd += " -qcop " + qcopfn; | 135 | Global::execute(cmd); |
133 | Global::invoke(cmd); | ||
134 | } | 136 | } |
135 | 137 | ||
@@ -155,4 +157,13 @@ QCopEnvelope::~QCopEnvelope() | |||
155 | } // endif open | 157 | } // endif open |
156 | } | 158 | } |
159 | else if (qstrncmp(ch.data(), "QPE/SOAP/", 9) == 0) { | ||
160 | // If this is a message that should go along the SOAP channel, we move the | ||
161 | // endpoint URL to the data section. | ||
162 | QString endpoint = ch.mid(9); | ||
163 | |||
164 | ch = "QPE/SOAP"; | ||
165 | // Since byte arrays are explicitly shared, this is appended to the data variable.. | ||
166 | *this << endpoint; | ||
167 | } | ||
157 | QCopChannel::send(ch,msg,data); | 168 | QCopChannel::send(ch,msg,data); |
158 | end: | 169 | end: |