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
@@ -243,161 +243,155 @@ bool ODevice::suspend ( )
 
 
 bool ODevice::setDisplayStatus ( bool on )
 {
 	if ( d-> m_model == Model_Unknown )
 		return false;
 
 	bool res = false;
 	int fd;
 	
 	if (( fd = ::open ( "/dev/fb0", O_RDWR )) >= 0 ) {
 		res = ( ::ioctl ( fd, FBIOBLANK, on ? VESA_NO_BLANKING : VESA_POWERDOWN ) == 0 );
 		::close ( fd );
 	}	                                                                                       
 	return res;
 }
 
 bool ODevice::setDisplayBrightness ( int )
 {
 	return false;
 }
 
 int ODevice::displayBrightnessResolution ( ) const
 {
 	return 16;
 }
 
 QString ODevice::vendorString ( ) const
 {
 	return d-> m_vendorstr;
 }
 
 OVendor ODevice::vendor ( ) const
 {
 	return d-> m_vendor;
 }
 
 QString ODevice::modelString ( ) const
 {
 	return d-> m_modelstr;
 }
 
 OModel ODevice::model ( ) const
 {
 	return d-> m_model;
 }
 
 QString ODevice::systemString ( ) const
 {
 	return d-> m_systemstr;
 }
 
 OSystem ODevice::system ( ) const
 {
 	return d-> m_system;
 }
 
 QString ODevice::systemVersionString ( ) const
 {
 	return d-> m_sysverstr;
 }
 
 void ODevice::alarmSound ( )
 {
-#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "alarm" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
-#endif
 }
 
 void ODevice::keySound ( )
 {
-#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "keysound" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
-#endif
 }
 
 void ODevice::touchSound ( )
 {
 
-#ifndef QT_QWS_EBX
 #ifndef QT_NO_SOUND
 	static Sound snd ( "touchsound" );
 
 	if ( snd. isFinished ( ))
 		snd. play ( );
 #endif
-#endif
 }
 
 
 QValueList <OLed> ODevice::ledList ( ) const
 {
 	return QValueList <OLed> ( );
 }
 
 QValueList <OLedState> ODevice::ledStateList ( OLed /*which*/ ) const
 {
 	return QValueList <OLedState> ( );
 }
 
 OLedState ODevice::ledState ( OLed /*which*/ ) const
 {
 	return Led_Off;
 }
 
 bool ODevice::setLedState ( OLed /*which*/, OLedState /*st*/ )
 {
 	return false;
 }
 
 bool ODevice::hasLightSensor ( ) const
 {
 	return false;
 }
 
 int ODevice::readLightSensor ( )
 {
 	return -1;
 }
 
 int ODevice::lightSensorResolution ( ) const
 {
 	return 0;
 }
 
 //QValueList <int> ODevice::keyList ( ) const
 //{
 //	return QValueList <int> ( );
 //}
 
 
 
 /**************************************************
  *
  * iPAQ
  *
  **************************************************/
 
 void iPAQ::init ( )
 {
 	d-> m_vendorstr = "HP";
 	d-> m_vendor = Vendor_HP;
 
 	QFile f ( "/proc/hal/model" );
 
 	if ( f. open ( IO_ReadOnly )) {
 		QTextStream ts ( &f );
 
 		d-> m_modelstr = "H" + ts. readLine ( );
 
 		if ( d-> m_modelstr == "H3100" )
@@ -531,165 +525,163 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
 	int newkeycode = keycode;
 
 	
 	// simple susbstitutions
 	switch ( d-> m_model ) {
 		case Model_iPAQ_H38xx:
 			// H38xx has no "Q" key anymore - this is now the Mail key
 			if ( keycode == HardKey_Menu )
 				newkeycode = HardKey_Mail;
 			//nobreak
 						
 		case Model_iPAQ_H31xx: 
 			// Rotate cursor keys 180°
 			switch ( keycode ) {
 				case Key_Left : newkeycode = Key_Right; break;
 				case Key_Right: newkeycode = Key_Left; break;
 				case Key_Up   : newkeycode = Key_Down; break;
 				case Key_Down : newkeycode = Key_Up; break;
 			}
 			//nobreak;
 
 		case Model_iPAQ_H36xx: 
 		case Model_iPAQ_H37xx: 
 			// map Power Button short/long press to F34/F35
 			if ( keycode == Key_SysReq ) {
 				if ( isPress ) {
 					if ( m_power_timer )
 						killTimer ( m_power_timer );
 					m_power_timer = startTimer ( 500 );
 				}
 				else if ( m_power_timer ) {
 					killTimer ( m_power_timer );
 					m_power_timer = 0;
 					QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, true, false );
 					QWSServer::sendKeyEvent ( -1, HardKey_Suspend, 0, false, false );
 				}
 				newkeycode = Key_unknown;			
 			}
 			//nobreak;
 		
 		default: 
 			break;
 	}				
 
 	if ( newkeycode != keycode ) {
 		if ( newkeycode != Key_unknown )
 			QWSServer::sendKeyEvent ( -1, newkeycode, modifiers, isPress, autoRepeat );
 		return true;
 	}
 	else
 		return false;
 }
 
 void iPAQ::timerEvent ( QTimerEvent * )
 {
 	killTimer ( m_power_timer );
 	m_power_timer = 0;
 	QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, true, false );
 	QWSServer::sendKeyEvent ( -1, HardKey_Backlight, 0, false, false );
 }
 
 
 void iPAQ::alarmSound ( )
 {
-#if defined( QT_QWS_IPAQ ) // IPAQ
 #ifndef QT_NO_SOUND
 	static Sound snd ( "alarm" );
 	int fd;
 	int vol;
 	bool vol_reset = false;
 
 	if (( fd = ::open ( "/dev/sound/mixer", O_RDWR )) >= 0 ) {
 		if ( ::ioctl ( fd, MIXER_READ( 0 ), &vol ) >= 0 ) {
 			Config cfg ( "qpe" );
 			cfg. setGroup ( "Volume" );
 
  			int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
 			if ( volalarm < 0 )
 				volalarm = 0;
 			else if ( volalarm > 100 )
 				volalarm = 100;
 			volalarm |= ( volalarm << 8 );
 
 			if (( volalarm & 0xff ) > ( vol & 0xff )) {
 				if ( ::ioctl ( fd, MIXER_WRITE( 0 ), &volalarm ) >= 0 )
 					vol_reset = true;
 			}
 		}
 	}
 
 	snd. play ( );
 	while ( !snd. isFinished ( ))
 		qApp-> processEvents ( );
 
 	if ( fd >= 0 ) {
 		if ( vol_reset )
 			::ioctl ( fd, MIXER_WRITE( 0 ), &vol );
 		::close ( fd );
 	}
 #endif
-#endif
 }
 
 
 bool iPAQ::setSoftSuspend ( bool soft )
 {
 	bool res = false;
 	int fd;
 	
 	if (( fd = ::open ( "/proc/sys/ts/suspend_button_mode", O_WRONLY )) >= 0 ) {
 		if ( ::write ( fd, soft ? "1" : "0", 1 ) == 1 )
 			res = true;
 		else
 			::perror ( "write to /proc/sys/ts/suspend_button_mode" );
 		
 		::close ( fd );
 	}
 	else
 		::perror ( "/proc/sys/ts/suspend_button_mode" );
 	
 	return res;
 }
 
 
 bool iPAQ::setDisplayBrightness ( int bright )
 {
 	bool res = false;
 	int fd;
 	
 	if ( bright > 255 )
 		bright = 255;
 	if ( bright < 0 )
 		bright = 0;
 
 	if (( fd = ::open ( "/dev/touchscreen/0", O_WRONLY )) >= 0 ) {
 		FLITE_IN bl;
 		bl. mode = 1;
 		bl. pwr = bright ? 1 : 0;
 		bl. brightness = ( bright * ( displayBrightnessResolution ( ) - 1 ) + 127 ) / 255;
 		res = ( ::ioctl ( fd, FLITE_ON, &bl ) == 0 );
 		::close ( fd );
 	}
 	return res;
 }
 
 int iPAQ::displayBrightnessResolution ( ) const
 {
 	switch ( model ( )) {
 		case Model_iPAQ_H31xx:
 		case Model_iPAQ_H36xx:
 		case Model_iPAQ_H37xx:
 			return 128;  	// really 256, but >128 could damage the LCD
 			
 		case Model_iPAQ_H38xx:
 		case Model_iPAQ_H39xx:
 			return 64;
 		
 		default:
 			return 2;
 	}	
 }
 
 
 bool iPAQ::hasLightSensor ( ) const
 {