Move to LibOpie2

remove launcher global and use OGlobal

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
@@ -14,33 +14,33 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QTOPIA_INTERNAL_PRELOADACCESS
 #define QTOPIA_INTERNAL_PRELOADACCESS
 #endif
 #ifndef QTOPIA_INTERNAL_FILEOPERATIONS
 #define QTOPIA_INTERNAL_FILEOPERATIONS
 #endif
 #ifndef QTOPIA_PROGRAM_MONITOR
 #define QTOPIA_PROGRAM_MONITOR
 #endif
-#include <qtopia/global.h>
+#include <opie2/oglobal.h>
 
 #ifndef Q_OS_WIN32
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/file.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <errno.h>
 #else
 #include <process.h>
 #include <windows.h>
 #include <winbase.h>
 #endif
 
 #include <signal.h>
@@ -48,33 +48,32 @@
 #include <stdlib.h>
 
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 
 #include <qtopia/qcopenvelope_qws.h>
 #include <qtopia/applnk.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/config.h>
 #include <qtopia/global.h>
 
 #include "applauncher.h"
 #include "documentlist.h"
-#include "launcherglobal.h"
 
 const int AppLauncher::RAISE_TIMEOUT_MS = 5000;
 
 //---------------------------------------------------------------------------
 
 static AppLauncher* appLauncherPtr;
 
 const int appStopEventID = 1290;
 
 class AppStoppedEvent : public QCustomEvent
 {
 public:
     AppStoppedEvent(int pid, int status)
 	: QCustomEvent( appStopEventID ), mPid(pid), mStatus(status) { }
 
     int pid() { return mPid; }
@@ -391,33 +390,33 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus)
 	    case SIGPIPE: sig = "SIGPIPE"; break;
 	    case SIGQUIT: sig = "SIGQUIT"; break;
 	    case SIGSEGV: sig = "SIGSEGV"; break;
 	    case SIGTERM: sig = "SIGTERM"; break;
 	    case SIGTRAP: sig = "SIGTRAP"; break;
 	    default: sig = QString("Unkown %1").arg(exitStatus);
 	}
 	if ( preloadDisabled )
 	    sig += tr("<qt><p>Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.</qt>");
 
 	QString str = tr("<qt><b>%1</b> was terminated due to signal code %2</qt>").arg( app->name() ).arg( sig );
 	QMessageBox::information(0, tr("Application terminated"), str );
     } else {
 	if ( exitStatus == 255 ) {  //could not find app (because global returns -1)
 	    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);
                 qWarning("Re executing obmitted for %s", appName.latin1() );
 //		execute( appName, QString::null );
 		return;
 	    }
 	}
     }
 
 #endif
 
     emit terminated(sigPid, appName);
 }
 #else
 void AppLauncher::sigStopped(int sigPid, int sigStatus)
 {
@@ -433,34 +432,34 @@ bool AppLauncher::isRunning(const QString &app)
 	    pid_t t = ::__getpgid( it.key() );
 	    if ( t == -1 ) {
 		qDebug("appLauncher bug, %s believed running, but pid %d is not existing", app.data(), it.key() );
 		runningApps.remove( it.key() );
 		return FALSE;
 	    }
 #endif
 	    return TRUE;
 	}
     }
 
     return FALSE;
 }
 
 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
     if (builtin) {
 	for (int i = 0; builtin[i].file; i++) {
 	    if ( builtin[i].file == c ) {
 		if ( running[i] ) {
 		    if ( !document.isNull() && builtin[i].documentary )
 			Global::setDocument(running[i], document);
 		    running[i]->raise();
 		    running[i]->show();
 		    running[i]->setActiveWindow();
 		} else {
 		    running[i] = builtin[i].func( builtin[i].maximized );
 		}
 #ifndef QT_NO_COP
 		QCopEnvelope e("QPE/System", "notBusy(QString)" );
@@ -484,33 +483,33 @@ bool AppLauncher::executeBuiltin(const QString &c, const QString &document)
 }
 
 bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRaise)
 {
     qWarning("AppLauncher::execute");
     // Convert the command line in to a list of arguments
     QStringList list = QStringList::split(QRegExp("  *"),c);
     if ( !docParam.isEmpty() )
 	list.append( docParam );
 
     QString appName = list[0];
     if ( isRunning(appName) ) {
 	QCString channel = "QPE/Application/";
 	channel += appName.latin1();
 
 	// 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
 	    flock(f.handle(), LOCK_EX);
 #endif
 
 	    QDataStream ds(&f);
 	    QByteArray b;
 	    QDataStream bstream(b, IO_WriteOnly);
 	    if ( !f.size() ) {
 		ds << channel << QCString("raise()") << b;
 		if ( !waitingHeartbeat.contains( appName ) && appKillerName != appName ) {
 		    int id = startTimer(RAISE_TIMEOUT_MS);
 		    waitingHeartbeat.insert( appName, id );
 		}
 	    }
 	    if ( !docParam.isEmpty() ) {
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
@@ -1,16 +1,16 @@
   config LAUNCHER
     boolean "opie-taskbar (program launcher qpe for Opie)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
 
 if LAUNCHER
   config PRELOAD
     boolean
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && LAUNCHER
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER
 
   config LAUNCHER_CORE
     boolean
     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
@@ -6,38 +6,38 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "documentlist.h"
 #include "serverinterface.h"
-#include "launcherglobal.h"
+
+#include <opie2/oglobal.h>
 
 #include <qtopia/config.h>
 #include <qtopia/mimetype.h>
 #include <qtopia/resource.h>
-#include <qtopia/global.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/qpeapplication.h>
 #include <qtopia/applnk.h>
 #include <qtopia/storage.h>
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qpainter.h>
 #include <qimage.h>
 #include <qcopchannel_qws.h>
@@ -77,33 +77,36 @@ public:
     const QFileInfoList *lists[MAX_SEARCH_DEPTH];
     unsigned int listPositions[MAX_SEARCH_DEPTH];
 
     StorageInfo *storage;
 
     int tid;
 
     ServerInterface *serverGui;
 
     bool needToSendAllDocLinks;
     bool sendAppLnks;
     bool sendDocLnks;
     bool scanDocs;
 };
 
 
-DocumentList::DocumentList( ServerInterface *serverGui, bool scanDocs,
+/*
+ * scandocs will be read from Config
+ */
+DocumentList::DocumentList( ServerInterface *serverGui, bool /*scanDocs*/,
 			    QObject *parent, const char *name )
  : QObject( parent, name )
 {
     appLnkSet = new AppLnkSet( MimeType::appsFolderName() );
     d = new DocumentListPrivate( serverGui );
     d->needToSendAllDocLinks = false;
 
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     d->scanDocs = cfg.readBoolEntry( "Enable", true );
     qDebug( "DocumentList::DocumentList() : scanDocs = %d", d->scanDocs );
 
     QTimer::singleShot( 10, this, SLOT( startInitialScan() ) );
 }
 
 void DocumentList::startInitialScan()
@@ -256,33 +259,33 @@ void DocumentList::reloadDocLnks()
 {
     if ( !d->scanDocs )
 	return;
 
     if ( d->sendDocLnks && d->serverGui ) {
 	d->serverGui->documentScanningProgress( 0 );
 	d->serverGui->allDocumentsRemoved();
     }
 
     rescan();
 }
 
 void DocumentList::linkChanged( QString arg )
 {
     //qDebug( "linkchanged( %s )", arg.latin1() );
 
-    if ( arg.isNull() || Opie::Global::isAppLnkFileName( arg ) ) {
+    if ( arg.isNull() || OGlobal::isAppLnkFileName( arg ) ) {
 	reloadAppLnks();
     } else {
 
 	const QList<DocLnk> &list = d->dls.children();
 	QListIterator<DocLnk> it( list );
 	while ( it.current() ) {
 	    DocLnk *doc = it.current();
 	    ++it;
 	    if ( ( doc->linkFileKnown() && doc->linkFile() == arg )
 		|| ( doc->fileKnown() && doc->file() == arg ) ) {
 		//qDebug( "found old link" );
 		DocLnk* dl = new DocLnk( arg );
 		// add new one if it exists and matches the mimetype
 		if ( d->store( dl ) ) {
 		    // Existing link has been changed, send old link ref and a ref
 		    // to the new link
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
@@ -14,77 +14,78 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QTOPIA_INTERNAL_FILEOPERATIONS
 #define QTOPIA_INTERNAL_FILEOPERATIONS
 #endif
 #include "server.h"
 #include "serverapp.h"
 #include "taskbar.h"
 #include "stabmon.h"
 #include "launcher.h"
 #include "firstuse.h"
-#include "launcherglobal.h"
+
+#include <opie2/oglobal.h>
 
 #include <qtopia/qpeapplication.h>
 #include <qtopia/network.h>
 #include <qtopia/config.h>
 //#include <qtopia/custom.h>
-#include <qtopia/global.h>
+
 
 #include <qfile.h>
 #include <qdir.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/alarmserver.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #ifndef Q_OS_WIN32
 #include <unistd.h>
 #else
 #include <process.h>
 #endif
 
 #include "calibrate.h"
 
 
 #ifdef QT_QWS_LOGIN
 #include "../login/qdmdialogimpl.h"
 #endif
 
 #ifdef Q_WS_QWS
 #include <qkeyboard_qws.h>
 #endif
 
 #include <qmessagebox.h>
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 using namespace Opie;
 
 
 static void cleanup()
 {
-    QDir dir( Opie::Global::tempDir(), "qcop-msg-*" );
+    QDir dir( OGlobal::tempDirPath(), "qcop-msg-*" );
 
     QStringList stale = dir.entryList();
     QStringList::Iterator it;
     for ( it = stale.begin(); it != stale.end(); ++it ) {
 	dir.remove( *it );
     }
 }
 
 static void refreshTimeZoneConfig()
 {
     /* ### FIXME timezone handling */
 #if 0
    // We need to help WorldTime in setting up its configuration for
    //   the current translation
     // BEGIN no tr
     const char *defaultTz[] = {
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
@@ -8,67 +8,68 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "qcopbridge.h"
 #include "transferserver.h"
 
+#include <opie2/oglobal.h>
+
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 #include <qtopia/qpeapplication.h>
-#include <qtopia/global.h>
+
 #include <qtopia/version.h>
 #include <qtopia/config.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdatastream.h>
 #include <qcstring.h>
 #include <qstringlist.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qtimer.h>
 #ifdef Q_WS_QWS
 #include <qcopchannel_qws.h>
 #endif
 
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE
 #endif
 #ifndef Q_OS_WIN32
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/types.h>
 #endif
 
 #if defined(_OS_LINUX_)
 #include <shadow.h>
 #endif
 
-#include "launcherglobal.h"
 
 //#define INSECURE
 
 const int block_size = 51200;
 
 QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
         const char* name )
     : QServerSocket( port, 1, parent, name ),
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
 	qWarning( "Failed to bind to port %d", port );
     else {
 #ifndef QT_NO_COP
 	desktopChannel = new QCopChannel( "QPE/Desktop", this );
@@ -312,33 +313,33 @@ void QCopBridgePI::myConnectionClosed()
 
 void QCopBridgePI::sendDesktopMessage( const QString &msg )
 {
     QString str = "CALL QPE/Desktop " + msg; // No tr
     send ( str );
 }
 
 void QCopBridgePI::sendDesktopMessage( const QCString &msg, const QByteArray& data )
 {
     if ( !isOpen() ) // eg. Forbidden
 	return;
 
     const char hdr[]="CALLB QPE/Desktop ";
     writeBlock(hdr,sizeof(hdr)-1);
     writeBlock(msg,msg.length());
     writeBlock(" ",1);
-    QByteArray b64 = Opie::Global::encodeBase64(data);
+    QByteArray b64 = OGlobal::encodeBase64(data);
     writeBlock(b64.data(),b64.size());
     writeBlock("\r\n",2);
 
 }
 
 
 void QCopBridgePI::send( const QString& msg )
 {
     if ( !isOpen() ) // eg. Forbidden
 	return;
     QTextStream os( this );
     os << msg << endl;
     //qDebug( "sending qcop message: %s", msg.latin1() );
 }
 
 void QCopBridgePI::read()
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
@@ -1,24 +1,24 @@
 
 #include "screensaver.h"
 
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/network.h>
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 
 using namespace Opie;
 
 
 
 OpieScreenSaver::OpieScreenSaver ( )
 		: QObject ( 0, "screensaver" ), QWSScreenSaver ( )
 {
 	m_disable_suspend = 100;
 	m_enable_dim = false;
 	m_enable_lightoff = false;
 	m_enable_suspend = false;
 	m_onlylcdoff = false;
 
 	m_enable_dim_ac = false;
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
@@ -38,34 +38,34 @@
 #include "documentlist.h"
 
 #include <qtopia/applnk.h>
 #include <qtopia/private/categories.h>
 #include <qtopia/mimetype.h>
 #include <qtopia/config.h>
 #include <qtopia/resource.h>
 #include <qtopia/version.h>
 #include <qtopia/storage.h>
 
 #include <qtopia/qcopenvelope_qws.h>
 #include <qwindowsystem_qws.h>
 #include <qgfx_qws.h>
 #include <qtopia/global.h>
 //#include <qtopia/custom.h>
 
-#include <opie/odevicebutton.h>
-#include <opie/odevice.h>
+#include <opie2/odevicebutton.h>
+#include <opie2/odevice.h>
 
 #include <unistd.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 
 #include <stdlib.h>
 
 extern QRect qt_maxWindowRect;
 
 using namespace Opie;
 
 static QWidget *calibrate(bool)
 {
 #ifdef Q_WS_QWS
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
@@ -33,33 +33,32 @@ HEADERS		+= server.h \
 	$$(OPIEDIR)/rsync/job.h \
 	$$(OPIEDIR)/rsync/netint.h \
 	$$(OPIEDIR)/rsync/protocol.h \
 	$$(OPIEDIR)/rsync/prototab.h \
 	$$(OPIEDIR)/rsync/rsync.h \
 	$$(OPIEDIR)/rsync/search.h \
 	$$(OPIEDIR)/rsync/stream.h \
 	$$(OPIEDIR)/rsync/sumset.h \
 	$$(OPIEDIR)/rsync/trace.h \
 	$$(OPIEDIR)/rsync/types.h \
 	$$(OPIEDIR)/rsync/util.h \
 	$$(OPIEDIR)/rsync/whole.h \
 	$$(OPIEDIR)/rsync/config_rsync.h \
 	$$(OPIEDIR)/rsync/qrsync.h \
 		  syncdialog.h \
 		  serverapp.h \
-		  launcherglobal.h \
 		  qprocess.h \
 		  screensaver.h
 
 SOURCES		+= server.cpp \
 		  serverinterface.cpp \
 		  launchertab.cpp \
 		  documentlist.cpp \
 		  appicons.cpp \
 		  taskbar.cpp \
                   runningappbar.cpp \
 		  applauncher.cpp \
 		  stabmon.cpp \
 		  inputmethods.cpp \
 		  systray.cpp \
 		  wait.cpp \
 		  shutdownimpl.cpp \
@@ -88,38 +87,38 @@ SOURCES		+= server.cpp \
 	$$(OPIEDIR)/rsync/patch.c \
 	$$(OPIEDIR)/rsync/prototab.c \
 	$$(OPIEDIR)/rsync/readsums.c \
 	$$(OPIEDIR)/rsync/scoop.c \
 	$$(OPIEDIR)/rsync/search.c \
 	$$(OPIEDIR)/rsync/stats.c \
 	$$(OPIEDIR)/rsync/stream.c \
 	$$(OPIEDIR)/rsync/sumset.c \
 	$$(OPIEDIR)/rsync/trace.c \
 	$$(OPIEDIR)/rsync/tube.c \
 	$$(OPIEDIR)/rsync/util.c \
 	$$(OPIEDIR)/rsync/version.c \
 	$$(OPIEDIR)/rsync/whole.c \
 	$$(OPIEDIR)/rsync/qrsync.cpp \
 		  syncdialog.cpp \
 		  serverapp.cpp \
-		  launcherglobal.cpp \
 		  qprocess.cpp \
 		  qprocess_unix.cpp \
 		  screensaver.cpp
 
 
 INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
 DEPENDPATH	+= $(OPIEDIR)/core/apps/calibrate
 
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
 DEPENDPATH	+= $(OPIEDIR)/rsync
 
 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
 }
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -341,54 +341,54 @@ void StartMenu::loadApplets()
             QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";

             if ( trans->load( tfn ))

                 qApp->installTranslator( trans );

             else

                 delete trans;

         } else {

             exclude += *it;

             delete lib;

         }

     }

     cfg.writeEntry( "ExcludeApplets", exclude, ',' );

     qsort(xapplets, napplets, sizeof(menuApplets[0]), compareAppletPositions);

 

 

     while ( napplets-- ) {

         MenuApplet *applet = xapplets[napplets];

-

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

 

         // menuApplets got an id < -1

         menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) );

         currentItem++;

     }

     delete [] xapplets;

 

     addApplets( launchMenu );

 }

 

 

 /*

  * Launcher calls loadMenu too often fix that

  */

 void StartMenu::addApplets(QPopupMenu* pop) {

     QIntDict<MenuApplet> dict;

     if( pop-> count ( ))

         pop-> insertSeparator ( );

 

     for ( QIntDictIterator<MenuApplet> it( menuApplets ); it.current(); ++it ) {

     	MenuApplet *applet = it.current();

         if ( applet->popup )

             applet->id = pop->insertItem( applet->iface->icon(),

                                           applet->iface->text(), applet->popup );

         else

             applet->id = pop->insertItem( applet->iface->icon(),

                                           applet->iface->text() );

 

+

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

     }

     /* need to update the key */

     menuApplets.setAutoDelete( true );

     menuApplets.clear();

     menuApplets.setAutoDelete( false );

     menuApplets = dict;

 }

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
@@ -6,77 +6,76 @@
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 //#define _XOPEN_SOURCE
 
-#include <qtopia/global.h>
+#include <opie2/oglobal.h>
 #include <qtopia/qpeapplication.h>
 
 #ifndef Q_OS_WIN32
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
 
 #ifndef Q_OS_MACX
 #include <shadow.h>
 #include <crypt.h>
-#endif /* Q_OS_MACX */ 
+#endif /* Q_OS_MACX */
 
 #else
 #include <stdlib.h>
 #include <time.h>
 #endif
 
 
 #if defined(_OS_LINUX_)
 #include <shadow.h>
 #endif
 
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdatastream.h>
 #include <qmessagebox.h>
 #include <qstringlist.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //#include <qtopia/qcopchannel_qws.h>
 #include <qtopia/process.h>
 #include <qtopia/global.h>
 #include <qtopia/config.h>
 #include <qtopia/private/contact.h>
 #include <qtopia/quuid.h>
 #include <qtopia/version.h>
 #ifdef Q_WS_QWS
 #include <qtopia/qcopenvelope_qws.h>
 #endif
 
-#include "launcherglobal.h"
 
 #include "transferserver.h"
 #include <qtopia/qprocess.h>
 
 const int block_size = 51200;
 
 TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
         const char* name)
     : QServerSocket( port, 1, parent, name )
 {
     connections.setAutoDelete( TRUE );
     if ( !ok() )
 	qWarning( "Failed to bind to port %d", port );
 }
 
 void TransferServer::authorizeConnections()
@@ -101,33 +100,33 @@ TransferServer::~TransferServer()
 }
 
 void TransferServer::newConnection( int socket )
 {
     ServerPI *ptr = new ServerPI( socket, this );
     connect( ptr, SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
     connections.append( ptr );
 }
 
 QString SyncAuthentication::serverId()
 {
     Config cfg("Security");
     cfg.setGroup("Sync");
     QString r = cfg.readEntry("serverid");
 
     if ( r.isEmpty() ) {
-        r = Opie::Global::uuid();
+        r = OGlobal::generateUuid();
         cfg.writeEntry("serverid", r );
     }
    return r;
 }
 
 QString SyncAuthentication::ownerName()
 {
     QString vfilename = Global::applicationFileName("addressbook",
                 "businesscard.vcf");
     if (QFile::exists(vfilename)) {
 	Contact c;
 	c = Contact::readVCard( vfilename )[0];
 	return c.fullName();
     }
 
     return QString::null;
@@ -180,69 +179,69 @@ bool SyncAuthentication::checkPassword( const QString& password )
     pw = getpwuid( geteuid() );
     spw = getspnam( pw->pw_name );
 
     QString cpwd = QString::fromLocal8Bit( pw->pw_passwd );
     if ( cpwd == "x" && spw )
 	cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
 
     // Note: some systems use more than crypt for passwords.
     QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) );
     if ( cpwd == cpassword )
 	return TRUE;
 #endif
 
     static int lastdenial=0;
     static int denials=0;
     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
     if (syncapp == "IntelliSync") {
     	return TRUE;
-    }	
-      
+    }
+
     // Detect old Qtopia Desktop (no password)
-    if ( password.isEmpty() ) {	
+    if ( password.isEmpty() ) {
 		if ( denials < 3 || now > lastdenial+600 ) {
 		    QMessageBox unauth(
 			tr("Sync Connection"),
 			tr("<p>An unauthorized system is requesting access to this device."
 			    "<p>If you are using a version of Qtopia Desktop older than 1.5.1, "
 			    "please upgrade or change the security setting to use IntelliSync." ),
 			QMessageBox::Warning,
 			QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
 			0, QString::null, TRUE, WStyle_StaysOnTop);
 		    unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
 		    unauth.exec();
 
 		    denials++;
 		    lastdenial=now;
-		 } 
+		 }
 		return FALSE;
-	   
-    } 
+
+    }
 
     // Second, check sync password...
 
     static int lock=0;
     if ( lock ) return FALSE;
 
-    ++lock;    
+    ++lock;
 
     /*
      *  we need to support old Sync software and QtopiaDesktop
      */
     if ( password.left(6) == "Qtopia" || password.left(6) == "rootme" ) {
 	Config cfg( "Security" );
 	cfg.setGroup("Sync");
 	QStringList pwds = cfg.readListEntry("Passwords",' ');
 	for (QStringList::ConstIterator it=pwds.begin(); it!=pwds.end(); ++it) {
 #ifndef Q_OS_WIN32
 	    QString cpassword = QString::fromLocal8Bit(
 		crypt( password.mid(8).local8Bit(), (*it).left(2).latin1() ) );
 #else
 	    // ### revise
 	    QString cpassword("");
 #endif
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
@@ -10,33 +10,33 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "wait.h"
 
 #include <qtopia/resource.h>
 #include <qtopia/config.h>
 
-#include <opie/owait.h>
+#include <opie2/owait.h>
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 
 
 Wait *lastWaitObject = NULL;
 
 
 Wait::Wait( QWidget *parent ) : QWidget( parent ),
 	pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE )
 {
     setFixedSize( pm.size() );
     lastWaitObject = this;
     m_centralWait = new OWait( 0l );
     m_centralWait->hide();