-rw-r--r-- | libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | 16 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 24 |
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 | |||
@@ -30,9 +30,10 @@ | |||
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> |
@@ -63,9 +64,5 @@ bool OAbstractMobileDevice::suspend() { | |||
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; |
@@ -86,8 +83,5 @@ bool OAbstractMobileDevice::suspend() { | |||
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; |
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 | |||
@@ -30,10 +30,4 @@ | |||
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> |
@@ -42,5 +36,11 @@ | |||
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 */ |
@@ -713,8 +713,5 @@ bool Zaurus::suspend() { | |||
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; |
@@ -736,8 +733,5 @@ bool Zaurus::suspend() { | |||
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; |