summaryrefslogtreecommitdiff
path: root/core/launcher/main.cpp
Side-by-side diff
Diffstat (limited to 'core/launcher/main.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/main.cpp15
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;
}
}