remove setSoftSuspend() from ODevice. this is a left-over from the old days

10 files changed, 3 insertions, 95 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 734d072..5bbed59 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -160,5 +160,2 @@ int initApplication( int argc, char ** argv )
 
-#ifndef Q_OS_MACX
-    ODevice::inst()->setSoftSuspend( true );
-#endif
     {
@@ -197,6 +194,2 @@ int initApplication( int argc, char ** argv )
 
-#ifndef Q_OS_MACX
-    ODevice::inst()->setSoftSuspend( false );
-#endif
-    
     odebug << "returning from qpe/initapplication..." << oendl;
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 0699d0a..2de0180 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -194,4 +194,3 @@ int main ( int argc, char **argv )
                 QWSServer::setDesktopBackground( QImage() );
-                ODevice::inst ( )-> setDisplayStatus ( true );
-                ODevice::inst ( )-> setSoftSuspend ( false );
+                ODevice::inst()->setDisplayStatus( true );
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
@@ -337,4 +336,2 @@ int login_main ( int argc, char **argv, pid_t ppid )
 
-        ODevice::inst ( )-> setSoftSuspend ( true );
-
         if ( QWSServer::mouseHandler() &&
@@ -363,4 +360,2 @@ int login_main ( int argc, char **argv, pid_t ppid )
 
-        ODevice::inst ( )-> setSoftSuspend ( false );
-
         if ( app-> loginAs ( )) {
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index a824392..3d69614 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -256,7 +256,2 @@ ODevice::~ODevice()
 
-bool ODevice::setSoftSuspend ( bool /*soft*/ )
-{
-    return false;
-}
-
 //#include <linux/apm_bios.h>
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h
index bbc32fa..96a41fc 100644
--- a/libopie2/opiecore/device/odevice.h
+++ b/libopie2/opiecore/device/odevice.h
@@ -257,4 +257,2 @@ public:
     // system
-
-    virtual bool setSoftSuspend ( bool on );
     virtual bool suspend();
diff --git a/libopie2/opiecore/device/odevice_genuineintel.cpp b/libopie2/opiecore/device/odevice_genuineintel.cpp
index 61ba052..1584249 100644
--- a/libopie2/opiecore/device/odevice_genuineintel.cpp
+++ b/libopie2/opiecore/device/odevice_genuineintel.cpp
@@ -162,8 +162,2 @@ void GenuineIntel::playAlarmSound()
 
-bool GenuineIntel::setSoftSuspend ( bool )
-{
-    return false;
-}
-
-
 bool GenuineIntel::setDisplayBrightness ( int )
diff --git a/libopie2/opiecore/device/odevice_genuineintel.h b/libopie2/opiecore/device/odevice_genuineintel.h
index 52c5fc6..69316af 100644
--- a/libopie2/opiecore/device/odevice_genuineintel.h
+++ b/libopie2/opiecore/device/odevice_genuineintel.h
@@ -49,4 +49,2 @@ class GenuineIntel : public ODevice, public QWSServer::KeyboardFilter
   public:
-    virtual bool setSoftSuspend( bool soft );
-
     virtual bool setDisplayBrightness( int b );
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 9e01a0c..2ce38a9 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -338,23 +338,2 @@ void iPAQ::playAlarmSound()
 
-
-bool iPAQ::setSoftSuspend ( bool soft )
-{
-    bool res = false;
-    int fd;
-
-    if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) {
-        if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 )
-            res = true;
-        else
-            ::perror ( "write to /proc/sys/ts/suspend_button_mode" );
-
-        ::close ( fd );
-    }
-    else
-        ::perror ( "/proc/sys/ts/suspend_button_mode" );
-
-    return res;
-}
-
-
 bool iPAQ::setDisplayBrightness ( int bright )
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h
index cc0b8ac..b1dac74 100644
--- a/libopie2/opiecore/device/odevice_ipaq.h
+++ b/libopie2/opiecore/device/odevice_ipaq.h
@@ -49,4 +49,2 @@ class iPAQ : public ODevice, public QWSServer::KeyboardFilter
   public:
-    virtual bool setSoftSuspend( bool soft );
-
     virtual bool setDisplayBrightness( int b );
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index b22ee70..cbc7a24 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -382,39 +382,2 @@ bool Zaurus::setLedState( OLed which, OLedState st )
 
-bool Zaurus::setSoftSuspend ( bool soft )
-{
-    if (!m_embedix) {
-        /* non-Embedix kernels dont have kernel autosuspend */
-        return ODevice::setSoftSuspend( soft );
-    }
-
-    bool res = false;
-    int fd;
-
-    if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
-        (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
-
-        int sources = ::ioctl( fd, APM_IOCGEVTSRC, 0 ); // get current event sources
-
-        if ( sources >= 0 ) {
-            if ( soft )
-                sources &= ~APM_EVT_POWER_BUTTON;
-            else
-                sources |= APM_EVT_POWER_BUTTON;
-
-            if ( ::ioctl( fd, APM_IOCSEVTSRC, sources ) >= 0 ) // set new event sources
-                res = true;
-            else
-                perror ( "APM_IOCGEVTSRC" );
-        }
-        else
-            perror ( "APM_IOCGEVTSRC" );
-
-        ::close( fd );
-    }
-    else
-        perror( "/dev/apm_bios or /dev/misc/apm_bios" );
-
-    return res;
-}
-
 int Zaurus::displayBrightnessResolution() const
@@ -542,5 +505,3 @@ Transformation Zaurus::rotation() const
     Transformation rot;
-    int handle = 0;
-    int retval = 0;
-
+    
     switch ( d->m_model ) {
@@ -568,4 +529,3 @@ ODirection Zaurus::direction() const
     ODirection dir;
-    int handle = 0;
-    int retval = 0;
+    
     switch ( d->m_model ) {
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h
index c763798..04e73c4 100644
--- a/libopie2/opiecore/device/odevice_zaurus.h
+++ b/libopie2/opiecore/device/odevice_zaurus.h
@@ -96,4 +96,2 @@ class Zaurus : public ODevice
   public:
-    virtual bool setSoftSuspend( bool soft );
-
     virtual bool setDisplayBrightness( int b );