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, 14 insertions, 14 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
@@ -99,20 +99,20 @@ int initApplication( int argc, char ** argv )
     QObject::connect( &a, SIGNAL(capsLockStateToggle()),   d, SLOT(toggleCapsLockState()) );
     QObject::connect( &a, SIGNAL(prepareForRestart()),   d, SLOT(terminateServers()) );
 
     (void)new SysFileMonitor(d);
     Network::createServer(d);
 
-#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
-    if ( !QFile::exists( "/etc/pointercal" ) ) {
-	// Make sure calibration widget starts on top.
-	Calibrate *cal = new Calibrate;
-	cal->exec();
-	delete cal;
+    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 ) {
 		if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ). arg( TimeString::dateString ( QDate::currentDate ( ))), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
 			QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
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
@@ -320,20 +320,20 @@ int login_main ( int argc, char **argv, pid_t ppid )
 
 	app-> setFont ( QFont ( "Helvetica", 10 ));
 	app-> setStyle ( new QPEStyle ( ));
 
 	ODevice::inst ( )-> setSoftSuspend ( true );
 
-#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
-	if ( !QFile::exists ( "/etc/pointercal" )) {
-		// Make sure calibration widget starts on top.
-		Calibrate *cal = new Calibrate;
-		cal-> exec ( );
-		delete cal;
+	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 ( );
 	QWSServer::setScreenSaver ( saver );
 	saver-> restore ( );