Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

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,10 +1,10 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
@@ -15,13 +15,15 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#ifndef QT_NO_COP
 #include "qcopenvelope_qws.h"
+#endif
 #include "global.h"
 #include <qbuffer.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <unistd.h>
 #include <errno.h>
@@ -31,66 +33,67 @@
 #include <time.h>
 
 #ifndef QT_NO_COP
 
 /*!
   \class QCopEnvelope qcopenvelope_qws.h
-  \brief The QCopEnvelope class encapsulates QCop message sending.
+  \brief The QCopEnvelope class encapsulates and sends QCop messages
+  over QCopChannels.
 
   QCop messages allow applications to communicate with each other.
-  These messages are send using QCopEnvelope, and received by connecting
+  These messages are sent using QCopEnvelope, and received by connecting
   to a QCopChannel.
 
   To send a message, use the following protocol:
 
   \code
      QCopEnvelope e(channelname, messagename);
      e << parameter1 << parameter2 << ...;
   \endcode
 
-  For messages without parameters, you can simply use:
+  For messages without parameters, simply use:
 
   \code
-     QCopEnvelope (channelname, messagename);
+     QCopEnvelope e(channelname, messagename);
   \endcode
 
-  Do not try to simplify further as some compilers may not do
-  as you expect.
+  (Do not try to simplify this further as it may confuse some
+  compilers.)
 
-  The <tt>channelname</tt> of channels within Qtopia all start with "QPE/".
-  The <tt>messagename</tt> is a function identifier followed by a list of types
-  in parentheses. There are no spaces in the message name.
+  The \c{channelname} of channels within Qtopia all start with "QPE/".
+  The \c{messagename} is a function identifier followed by a list of types
+  in parentheses. There is no whitespace in the message name.
 
-  To receive a message, you will generally just use your applications
-  predefined QPE/Application/<i>appname</i> channel
+  To receive a message, you will generally just use your application's
+  predefined QPE/Application/\e{appname} channel
   (see QPEApplication::appMessage()), but you can make another channel
-  and connect it to a slot with:
+  and connect it to a slot like this:
 
   \code
       myChannel = new QCopChannel( "QPE/FooBar", this );
       connect( myChannel, SIGNAL(received(const QCString &, const QByteArray &)),
                this, SLOT(fooBarMessage( const QCString &, const QByteArray &)) );
   \endcode
 
   See also, the \link qcop.html list of Qtopia messages\endlink.
 */
 
 /*!
   Constructs a QCopEnvelope that will write \a message to \a channel.
-  If \a message has parameters, you must then user operator<<() to
-  write the parameters.
+  If \a message has parameters, you must then use operator<<() to
+  add these parameters to the envelope.
 */
 QCopEnvelope::QCopEnvelope( const QCString& channel, const QCString& message ) :
     QDataStream(new QBuffer),
     ch(channel), msg(message)
 {
     device()->open(IO_WriteOnly);
 }
 
 /*!
-  Writes the completed message and destroys the QCopEnvelope.
+  Writes the message and then destroys the QCopEnvelope.
 */
 QCopEnvelope::~QCopEnvelope()
 {
     QByteArray data = ((QBuffer*)device())->buffer();
     const int pref=16;
     if ( qstrncmp(ch.data(),"QPE/Application/",pref)==0 ) {
@@ -108,13 +111,13 @@ QCopEnvelope::~QCopEnvelope()
 	       reason did not start).  I modified more than 1 minute ago,
 	       truncate the file */
 	    struct stat buf;
 	    time_t t;
 	    if (!fstat(qcopfile.handle(), &buf) &&  (time(&t) != (time_t)-1) ) {
 		// success on fstat, lets compare times
-		if (buf.st_mtime + 60 < t) {
+		if (buf.st_ctime + 60 < t) {
 		    qWarning("stale file " + qcopfn + " found.  Truncating");
 		    ftruncate(qcopfile.handle(), 0);
 		    qcopfile.reset();
 		}
 	    }
 
@@ -126,14 +129,13 @@ QCopEnvelope::~QCopEnvelope()
 		    flock(qcopfile.handle(), LOCK_UN);
 		    qcopfile.close();
 		}
 
 		if (fsize == 0) {
 		    QString cmd = ch.mid(pref);
-		    cmd += " -qcop " + qcopfn;
-		    Global::invoke(cmd);
+		    Global::execute(cmd);
 		}
 
 		char c;
 		for (int i=0; (c=msg[i]); i++) {
 		    if ( c == ' ' ) {
 			// Return-value required
@@ -151,12 +153,21 @@ QCopEnvelope::~QCopEnvelope()
 	    qcopfile.remove();
 	} else {
 	    qWarning(QString("Failed to obtain file lock on %1")
 			.arg(qcopfn));
 	} // endif open
     }
+    else if (qstrncmp(ch.data(), "QPE/SOAP/", 9) == 0) {
+      // If this is a message that should go along the SOAP channel, we move the
+      // endpoint URL to the data section.
+      QString endpoint = ch.mid(9);
+      
+      ch = "QPE/SOAP";
+      // Since byte arrays are explicitly shared, this is appended to the data variable..
+      *this << endpoint;
+    }
     QCopChannel::send(ch,msg,data);
 end:
     delete device();
 }
 
 #endif