| -rw-r--r-- | core/launcher/serverapp.cpp | 20 |
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 @@ -21,5 +21,5 @@ #include "serverapp.h" -#include <opie/odevice.h> +#include <opie2/odevice.h> #include <qtopia/password.h> @@ -370,8 +370,8 @@ void ServerApplication::apmTimeout() { m_screensaver-> powerStatusChanged( *m_ps ); - if ( m_ps->acStatus() == PowerStatus::Online ) { + if ( m_ps->acStatus() == PowerStatus::Online ) { return; } - + int bat = m_ps-> batteryPercentRemaining(); @@ -386,9 +386,9 @@ void ServerApplication::apmTimeout() { 0, QString::null, TRUE, WStyle_StaysOnTop); battlow.setButtonText(QMessageBox::Cancel, tr("Ok")); - battlow.exec(); + battlow.exec(); } else if ( bat <= m_powerVeryLow ) pa->alert( tr( "The battery is running very low. "), 2 ); } - + if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow ) { QMessageBox battlow( @@ -400,6 +400,6 @@ void ServerApplication::apmTimeout() { 0, QString::null, TRUE, WStyle_StaysOnTop); battlow.setButtonText(QMessageBox::Cancel, tr("Ok")); - battlow.exec(); - } + battlow.exec(); + } } @@ -827,5 +827,5 @@ void ServerApplication::keyClick(int , bool press, bool ) { if ( press && m_keyclick_sound ) - ODevice::inst() -> keySound(); + ODevice::inst() -> playKeySound(); } @@ -834,10 +834,10 @@ void ServerApplication::screenClick(bool press) { if ( press && m_screentap_sound ) - ODevice::inst() -> touchSound(); + ODevice::inst() -> playTouchSound(); } void ServerApplication::soundAlarm() { if ( me ()->m_alarm_sound ) - ODevice::inst()->alarmSound(); + ODevice::inst()->playAlarmSound(); } |