summaryrefslogtreecommitdiff
path: root/libopie
Side-by-side diff
Diffstat (limited to 'libopie') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/odevice.cpp48
-rw-r--r--libopie/odevice.h2
2 files changed, 21 insertions, 29 deletions
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d952edf..61c24f4 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -21,2 +21,4 @@
#include <qtextstream.h>
+#include <qpe/sound.h>
+#include <qpe/resource.h>
@@ -46,4 +48,2 @@ public:
virtual void alarmSound ( );
- virtual void keySound ( );
- virtual void touchSound ( );
@@ -74,5 +74,2 @@ protected:
-
-
-
ODevice *ODevice::inst ( )
@@ -147,2 +144,8 @@ void ODevice::alarmSound ( )
{
+#ifndef QT_NO_SOUND
+ static Sound snd ( "alarm" );
+
+ if ( snd. isFinished ( ))
+ snd. play ( );
+#endif
}
@@ -151,2 +154,8 @@ void ODevice::keySound ( )
{
+#ifndef QT_NO_SOUND
+ static Sound snd ( "keysound" );
+
+ if ( snd. isFinished ( ))
+ snd. play ( );
+#endif
}
@@ -155,2 +164,8 @@ void ODevice::touchSound ( )
{
+#ifndef QT_NO_SOUND
+ static Sound snd ( "touchsound" );
+
+ if ( snd. isFinished ( ))
+ snd. play ( );
+#endif
}
@@ -217,5 +232,3 @@ void ODeviceIPAQ::init ( )
#include <qapplication.h>
-#include <qpe/resource.h>
#include <qpe/config.h>
-#include <qpe/sound.h>
@@ -277,23 +290,2 @@ void ODeviceIPAQ::alarmSound ( )
-void ODeviceIPAQ::touchSound ( )
-{
-#ifndef QT_NO_SOUND
- static Sound snd ( "touchsound" );
-
- if ( snd. isFinished ( ))
- snd. play ( );
-#endif
-}
-
-void ODeviceIPAQ::keySound ( )
-{
-#ifndef QT_NO_SOUND
- static Sound snd ( "keysound" );
-
- if ( snd. isFinished ( ))
- snd. play ( );
-#endif
-}
-
-
uint ODeviceIPAQ::hasLeds ( ) const
diff --git a/libopie/odevice.h b/libopie/odevice.h
index 793becc..b40abe7 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -42,3 +42,3 @@ enum OVendor {
OVENDOR_HP,
- OVENDOR_Sharp,
+ OVENDOR_Sharp
};