1 files changed, 5 insertions, 6 deletions

diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index 0db99dd..f161e98 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -28,5 +28,5 @@
 #define QTOPIA_PROGRAM_MONITOR
 #endif
-#include <qtopia/global.h>
+#include <opie2/oglobal.h>
 
 #ifndef Q_OS_WIN32
@@ -62,5 +62,4 @@
 #include "applauncher.h"
 #include "documentlist.h"
-#include "launcherglobal.h"
 
 const int AppLauncher::RAISE_TIMEOUT_MS = 5000;
@@ -405,5 +404,5 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus)
             QMessageBox::information(0, tr("Application not found"), tr("<qt>Could not locate application <b>%1</b></qt>").arg( app->exec() ) );
         } else  {
-            QFileInfo fi(Opie::Global::tempDir() + "qcop-msg-" + appName);
+            QFileInfo fi(OGlobal::tempDirPath() + "qcop-msg-" + appName);
             if ( fi.exists() && fi.size() ) {
                 emit terminated(sigPid, appName);
@@ -447,6 +446,6 @@ bool AppLauncher::isRunning(const QString &app)
 bool AppLauncher::executeBuiltin(const QString &c, const QString &document)
 {
-    Global::Command* builtin = Opie::Global::builtinCommands();
-    QGuardedPtr<QWidget> *running = Opie::Global::builtinRunning();
+    Global::Command* builtin = OGlobal::builtinCommands();
+    QGuardedPtr<QWidget> *running = OGlobal::builtinRunning();
 
     // Attempt to execute the app using a builtin class for the app
@@ -498,5 +497,5 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais
 
         // Need to lock it to avoid race conditions with QPEApplication::processQCopFile
-        QFile f(Opie::Global::tempDir() + "qcop-msg-" + appName);
+        QFile f(OGlobal::tempDirPath() + "qcop-msg-" + appName);
         if ( !noRaise && f.open(IO_WriteOnly | IO_Append) ) {
 #ifndef Q_OS_WIN32