Randomly jumping in the vtable is fun :)

use libopie2 odevice

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
@@ -22,3 +22,3 @@
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
@@ -371,6 +371,6 @@ void ServerApplication::apmTimeout() {
 
-    if ( m_ps->acStatus() == PowerStatus::Online ) {  
+    if ( m_ps->acStatus() == PowerStatus::Online ) {
         return;
     }
-    
+
     int bat = m_ps-> batteryPercentRemaining();
@@ -387,3 +387,3 @@ void ServerApplication::apmTimeout() {
 	    battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
-	    battlow.exec();     
+	    battlow.exec();
         } else if ( bat <= m_powerVeryLow )
@@ -391,3 +391,3 @@ void ServerApplication::apmTimeout() {
     }
-    
+
     if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow ) {
@@ -401,4 +401,4 @@ void ServerApplication::apmTimeout() {
 	    battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
-	    battlow.exec();   
-    }    
+	    battlow.exec();
+    }
 }
@@ -828,3 +828,3 @@ void ServerApplication::keyClick(int , bool press, bool )
     if ( press && m_keyclick_sound )
-        ODevice::inst() -> keySound();
+        ODevice::inst() -> playKeySound();
 
@@ -835,3 +835,3 @@ void ServerApplication::screenClick(bool press)
     if ( press && m_screentap_sound )
-        ODevice::inst() -> touchSound();
+        ODevice::inst() -> playTouchSound();
 }
@@ -840,3 +840,3 @@ void ServerApplication::soundAlarm() {
     if ( me ()->m_alarm_sound )
-        ODevice::inst()->alarmSound();
+        ODevice::inst()->playAlarmSound();
 }