summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-27 22:40:41 (UTC)
committer mickeyl <mickeyl>2005-08-27 22:40:41 (UTC)
commit43217700cc9b23519776a27661fbf0c29a7d100d (patch) (unidiff)
tree566f54414b7148c519bf3781f723a269b33c32e1
parent85bddcabafcf7a0529e3738f306d63988b7dcbbc (diff)
downloadopie-43217700cc9b23519776a27661fbf0c29a7d100d.zip
opie-43217700cc9b23519776a27661fbf0c29a7d100d.tar.gz
opie-43217700cc9b23519776a27661fbf0c29a7d100d.tar.bz2
call QCopChannel::send() instead of using a QCopEnvelop
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_abstractmobiledevice.cpp16
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp24
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
@@ -29,11 +29,12 @@
29 29
30#include "odevice_abstractmobiledevice.h" 30#include "odevice_abstractmobiledevice.h"
31 31
32#include <qpe/qcopenvelope_qws.h> 32/* QT */
33#include <qcopchannel_qws.h>
33 34
35/* STD */
34#include <sys/time.h> 36#include <sys/time.h>
35#include <sys/ioctl.h> 37#include <sys/ioctl.h>
36
37#include <time.h> 38#include <time.h>
38#include <fcntl.h> 39#include <fcntl.h>
39#include <unistd.h> 40#include <unistd.h>
@@ -62,11 +63,7 @@ bool OAbstractMobileDevice::suspend() {
62 return false; 63 return false;
63 64
64 bool res = false; 65 bool res = false;
65 66 QCopChannel::send( "QPE/System", "aboutToSuspend()" );
66 {
67 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
68 }
69 qApp->processEvents(); // ensure the qcop call is being processed asap
70 67
71 struct timeval tvs, tvn; 68 struct timeval tvs, tvn;
72 ::gettimeofday ( &tvs, 0 ); 69 ::gettimeofday ( &tvs, 0 );
@@ -85,10 +82,7 @@ bool OAbstractMobileDevice::suspend() {
85 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 82 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
86 } 83 }
87 84
88 { 85 QCopChannel::send( "QPE/System", "returnFromSuspend()" );
89 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
90 }
91 qApp->processEvents(); // ensure the qcop call is being processed asap
92 86
93 return res; 87 return res;
94} 88}
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
@@ -29,19 +29,19 @@
29 29
30#include "odevice_zaurus.h" 30#include "odevice_zaurus.h"
31 31
32/* QT */
33#include <qapplication.h>
34#include <qfile.h>
35#include <qtextstream.h>
36#include <qwindowsystem_qws.h>
37
38/* OPIE */ 32/* OPIE */
39#include <opie2/oinputsystem.h> 33#include <opie2/oinputsystem.h>
40#include <opie2/oresource.h> 34#include <opie2/oresource.h>
41 35
42#include <qpe/config.h> 36#include <qpe/config.h>
43#include <qpe/sound.h> 37#include <qpe/sound.h>
44#include <qpe/qcopenvelope_qws.h> 38
39/* QT */
40#include <qapplication.h>
41#include <qfile.h>
42#include <qtextstream.h>
43#include <qwindowsystem_qws.h>
44#include <qcopchannel_qws.h>
45 45
46/* STD */ 46/* STD */
47#include <fcntl.h> 47#include <fcntl.h>
@@ -712,10 +712,7 @@ bool Zaurus::suspend() {
712 return false; 712 return false;
713 713
714 bool res = false; 714 bool res = false;
715 { 715 QCopChannel::send( "QPE/System", "aboutToSuspend()" );
716 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
717 }
718 qApp->processEvents(); // ensure the qcop call is being processed asap
719 716
720 struct timeval tvs, tvn; 717 struct timeval tvs, tvn;
721 ::gettimeofday ( &tvs, 0 ); 718 ::gettimeofday ( &tvs, 0 );
@@ -735,10 +732,7 @@ bool Zaurus::suspend() {
735 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 732 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
736 } 733 }
737 734
738 { 735 QCopChannel::send( "QPE/System", "returnFromSuspend()" );
739 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
740 }
741 qApp->processEvents(); // ensure the qcop call is being processed asap
742 736
743 return res; 737 return res;
744} 738}