summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -30,9 +30,10 @@
#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>
@@ -63,9 +64,5 @@ bool OAbstractMobileDevice::suspend() {
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;
@@ -86,8 +83,5 @@ bool OAbstractMobileDevice::suspend() {
}
- {
- QCopEnvelope( "QPE/System", "returnFromSuspend()" );
- }
- qApp->processEvents(); // ensure the qcop call is being processed asap
+ QCopChannel::send( "QPE/System", "returnFromSuspend()" );
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 @@
#include "odevice_zaurus.h"
-/* QT */
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qwindowsystem_qws.h>
-
/* OPIE */
#include <opie2/oinputsystem.h>
@@ -42,5 +36,11 @@
#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 */
@@ -713,8 +713,5 @@ bool Zaurus::suspend() {
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;
@@ -736,8 +733,5 @@ bool Zaurus::suspend() {
}
- {
- QCopEnvelope( "QPE/System", "returnFromSuspend()" );
- }
- qApp->processEvents(); // ensure the qcop call is being processed asap
+ QCopChannel::send( "QPE/System", "returnFromSuspend()" );
return res;