1 files changed, 10 insertions, 10 deletions

diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index e544c61..6aaab3a 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -1,22 +1,22 @@
 
 #include "screensaver.h"
 
 #include <qpe/config.h>
 #include <qpe/network.h>
 
 #include <opie2/odevice.h>
 
 
-using namespace Opie;
+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;
 
@@ -148,25 +148,25 @@ void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend )
         if ( m_on_ac ) {
                 m_enable_dim_ac = ( dim > 0 );
                 m_enable_lightoff_ac = ( lightoff > 0 );
                 m_enable_suspend_ac = ( suspend > 0 );
                 m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false );
         }
         else {
                 m_enable_dim = ( dim > 0 );
                 m_enable_lightoff = ( lightoff > 0 );
                 m_enable_suspend = ( suspend > 0 );
                 m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false );
         }
-        
+
         //qDebug("screen saver intervals: %d %d %d", dim, lightoff, suspend);
 
         v [ 0 ] = QMAX( 1000 * dim, 100 );
         v [ 1 ] = QMAX( 1000 * lightoff, 100 );
         v [ 2 ] = QMAX( 1000 * suspend, 100 );
         v [ 3 ] = 0;
 
         if ( !dim && !lightoff && !suspend )
                 QWSServer::setScreenSaverInterval( 0 );
         else
                 QWSServer::setScreenSaverIntervals( v );
 }
@@ -206,32 +206,32 @@ 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 );
 
         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;      
-                
+                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 );
@@ -270,35 +270,35 @@ void OpieScreenSaver::setBacklightInternal ( int bright )
                 m_backlight_current = 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] );
 
         if ( m_level <= 0 )
                 setBacklightInternal ( -1 );
 }
 
 
 /**
  * Like ODevice::setDisplayStatus(), but keep current state in m_lcd_status.
@@ -309,20 +309,20 @@ void OpieScreenSaver::setDisplayState ( bool 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 );
-        
+
         if ( newonac != m_on_ac ) {
                 m_on_ac = newonac;
                 setInterval ( -1 );
                 setBacklight ( -1 );
-                        restore ( );    
+                restore ( );
         }
 }