Fix bug #1557

1 files changed, 3 insertions, 3 deletions

diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 1c61787..d0ac878 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -79,195 +79,195 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
     }
 
     // check whether to show the cpu frequency stuff
 
     QStrList freq = ODevice::inst()->allowedCpuFrequencies();
     if ( freq.count() ) {
         frequency->insertStrList( freq );
         frequency_ac->insertStrList( freq );
     } else {
         frequencyLabel->hide();
         frequency->hide();
         frequencyLabel_ac->hide();
         frequency_ac->hide();
     }
 
     // check whether to show the hinge action stuff
 
     if ( !ODevice::inst()->hasHingeSensor() ) {
         closeHingeLabel->hide();
         closeHingeAction->hide();
         closeHingeLabel_ac->hide();
         closeHingeAction_ac->hide();
     }
 
     Config config ( "apm" );
     config. setGroup ( "Battery" );
 
     // battery spinboxes
     interval_dim->      setValue ( config. readNumEntry ( "Dim", 20 ));
     interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 30 ));
     interval_suspend->  setValue ( config. readNumEntry ( "Suspend", 60 ));
 
     // battery check and slider
     LcdOffOnly->setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
     // CPU frequency
     frequency->setCurrentItem( config.readNumEntry("Freq", 0) );
 
     // hinge action
     closeHingeAction->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) );
 
     int bright = config. readNumEntry ( "Brightness", 127 );
     int contr  = m_oldcontrast = config. readNumEntry ( "Contrast", 127 );
     brightness-> setTickInterval ( QMAX( 16, 256 / m_bres ));
     brightness-> setLineStep ( QMAX( 1, 256 / m_bres ));
     brightness-> setPageStep ( QMAX( 1, 256 / m_bres ));
     brightness-> setValue ( bright );
 
 //
     if (m_cres) {
         contrast-> setTickInterval ( QMAX( 16, 256 / m_cres ));
         contrast-> setLineStep ( QMAX( 1, 256 / m_cres ));
         contrast-> setPageStep ( QMAX( 1, 256 / m_cres ));
         contrast-> setValue ( contr );
     }
 
     // light sensor
     auto_brightness-> setChecked ( config. readBoolEntry ( "LightSensor", false ));
     m_sensordata = config. readListEntry ( "LightSensorData", ';' );
 
     config. setGroup ( "AC" );
 
     // ac spinboxes
     interval_dim_ac->      setValue ( config. readNumEntry ( "Dim", 60 ));
     interval_lightoff_ac-> setValue ( config. readNumEntry ( "LightOff", 120 ));
     interval_suspend_ac->  setValue ( config. readNumEntry ( "Suspend", 0 ));
 
     // ac check and slider
     LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
 
     // CPU frequency
     frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) );
 
     // hinge action
     closeHingeAction_ac->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) );
 
     bright = config. readNumEntry ( "Brightness", 255 );
     brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres ));
     brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres ));
     brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres ));
     brightness_ac-> setValue ( bright );
 
     if (m_cres) {
         contr = config. readNumEntry ( "Contrast", 127);
         contrast_ac-> setTickInterval ( QMAX( 16, 256 / m_cres ));
         contrast_ac-> setLineStep ( QMAX( 1, 256 / m_cres ));
         contrast_ac-> setPageStep ( QMAX( 1, 256 / m_cres ));
         contrast_ac-> setValue ( contr );
     }
 
     // light sensor
     auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false ));
     m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' );
 
     // warnings
     config. setGroup ( "Warnings" );
-    warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 );
-    lowSpinBox->      setValue ( config. readNumEntry ( "powerverylow", 10 ) );
-    criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) );
+    warnintervalBox-> setValue ( config. readNumEntry ( "check_interval", 10000 ) / 1000 );
+    lowSpinBox->      setValue ( config. readNumEntry ( "power_verylow", 10 ) );
+    criticalSpinBox-> setValue ( config. readNumEntry ( "power_critical", 5 ) );
 
     m_resettimer = new QTimer ( this );
     connect ( m_resettimer, SIGNAL( timeout()), this, SLOT( resetBacklight()));
 
     if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) {
         tabs-> setCurrentPage ( 0 );
 	brightness->setFocus();
     }
     else {
         tabs-> setCurrentPage ( 1 );
 	brightness_ac->setFocus();
     }
 
     connect ( brightness, SIGNAL( valueChanged(int)), this, SLOT( setBacklight(int)));
     connect ( brightness_ac, SIGNAL( valueChanged(int)), this, SLOT( setBacklight(int)));
     if (m_cres) {
         connect ( contrast,    SIGNAL( valueChanged(int)), this, SLOT( setContrast(int)));
         connect ( contrast_ac, SIGNAL( valueChanged(int)), this, SLOT( setContrast(int)));
     }
     connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) );
     connect( frequency_ac, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) );
     connect( closeHingeAction, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) );
     connect( closeHingeAction_ac, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) );
 }
 
 LightSettings::~LightSettings ( )
 {
 }
 
 void LightSettings::calibrateSensor ( )
 {
     Sensor *s = new Sensor ( m_sensordata, this );
     connect ( s, SIGNAL( viewBacklight(int)), this, SLOT( setBacklight(int)));
     QPEApplication::execDialog( s );
     delete s;
 }
 
 void LightSettings::calibrateSensorAC ( )
 {
     Sensor *s = new Sensor ( m_sensordata_ac, this );
     connect ( s, SIGNAL( viewBacklight(int)), this, SLOT( setBacklight(int)));
     QPEApplication::execDialog ( s );
     delete s;
 }
 
 void LightSettings::setBacklight ( int bright )
 {
     QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
     e << bright;
 
     if ( bright != -1 ) {
         m_resettimer-> stop ( );
         m_resettimer-> start ( 4000, true );
     }
 }
 
 void LightSettings::setContrast ( int contr )
 {
     if (contr == -1) contr = m_oldcontrast;
     ODevice::inst ( )-> setDisplayContrast(contr);
 }
 
 void LightSettings::setFrequency ( int index )
 {
     owarn << "LightSettings::setFrequency(" << index << ")" << oendl;
     ODevice::inst ( )-> setCurrentCpuFrequency(index);
 }
 
 void LightSettings::resetBacklight ( )
 {
     setBacklight ( -1 );
     setContrast ( -1 );
 }
 
 void LightSettings::setCloseHingeAction ( int index )
 {
     owarn << "LightSettings::setCloseHingeStatus(" << index << ")" << oendl;
 }
 
 void LightSettings::accept ( )
 {
     Config config ( "apm" );
 
     // bat
     config. setGroup ( "Battery" );
     config. writeEntry ( "LcdOffOnly", LcdOffOnly-> isChecked ( ));
     config. writeEntry ( "Dim",        interval_dim-> value ( ));
     config. writeEntry ( "LightOff",   interval_lightoff-> value ( ));
     config. writeEntry ( "Suspend",    interval_suspend-> value ( ));
     config. writeEntry ( "Brightness", brightness-> value () );
     if (m_cres)
     config. writeEntry ( "Contrast",   contrast-> value () );
     config. writeEntry ( "Freq",       frequency->currentItem() );
     config. writeEntry ( "CloseHingeAction", closeHingeAction->currentItem() );
 
     // ac