Removed the last QT_QWS_* in libopie .. the libopie binary should now be

interchangeable between iPAQ, OZ and retail Z (in theory ;) )

1 files changed, 0 insertions, 8 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 25c9826..2d2f7db 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -305,5 +305,4 @@ QString ODevice::systemVersionString ( ) const
 void ODevice::alarmSound ( )
 {
-#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
         static Sound snd ( "alarm" );
@@ -312,10 +311,8 @@ void ODevice::alarmSound ( )
                 snd. play ( );
 #endif
-#endif
 }
 
 void ODevice::keySound ( )
 {
-#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
         static Sound snd ( "keysound" );
@@ -324,5 +321,4 @@ void ODevice::keySound ( )
                 snd. play ( );
 #endif
-#endif
 }
 
@@ -330,5 +326,4 @@ void ODevice::touchSound ( )
 {
 
-#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
         static Sound snd ( "touchsound" );
@@ -337,5 +332,4 @@ void ODevice::touchSound ( )
                 snd. play ( );
 #endif
-#endif
 }
 
@@ -593,5 +587,4 @@ void iPAQ::timerEvent ( QTimerEvent * )
 void iPAQ::alarmSound ( )
 {
-#if defined( QT_QWS_IPAQ ) // IPAQ
 #ifndef QT_NO_SOUND
         static Sound snd ( "alarm" );
@@ -629,5 +622,4 @@ void iPAQ::alarmSound ( )
         }
 #endif
-#endif
 }