summaryrefslogtreecommitdiff
path: root/libopie2
Side-by-side diff
Diffstat (limited to 'libopie2') (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
@@ -31,7 +31,8 @@
-#include <qpe/qcopenvelope_qws.h>
+/* QT */
+#include <qcopchannel_qws.h>
+/* STD */
#include <sys/time.h>
#include <sys/ioctl.h>
-
#include <time.h>
@@ -64,7 +65,3 @@ 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()" );
@@ -87,6 +84,3 @@ bool OAbstractMobileDevice::suspend() {
- {
- QCopEnvelope( "QPE/System", "returnFromSuspend()" );
- }
- qApp->processEvents(); // ensure the qcop call is being processed asap
+ QCopChannel::send( "QPE/System", "returnFromSuspend()" );
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
@@ -31,8 +31,2 @@
-/* QT */
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qwindowsystem_qws.h>
-
/* OPIE */
@@ -43,3 +37,9 @@
#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>
@@ -714,6 +714,3 @@ 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()" );
@@ -737,6 +734,3 @@ bool Zaurus::suspend() {
- {
- QCopEnvelope( "QPE/System", "returnFromSuspend()" );
- }
- qApp->processEvents(); // ensure the qcop call is being processed asap
+ QCopChannel::send( "QPE/System", "returnFromSuspend()" );