11 files changed, 45 insertions, 43 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) ) {
diff --git a/core/launcher/config.in b/core/launcher/config.in
index 2d9c1c2..db39210 100644
--- a/core/launcher/config.in
+++ b/core/launcher/config.in
@@ -3,3 +3,3 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
 
@@ -9,3 +9,3 @@ if LAUNCHER
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER
 
@@ -14,3 +14,3 @@ if LAUNCHER
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER && PRELOAD
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER && PRELOAD
 endif
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index ece6931..440bf1e 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -21,3 +21,4 @@
 #include "serverinterface.h"
-#include "launcherglobal.h"
+
+#include <opie2/oglobal.h>
 
@@ -26,3 +27,2 @@
 #include <qtopia/resource.h>
-#include <qtopia/global.h>
 #include <qtopia/private/categories.h>
@@ -92,3 +92,6 @@ public:
 
-DocumentList::DocumentList( ServerInterface *serverGui, bool scanDocs,
+/*
+ * scandocs will be read from Config
+ */
+DocumentList::DocumentList( ServerInterface *serverGui, bool /*scanDocs*/,
                             QObject *parent, const char *name )
@@ -271,3 +274,3 @@ void DocumentList::linkChanged( QString arg )
 
-    if ( arg.isNull() || Opie::Global::isAppLnkFileName( arg ) ) {
+    if ( arg.isNull() || OGlobal::isAppLnkFileName( arg ) ) {
         reloadAppLnks();
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 988e432..bf06e75 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -29,3 +29,4 @@
 #include "firstuse.h"
-#include "launcherglobal.h"
+
+#include <opie2/oglobal.h>
 
@@ -35,3 +36,3 @@
 //#include <qtopia/custom.h>
-#include <qtopia/global.h>
+
 
@@ -66,3 +67,3 @@
 #include <qmessagebox.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
@@ -73,3 +74,3 @@ static void cleanup()
 {
-    QDir dir( Opie::Global::tempDir(), "qcop-msg-*" );
+    QDir dir( OGlobal::tempDirPath(), "qcop-msg-*" );
 
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index 9cb56ce..b45f0cc 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -23,2 +23,4 @@
 
+#include <opie2/oglobal.h>
+
 #ifdef Q_WS_QWS
@@ -27,3 +29,3 @@
 #include <qtopia/qpeapplication.h>
-#include <qtopia/global.h>
+
 #include <qtopia/version.h>
@@ -57,3 +59,2 @@
 
-#include "launcherglobal.h"
 
@@ -327,3 +328,3 @@ void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& da
     writeBlock(" ",1);
-    QByteArray b64 = Opie::Global::encodeBase64(data);
+    QByteArray b64 = OGlobal::encodeBase64(data);
     writeBlock(b64.data(),b64.size());
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index 48770e8..1146dcd 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -7,3 +7,3 @@
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index b9580c7..32fcdd0 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -53,4 +53,4 @@
 
-#include <opie/odevicebutton.h>
-#include <opie/odevice.h>
+#include <opie2/odevicebutton.h>
+#include <opie2/odevice.h>
 
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 0513536..f82c741 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -48,3 +48,2 @@ HEADERS		+= server.h \
                   serverapp.h \
-                  launcherglobal.h \
                   qprocess.h \
@@ -103,3 +102,2 @@ SOURCES		+= server.cpp \
                   serverapp.cpp \
-                  launcherglobal.cpp \
                   qprocess.cpp \
@@ -117,7 +115,8 @@ TARGET		= qpe
 
+#needs OWait and ODevice
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
-  LIBS += -lqpe -lopie
+  LIBS += -lqpe -lopiecore2 -lopieui2
 }else{
-          LIBS+= -lcrypt -lqpe -lopie
+          LIBS+= -lcrypt -lqpe -lopiecore2 -lopieui2
 }
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index b84eed8..c199063 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -356,3 +356,2 @@ void StartMenu::loadApplets()
         MenuApplet *applet = xapplets[napplets];

-

         applet->popup = applet->iface->popup( this );

@@ -386,2 +385,3 @@ void StartMenu::addApplets(QPopupMenu* pop) {
 

+

         dict.insert( applet->id, new MenuApplet( *applet ) );

diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 9519d11..9cb9d7a 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -21,3 +21,3 @@
 
-#include <qtopia/global.h>
+#include <opie2/oglobal.h>
 #include <qtopia/qpeapplication.h>
@@ -34,3 +34,3 @@
 #include <crypt.h>
-#endif /* Q_OS_MACX */ 
+#endif /* Q_OS_MACX */
 
@@ -65,3 +65,2 @@
 
-#include "launcherglobal.h"
 
@@ -116,3 +115,3 @@ QString SyncAuthentication::serverId()
     if ( r.isEmpty() ) {
-        r = Opie::Global::uuid();
+        r = OGlobal::generateUuid();
         cfg.writeEntry("serverid", r );
@@ -195,7 +194,7 @@ bool SyncAuthentication::checkPassword( const QString& password )
     int now = time(0);
- 
+
     Config cfg("Security");
-    cfg.setGroup("Sync");    
+    cfg.setGroup("Sync");
     QString syncapp = cfg.readEntry("syncapp","Qtopia");
-    
+
     //No password needed if the user really wants it
@@ -203,6 +202,6 @@ bool SyncAuthentication::checkPassword( const QString& password )
             return TRUE;
-            }
-      
+    }
+
     // Detect old Qtopia Desktop (no password)
-            if ( password.isEmpty() ) {
+    if ( password.isEmpty() ) {
                 if ( denials < 3 || now > lastdenial+600 ) {
@@ -221,6 +220,6 @@ bool SyncAuthentication::checkPassword( const QString& password )
                     lastdenial=now;
-                 } 
+                 }
                 return FALSE;
-           
-    } 
+
+    }
 
@@ -231,3 +230,3 @@ bool SyncAuthentication::checkPassword( const QString& password )
 
-    ++lock;    
+    ++lock;
 
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp
index ab53a07..34ffd1a 100644
--- a/core/launcher/wait.cpp
+++ b/core/launcher/wait.cpp
@@ -25,3 +25,3 @@
 
-#include <opie/owait.h>
+#include <opie2/owait.h>