Remove ifdefs based on device as the means by which we decide to run calibrate, and instead check if the mouse handler inherits from QCalibratedMouseHandler.

2 files changed, 4 insertions, 4 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 8eaea17..64fb968 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -101,16 +101,16 @@ int initApplication( int argc, char ** argv )
 
     (void)new SysFileMonitor(d);
     Network::createServer(d);
 
-#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+    if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
     if ( !QFile::exists( "/etc/pointercal" ) ) {
 	// Make sure calibration widget starts on top.
 	Calibrate *cal = new Calibrate;
 	cal->exec();
 	delete cal;
     }
-#endif
+    }
 
     d->show();
 
 	if ( QDate::currentDate ( ). year ( ) < 2000 ) {
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 1800be0..9c40fc4 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -322,16 +322,16 @@ int login_main ( int argc, char **argv, pid_t ppid )
 	app-> setStyle ( new QPEStyle ( ));
 
 	ODevice::inst ( )-> setSoftSuspend ( true );
 
-#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+	if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
 	if ( !QFile::exists ( "/etc/pointercal" )) {
 		// Make sure calibration widget starts on top.
 		Calibrate *cal = new Calibrate;
 		cal-> exec ( );
 		delete cal;
 	}
-#endif
+	}
 
 	LoginScreenSaver *saver = new LoginScreenSaver;
 
 	saver-> setIntervals ( );