summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-24 01:24:56 (UTC)
committer kergoth <kergoth>2003-03-24 01:24:56 (UTC)
commit1b4836ba28ca57947d37699fc67cddd74fb29fbe (patch) (unidiff)
treece940472f7ca14c5c7f0c88eebcf95ca953cfef9
parentc8205a610f350b8bde7c5aa0522944f0418f1fc9 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp14
-rw-r--r--core/opie-login/main.cpp14
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
@@ -102,14 +102,14 @@ int initApplication( int argc, char ** argv )
102 (void)new SysFileMonitor(d); 102 (void)new SysFileMonitor(d);
103 Network::createServer(d); 103 Network::createServer(d);
104 104
105#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) 105 if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
106 if ( !QFile::exists( "/etc/pointercal" ) ) { 106 if ( !QFile::exists( "/etc/pointercal" ) ) {
107 // Make sure calibration widget starts on top. 107 // Make sure calibration widget starts on top.
108 Calibrate *cal = new Calibrate; 108 Calibrate *cal = new Calibrate;
109 cal->exec(); 109 cal->exec();
110 delete cal; 110 delete cal;
111 }
111 } 112 }
112#endif
113 113
114 d->show(); 114 d->show();
115 115
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
@@ -323,14 +323,14 @@ int login_main ( int argc, char **argv, pid_t ppid )
323 323
324 ODevice::inst ( )-> setSoftSuspend ( true ); 324 ODevice::inst ( )-> setSoftSuspend ( true );
325 325
326#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) 326 if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
327 if ( !QFile::exists ( "/etc/pointercal" )) { 327 if ( !QFile::exists ( "/etc/pointercal" )) {
328 // Make sure calibration widget starts on top. 328 // Make sure calibration widget starts on top.
329 Calibrate *cal = new Calibrate; 329 Calibrate *cal = new Calibrate;
330 cal-> exec ( ); 330 cal-> exec ( );
331 delete cal; 331 delete cal;
332 }
332 } 333 }
333#endif
334 334
335 LoginScreenSaver *saver = new LoginScreenSaver; 335 LoginScreenSaver *saver = new LoginScreenSaver;
336 336