author | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
commit | 258feac229c2e8b5016670c1edc442e923c58628 (patch) (side-by-side diff) | |
tree | 7ef7f582eea8dee7ca1335b2e8748965e04cb8e6 /core/launcher/main.cpp | |
parent | 50fc4807caa741b4bddf7c727273082a038d9760 (diff) | |
download | opie-258feac229c2e8b5016670c1edc442e923c58628.zip opie-258feac229c2e8b5016670c1edc442e923c58628.tar.gz opie-258feac229c2e8b5016670c1edc442e923c58628.tar.bz2 |
Revert the attempt to split calibrate, as it failed miserably.
-rw-r--r-- | core/launcher/main.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index e96eeae..20a1ecd 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp @@ -30,7 +30,6 @@ #endif #include <opie/odevice.h> -#include <opie/oprocess.h> #include <qmessagebox.h> #include <qfile.h> @@ -45,6 +44,8 @@ #include <signal.h> #include <unistd.h> +#include "../calibrate/calibrate.h" + using namespace Opie; void initEnvironment() @@ -117,14 +118,10 @@ int initApplication( int argc, char ** argv ) if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { if ( !QFile::exists( "/etc/pointercal" ) ) { - OProcess cal; - cal << "calibrate"; - - if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) { - QMessageBox::warning( 0, "Unable to calibrate", - "Failed to start the calibration tool.\n" - ); - } + // Make sure calibration widget starts on top. + Calibrate *cal = new Calibrate; + cal->exec(); + delete cal; } } |