4 files changed, 21 insertions, 37 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index ab4f14a..7662e48 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -45,2 +45,4 @@
 
+#include <opie/odevice.h>
+
 #include <qgfx_qws.h>
@@ -269,3 +271,3 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
     }
-    if ( press )
+    if (( press && !autoRepeat ) || ( !press && autoRepeat ))
       qpedesktop->keyClick();
@@ -329,6 +331,2 @@ QPE_MEMALERTER_IMPL
 
-#if defined(CUSTOM_SOUND_IMPL)
-CUSTOM_SOUND_IMPL
-#endif
-
 //===========================================================================
@@ -341,6 +339,2 @@ Desktop::Desktop() :
 {
-#ifdef CUSTOM_SOUND_INIT
-    CUSTOM_SOUND_INIT;
-#endif
-
     qpedesktop = this;
@@ -758,6 +752,4 @@ void Desktop::keyClick()
 {
-#ifdef CUSTOM_SOUND_KEYCLICK
     if ( keyclick )
-  CUSTOM_SOUND_KEYCLICK;
-#endif
+            ODevice::inst ( )-> keySound ( );
 }
@@ -766,6 +758,4 @@ void Desktop::screenClick()
 {
-#ifdef CUSTOM_SOUND_TOUCH
     if ( touchclick )
-  CUSTOM_SOUND_TOUCH;
-#endif
+            ODevice::inst ( )-> touchSound ( );
 }
@@ -774,9 +764,7 @@ void Desktop::soundAlarm()
 {
-#ifdef CUSTOM_SOUND_ALARM
     if (qpedesktop->alarmsound)
-    CUSTOM_SOUND_ALARM;
-#endif
+                ODevice::inst ( )-> alarmSound ( );
 }
 
-bool Desktop::eventFilter( QObject *w, QEvent *ev )
+bool Desktop::eventFilter( QObject *, QEvent *ev )
 {
@@ -786,11 +774,11 @@ bool Desktop::eventFilter( QObject *w, QEvent *ev )
       QWidget *active = qApp->activeWindow();
-      if ( active && active->isPopup() ) {
+                        
+                        if ( active && active-> isPopup ( ))
     active->close();
-      }
+
       raiseMenu();
-      return TRUE;
+                        return true;
   }
     }
-    return FALSE;
+        return false;
 }
-
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 347eee9..b3c331b 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -31,2 +31,4 @@
 
+#include <opie/odevice.h>
+
 #include <qfile.h>
@@ -36,4 +38,2 @@
 
-#include <opie/ohwinfo.h>
-
 #include <stdlib.h>
@@ -195,3 +195,3 @@ public:
         
-                m_model = OHwInfo::inst ( )-> model ( );
+                m_model = ODevice::inst ( )-> model ( );
                 m_power_timer = 0;
@@ -210,3 +210,3 @@ public:
 
-        virtual bool filter ( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
+        virtual bool filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, bool autoRepeat )
         {
@@ -269,4 +269,3 @@ public:
 private:
-        OHwModel m_model;
-        bool     m_power_press;
+        OModel  m_model;
         int      m_power_timer;
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 5e95c99..e38b9fe 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -39,2 +39,4 @@
 
+#include <opie/odevice.h>
+
 #include <qlabel.h>
@@ -271,3 +273,2 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
     }
-#ifdef CUSTOM_LEDS
     else if ( msg == "setLed(int,bool)" ) {
@@ -275,5 +276,5 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
   stream >> led >> status;
-  CUSTOM_LEDS( led, status );
+                
+                ODevice::inst ( )-> setLed ( led, status ? OLED_BlinkSlow : OLED_Off );
     }
-#endif
 }
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h
index 78c4722..40983af 100644
--- a/core/launcher/taskbar.h
+++ b/core/launcher/taskbar.h
@@ -23,6 +23,2 @@
 
-#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ )
-#include <qpe/custom.h>
-#endif
-
 #include <qhbox.h>