Replaced OHwInfo with ODevice and ported from custom-*.h #defines to

ODevice methods

4 files changed, 53 insertions, 69 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
@@ -42,8 +42,10 @@
 #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ )
 #include <qpe/custom.h>
 #endif
 
+#include <opie/odevice.h>
+
 #include <qgfx_qws.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
@@ -266,9 +268,9 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
     }
     if ( ke->simpleData.keycode == Key_CapsLock ) {
       if ( press ) emit capsLockStateToggle();
     }
-    if ( press )
+    if (( press && !autoRepeat ) || ( !press && autoRepeat ))
       qpedesktop->keyClick();
     } else {
     if ( e->type == QWSEvent::Mouse ) {
       QWSMouseEvent *me = (QWSMouseEvent *)e;
@@ -326,24 +328,16 @@ void DesktopApplication::sendCard()
 #if defined(QPE_HAVE_MEMALERTER)
 QPE_MEMALERTER_IMPL
 #endif
 
-#if defined(CUSTOM_SOUND_IMPL)
-CUSTOM_SOUND_IMPL
-#endif
-
 //===========================================================================
 
 Desktop::Desktop() :
     QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
     qcopBridge( 0 ),
     transferServer( 0 ),
     packageSlave( 0 )
 {
-#ifdef CUSTOM_SOUND_INIT
-    CUSTOM_SOUND_INIT;
-#endif
-
     qpedesktop = this;
 
 //    bg = new Info( this );
     tb = new TaskBar;
@@ -755,42 +749,36 @@ void Desktop::rereadVolumes()
 }
 
 void Desktop::keyClick()
 {
-#ifdef CUSTOM_SOUND_KEYCLICK
-    if ( keyclick )
-  CUSTOM_SOUND_KEYCLICK;
-#endif
+	if ( keyclick )
+    	ODevice::inst ( )-> keySound ( );
 }
 
 void Desktop::screenClick()
 {
-#ifdef CUSTOM_SOUND_TOUCH
-    if ( touchclick )
-  CUSTOM_SOUND_TOUCH;
-#endif
+	if ( touchclick )
+    	ODevice::inst ( )-> touchSound ( );
 }
 
 void Desktop::soundAlarm()
 {
-#ifdef CUSTOM_SOUND_ALARM
-    if (qpedesktop->alarmsound)
-    CUSTOM_SOUND_ALARM;
-#endif
+	if ( qpedesktop-> alarmsound )
+		ODevice::inst ( )-> alarmSound ( );
 }
 
-bool Desktop::eventFilter( QObject *w, QEvent *ev )
+bool Desktop::eventFilter( QObject *, QEvent *ev )
 {
-    if ( ev->type() == QEvent::KeyPress ) {
-  QKeyEvent *ke = (QKeyEvent *)ev;
-  if ( ke->key() == Qt::Key_F11 ) { // menu key
-      QWidget *active = qApp->activeWindow();
-      if ( active && active->isPopup() ) {
-    active->close();
-      }
-      raiseMenu();
-      return TRUE;
-  }
-    }
-    return FALSE;
-}
+	if ( ev-> type ( ) == QEvent::KeyPress ) {
+		QKeyEvent *ke = (QKeyEvent *) ev;
+		if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key
+			QWidget *active = qApp-> activeWindow ( );
+			
+			if ( active && active-> isPopup ( ))
+				active->close();
 
+			raiseMenu ( );
+			return true;
+		}
+	}
+	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
@@ -28,15 +28,15 @@
 #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ )
 #include <qpe/custom.h>
 #endif
 
+#include <opie/odevice.h>
+
 #include <qfile.h>
 #include <qwindowsystem_qws.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/alarmserver.h>
 
-#include <opie/ohwinfo.h>
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <unistd.h>
@@ -192,9 +192,9 @@ public:
 	ModelKeyFilter ( ) : QObject ( 0, "MODEL_KEY_FILTER" )
 	{
 		bool doinst = false;
 	
-		m_model = OHwInfo::inst ( )-> model ( );
+		m_model = ODevice::inst ( )-> model ( );
 		m_power_timer = 0;
 		
 		switch ( m_model ) {
 			case OMODEL_iPAQ_H31xx:
@@ -207,9 +207,9 @@ public:
 		if ( doinst )
 			QWSServer::setKeyboardFilter ( this );
 	}
 
-	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 )
 	{
 		bool kill = false;
 	
 		// Rotate cursor keys 180°
@@ -266,11 +266,10 @@ public:
 		QWSServer::sendKeyEvent ( -1, Key_F35, 0, false, false );
 	}
 
 private:
-	OHwModel m_model;
-	bool     m_power_press;
-	int      m_power_timer;
+	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
@@ -36,8 +36,10 @@
 #if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ )
 #include <qpe/custom.h>
 #endif
 
+#include <opie/odevice.h>
+
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
@@ -252,31 +254,30 @@ void TaskBar::calcMaxWindowRect()
 }
 
 void TaskBar::receive( const QCString &msg, const QByteArray &data )
 {
-    QDataStream stream( data, IO_ReadOnly );
-    if ( msg == "message(QString)" ) {
-        QString text;
-        stream >> text;
-        setStatusMessage( text );
-    } else if ( msg == "hideInputMethod()" ) {
-  inputMethods->hideInputMethod();
-    } else if ( msg == "showInputMethod()" ) {
-  inputMethods->showInputMethod();
-    } else if ( msg == "reloadInputMethods()" ) {
-  inputMethods->loadInputMethods();
-    } else if ( msg == "reloadApplets()" ) {
-  sysTray->loadApplets();
-    } else if ( msg == "soundAlarm()" ) {
-  Desktop::soundAlarm();
-    }
-#ifdef CUSTOM_LEDS
-    else if ( msg == "setLed(int,bool)" ) {
-  int led, status;
-  stream >> led >> status;
-  CUSTOM_LEDS( led, status );
-    }
-#endif
+	QDataStream stream( data, IO_ReadOnly );
+	if ( msg == "message(QString)" ) {
+		QString text;
+		stream >> text;
+		setStatusMessage( text );
+	} else if ( msg == "hideInputMethod()" ) {
+		inputMethods->hideInputMethod();
+	} else if ( msg == "showInputMethod()" ) {
+		inputMethods->showInputMethod();
+	} else if ( msg == "reloadInputMethods()" ) {
+		inputMethods->loadInputMethods();
+	} else if ( msg == "reloadApplets()" ) {
+		sysTray->loadApplets();
+	} else if ( msg == "soundAlarm()" ) {
+		Desktop::soundAlarm();
+	}
+	else if ( msg == "setLed(int,bool)" ) {
+		int led, status;
+		stream >> led >> status;
+		
+		ODevice::inst ( )-> setLed ( led, status ? OLED_BlinkSlow : OLED_Off );
+	}
 }
 
 QWidget *TaskBar::calibrate(bool)
 {
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
@@ -20,12 +20,8 @@
 
 #ifndef __TASKBAR_H__
 #define __TASKBAR_H__
 
-#if defined( QT_QWS_CUSTOM ) || defined( QT_QWS_IPAQ )
-#include <qpe/custom.h>
-#endif
-
 #include <qhbox.h>
 
 class QLabel;
 class QTimer;