author | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
commit | 258feac229c2e8b5016670c1edc442e923c58628 (patch) (unidiff) | |
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 @@ | |||
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include <opie/odevice.h> | 32 | #include <opie/odevice.h> |
33 | #include <opie/oprocess.h> | ||
34 | 33 | ||
35 | #include <qmessagebox.h> | 34 | #include <qmessagebox.h> |
36 | #include <qfile.h> | 35 | #include <qfile.h> |
@@ -45,6 +44,8 @@ | |||
45 | #include <signal.h> | 44 | #include <signal.h> |
46 | #include <unistd.h> | 45 | #include <unistd.h> |
47 | 46 | ||
47 | #include "../calibrate/calibrate.h" | ||
48 | |||
48 | using namespace Opie; | 49 | using namespace Opie; |
49 | 50 | ||
50 | void initEnvironment() | 51 | void initEnvironment() |
@@ -117,14 +118,10 @@ int initApplication( int argc, char ** argv ) | |||
117 | 118 | ||
118 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { | 119 | if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) { |
119 | if ( !QFile::exists( "/etc/pointercal" ) ) { | 120 | if ( !QFile::exists( "/etc/pointercal" ) ) { |
120 | OProcess cal; | 121 | // Make sure calibration widget starts on top. |
121 | cal << "calibrate"; | 122 | Calibrate *cal = new Calibrate; |
122 | 123 | cal->exec(); | |
123 | if ( ! cal.start(OProcess::Block, OProcess::NoCommunication) ) { | 124 | delete cal; |
124 | QMessageBox::warning( 0, "Unable to calibrate", | ||
125 | "Failed to start the calibration tool.\n" | ||
126 | ); | ||
127 | } | ||
128 | } | 125 | } |
129 | } | 126 | } |
130 | 127 | ||