| -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 @@ -24,21 +24,22 @@ -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 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 { namespace Core { OAbstractMobileDevice::OAbstractMobileDevice() @@ -57,21 +58,17 @@ 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 ); // This is needed because some apm implementations are asynchronous and we @@ -80,20 +77,17 @@ bool OAbstractMobileDevice::suspend() { if ( res ) { 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 ... // _IO and friends are only defined in kernel headers ... #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) 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 @@ -24,29 +24,29 @@ -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, 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> #include <sys/ioctl.h> #include <sys/time.h> @@ -707,20 +707,17 @@ bool Zaurus::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, return false; } 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 ); // This is needed because some apm implementations are asynchronous and we @@ -730,15 +727,12 @@ bool Zaurus::suspend() { if ( res && m_embedix) { 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; } |