call QCopChannel::send() instead of using a QCopEnvelop

2 files changed, 14 insertions, 26 deletions

diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
index b446d05..7ee72ba 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -26,17 +26,18 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "odevice_abstractmobiledevice.h"
 
-#include <qpe/qcopenvelope_qws.h>
+/* QT */
+#include <qcopchannel_qws.h>
 
+/* STD */
 #include <sys/time.h>
 #include <sys/ioctl.h>
-
 #include <time.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 namespace Opie {
@@ -59,17 +60,13 @@ void OAbstractMobileDevice::setAPMTimeOut( int time ) {
 
 bool OAbstractMobileDevice::suspend() {
     if ( !isQWS( ) ) // only qwsserver is allowed to suspend
         return false;
 
     bool res = false;
-
-    {
-        QCopEnvelope( "QPE/System", "aboutToSuspend()" );
-    }
-    qApp->processEvents(); // ensure the qcop call is being processed asap
+    QCopChannel::send( "QPE/System", "aboutToSuspend()" );
 
     struct timeval tvs, tvn;
     ::gettimeofday ( &tvs, 0 );
 
     ::sync(); // flush fs caches
     res = ( ::system ( "apm --suspend" ) == 0 );
@@ -82,16 +79,13 @@ bool OAbstractMobileDevice::suspend() {
         do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
             ::usleep ( 200 * 1000 );
             ::gettimeofday ( &tvn, 0 );
         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
     }
 
-    {
-        QCopEnvelope( "QPE/System", "returnFromSuspend()" );
-    }
-    qApp->processEvents(); // ensure the qcop call is being processed asap
+    QCopChannel::send( "QPE/System", "returnFromSuspend()" );
 
     return res;
 }
 
 //#include <linux/fb.h> better not rely on kernel headers in userspace ...
 
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 2b2467c..33d5cd6 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -26,25 +26,25 @@
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include "odevice_zaurus.h"
 
-/* QT */
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qwindowsystem_qws.h>
-
 /* OPIE */
 #include <opie2/oinputsystem.h>
 #include <opie2/oresource.h>
 
 #include <qpe/config.h>
 #include <qpe/sound.h>
-#include <qpe/qcopenvelope_qws.h>
+
+/* QT */
+#include <qapplication.h>
+#include <qfile.h>
+#include <qtextstream.h>
+#include <qwindowsystem_qws.h>
+#include <qcopchannel_qws.h>
 
 /* STD */
 #include <fcntl.h>
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -709,16 +709,13 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress,
 
 bool Zaurus::suspend() {
     if ( !isQWS( ) ) // only qwsserver is allowed to suspend
         return false;
 
     bool res = false;
-    {
-        QCopEnvelope( "QPE/System", "aboutToSuspend()" );
-    }
-    qApp->processEvents(); // ensure the qcop call is being processed asap
+    QCopChannel::send( "QPE/System", "aboutToSuspend()" );
 
     struct timeval tvs, tvn;
     ::gettimeofday ( &tvs, 0 );
 
     ::sync(); // flush fs caches
     res = ( ::system ( "apm --suspend" ) == 0 );
@@ -732,13 +729,10 @@ bool Zaurus::suspend() {
         do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
             ::usleep ( 200 * 1000 );
             ::gettimeofday ( &tvn, 0 );
         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
     }
 
-    {
-        QCopEnvelope( "QPE/System", "returnFromSuspend()" );
-    }
-    qApp->processEvents(); // ensure the qcop call is being processed asap
+    QCopChannel::send( "QPE/System", "returnFromSuspend()" );
 
     return res;
 }