summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 6771a66..693e77f 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -33,19 +33,17 @@
33#include <qpe/applnk.h> 33#include <qpe/applnk.h>
34#include <qpe/mimetype.h> 34#include <qpe/mimetype.h>
35#include <qpe/password.h> 35#include <qpe/password.h>
36#include <qpe/config.h> 36#include <qpe/config.h>
37#include <qpe/power.h> 37#include <qpe/power.h>
38#include <qpe/timeconversion.h> 38#include <qpe/timeconversion.h>
39#include <qpe/qcopenvelope_qws.h> 39#include <qpe/qcopenvelope_qws.h>
40#include <qpe/global.h> 40#include <qpe/global.h>
41#ifdef QT_QWS_CUSTOM 41#include <qpe/custom.h>
42#include "qpe/custom.h"
43#endif
44 42
45#include <qgfx_qws.h> 43#include <qgfx_qws.h>
46#include <qmainwindow.h> 44#include <qmainwindow.h>
47#include <qmessagebox.h> 45#include <qmessagebox.h>
48#include <qtimer.h> 46#include <qtimer.h>
49#include <qwindowsystem_qws.h> 47#include <qwindowsystem_qws.h>
50 48
51#include <qvaluelist.h> 49#include <qvaluelist.h>
@@ -764,17 +762,17 @@ void Desktop::screenClick()
764 if ( touchclick ) 762 if ( touchclick )
765 CUSTOM_SOUND_TOUCH; 763 CUSTOM_SOUND_TOUCH;
766#endif 764#endif
767} 765}
768 766
769void Desktop::soundAlarm() 767void Desktop::soundAlarm()
770{ 768{
771#ifdef CUSTOM_SOUND_ALARM 769#ifdef CUSTOM_SOUND_ALARM
772 if (alarmsound) 770 if (qpedesktop->alarmsound)
773 CUSTOM_SOUND_ALARM; 771 CUSTOM_SOUND_ALARM;
774#endif 772#endif
775} 773}
776 774
777bool Desktop::eventFilter( QObject *w, QEvent *ev ) 775bool Desktop::eventFilter( QObject *w, QEvent *ev )
778{ 776{
779 if ( ev->type() == QEvent::KeyPress ) { 777 if ( ev->type() == QEvent::KeyPress ) {
780 QKeyEvent *ke = (QKeyEvent *)ev; 778 QKeyEvent *ke = (QKeyEvent *)ev;