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
@@ -29,3 +29,3 @@
 #endif
-#include <qtopia/global.h>
+#include <opie2/oglobal.h>
 
@@ -63,3 +63,2 @@
 #include "documentlist.h"
-#include "launcherglobal.h"
 
@@ -406,3 +405,3 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus)
         } else  {
-            QFileInfo fi(Opie::Global::tempDir() + "qcop-msg-" + appName);
+            QFileInfo fi(OGlobal::tempDirPath() + "qcop-msg-" + appName);
             if ( fi.exists() && fi.size() ) {
@@ -448,4 +447,4 @@ 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();
 
@@ -499,3 +498,3 @@ 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) ) {