summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index e18bcee..11381e6 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -20,7 +20,7 @@
20 20
21#include "serverapp.h" 21#include "serverapp.h"
22 22
23#include <opie/odevice.h> 23#include <opie2/odevice.h>
24 24
25#include <qtopia/password.h> 25#include <qtopia/password.h>
26#include <qtopia/config.h> 26#include <qtopia/config.h>
@@ -369,10 +369,10 @@ void ServerApplication::apmTimeout() {
369 if ( m_ps->acStatus() != m_ps_last-> acStatus() ) 369 if ( m_ps->acStatus() != m_ps_last-> acStatus() )
370 m_screensaver-> powerStatusChanged( *m_ps ); 370 m_screensaver-> powerStatusChanged( *m_ps );
371 371
372 if ( m_ps->acStatus() == PowerStatus::Online ) { 372 if ( m_ps->acStatus() == PowerStatus::Online ) {
373 return; 373 return;
374 } 374 }
375 375
376 int bat = m_ps-> batteryPercentRemaining(); 376 int bat = m_ps-> batteryPercentRemaining();
377 377
378 if ( bat < m_ps_last-> batteryPercentRemaining() ) { 378 if ( bat < m_ps_last-> batteryPercentRemaining() ) {
@@ -385,11 +385,11 @@ void ServerApplication::apmTimeout() {
385 QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, 385 QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
386 0, QString::null, TRUE, WStyle_StaysOnTop); 386 0, QString::null, TRUE, WStyle_StaysOnTop);
387 battlow.setButtonText(QMessageBox::Cancel, tr("Ok")); 387 battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
388 battlow.exec(); 388 battlow.exec();
389 } else if ( bat <= m_powerVeryLow ) 389 } else if ( bat <= m_powerVeryLow )
390 pa->alert( tr( "The battery is running very low. "), 2 ); 390 pa->alert( tr( "The battery is running very low. "), 2 );
391 } 391 }
392 392
393 if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow ) { 393 if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow ) {
394 QMessageBox battlow( 394 QMessageBox battlow(
395 tr("WARNING"), 395 tr("WARNING"),
@@ -399,8 +399,8 @@ void ServerApplication::apmTimeout() {
399 QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, 399 QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
400 0, QString::null, TRUE, WStyle_StaysOnTop); 400 0, QString::null, TRUE, WStyle_StaysOnTop);
401 battlow.setButtonText(QMessageBox::Cancel, tr("Ok")); 401 battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
402 battlow.exec(); 402 battlow.exec();
403 } 403 }
404} 404}
405 405
406void ServerApplication::systemMessage( const QCString& msg, 406void ServerApplication::systemMessage( const QCString& msg,
@@ -826,19 +826,19 @@ bool ServerApplication::recoverMemory()
826void ServerApplication::keyClick(int , bool press, bool ) 826void ServerApplication::keyClick(int , bool press, bool )
827{ 827{
828 if ( press && m_keyclick_sound ) 828 if ( press && m_keyclick_sound )
829 ODevice::inst() -> keySound(); 829 ODevice::inst() -> playKeySound();
830 830
831} 831}
832 832
833void ServerApplication::screenClick(bool press) 833void ServerApplication::screenClick(bool press)
834{ 834{
835 if ( press && m_screentap_sound ) 835 if ( press && m_screentap_sound )
836 ODevice::inst() -> touchSound(); 836 ODevice::inst() -> playTouchSound();
837} 837}
838 838
839void ServerApplication::soundAlarm() { 839void ServerApplication::soundAlarm() {
840 if ( me ()->m_alarm_sound ) 840 if ( me ()->m_alarm_sound )
841 ODevice::inst()->alarmSound(); 841 ODevice::inst()->playAlarmSound();
842} 842}
843 843
844ServerApplication *ServerApplication::me ( ) 844ServerApplication *ServerApplication::me ( )