1 files changed, 6 insertions, 2 deletions

diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index a7d23c4..f818d62 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -1,31 +1,32 @@
 
 #include "screensaver.h"
 
 #include <qpe/config.h>
 #include <qpe/network.h>
 
 #include <opie2/odevice.h>
+#include <opie2/odebug.h>
 
 
 using namespace Opie::Core;
 
 
 
 OpieScreenSaver::OpieScreenSaver ( )
                 : QObject ( 0, "screensaver" ), QWSScreenSaver ( )
 {
         m_disable_suspend = 100;
         m_enable_dim = false;
         m_enable_lightoff = false;
         m_enable_suspend = false;
         m_onlylcdoff = false;
 
         m_enable_dim_ac = false;
         m_enable_lightoff_ac = false;
         m_enable_suspend_ac = false;
         m_onlylcdoff_ac = false;
 
         m_use_light_sensor = false;
         m_backlight_sensor = -1;
         ::memset ( m_sensordata, 0xff, LS_Count * sizeof( m_sensordata [0] ));
 
@@ -189,49 +190,50 @@ void OpieScreenSaver::setMode ( int mode )
         if ( mode > m_disable_suspend )
                 setInterval ( -1 );
         m_disable_suspend = mode;
 }
 
 
 /**
  * Set display brightness
  *
  * Get's default values for backlight, contrast and light sensor from config file.
  *
  * @param bright desired brighness (-1 to use automatic sensor data or value
  *               from config file, -2 to toggle backlight on and off, -3 to
  *               force backlight off)
  */
 void OpieScreenSaver::setBacklight ( int bright )
 {
         // Read from config
         Config config ( "apm" );
         config. setGroup ( m_on_ac ? "AC" : "Battery" );
         m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 );
         int contrast = config. readNumEntry ( "Contrast", 127);
         m_use_light_sensor = config. readBoolEntry ( "LightSensor", false );
 
-        //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 );
+    //odebug << "setBacklight: " << bright << " (norm: " << m_backlight_normal << ") (ls: "
+    //       << ( m_use_light_sensor ? 1 : 0 ) << ")" << oendl;
 
         killTimers ( );
         if (( bright < 0 ) && m_use_light_sensor ) {
                 QStringList sl = config. readListEntry ( "LightSensorData", ';' );
 
                 m_sensordata [LS_SensorMin] = 40;
                 m_sensordata [LS_SensorMax] = 215;
                 m_sensordata [LS_LightMin] = 1;
                 m_sensordata [LS_LightMax] = 255;
                 m_sensordata [LS_Steps] = 12;
                 m_sensordata [LS_Interval] = 2000;
 
                 for ( uint i = 0; i < LS_Count; i++ ) {
                         if ( i < sl. count ( ))
                                 m_sensordata [i] = sl [i]. toInt ( );
                 }
                 if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE
                         m_sensordata [LS_Steps] = 2;
 
                 timerEvent ( 0 );
                 startTimer ( m_sensordata [LS_Interval] );
         }
 
         setBacklightInternal ( bright );
@@ -272,49 +274,51 @@ void OpieScreenSaver::setBacklightInternal ( int bright )
 }
 
 
 /**
  * Timer event used for automatic setting the backlight according to a light sensor
  * and to set the default brightness
  */
 void OpieScreenSaver::timerEvent ( QTimerEvent * )
 {
         int s = ODevice::inst ( )-> readLightSensor ( ) * 256 / ODevice::inst ( )-> lightSensorResolution ( );
 
         if ( s < m_sensordata [LS_SensorMin] )
                 m_backlight_sensor = m_sensordata [LS_LightMax];
         else if ( s >= m_sensordata [LS_SensorMax] )
                 m_backlight_sensor = m_sensordata [LS_LightMin];
         else {
                 int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin];
                 int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin];
 
                 int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0
 
                 m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 );
         }
 
-        //qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] );
+    odebug << "f(" << s << ") = " << m_backlight_sensor << " [" << m_sensordata [LS_SensorMin]
+           << " - " << m_sensordata [LS_SensorMax] << " ] -> [" << m_sensordata [LS_LightMin]
+           << " - " << m_sensordata [LS_LightMax] << "] / " << m_sensordata [LS_Steps] << oendl;
 
         if ( m_level <= 0 )
                 setBacklightInternal ( -1 );
 }
 
 
 /**
  * Like ODevice::setDisplayStatus(), but keep current state in m_lcd_status.
  */
 void OpieScreenSaver::setDisplayState ( bool on )
 {
         if ( m_lcd_status != on ) {
                 ODevice::inst ( ) -> setDisplayStatus ( on );
                 m_lcd_status = on;
         }
 }
 
 
 /**
  * Set display to default ac/battery settings when power status changed.
  */
 void OpieScreenSaver::powerStatusChanged ( PowerStatus ps )
 {
         bool newonac = ( ps. acStatus ( ) == PowerStatus::Online );