author | kergoth <kergoth> | 2003-03-24 01:24:56 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-03-24 01:24:56 (UTC) |
commit | 1b4836ba28ca57947d37699fc67cddd74fb29fbe (patch) (side-by-side diff) | |
tree | ce940472f7ca14c5c7f0c88eebcf95ca953cfef9 /core/launcher | |
parent | c8205a610f350b8bde7c5aa0522944f0418f1fc9 (diff) | |
download | opie-1b4836ba28ca57947d37699fc67cddd74fb29fbe.zip opie-1b4836ba28ca57947d37699fc67cddd74fb29fbe.tar.gz opie-1b4836ba28ca57947d37699fc67cddd74fb29fbe.tar.bz2 |
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.
-rw-r--r-- | core/launcher/main.cpp | 14 |
1 files changed, 7 insertions, 7 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 @@ -93,32 +93,32 @@ int initApplication( int argc, char ** argv ) Desktop *d = new Desktop(); QObject::connect( &a, SIGNAL(power()), d, SLOT(togglePower()) ); QObject::connect( &a, SIGNAL(backlight()), d, SLOT(toggleLight()) ); QObject::connect( &a, SIGNAL(symbol()), d, SLOT(toggleSymbolInput()) ); QObject::connect( &a, SIGNAL(numLockStateToggle()), d, SLOT(toggleNumLockState()) ); 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)" ); e << QString ( ); } } int rv = a.exec(); |