45 files changed, 80 insertions, 80 deletions
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index 195d8a4..8cb9083 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -62,49 +62,49 @@ void Multikey::mousePressEvent(QMouseEvent *ev)
 }
 void Multikey::mouseReleaseEvent(QMouseEvent *ev)
 {
    if (!sw_maps.count())
        return;
    lang = lang < sw_maps.count()-1 ? lang+1 : 0;
    QCopEnvelope e("MultiKey/Keyboard", "setmultikey(QString)");
    //odebug << "Lang=" << lang << ", count=" << sw_maps.count() << ", lab=" << labels[lang].ascii() << "" << oendl; 
    e << sw_maps[lang];
    setText(labels[lang]);
 }
 void Multikey::message(const QCString &message, const QByteArray &data)
 {
    if ( message == "setsw(QString,QString)" ) {
        QDataStream stream(data, IO_ReadOnly);
        QString maps, current_map;
        stream >> maps >> current_map;
        QStringList sw = QStringList::split(QChar('|'), maps);
        sw.append(current_map);
-        QDir map_dir(QPEApplication::qpeDir() + "/share/multikey/", "*.keymap");
+        QDir map_dir(QPEApplication::qpeDir() + "share/multikey/", "*.keymap");
        lang = 0;
        labels.clear();
        sw_maps.clear();
        popupMenu.clear();
        for (uint i = 0; i < sw.count(); ++i) {
            QString keymap_map;
            if (sw[i][0] != '/') {
                keymap_map =  map_dir.absPath() + "/" + sw[i];
            } else {
                if ((map_dir.exists(QFileInfo(sw[i]).fileName(), false)
                     && i != sw.count()-1) || !QFile::exists(sw[i])) {
                    continue;
                }
                keymap_map = sw[i];
            }
            QFile map(keymap_map);
            if (map.open(IO_ReadOnly)) {
                QString line;
                map.readLine(line, 1024);
diff --git a/core/apps/taboapp/main.cpp b/core/apps/taboapp/main.cpp
index e43f118..e999803 100644
--- a/core/apps/taboapp/main.cpp
+++ b/core/apps/taboapp/main.cpp
@@ -1,57 +1,57 @@
 /* OPIE */
 #include <oappinterface.h>
 #include <oappplugin.h>
 #include <opie2/odebug.h>
 #include <opie2/otabwidget.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qlibrary.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 /* QT */
 #include <qdir.h>
 int main( int argc, char **argv )
 {
    QPEApplication a( argc, argv );
    OTabWidget *tabwidget = new OTabWidget(0, "tab widget");
-    QString path = QPEApplication::qpeDir() + "/plugins/app";
+    QString path = QPEApplication::qpeDir() + "plugins/app";
    QDir dir( path, "lib*.so" );
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    QInterfacePtr<OAppInterface> iface;
    for ( it = list.begin(); it != list.end(); ++it ) {
        QLibrary *lib = new QLibrary( path + "/" + *it );
    odebug << "querying: " << QString( path + "/" + *it ) << "" << oendl;
        if ( lib->queryInterface( IID_OAppInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
        odebug << "accepted: " << QString( path + "/" + *it ) << "" << oendl;
        QList<QWidget> list = iface->widgets();
            QWidget *widget;
            for ( widget = list.first(); widget != 0; widget = list.next() )
                tabwidget->addTab(widget, QString(*it), QString(*it));
            QString lang = getenv( "LANG" );
        if (lang.isNull())
        lang = "en";
        QTranslator *trans = new QTranslator(qApp);
        QString type = (*it).left( (*it).find(".") );
        if (type.left(3) == "lib")
         type = type.mid(3);
        type = type.right( type.find("lib") );
-        QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+        QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";
        if ( trans->load( tfn ))
        qApp->installTranslator( trans );
        else
        delete trans;
    }
    }
    a.showMainDocumentWidget(tabwidget);
    return a.exec();
 }
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index 586628b..24669ac 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -196,108 +196,108 @@ QRect InputMethods::inputRect() const
        return QRect();
    else
        return mkeyboard->widget->geometry();
 }
 void InputMethods::unloadInputMethods()
 {
    unloadMethod( inputMethodList );
    unloadMethod( inputModifierList );
    inputMethodList.clear();
    inputModifierList.clear();
 }
 void InputMethods::unloadMethod( QValueList<InputMethod>& list ) {
    QValueList<InputMethod>::Iterator it;
    for (it = list.begin(); it != list.end(); ++it )
        (*it).releaseInterface();
 }
 QStringList InputMethods::plugins()const {
-   QString path = QPEApplication::qpeDir() + "/plugins/inputmethods";
+   QString path = QPEApplication::qpeDir() + "plugins/inputmethods";
 #ifdef Q_OS_MACX
   QDir dir( path, "lib*.dylib" );
 #else
   QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
   return dir.entryList();
 }
 void InputMethods::installTranslator( const QString& type ) {
    QStringList langs = Global::languageList();
    QStringList::ConstIterator lit;
    for ( lit= langs.begin(); lit!=langs.end(); ++lit) {
        QString lang = *lit;
        QTranslator * trans = new QTranslator(qApp);
-        QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+        QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";
        if ( trans->load( tfn ))
            qApp->installTranslator( trans );
        else
            delete trans;
    }
 }
 void InputMethods::setPreferedHandlers() {
    Config cfg("qpe");
    cfg.setGroup("InputMethod");
    QString current = cfg.readEntry("current");
    QString im = cfg.readEntry("im");
    QValueList<InputMethod>::Iterator it;
    if (!inputModifierList.isEmpty() && !im.isEmpty() ) {
        for (it = inputModifierList.begin(); it != inputModifierList.end(); ++it )
            if ( (*it).name() == im ) {
                imethod = &(*it); break;
            }
    }
    if (!inputMethodList.isEmpty() && !current.isEmpty() ) {
        for (it = inputMethodList.begin(); it != inputMethodList.end(); ++it )
            if ( (*it).name() == current ) {
                owarn << "preferred keyboard is " << current << "" << oendl;
                mkeyboard = &(*it);
                kbdButton->setPixmap( *mkeyboard->icon() );
                break;
            }
    }
 }
 void InputMethods::loadInputMethods()
 {
 #ifndef QT_NO_COMPONENT
    hideInputMethod();
    mkeyboard = 0;
    unloadInputMethods();
-    QString path = QPEApplication::qpeDir() + "/plugins/inputmethods";
+    QString path = QPEApplication::qpeDir() + "plugins/inputmethods";
    QStringList list = plugins();
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        InputMethodInterface *iface = 0;
        ExtInputMethodInterface *eface = 0;
        QLibrary *lib = new QLibrary( path + "/" + *it );
        if ( lib->queryInterface( IID_InputMethod, (QUnknownInterface**)&iface ) == QS_OK ) {
            InputMethod input;
            input.newIM = FALSE;
            input.library = lib;
            input.libName = *it;
            input.interface = iface;
            input.widget = input.interface->inputMethod( 0, inputWidgetStyle );
            input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) );
            inputMethodList.append( input );
        } else if ( lib->queryInterface( IID_ExtInputMethod, (QUnknownInterface**)&eface ) == QS_OK ) {
            InputMethod input;
            input.newIM = TRUE;
            input.library = lib;
            input.libName = *it;
            input.extInterface = eface;
            input.widget = input.extInterface->keyboardWidget( 0, inputWidgetStyle );
            // may be either a simple, or advanced.
diff --git a/core/launcher/irserver.cpp b/core/launcher/irserver.cpp
index 092eb0c..19cf904 100644
--- a/core/launcher/irserver.cpp
+++ b/core/launcher/irserver.cpp
@@ -13,64 +13,64 @@
 **
 ** 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 "irserver.h"
 #include "obexinterface.h"
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qtopia/qlibrary.h>
 #include <qtopia/qpeapplication.h>
 /* QT */
 #include <qdir.h>
 IrServer::IrServer( QObject *parent, const char *name )
  : QObject( parent, name ), obexIface(0)
 {
    lib = 0;
    obexIface = 0;
-    QString path = QPEApplication::qpeDir() + "/plugins/obex/";
+    QString path = QPEApplication::qpeDir() + "plugins/obex/";
 #ifdef Q_OS_MACX
    QDir dir( path, "lib*.dylib" );
 #else
    QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        QLibrary *trylib = new QLibrary( path + *it );
    //odebug << "trying lib " << (path + (*it)) << "" << oendl;
        if ( trylib->queryInterface( IID_ObexInterface, (QUnknownInterface**)&obexIface ) == QS_OK ) {
            lib = trylib;
        //odebug << "found obex lib" << oendl;
            QString lang = getenv( "LANG" );
            QTranslator * trans = new QTranslator(qApp);
            QString type = (*it).left( (*it).find(".") );
-            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+            QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";
        //odebug << "tr fpr obex: " << tfn << "" << oendl;
            if ( trans->load( tfn ))
                qApp->installTranslator( trans );
            else
                delete trans;
            break;
        } else {
            delete lib;
        }
    }
    if ( !lib )
    odebug << "could not load IR plugin" << oendl;
 }
 IrServer::~IrServer()
 {
    if ( obexIface )
        obexIface->release();
    delete lib;
 }
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index f3a7651..66f665f 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -294,68 +294,68 @@ void StartMenu::clearApplets()
        applet->iface->release();
        applet->library->unload();
        delete applet-> library;
    }
    menuApplets.clear();
 }
 void StartMenu::loadApplets()
 {
    Config cfg( "StartMenu" );
    cfg.setGroup( "Applets" );
    // SafeMode causes too much problems, so we disable it for now --
    // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
    // removed in the remerge PluginManager could handle it
    // we don't currently use it -zecke
    QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
    QString lang = getenv( "LANG" );
-    QString path = QPEApplication::qpeDir() + "/plugins/applets";
+    QString path = QPEApplication::qpeDir() + "plugins/applets";
    QDir dir( path, "lib*.so" );
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    int napplets = 0;
    MenuApplet* *xapplets = new MenuApplet*[list.count()];
    for ( it = list.begin(); it != list.end(); ++it ) {
        if ( exclude.find( *it ) != exclude.end() )
            continue;
        MenuAppletInterface *iface = 0;
        QLibrary *lib = new QLibrary( path + "/" + *it );
        if (( lib->queryInterface( IID_MenuApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
            MenuApplet *applet = new MenuApplet;
            xapplets[napplets++] = applet;
            applet->library = lib;
            applet->iface = iface;
            QTranslator *trans = new QTranslator(qApp);
            QString type = (*it).left( (*it).find(".") );
-            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+            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 );
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 3c72d25..d0f1808 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -76,73 +76,73 @@ void SysTray::clearApplets()
    QValueList<TaskbarApplet>::Iterator mit;
    for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) {
        (*mit).iface->release();
        (*mit).library->unload();
        delete (*mit).library;
    }
 #endif
    appletList.clear();
    if ( layout )
        delete layout;
    layout = new QHBoxLayout( this, 0, 1 );
    layout->setAutoAdd(TRUE);
 }
 void SysTray::addApplets()
 {
    hide();
 #ifndef QT_NO_COMPONENTS
    Config cfg( "Taskbar" );
    cfg.setGroup( "Applets" );
    QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
    QString lang = getenv( "LANG" );
-    QString path = QPEApplication::qpeDir() + "/plugins/applets";
+    QString path = QPEApplication::qpeDir() + "plugins/applets";
 #ifdef Q_OS_MACX
    QDir dir( path, "lib*.dylib" );
 #else
    QDir dir( path, "lib*.so" );
 #endif /* Q_OS_MACX */
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    int napplets=0;
    TaskbarApplet* *applets = new TaskbarApplet*[list.count()];
    for ( it = list.begin(); it != list.end(); ++it ) {
        if ( exclude.find( *it ) != exclude.end() )
            continue;
    owarn << "Found Applet: " << (*it) << "" << oendl;
        TaskbarAppletInterface *iface = 0;
        QLibrary *lib = new QLibrary( path + "/" + *it );
        if (( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
            TaskbarApplet *applet = new TaskbarApplet;
            applets[napplets++] = applet;
            applet->library = lib;
            applet->iface = iface;
            QTranslator *trans = new QTranslator(qApp);
            QString type = (*it).left( (*it).find(".") );
-            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+            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(applets,napplets,sizeof(applets[0]),compareAppletPositions);
    while (napplets--) {
        TaskbarApplet *applet = applets[napplets];
        applet->applet = applet->iface->applet( this );
        appletList.append(*applet);
    }
    delete [] applets;
 #else /* ## FIXME single app */
    TaskbarApplet * const applet = new TaskbarApplet();
    applet->iface = new ClockAppletImpl();
    applet->applet = applet->iface->applet( this );
    appletList.append( applet );
 #endif
    show();
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index b700cd1..8b0fbbc 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -118,49 +118,49 @@ MediaPlayerDecoder *MediaPlayerState::curDecoder() {
 }
 // ### hack to get true sample count
 MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() {
    return libmpeg3decoder;
 }
 // ### hack to get true sample count
 // MediaPlayerDecoder *MediaPlayerState::libWavDecoder() {
 //     return libwavdecoder;
 // }
 void MediaPlayerState::loadPlugins() {
   //    odebug << "load plugins" << oendl;
 #ifndef QT_NO_COMPONENT
    QValueList<MediaPlayerPlugin>::Iterator mit;
    for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) {
        (*mit).iface->release();
        (*mit).library->unload();
        delete (*mit).library;
    }
    pluginList.clear();
-    QString path = QPEApplication::qpeDir() + "/plugins/codecs";
+    QString path = QPEApplication::qpeDir() + "plugins/codecs";
    QDir dir( path, "lib*.so" );
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        MediaPlayerPluginInterface *iface = 0;
        QLibrary *lib = new QLibrary( path + "/" + *it );
 //   odebug << "querying: " << QString( path + "/" + *it ) << "" << oendl;
        if ( lib->queryInterface( IID_MediaPlayerPlugin, (QUnknownInterface**)&iface ) == QS_OK ) {
 //       odebug << "loading: " << QString( path + "/" + *it ) << "" << oendl;
            MediaPlayerPlugin plugin;
            plugin.library = lib;
            plugin.iface = iface;
            plugin.decoder = plugin.iface->decoder();
            plugin.encoder = plugin.iface->encoder();
            pluginList.append( plugin );
              // ### hack to get true sample count
            if ( plugin.decoder->pluginName() == QString("LibMpeg3Plugin") )
                libmpeg3decoder = plugin.decoder;
        } else {
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 46aeff2..db2bf1b 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1361,49 +1361,49 @@ void PlayListWidget::doBlank() {
   }
 }
 void PlayListWidget::doUnblank() {
   // this crashes opieplayer with a segfault
   //      int fd;
   //       fd=open("/dev/fb0",O_RDWR);
   //    odebug << "do unblanking" << oendl;
   if (fd != -1) {
      ioctl(fd,FBIOBLANK,0);
      close(fd);
   }
   QCopEnvelope h("QPE/System", "setBacklight(int)");
   h <<-3;// v[1]; // -3 Force on
 }
 void PlayListWidget::populateSkinsMenu() {
   int item = 0;
   defaultSkinIndex = 0;
   QString skinName;
   Config cfg( "OpiePlayer" );
   cfg.setGroup("Options" );
   QString skin = cfg.readEntry( "Skin", "default" );
-   QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" );
+   QDir skinsDir( QPEApplication::qpeDir() + "pics/opieplayer2/skins" );
   skinsDir.setFilter( QDir::Dirs );
   skinsDir.setSorting(QDir::Name );
   const QFileInfoList *skinslist = skinsDir.entryInfoList();
   QFileInfoListIterator it( *skinslist );
   QFileInfo *fi;
   while ( ( fi = it.current() ) ) {
      skinName =  fi->fileName();
      //        odebug << fi->fileName() << oendl;
      if( skinName != "." &&  skinName != ".." && skinName !="CVS" )  {
         item = skinsMenu->insertItem( fi->fileName() ) ;
      }
      if( skinName == "default" ) {
         defaultSkinIndex = item;
      }
      if( skinName == skin ) {
         skinsMenu->setItemChecked( item, TRUE );
      }
      ++it;
   }
 }
 void PlayListWidget::skinsMenuActivated( int item ) {
   for( int i = defaultSkinIndex; i > defaultSkinIndex - static_cast<int>(skinsMenu->count()); i-- ) {
      skinsMenu->setItemChecked( i, FALSE );
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 2396ed5..c545511 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -77,49 +77,49 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
                                QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 )
 {
                setCaption( tr("OpiePlayer") );
                Config cfg("OpiePlayer");
                cfg.setGroup("Options");
                skin = cfg.readEntry("Skin","default");
                QString skinPath;
                skinPath = "opieplayer2/skins/" + skin;
    if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
                                skinPath = "opieplayer2/skins/default";
 //     QString skinPath = "opieplayer2/skins/" + skin;
                pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
                imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
                imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
                imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
                imgButtonMask->fill( 0 );
                for ( int i = 0; i < 7; i++ ) {
-                                QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
+                                QString filename = QString( QPEApplication::qpeDir() + "pics/" + skinPath +
                                                                                                                                                "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
                                        //      odebug << "loading "+filename << oendl;
                                masks[i] = new QBitmap( filename );
                                if ( !masks[i]->isNull() ) {
                                                QImage imgMask = masks[i]->convertToImage();
                                                uchar **dest = imgButtonMask->jumpTable();
                                                for ( int y = 0; y < imgUp->height(); y++ ) {
                                                                uchar *line = dest[y];
                                                                for ( int x = 0; x < imgUp->width(); x++ ) {
                                                                                if ( !qRed( imgMask.pixel( x, y ) ) )
                                                                                                line[x] = i + 1;
                                                                }
                                                }
                                }
                }
                for ( int i = 0; i < 7; i++ ) {
                                buttonPixUp[i] = NULL;
                                buttonPixDown[i] = NULL;
                }
                QWidget *d = QApplication::desktop();
                int width = d->width();
                int height = d->height();
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index f0a8ba2..0699d0a 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -159,49 +159,49 @@ int main ( int argc, char **argv )
                                ::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig );
                                QWSServer::setDesktopBackground ( QImage ( ));
                                QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer );
                                app-> setFont ( QFont ( "Helvetica", 10 ));
                                app-> setStyle ( new QPEStyle ( ));
        //                      const char *sig = ::strsignal ( killedbysig );
                                const char *sig = ::sys_siglist[killedbysig];
                                QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool );
                                l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig ));
                                l-> setAlignment ( Qt::AlignCenter );
                                l-> move ( 0, 0 );
                                l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
                                l-> show ( );
                                QTimer::singleShot ( 3000, app, SLOT( quit()));
                                app-> exec ( );
                                delete app;
                                qApp = 0;
                        }
                }
                else {
                        if ( !autolog ) {
-                QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf";
+                QString confFile=QPEApplication::qpeDir() + "etc/opie-login.conf";
                                Config cfg ( confFile, Config::File );
                                cfg. setGroup ( "General" );
                                QString user = cfg. readEntry ( "AutoLogin" );
                                if ( !user. isEmpty ( ))
                                        autolog = ::strdup ( user. latin1 ( ));
                        }
                        if ( autolog && !userExited ) {
                QWSServer::setDesktopBackground( QImage() );
                ODevice::inst ( )-> setDisplayStatus ( true );
                ODevice::inst ( )-> setSoftSuspend ( false );
                LoginApplication *app = new LoginApplication ( argc, argv, ppid );
                LoginApplication::setLoginAs ( autolog );
                                if ( LoginApplication::changeIdentity ( ))
                                        ::exit ( LoginApplication::login ( ));
                                else
                                        ::exit ( 0 );
                        }
                        else  {
                                ::exit ( login_main ( argc, argv, ppid ));
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 2b64c47..55bf358 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -60,67 +60,67 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
        m_list-> header ( )-> hide ( );
        lay-> addWidget ( m_list );
        m_menutabs = new QCheckBox ( tr( "Show Launcher tabs in O-Menu" ), this );
        lay-> addWidget ( m_menutabs );
        m_menusubpopup = new QCheckBox ( tr( "Show Applications in Subpopups" ), this );
        lay-> addWidget ( m_menusubpopup );
        QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." ));
        QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." ));
        connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged()));
        init ( );
 }
 void MenuSettings::init ( )
 {
        Config cfg ( "StartMenu" );
        cfg. setGroup ( "Applets" );
        QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
-        QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+        QString path = QPEApplication::qpeDir ( ) + "plugins/applets";
 #ifdef Q_OS_MACX
        QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
 #else
        QStringList list = QDir ( path, "lib*.so" ). entryList ( );
 #endif /* Q_OS_MACX */
        for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
                QString name;
                QPixmap icon;
                MenuAppletInterface *iface = 0;
                QLibrary *lib = new QLibrary ( path + "/" + *it );
                lib-> queryInterface ( IID_MenuApplet, (QUnknownInterface**) &iface );
        if ( iface ) {
                        QString lang = getenv( "LANG" );
                        QTranslator *trans = new QTranslator ( qApp );
                        QString type = (*it). left ((*it). find ("."));
-                        QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
+                        QString tfn = QPEApplication::qpeDir ( ) + "i18n/" + lang + "/" + type + ".qm";
                        if ( trans-> load ( tfn ))
                                qApp-> installTranslator ( trans );
                        else
                                delete trans;
                        name = iface-> name ( );
                        icon = iface-> icon ( ). pixmap ( QIconSet::Small, QIconSet::Normal );
                        iface-> release ( );
                        lib-> unload ( );
                        QCheckListItem *item;
                        item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
                        if ( !icon. isNull ( ))
                                item-> setPixmap ( 0, icon );
                        item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
                        m_applets [*it] = item;
                } else {
                        delete lib;
                }
        }
        cfg. setGroup ( "Menu" );
        m_menutabs->setChecked( cfg.readBoolEntry( "LauncherTabs", true ) );
        m_menusubpopup->setChecked( cfg.readBoolEntry( "LauncherSubPopup", true ) );
        m_menusubpopup->setEnabled( m_menutabs->isChecked() );
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 8dd9e97..861ff3a 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -56,70 +56,70 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
    QBoxLayout *lay = new QVBoxLayout ( this, 4, 4 );
    QLabel *l = new QLabel ( tr( "Load applets in Taskbar:" ), this );
    lay-> addWidget ( l );
    m_list = new QListView ( this );
    m_list-> addColumn ( "foobar" );
    m_list-> header ( )-> hide ( );
    lay-> addWidget ( m_list );
    QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." ));
    connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged()));
    init ( );
 }
 void TaskbarSettings::init ( )
 {
    Config cfg ( "Taskbar" );
    cfg. setGroup ( "Applets" );
    QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
-    QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+    QString path = QPEApplication::qpeDir ( ) + "plugins/applets";
 #ifdef Q_OS_MACX
    QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
 #else
    QStringList list = QDir ( path, "lib*.so" ). entryList ( );
 #endif /* Q_OS_MACX */
    for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
        QString name;
        QPixmap icon;
        TaskbarNamedAppletInterface *iface = 0;
        owarn << "Load applet: " << (*it) << "" << oendl;
        QLibrary *lib = new QLibrary ( path + "/" + *it );
        lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
        owarn << "<1>" << oendl;
        if ( iface ) {
            owarn << "<2>" << oendl;
            QString lang = getenv( "LANG" );
            QTranslator *trans = new QTranslator ( qApp );
            QString type = (*it). left ((*it). find ("."));
-            QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
+            QString tfn = QPEApplication::qpeDir ( ) + "i18n/" + lang + "/" + type + ".qm";
            if ( trans-> load ( tfn ))
                qApp-> installTranslator ( trans );
            else
                delete trans;
            name = iface-> name ( );
            icon = iface-> icon ( );
            iface-> release ( );
        }
        owarn << "<3>" << oendl;
        if ( !iface ) {
            owarn << "<4>" << oendl;
            lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
            if ( iface ) {
                owarn << "<5>" << oendl;
                name = (*it). mid ( 3 );
                owarn << "Found applet: " << name << "" << oendl;
 #ifdef Q_OS_MACX
                int sep = name. find( ".dylib" );
 #else
                int sep = name. find( ".so" );
 #endif /* Q_OS_MACX */
                if ( sep > 0 )
                    name. truncate ( sep );
diff --git a/core/settings/security/multiauthconfig.cpp b/core/settings/security/multiauthconfig.cpp
index e545e17..45d691b 100644
--- a/core/settings/security/multiauthconfig.cpp
+++ b/core/settings/security/multiauthconfig.cpp
@@ -133,49 +133,49 @@ static void test_and_start() {
    pcfg.setGroup( "Misc" );
    bool protectConfigDialog = ! pcfg.readBoolEntry("noProtectConfig", true);
    if (protectConfigDialog && Opie::Security::Internal::runPlugins() != 0) {
        owarn << "authentication failed, not showing opie-security" << oendl;
        exit( -1 );
    }
 }
    MultiauthConfig::MultiauthConfig(QWidget* par, const char* w = "MultiauthConfig dialog",  WFlags f = 0)
 : QDialog(par, w, TRUE, f),
    m_mainTW(0), m_pluginListView(0), m_pluginListWidget(0),
    m_generalConfig(0), m_loginWidget(0), m_syncWidget(0),
    m_nbSuccessReq(0), m_plugins_changed(false)
 {
    /* Initializes the global configuration window
    */
    test_and_start();
    /* Checks (and memorizes) if any authentication plugins are
     * installed on the system
     */
-    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QString path = QPEApplication::qpeDir() + "plugins/security";
    QDir dir( path, "lib*.so" );
    QStringList list = dir.entryList();
    
    m_pluginsInstalled = ! list.isEmpty();
    if (m_pluginsInstalled == false)
        owarn << "no authentication plugins installed! Talking about it in the last tab..." << oendl;
    setCaption( tr( "Security configuration" ) );
    QVBoxLayout *layout = new QVBoxLayout( this );
    m_mainTW = new Opie::Ui::OTabWidget( this, "main tab widget" );
    layout->addWidget(m_mainTW);
    if (m_pluginsInstalled)
    {
        m_pluginListWidget = new QWidget(m_mainTW, "plugin list widget");
        QVBoxLayout * pluginListLayout = new QVBoxLayout(m_pluginListWidget);
        pluginListLayout->setSpacing(6);
        pluginListLayout->setMargin(11);
        QLabel * pluginListTitle = new QLabel( tr( "Load which plugins in what order:" ), m_pluginListWidget );
        pluginListLayout->addWidget(pluginListTitle);
        QHBox * pluginListHB = new QHBox(m_pluginListWidget);
        pluginListLayout->addWidget(pluginListHB);
        m_pluginListView = new QListView(pluginListHB);
@@ -353,49 +353,49 @@ void MultiauthConfig::readConfig()
    }
    /*
       cfg.setGroup("Remote");
       if ( telnetAvailable() )
       telnet->setChecked(cfg.readEntry("allow_telnet"));
       else
       telnet->hide();
       if ( sshAvailable() )
       ssh->setChecked(cfg.readEntry("allow_ssh"));
       else
       ssh->hide();
       */
    // release the Config handler
    delete pcfg;
    // indeed, selectNet will open the config file...
    selectNet(auth_peer,auth_peer_bits,TRUE);
    connect( m_syncWidget->syncnet, SIGNAL(textChanged(const QString&)),
             this, SLOT(setSyncNet(const QString&)));
-    QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
+    QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf";
    Config loginCfg(configFile,Config::File);
    loginCfg.setGroup("General");
    autoLoginName=loginCfg.readEntry("AutoLogin","");
    if (autoLoginName.stripWhiteSpace().isEmpty()) {
        autoLogin=false;
    } else {
        autoLogin=true;
    }
    connect(m_loginWidget->autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
    connect(m_loginWidget->userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
    connect(m_syncWidget->restoredefaults,SIGNAL(clicked()), this, SLOT(restoreDefaults()));
    connect(m_syncWidget->deleteentry,SIGNAL(clicked()), this, SLOT(deleteListEntry()));
    loadUsers();
    updateGUI();
 }
 void MultiauthConfig::writeConfig()
 {
@@ -468,69 +468,69 @@ void MultiauthConfig::writeConfig()
            value = 0x01;
            break;
        case 1:
            value = 0x02;
            break;
        case 2:
            value = 0x04;
            break;
    }
    pcfg->setGroup("SyncMode");
    pcfg->writeEntry( "Mode", value );
    /*
       pcfg->setGroup("Remote");
       if ( telnetAvailable() )
       pcfg->writeEntry("allow_telnet",telnet->isChecked());
       if ( sshAvailable() )
       pcfg->writeEntry("allow_ssh",ssh->isChecked());
    // ### write ssh/telnet sys config files
    */
    //release the Config handler
    delete pcfg;
-    QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
+    QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf";
    Config loginCfg(configFile,Config::File);
    loginCfg.setGroup("General");
    if (autoLogin) {
        loginCfg.writeEntry("AutoLogin",autoLoginName);
    } else {
        loginCfg.removeEntry("AutoLogin");
    }
 }
 /// slot used to record the fact plugins order has been modified
 void MultiauthConfig::pluginsChanged() {
    m_plugins_changed = true;
 }
 /// loads each multiauth plugin
 void MultiauthConfig::loadPlugins() {
-    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QString path = QPEApplication::qpeDir() + "plugins/security";
    QDir dir( path, "lib*.so" );
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    // temporary list used to sort plugins
    QMap<QString, MultiauthPlugin> sortList;
    for ( it = list.begin(); it != list.end(); ++it ) {
        QInterfacePtr<MultiauthPluginInterface> iface;
        QLibrary *lib = new QLibrary( path + "/" + *it );
        QString libPath(path + "/" + *it);
        if ( lib->queryInterface( IID_MultiauthPluginInterface, (QUnknownInterface**)&iface ) == QS_OK ) {
            MultiauthPlugin plugin;
            plugin.library = lib;
            plugin.iface = iface;
            plugin.name = QString(*it);
            // find out if plugins should be launched
            if ( m_excludePlugins.grep( *it ).isEmpty() ) {
                plugin.active = true;
            } else {
                plugin.active = false;
diff --git a/core/tools/quicklauncher/dropins.h b/core/tools/quicklauncher/dropins.h
index a9664f8..df364ce 100644
--- a/core/tools/quicklauncher/dropins.h
+++ b/core/tools/quicklauncher/dropins.h
@@ -24,48 +24,48 @@ namespace QuickPrivate {
        QMap<QUnknownInterface*, QLibrary*> libs;
    };
    /*
     * We can skip installing a Translator here because Opies QPEApplication
     * will do that in initApp for us as well
     */
    QRESULT PluginLoader::queryInterface( const QString& libFile, const QUuid& uuid, QUnknownInterface** iface ) {
        QRESULT res = QS_FALSE;
        *iface = 0;
        // This code is very platform specific.. We should find better
        // solutions to handle names.. Maybe one central function would be
        // better than checking this ".so" stuff all around in the sources.. 
        // (eilers)
        // Below lines from TT then mine again
        QString name = libFile;
        if ( libFile.findRev(".so") == (int)libFile.length()-3 ) {
            name = libFile.left( libFile.length()-3 );
            if ( name.find( "lib" ) == 0 )
                name = name.mid( 3 );
        }
 #ifdef Q_OS_MACX
-        QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".dylib";
+        QString path = QPEApplication::qpeDir() + "plugins/application/lib"+name+".dylib";
 #else
-        QString path = QPEApplication::qpeDir() + "/plugins/application/lib"+name+".so";
+        QString path = QPEApplication::qpeDir() + "plugins/application/lib"+name+".so";
 #endif
        QLibrary *lib = new QLibrary( path );
        if ( lib->queryInterface( uuid, iface ) == QS_OK && iface ) {
            libs.insert( *iface, lib );
            res = QS_OK;
        }
        return res;
    }
    void PluginLoader::releaseInterface( QUnknownInterface* iface ) {
        if ( libs.contains( iface ) ) {
            iface->release();
            delete libs[iface];
            libs.remove( iface ); // we only handle pointers so even if the object is not valid the address-space is
        }
    }
 }
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 1fba9bc..fe5051d 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -58,49 +58,49 @@ ConfigDlg::ConfigDlg () : QDialog ()
    QHBox *hbox1 = new QHBox(map_group);
    keymaps = new QListBox(hbox1);
    keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
    QVBox *vbox1 = new QVBox(hbox1);
    
    QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up"));
    tb1->setPixmap(Resource::loadPixmap("up"));
    tb1->setAutoRaise(TRUE);
    tb1->setFocusPolicy(QWidget::NoFocus);
    tb1->setToggleButton(FALSE);
    connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp()));
    QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down"));
    tb2->setPixmap(Resource::loadPixmap("down"));
    tb2->setAutoRaise(TRUE);
    tb2->setFocusPolicy(QWidget::NoFocus);
    tb2->setToggleButton(FALSE);
    connect(tb2, SIGNAL(clicked()), this, SLOT(moveSelectedDown()));
    QString cur(tr("Current Language"));
    keymaps->insertItem(cur);
    keymaps->setSelected(0, true);
    
-    QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap");
+    QDir map_dir(QPEApplication::qpeDir() + "share/multikey", "*.keymap");
    default_maps = map_dir.entryList(); // so i can access it in other places
    custom_maps = config.readListEntry("maps", QChar('|'));
    sw_maps = ConfigDlg::loadSw();
    QStringList sw_copy(sw_maps);
    for (uint i = 0; i < sw_copy.count(); i++) {
        QString keymap_map;
        if (sw_copy[i][0] != '/') { /* share/multikey */
            keymap_map =  map_dir.absPath() + "/" + sw_copy[i];
        } else {
            if (map_dir.exists(QFileInfo(sw_copy[i]).fileName(), false) 
                || !QFile::exists(sw_copy[i])) {
                custom_maps.remove(sw_copy[i]);
                sw_maps.remove(sw_copy[i]);
                // remove it from the list too
                config.writeEntry("maps", custom_maps.join("|"));
                continue;
            }
@@ -227,49 +227,49 @@ ConfigDlg::ConfigDlg () : QDialog ()
    label = new QLabel(tr("Text Color"), color_grid);
    textcolor_button = new QPushButton(color_grid);
    connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked()));
    textcolor_button->setFlat(TRUE);
    color = config.readListEntry("textcolor", QChar(','));
    textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
    label = new QLabel("", color_grid); // a spacer so the above buttons dont expand
    label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
    /* FIXME: hacked spacer height */
    QSpacerItem *spacer = new QSpacerItem(0, 300, QSizePolicy::Expanding, QSizePolicy::Maximum);
    color_lay->addWidget(color_grid, 0, 0);
    color_lay->addItem(spacer);
    tabs->addTab(color_box, tr("Colors"));
    base_lay->addWidget(tabs);
 }
 QStringList ConfigDlg::loadSw()
 {
    Config *config = new Config("multikey");
    config->setGroup("keymaps");
-    QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap");
+    QDir map_dir(QPEApplication::qpeDir() + "share/multikey", "*.keymap");
    QStringList d_maps = map_dir.entryList(); // so i can access it in other places
    QStringList c_maps = config->readListEntry("maps", QChar('|'));
    QStringList s_maps = config->readListEntry("sw", QChar('|'));
    delete config;
    if (!s_maps.count())
    {
        s_maps = d_maps+c_maps;
    }
    else
    {
        /* Clear non existents entries */
        QStringList s_copy(s_maps);
        for (uint i = 0; i < s_copy.count(); ++i) {
            if (d_maps.find(s_copy[i]) == d_maps.end()
                && c_maps.find(s_copy[i]) == c_maps.end()) {
                s_maps.remove(s_copy[i]);
            }
        }
        /* Update sw_maps from default_maps */
        for (uint i = 0; i < d_maps.count(); ++i) {
            if (s_maps.find(d_maps[i]) == s_maps.end()) {
                s_maps.append(d_maps[i]);
            }
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 7ddfd3e..f8cafd5 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -1356,54 +1356,54 @@ ushort Keyboard::constoe(const ushort c) {
                        default: return 0;
                }
        }
 }
 // Keys::Keys {{{1
 Keys::Keys() {
    Config *config = new Config ("multikey");
    config->setGroup( "keymaps" );
    QString map = config->readEntry( "current" );
    delete config;
    if (map.isNull() || !(QFile(map).exists())) {
        Config *config = new Config("locale");
        config->setGroup( "Language" );
        QString l = config->readEntry( "Language" , "en" );
        delete config;
    
-        map = QPEApplication::qpeDir() + "/share/multikey/" 
+        map = QPEApplication::qpeDir() + "share/multikey/" 
                + l + ".keymap";
    } 
    if (map.isNull() || !(QFile(map).exists())) {
-        map = QPEApplication::qpeDir() + "/share/multikey/en.keymap";
+        map = QPEApplication::qpeDir() + "share/multikey/en.keymap";
    }
    
    setKeysFromFile(map);
 }
 Keys::Keys(const char * filename) {
    setKeysFromFile(filename);
 }
 // Keys::setKeysFromFile {{{2
 void Keys::setKeysFromFile(const char * filename) {
    QFile f(filename);
    if (f.open(IO_ReadOnly)) {
        QTextStream t(&f);
        int row;
        int qcode;
        ushort unicode;
        int width;
        QString buf;
        QString comment;
diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp
index 2a6e369..d33eac6 100644
--- a/libopie2/opiecore/opluginloader.cpp
+++ b/libopie2/opiecore/opluginloader.cpp
@@ -452,49 +452,49 @@ QUnknownInterface* OGenericPluginLoader::load( const OPluginItem& item, const QU
 * @internal and reads in the safe mode
 */
 void OGenericPluginLoader::readConfig() {
 /* read the config for SafeMode */
    OConfig conf(  m_dir + "-odpplugins" );
    conf.setGroup( "General" );
    m_isSafeMode = conf.readBoolEntry( "SafeMode", false );
 }
 /**
 * @internal Enter or leave SafeMode
 */
 void OGenericPluginLoader::setSafeMode(const QString& str, bool b) {
    OConfig conf(  m_dir + "-odpplugins" );
    conf.setGroup( "General" );
    conf.writeEntry( "SafeMode", b );
    conf.writeEntry( "CrashedPlugin", str );
 }
 /**
 * @internal
 *
- * Set the List of Plugin Dirs to lst. Currently only QPEApplication::qpeDir()+"/plugins/"+mytype
+ * Set the List of Plugin Dirs to lst. Currently only QPEApplication::qpeDir()+"plugins/"+mytype
 * is used as plugin dir
 */
 void OGenericPluginLoader::setPluginDirs( const QStringList& lst ) {
    m_plugDirs = lst;
 }
 /**
 *
 * @internal
 * Set the Plugin Dir to str. Str will be the only element in the list of plugin dirs
 */
 void OGenericPluginLoader::setPluginDir( const QString& str) {
    m_plugDirs.clear();
    m_plugDirs.append( str );
 }
 /**
 * @internal
 */
 bool OGenericPluginLoader::isSorted()const{
    return m_isSorted;
 }
@@ -617,49 +617,49 @@ QStringList OGenericPluginLoader::languageList() {
        if ( pos > 0 )
            m_languages += str.left( pos );
        int n_pos = str.find( '_' );
        if ( n_pos > 0  )
            m_languages += str.left( n_pos );
    }
    return m_languages;
 }
 /**
 * @internal
 * Tries to install languages using the languageList for the type
 */
 void OGenericPluginLoader::installTranslators(const QString& type) {
    QStringList lst = languageList();
    /*
     * for each language and maybe later for each language dir...
     * try to load a Translator
     */
    for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
        QTranslator* trans = new QTranslator(  qApp );
-        QString tfn = QPEApplication::qpeDir()+"/i18n/" + *it + "/lib" + type + ".qm" ;
+        QString tfn = QPEApplication::qpeDir()+"i18n/" + *it + "/lib" + type + ".qm" ;
        /*
         * If loaded then install else clean up and don't leak
         */
        if ( trans->load( tfn ) ) 
                    qApp->installTranslator( trans );
        else
            delete trans;
    }
 }
 /**
 * \brief Simple c'tor.
 *
 * Simple C'tor same as the one of the base class. Additional this
 * class can cast for you if you nee it.
 *
 *
 * @param name The name of your plugin class
 * @param sorted If plugins are sorted
 *
 * @see OGenericPluginLoader
 */
 OPluginLoader::OPluginLoader( const QString& name,  bool sorted )
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index 32bae0a..7e185a2 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -49,49 +49,49 @@ namespace Opie {
 namespace Net  {
 OManufacturerDB* OManufacturerDB::_instance = 0;
 OManufacturerDB* OManufacturerDB::instance()
 {
    if ( !OManufacturerDB::_instance )
    {
        odebug << "OManufacturerDB::instance(): creating OManufacturerDB..." << oendl;
       _instance = new OManufacturerDB();
    }
    return _instance;
 }
 OManufacturerDB::OManufacturerDB()
 {
    #ifdef OPIE_IMPROVE_GUI_LATENCY
    Global::statusMessage( "Reading Manufacturers..." );
    #endif
    QString filename( "/etc/manufacturers" );
    odebug << "OManufacturerDB: trying to read " << filename << oendl;
    if ( !QFile::exists( filename ) )
    {
-        filename = QPEApplication::qpeDir()+"/etc/manufacturers";
+        filename = QPEApplication::qpeDir()+"etc/manufacturers";
        odebug << "OManufacturerDB: trying to read " << filename << oendl;
        if ( !QFile::exists( filename ) )
        {
            filename = "/usr/share/wellenreiter/manufacturers";
            odebug << "OManufacturerDB: trying to read " << filename << oendl;
        }
    }
    QFile file( filename );
    bool hasFile = file.open( IO_ReadOnly );
    if (!hasFile)
    {
        owarn << "OManufacturerDB: no valid manufacturer list found." << oendl;
    }
    else
    {
        odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl;
        QTextStream s( &file );
        QString addr;
        QString manu;
        QString extManu;
        #ifdef OPIE_IMPROVE_GUI_LATENCY
        int counter = 0;
        #endif
diff --git a/libopie2/opiesecurity/multiauthcommon.cpp b/libopie2/opiesecurity/multiauthcommon.cpp
index 9de62d2..e563193 100644
--- a/libopie2/opiesecurity/multiauthcommon.cpp
+++ b/libopie2/opiesecurity/multiauthcommon.cpp
@@ -68,49 +68,49 @@ int runPlugins() {
        c = Contact::readVCard( vfilename )[0];
        oi = new SecOwnerDlg(0, 0, c, TRUE, TRUE);
    }
    Config config("Security");
    config.setGroup("Plugins");
    QStringList plugins = config.readListEntry("IncludePlugins", ',');
    /* if there are no configured plugins, we simply return 0 to
     * let the user in:
     */
    if (plugins.isEmpty() == true) {
        owarn << "No authentication plugin has been configured yet!" << oendl;
        odebug << "Letting the user in..." << oendl;
        if(oi) delete oi;
        return 0;
    }
    config.setGroup("Misc");
    int nbSuccessMin = config.readNumEntry("nbSuccessMin", 1);
    int nbSuccess = 0;
    /* tries to launch successively each plugin in $OPIEDIR/plugins/security
     * directory which file name is in Security.conf / [Misc] / IncludePlugins
     */
-    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QString path = QPEApplication::qpeDir() + "plugins/security";
    QStringList::Iterator libIt;
    for ( libIt = plugins.begin(); libIt != plugins.end(); ++libIt ) {
        QInterfacePtr<MultiauthPluginInterface> iface;
        QLibrary *lib = new QLibrary( path + "/" + *libIt );
        if ( lib->queryInterface(
                                 IID_MultiauthPluginInterface,
                                 (QUnknownInterface**)&iface ) == QS_OK )
        {
            // the plugin is a true Multiauth plugin
            odebug << "Accepted plugin: " << QString( path + "/" + *libIt ) << oendl;
            odebug << "Plugin name: " << iface->plugin()->pluginName() << oendl;
            int resultCode;
            int tries = 0;
            // perform authentication
            resultCode = iface->plugin()->authenticate();
            // display the result in command line
            QString resultMessage;
            switch (resultCode)
            {
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index d94e338..7934a09 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -146,49 +146,49 @@ QValueList<int> FontDatabase::standardSizes()
  Load any font renderer plugins that are available and make the fonts
  that the plugins can read available.
 */
 void FontDatabase::loadRenderers()
 {
 #ifndef QWS
    return;
 #else
 #ifndef QT_NO_COMPONENT
    if ( !factoryList )
        factoryList = new QValueList<FontFactory>;
    QValueList<FontFactory>::Iterator mit;
    for ( mit = factoryList->begin(); mit != factoryList->end(); ++mit ) {
        qt_fontmanager->factories.setAutoDelete( false );
        qt_fontmanager->factories.removeRef( (*mit).factory );
        qt_fontmanager->factories.setAutoDelete( true );
        (*mit).interface->release();
        (*mit).library->unload();
        delete (*mit).library;
    }
    factoryList->clear();
-    QString path = QPEApplication::qpeDir() + "/plugins/fontfactories";
+    QString path = QPEApplication::qpeDir() + "plugins/fontfactories";
 #ifdef Q_OS_MACX
    QDir dir( path, "lib*.dylib" );
 #else
    QDir dir( path, "lib*.so" );
 #endif
    
    if ( !dir.exists())
            return;
    
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        FontFactoryInterface *iface = 0;
        QLibrary *lib = new QLibrary( path + "/" + *it );
        if ( lib->queryInterface( IID_FontFactory, (QUnknownInterface**)&iface ) == QS_OK ) {
            FontFactory factory;
            factory.library = lib;
            factory.interface = iface;
            factory.factory = factory.interface->fontFactory();
            factoryList->append( factory );
            qt_fontmanager->factories.append( factory.factory );
            readFonts( factory.factory );
        } else {
            delete lib;
diff --git a/library/network.cpp b/library/network.cpp
index f2a673c..0bbbec1 100644
--- a/library/network.cpp
+++ b/library/network.cpp
@@ -398,51 +398,51 @@ int Network::addStateWidgets(QWidget* parent)
        cfg.setGroup("Properties");
        if ( plugin ) {
            QWidget* w;
            if ( (w=plugin->addStateWidget(parent,cfg)) ) {
                n++;
                vb->addWidget(w);
            }
        }
    }
    return n;
 }
 static QDict<NetworkInterface> *ifaces;
 /*!
  \internal
 */
 NetworkInterface* Network::loadPlugin(const QString& type)
 {
 #ifndef QT_NO_COMPONENT
    if ( !ifaces ) ifaces = new QDict<NetworkInterface>;
    NetworkInterface *iface = ifaces->find(type);
    if ( !iface ) {
 #ifdef Q_OS_MACX
-        QString libfile = QPEApplication::qpeDir() + "/plugins/network/lib" + type + ".dylib";
+        QString libfile = QPEApplication::qpeDir() + "plugins/network/lib" + type + ".dylib";
 #else
-        QString libfile = QPEApplication::qpeDir() + "/plugins/network/lib" + type + ".so";
+        QString libfile = QPEApplication::qpeDir() + "plugins/network/lib" + type + ".so";
 #endif
        QLibrary lib(libfile);
        if ( !lib.queryInterface( IID_Network, (QUnknownInterface**)&iface ) == QS_OK )
            return 0;
        ifaces->insert(type,iface);
        QStringList langs = Global::languageList();
        for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
            QString lang = *it;
            QTranslator * trans = new QTranslator(qApp);
-            QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/lib"+type+".qm";
+            QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/lib"+type+".qm";
            if ( trans->load( tfn ))
                qApp->installTranslator( trans );
            else
                delete trans;
        }
    }
    return iface;
 #else
    return 0;
 #endif
 }
 #include "network.moc"
        #endif// QT_NO_COP
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index 7842ebd..8b02de6 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -515,49 +515,49 @@ QPEDecoration::QPEDecoration()
    wdiface = new DefaultWindowDecoration;
    helpexists = FALSE; // We don't know (flagged by helpFile being null)
    qpeManager = new QPEManager( this );
    imageOk = Resource::loadImage( "OKButton" );
    imageClose = Resource::loadImage( "CloseButton" );
    imageHelp = Resource::loadImage( "HelpButton" );
 }
 QPEDecoration::QPEDecoration( const QString &plugin )
    : QWSDefaultDecoration()
 {
    libname = plugin;
    if ( wdlib ) {
        wdiface->release();
        wdlib->unload();
        delete wdlib;
        wdlib = 0;
    } else {
        delete wdiface;
    }
    WindowDecorationInterface *iface = 0;
-    QString path = QPEApplication::qpeDir() + "/plugins/decorations/";
+    QString path = QPEApplication::qpeDir() + "plugins/decorations/";
 #ifdef Q_OS_MACX
    if ( plugin.find( ".dylib" ) > 0 ) {
 #else
    if ( plugin.find( ".so" ) > 0 ) {
 #endif
        // full library name supplied
        path += plugin;
    } else {
 #ifdef Q_OS_MACX
        path += "lib" + plugin.lower() + ".dylib"; // compatibility
 #else
        path += "lib" + plugin.lower() + ".so"; // compatibility
 #endif
    }
    QLibrary *lib = new QLibrary( path );
    if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
        wdiface = iface;
        wdlib = lib;
    } else {
        delete lib;
        wdiface = new DefaultWindowDecoration;
    }
diff --git a/libslcompat/slmisc.h b/libslcompat/slmisc.h
index 20ba988..442b098 100644
--- a/libslcompat/slmisc.h
+++ b/libslcompat/slmisc.h
@@ -5,49 +5,49 @@
 #define _SLMISC_H_INCLUDED
 #include <qpe/qpeapplication.h>
 #include <qfileinfo.h>
 #include <qpe/global.h>
 #include <qmessagebox.h>
 #define _SLPOWER
 class QPopupMenu;
 class QListView;
 #if !defined(_SLPOWER)
 class PowerStatus;
 #else
 class SlPowerStatus;
 #endif
 class Config;
 typedef ulong SlResolutionScale;
 class SlMisc {
 public:
        static bool isExecutable(const QString &c) {
-                QFileInfo exec(QPEApplication::qpeDir() + "/bin/" + c);
+                QFileInfo exec(QPEApplication::qpeDir() + "bin/" + c);
                return exec.isExecutable();
        };
        static ulong availableMemory();
        static bool invalidFileName(QString &fName);
        static QString getValidFileName(const QString &baseName);
        static QString getCanonicalPath(const QString &fName);
        static void enableAutoPowerOff(bool isOn);
        static void enableAutoPowerOff(bool isOn,bool DimAlso,bool ScreenSaverAlso=FALSE);
        static void enableLockApplication(bool);
        static bool isTheSmbShareFileHasWriteEntry(const QString &shareFName);
        static bool isTheSmbShareFileNowCopy(const QString &shareFName);
        static bool checkTheSmbShareFileMode(const QString &shareFName,
                                                 char modeMask, char checkMode, bool equality);
        static bool isTheFileLockedBySmbd(const QString &fName);
        static bool isSambaForked();
        static void startSamba();
        static void stopSamba();
        enum ListType { Pid, CmdLine, Both };
        static QStringList procList (const QRegExp& re, uint max = 0, enum ListType type = Pid);
        static void dumpMemInfo(bool isShowHeap);
        static bool canCreateTheFile(const QString&);
        static QString getLanguage();
        static QSize getMaximizedWidgetInfo();
        static QSize SlMisc::getScrollbarMetrics();
diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.cpp b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
index 8499500..13729ea 100644
--- a/noncore/applets/zkbapplet/applet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
@@ -20,49 +20,49 @@ ZkbWidget::ZkbWidget(QWidget* parent)
    loadKeymap();
    channel = new QCopChannel("QPE/zkb", this);
    connect(channel, SIGNAL(received(const QCString&,const QByteArray&)),
        this, SLOT(signalReceived(const QCString&,const QByteArray&)));
    setFixedWidth ( AppLnk::smallIconSize()  );
    setFixedHeight ( AppLnk::smallIconSize()  );
 }
 ZkbWidget::~ZkbWidget()
 {
    if (keymap != 0) {
        delete keymap;
        keymap = 0;
    }
 }
 int ZkbWidget::position()
 {
    return 8;
 }
 bool ZkbWidget::loadKeymap() {
-    ZkbConfig c(QPEApplication::qpeDir()+"/share/zkb");
+    ZkbConfig c(QPEApplication::qpeDir()+"share/zkb");
    QFontMetrics fm(font());
    if (keymap != 0) {
        delete keymap;
        keymap = 0;
    }
    Keymap* km = new Keymap();
    if (!c.load("zkb.xml", *km, "")) {
        delete km;
        setPixmap(disabled);
        return false;
    }
    connect(km, SIGNAL(stateChanged(const QString&)),
        this, SLOT(stateChanged(const QString&)));
    Opie::Core::OKeyFilter::inst()->addHandler(km);
    Keymap* oldkm = keymap;
    keymap = km;
    if (oldkm != 0) {
diff --git a/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
index 8d868d4..4190a9e 100644
--- a/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
@@ -47,49 +47,49 @@ CfgDlg::CfgDlg(QWidget* parent, CfgFile* cf, QApplication* app, bool mod):
        gl->addWidget(addButton, 1, 2);
        gl->addWidget(delButton, 2, 2);
        gl->addWidget(l, 4, 0);
        gl->addWidget(label, 4, 1);
        gl->addMultiCellWidget(slabelButton, 4, 4, 3, 4);
        gl->addMultiCellWidget(adlabel, 5, 5, 0, 2);
        gl->addMultiCellWidget(ad, 5, 5, 3, 4);
        //gl->addWidget(adms, 5, 3);
        gl->addMultiCellWidget(aplabel, 6, 6, 0, 2);
        gl->addMultiCellWidget(ap, 6, 6, 3, 4);
        //gl->addWidget(apms, 6, 3);
        QList<CfgEntry>& e = cfile->getEntries();
        for(uint i = 0; i < e.count(); i++) {
                CfgEntry* entry = e.at(i);
                keymaps->insertItem(entry->getFile());
                m.insert(entry->getFile(), entry->getLabel());
        }
-        QDir dir(QPEApplication::qpeDir()+"/share/zkb", "*.xml");
+        QDir dir(QPEApplication::qpeDir()+"share/zkb", "*.xml");
        QStringList flist = dir.entryList();
        QStringList::Iterator sit;
        for(sit = flist.begin(); sit != flist.end(); ++sit) {
                if (*sit != "common.xml" && *sit != "zkb.xml" && m.find(*sit) == m.end()) {
                        files->insertItem(*sit);
                }
        }
        ad->setValue(cfile->getAutorepeatDelay());
        ap->setValue(cfile->getAutorepeatPeriod());
        //gl->addMultiCellWidget(enable, 7, 7, 0, 4);
 }
 CfgDlg::~CfgDlg() {
 }
 void CfgDlg::add() {
        if (!files->currentText().isEmpty()) {
                QString t = files->currentText();
                files->removeItem(files->currentItem());
                keymaps->insertItem(t);
                cfile->replaceEntry(t, "");
                m.replace(t, "");
@@ -103,30 +103,30 @@ void CfgDlg::del() {
                cfile->deleteEntry(t);
                files->insertItem(t);
                m.remove(files->currentText());
        }
 }
 void CfgDlg::setLabel() {
        if (!keymaps->currentText().isEmpty()) {
                cfile->replaceEntry(keymaps->currentText(),
                        label->text());
                m.replace(keymaps->currentText(), label->text());
        }
 }
 void CfgDlg::keymapHighlighted(const QString&text) {
        label->setText(*m.find(text));
 }
 void CfgDlg::accept() {
        cfile->setAutorepeatDelay(ad->value());
        cfile->setAutorepeatPeriod(ap->value());
        CfgParser p;
-        p.save(QPEApplication::qpeDir()+"/share/zkb/zkb.xml", *cfile);
+        p.save(QPEApplication::qpeDir()+"share/zkb/zkb.xml", *cfile);
        QCopEnvelope("QPE/zkb", "reload()");
        QDialog::accept();
 }
diff --git a/noncore/applets/zkbapplet/keyzcfg/main.cpp b/noncore/applets/zkbapplet/keyzcfg/main.cpp
index 4615562..afd0f6a 100644
--- a/noncore/applets/zkbapplet/keyzcfg/main.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/main.cpp
@@ -1,22 +1,22 @@
 #include <stdio.h>
 #include <qpe/qpeapplication.h>
 #include <qlayout.h>
 #include <qmainwindow.h>
 #include "cfgdlg.h"
 int main( int argc, char **argv ) {
        QPEApplication app(argc, argv);
        CfgFile cfile;
        CfgParser cp;
-        cp.load(QPEApplication::qpeDir()+"/share/zkb/zkb.xml", cfile);
+        cp.load(QPEApplication::qpeDir()+"share/zkb/zkb.xml", cfile);
        CfgDlg c(0, &cfile, &app, true);
        app.showMainWidget(&c);
        int ret = QPEApplication::execDialog(&c);
        return ret;
 }
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index 59fc242..b4958b3 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -92,49 +92,49 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
    a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ),"Edit", 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( doEdit() ) );
    a->addTo( ToolBar1 );
    QPushButton *t;
    t= new QPushButton( "BAC", ToolBar1, "bacButtin");
    connect( t, SIGNAL( clicked() ), this, SLOT( doBac() ) );
    DrinkView = new QListView( this, "DrinkView" );
    DrinkView->addColumn( tr( "Name of Drink" ) );
 //    DrinkView->setRootIsDecorated( TRUE );
    DrinkView->header()->hide();
    QPEApplication::setStylusOperation( DrinkView->viewport(),QPEApplication::RightOnHold);
    connect(DrinkView, SIGNAL( doubleClicked(QListViewItem*)),this,SLOT(showDrink(QListViewItem*)));
    connect(DrinkView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
            this,SLOT( showDrink(int,QListViewItem*,const QPoint&,int)));
    layout->addMultiCellWidget( DrinkView, 1, 2, 0, 4 );
    if(QDir("db").exists()) {
        dbFile.setName( "db/drinkdb.txt");
    } else
-        dbFile.setName( QPEApplication::qpeDir()+"/etc/bartender/drinkdb.txt");
+        dbFile.setName( QPEApplication::qpeDir()+"etc/bartender/drinkdb.txt");
    initDrinkDb();
 }
 Bartender::~Bartender() {
 }
 /*
 this happens right before exit  */
 void Bartender::cleanUp() {
   dbFile.close();
 }
 void Bartender::initDrinkDb() {
    if(!dbFile.isOpen())
    if ( !dbFile.open( IO_ReadOnly)) {
        QMessageBox::message( (tr("Note")), (tr("Drink database not opened sucessfully.\n")) );
        return;
    }
    fillList();
 }
 void Bartender::fillList() {
diff --git a/noncore/apps/opie-console/fixit.cpp b/noncore/apps/opie-console/fixit.cpp
index 3b0044a..f170074 100644
--- a/noncore/apps/opie-console/fixit.cpp
+++ b/noncore/apps/opie-console/fixit.cpp
@@ -33,62 +33,62 @@ FixIt::FixIt() {
 "# Specify things to do before rebooting"
 "um::ctrlaltdel:/bin/umount -a -r > /dev/null 2>&1"
 "sw::ctrlaltdel:/sbin/swapoff -a > /dev/null 2>&1"
 ""
 "# Specify program to run on ttyS0"
 "s0:24:respawn:/sbin/getty 9600 ttyS0"
 "#pd:5:respawn:/etc/sync/serialctl"
 ""
 "# Specify program to run on tty1"
 "1:2:respawn:/sbin/getty 9600 tty1"
 "ln:345:respawn:survive -l 6 /sbin/launch"
 "#qt:5:respawn:/sbin/qt"
 ""
 "# collie sp."
 "sy::respawn:/sbin/shsync\n";
 }
 /*
 * the retail Zaurus is broken in many ways
 * one is that pppd is listening on our port...
 * we've to stop it from that and then do kill(SIGHUP,1);
 */
 void FixIt::fixIt() {
        #ifndef EAST
-    ::rename("/etc/inittab", QPEApplication::qpeDir() + "/etc/inittab" );
+    ::rename("/etc/inittab", QPEApplication::qpeDir() + "etc/inittab" );
    QFile file( "/etc/inittab" );
    if ( file.open(IO_WriteOnly | IO_Raw ) ) {
        file.writeBlock(m_file,strlen(m_file) );
    }
    file.close();
    ::kill( SIGHUP, 1 );
    
    #else
    
    OProcess m_kill;
-    m_kill << QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_kill_0_1.sh";
+    m_kill << QPEApplication::qpeDir() + "share/opie-console/sl6000_embedix_kill_0_1.sh";
    
    
    if ( !m_kill.start(OProcess::DontCare,OProcess::NoCommunication) ) {
      owarn << "could not execute kill script" << oendl; 
    }  else {
      Global::statusMessage( QObject::tr("Fixing up Embedix"));
    }       
    #endif
 }
 void FixIt::breakIt() {
        #ifdef EAST
         OProcess m_restart;
-         m_restart << QPEApplication::qpeDir() + "/share/opie-console/sl6000_embedix_restart_0_1.sh";
+         m_restart << QPEApplication::qpeDir() + "share/opie-console/sl6000_embedix_restart_0_1.sh";
         
    
     if ( !m_restart.start(OProcess::DontCare,OProcess::NoCommunication) ) {
            owarn << "could not execute restart script" << oendl; 
     }
  
        #endif
 }
 #endif
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 020a116..3c096ed 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -29,53 +29,53 @@
 /* STD */
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 /*
 *  The dialog will by default be modeless, unless you set 'modal' to
 *  TRUE to construct a modal dialog. */
 LibraryDialog::LibraryDialog( QWidget* parent,  const char* name , bool /*modal*/, WFlags fl )
                : QDialog( parent, name, true/* modal*/, fl )
 {
        if ( !name )
                setName( "LibraryDialog" );
        indexLoaded=false;
        initDialog();
      //      this->setMaximumWidth(240);
        index = "GUTINDEX.ALL";
        local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
        local_index = local_library + index;
        QString iniFile ;
-        iniFile = QPEApplication::qpeDir()+"/etc/gutenbrowser/gutenbrowserrc";
+        iniFile = QPEApplication::qpeDir()+"etc/gutenbrowser/gutenbrowserrc";
-        new_index =QPEApplication::qpeDir()+"/etc/gutenbrowser/PGWHOLE.TXT";
+        new_index =QPEApplication::qpeDir()+"etc/gutenbrowser/PGWHOLE.TXT";
-        old_index = QPEApplication::qpeDir()+"/etc/gutenbrowser/GUTINDEX.ALL";
+        old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
            //    old_index = QPEApplication::qpeDir()+"etc/gutenbrowser/GUTINDEX.ALL";
            //     iniFile = local_library+"gutenbrowserrc";
            //     new_index = local_library + "PGWHOLE.TXT";
            //     old_index = local_library + "GUTINDEX.ALL";
        Config config("Gutenbrowser");
        config.setGroup( "HttpServer" );
        proxy_http = config.readEntry("Preferred", "http://sailor.gutenbook.org");
        config.setGroup( "FTPsite" );
        ftp_host=config.readEntry("SiteName", "sailor.gutenberg.org");
        odebug << "Library Dialog: ftp_host is "+ftp_host << oendl;
            //      ftp_host=ftp_host.right(ftp_host.length()-(ftp_host.find(") ",0,TRUE)+1) );
            //      ftp_host=ftp_host.stripWhiteSpace();
        ftp_base_dir= config.readEntry("base",  "/pub/gutenberg");
        i_binary = 0;
        config.setGroup("SortAuth");
        if( config.readEntry("authSort", "FALSE") == "TRUE")
                authBox->setChecked(TRUE);
diff --git a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
index a9c7346..de9c72b 100644
--- a/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
+++ b/noncore/apps/opie-gutenbrowser/ftpsitedlg.cpp
@@ -17,49 +17,49 @@
 //#include "NetworkDialog.h"
 #include "output.h"
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 /* QT */
 #include <qprogressbar.h>
 #include <qurloperator.h>
 #include <qlistbox.h>
 /* STD */
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 // :)~
 void optionsDialog::ftpSiteDlg( )
 {
 //printf( "ftpSiteDlg: ListFile is "+ ListFile +"\n" );
 //  initDialog();
    local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
 //    ListFile = local_library + "ftpList";
-    ListFile = QPEApplication::qpeDir() + "/etc/gutenbrowser";
+    ListFile = QPEApplication::qpeDir() + "etc/gutenbrowser";
    QDir dir(ListFile);
    if( !dir.exists())
        dir.mkdir(ListFile,true);
    ListFile+="/ftpList";
    odebug << "opening "+ListFile << oendl;
    if ( QFile(ListFile).exists() ) {
        openSiteList();
    } else {
           switch( QMessageBox::warning( this, "Gutenbrowser",
                                          "Do you want to  download \nan ftp site list?",
                                          QMessageBox::Yes,   QMessageBox::No)) {
                    case   QMessageBox::Yes: // yes
                        getSite();
                    break;
                    case   QMessageBox::No: // No
                      // exit
                    break;
            }
    }
 }
 /*
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
index 644fae8..fac21da 100644
--- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
+++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp
@@ -121,54 +121,54 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
                config.setGroup("General");
                config.setGroup( "Files" );
                QString s_numofFiles = config.readEntry("NumberOfFiles", "0" );
                int  i_numofFiles = s_numofFiles.toInt();
                QString tempFileName;
                for (int i = 0; i <= i_numofFiles; i++) {
                                        //       tempFileName.setNum(i);
                                config.setGroup( "Files" );
                                QString ramble = config.readEntry( QString::number(i), "" );
                                config.setGroup( "Titles" );
                                QString tempTitle = config.readEntry( ramble, "");
                                config.setGroup( tempTitle);
                                int index = config.readNumEntry( "LineNumber", -1 );
                                if( index != -1) {
                                                odebug << tempTitle << oendl;
                                                if(!tempTitle.isEmpty()) bookmarksMenu->insertItem( tempTitle);
                                }
                }
                        //    QString gutenIndex= local_library + "GUTINDEX.ALL";
-                QString gutenIndex = QPEApplication::qpeDir()+ "/etc/gutenbrowser/GUTINDEX.ALL";
+                QString gutenIndex = QPEApplication::qpeDir()+ "etc/gutenbrowser/GUTINDEX.ALL";
                qDebug("gutenindex "+gutenIndex );
                if( QFile( gutenIndex).exists() ) {
                                indexLib.setName( gutenIndex);
                } else {
-                                QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT";
+                                QString localLibIndexFile = QPEApplication::qpeDir()+ "etc/gutenbrowser/PGWHOLE.TXT";
                                        //        QString localLibIndexFile= local_library + "PGWHOLE.TXT";
                                newindexLib.setName( localLibIndexFile);
                }
                qDebug("attempting new library");
                LibraryDlg = new LibraryDialog( this, "Library Index" /*, TRUE */);
                loadCheck = false;
                chdir(local_library);
                if(!showMainList) {
                                Lview->setFocus();
                                        //          if(firstTime)
                                        //              Bookmark();
                                for (int i=1;i< qApp->argc();i++) {
                                                qDebug("Suppose we open somethin");
                                                if(!load(qApp->argv()[i])) return;
                                }
                } else {
                                fillWithTitles();
                                mainList->setFocus();
                                        //        mainList->setCurrentItem(0);
                }
                writeConfig();
         QTimer::singleShot( 250, this, SLOT(hideView()) );
 } //end init
diff --git a/noncore/apps/opie-gutenbrowser/helpme.cpp b/noncore/apps/opie-gutenbrowser/helpme.cpp
index 53e0236..0e23114 100644
--- a/noncore/apps/opie-gutenbrowser/helpme.cpp
+++ b/noncore/apps/opie-gutenbrowser/helpme.cpp
@@ -37,49 +37,49 @@ HelpMe::HelpMe(QWidget *parent,  QString name ) : QDialog(parent,name)
    setCaption(tr("Gutenbrowser About " VERSION));
  QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 4 );
    layout->setMargin( 4 );
    Edit = new QMultiLineEdit(this, "");
    Edit->setReadOnly(true);
    Edit->append(tr("Based on gutenbook.pl, available from http://www.gutenbook.org"));
    Edit->append(tr("Much appreciation to Lee Burgess,"));
    Edit->append(tr("for the original idea and concept of gutenbook.\n"));
    Edit->append(tr("A list of current Gutenberg ftp sites is at http://promo.net/pg/index.html\n"));
    Edit->append(tr("For bug reports, comments or questions about Gutenbrowser, email"));
    Edit->append(tr("ljp@llornkcor.com\n"));
    Edit->append(tr("\nMade using Qt, Qt Embedded, and Qtopia, a cross platform development API\nhttp://www.trolltech.com\n\n"));
    Edit->append(tr("Arnold's Laws of Documentation:"));
    Edit->append(tr("(1) If it should exist, it doesn't."));
    Edit->append(tr("(2) If it does exist, it's out of date."));
    Edit->append(tr("(3) Only documentation for"));
    Edit->append(tr("useless programs transcends the"));
    Edit->append(tr("first two laws.\n"));
    Edit->append(tr("Everything is temporary, anyway....\n :o)"));
    Edit->setWordWrap(QMultiLineEdit::WidgetWidth);
  QString pixDir;
-  pixDir=QPEApplication::qpeDir()+"/pics/";
+  pixDir=QPEApplication::qpeDir()+"pics/";
    QPushButton *help;
    help = new QPushButton(this);
    help->setPixmap( QPixmap( pixDir+"gutenbrowser/help.png"));
    help->setText("Help");
    connect( help,SIGNAL(clicked()),this,SLOT( help() ));
 /*    QPushButton *ok;
    ok = new QPushButton(this);
    ok->setPixmap(  QPixmap( pixDir+"/gutenbrowser/exit.png"));
    ok->setText("ok");
    connect(ok,SIGNAL(clicked()),this,SLOT(accept() ));
 */
    help->setFixedHeight(25);
 //    ok->setFixedHeight(25);
 //  layout->addMultiCellWidget( ok, 0, 0, 4, 4 );
  layout->addMultiCellWidget( help, 0, 0, 4, 4 );
  layout->addMultiCellWidget( Edit, 1, 1, 0, 4 );
 }
 HelpMe::~HelpMe()
 {
 //delete Edit;
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 6aa6392..1ae3b15 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -2755,49 +2755,49 @@ void ZSafe::addCategory()
                    firstCategory = categ;
              }
           }
           ++it;
        }
        if (firstCategory.isEmpty())
           setCategoryDialogFields(dialog);
        else
           setCategoryDialogFields(dialog, firstCategory);
        // CategoryDialog *dialog = new CategoryDialog(this, "Category", TRUE);
           if (initIcons)
           {
        Wait waitDialog(this, tr("Wait dialog"));
        waitDialog.waitLabel->setText(tr("Gathering icons..."));
        waitDialog.show();
        qApp->processEvents();
 #ifdef DESKTOP
        QDir d(iconPath);
 #else
-        QDir d(QPEApplication::qpeDir() + "/pics/");
+        QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
        d.setFilter( QDir::Files);
        const QFileInfoList *list = d.entryInfoList();
        QFileInfoListIterator it( *list );      // create list iterator
        QFileInfo *fi;                          // pointer for traversing
        dialog->IconField->insertItem("predefined");
        while ( (fi=it.current()) ) {           // for each file...
            QString fileName = fi->fileName();
            if(fileName.right(4) == ".png"){
                fileName = fileName.mid(0,fileName.length()-4);
 #ifdef DESKTOP
                QPixmap imageOfFile;
                                imageOfFile.load(iconPath + fi->fileName());
 #else
                QPixmap imageOfFile(Resource::loadPixmap(fileName));
 #endif
                QImage foo = imageOfFile.convertToImage();
                foo = foo.smoothScale(16,16);
                imageOfFile.convertFromImage(foo);
                dialog->IconField->insertItem(imageOfFile,fileName);
            }
            ++it;
@@ -2939,49 +2939,49 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog)
      dialog->Field5->setText(getFieldLabel (selectedItem, "5", tr("Field 4")));
      dialog->Field6->setText(getFieldLabel (selectedItem, "6", tr("Field 5")));
      Category *cat= categories.find (selectedItem->text(0));
      if (cat)
      {
         icon = cat->getIconName();
      }
      else
         icon = conf->readEntry(APP_KEY+selectedItem->text(0));
   }
   else
   {
      dialog->Field1->setText(tr("Name"));
      dialog->Field2->setText(tr("Username"));
      dialog->Field3->setText(tr("Password"));
      dialog->Field4->setText(tr("Comment"));
      dialog->Field5->setText(tr("Field 4"));
      dialog->Field6->setText(tr("Field 5"));
   }
 #ifdef DESKTOP
    QDir d(iconPath);
 #else
-    QDir d(QPEApplication::qpeDir() + "/pics/");
+    QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
    d.setFilter( QDir::Files);
    const QFileInfoList *list = d.entryInfoList();
    int i=0;
    QFileInfoListIterator it( *list );      // create list iterator
    QFileInfo *fi;                          // pointer for traversing
   if (icon.isEmpty() || icon.isNull())
   {
      dialog->IconField->setCurrentItem(0);
   }
   else
   {
        while ( (fi=it.current()) )
      { // for each file...
            QString fileName = fi->fileName();
            if(fileName.right(4) == ".png")
                        {
            fileName = fileName.mid(0,fileName.length()-4);
            if(fileName+".png"==icon)
         {
            dialog->IconField->setCurrentItem(i+1);
            break;
@@ -2996,49 +2996,49 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog)
 void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category)
 {
   if (!dialog)
      return;
   dialog->Field1->setText(getFieldLabel (category, "1", tr("Name")));
   dialog->Field2->setText(getFieldLabel (category, "2", tr("Username")));
   dialog->Field3->setText(getFieldLabel (category, "3", tr("Password")));
   dialog->Field4->setText(getFieldLabel (category, "4", tr("Comment")));
   dialog->Field5->setText(getFieldLabel (category, "5", tr("Field 4")));
   dialog->Field6->setText(getFieldLabel (category, "6", tr("Field 5")));
   QString icon;
   Category *cat= categories.find (category);
   if (cat)
   {
      icon = cat->getIconName();
   }
   else
      icon = conf->readEntry(APP_KEY+category);
 #ifdef DESKTOP
    QDir d(iconPath);
 #else
-    QDir d(QPEApplication::qpeDir() + "/pics/");
+    QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
    d.setFilter( QDir::Files);
    const QFileInfoList *list = d.entryInfoList();
    int i=0;
    QFileInfoListIterator it( *list );      // create list iterator
    QFileInfo *fi;                          // pointer for traversing
   if (icon.isEmpty() || icon.isNull())
   {
      dialog->IconField->setCurrentItem(0);
   }
   else
   {
        while ( (fi=it.current()) )
      { // for each file...
            QString fileName = fi->fileName();
            if(fileName.right(4) == ".png")
                        {
            fileName = fileName.mid(0,fileName.length()-4);
            if(fileName+".png"==icon)
         {
            dialog->IconField->setCurrentItem(i+1);
            break;
@@ -3175,92 +3175,92 @@ void ZSafe::editCategory()
        if (!foundCategory)
        {
            dialog->CategoryField->insertItem (category, i);
            dialog->CategoryField->setCurrentItem(i);
        }
        QString icon;
        Category *cat= categories.find (selectedItem->text(0));
        if (cat)
        {
           icon = cat->getIconName();
        }
           if (initIcons)
           {
        Wait waitDialog(this, tr("Wait dialog"));
        waitDialog.waitLabel->setText(tr("Gathering icons..."));
        waitDialog.show();
        qApp->processEvents();
 #ifdef DESKTOP
        QDir d(iconPath);
 #else
-        QDir d(QPEApplication::qpeDir() + "/pics/");
+        QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
        d.setFilter( QDir::Files);
        const QFileInfoList *list = d.entryInfoList();
        int i=0;
        QFileInfoListIterator it( *list );      // create list iterator
        QFileInfo *fi;                          // pointer for traversing
                if (icon.isEmpty() || icon.isNull())
                {
                   dialog->IconField->setCurrentItem(0);
                }
        dialog->IconField->insertItem("predefined");
        while ( (fi=it.current()) ) {           // for each file...
            QString fileName = fi->fileName();
            if(fileName.right(4) == ".png")
                        {
                fileName = fileName.mid(0,fileName.length()-4);
 #ifdef DESKTOP
                QPixmap imageOfFile;
                                imageOfFile.load(iconPath + fi->fileName());
 #else
                QPixmap imageOfFile(Resource::loadPixmap(fileName));
 #endif
                QImage foo = imageOfFile.convertToImage();
                foo = foo.smoothScale(16,16);
                imageOfFile.convertFromImage(foo);
                dialog->IconField->insertItem(imageOfFile,fileName);
                if(fileName+".png"==icon)
                                   dialog->IconField->setCurrentItem(i+1);
                    ++i;
            }
            ++it;
        }
        waitDialog.hide();
           }
           else
           {
 #ifdef DESKTOP
        // QDir d(QDir::homeDirPath() + "/pics/");
        QDir d(iconPath);
 #else
-        QDir d(QPEApplication::qpeDir() + "/pics/");
+        QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
        d.setFilter( QDir::Files);
        const QFileInfoList *list = d.entryInfoList();
        int i=0;
        QFileInfoListIterator it( *list );      // create list iterator
        QFileInfo *fi;                          // pointer for traversing
                if (icon.isEmpty() || icon.isNull())
                {
                   dialog->IconField->setCurrentItem(0);
                }
                else
                {
          while ( (fi=it.current()) )
                  { // for each file...
            QString fileName = fi->fileName();
            if(fileName.right(4) == ".png")
                        {
                fileName = fileName.mid(0,fileName.length()-4);
                if(fileName+".png"==icon)
                                {
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index bdb1c78..c286a36 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -36,49 +36,49 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
    //load the default theme
    Config conf("backgammon");
    if(!conf.isValid())
    {
        odebug << "config file does not exist" << oendl; 
        conf.setGroup("general");
        conf.writeEntry("theme","default");
        conf.setGroup("rules");
        conf.writeEntry("move_with_pieces_out",false);
        conf.writeEntry("nice_dice",false);
        conf.setGroup("display");
        conf.writeEntry("small",false);
        conf.writeEntry("warning",true);
        conf.setGroup("ai");
        conf.writeEntry("rescue",6);
        conf.writeEntry("eliminate",4);
        conf.writeEntry("expose",1);
        conf.writeEntry("protect",5);
        conf.writeEntry("safe",3);
        conf.writeEntry("empty",2);
    }
    conf.setGroup("general");
    theme_name=conf.readEntry("theme","default");
-    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
+    QString theme_file=QPEApplication::qpeDir()+"backgammon/"+theme_name+".theme";
    //the rules
    conf.setGroup("rules");
    rules.move_with_pieces_out=conf.readBoolEntry("move_with_pieces_out",false);
    rules.generous_dice=conf.readBoolEntry("nice_dice",false);
       
    move->setRules(rules);
    
    //get the AI settings
    AISettings ai;
    conf.setGroup("ai");
    ai.rescue=conf.readNumEntry("rescue",6);
    ai.eliminate=conf.readNumEntry("eliminate",4);
    ai.expose=conf.readNumEntry("expose",1);
    ai.protect=conf.readNumEntry("protect",5);
    ai.safe=conf.readNumEntry("safe",3);
    ai.empty=conf.readNumEntry("empty",2);
    move->setAISettings(ai);
    //get the theme component names
    Config theme(theme_file,Config::File);   
    if(!theme.isValid())
    {
@@ -307,230 +307,230 @@ void BackGammon::newgame()
    dice4_played=true;
    dice_rolled=false;
    setplayer();
    area->update();
 }
 void BackGammon::playerselect()
 {
    PlayerDialog* playerdialog=new PlayerDialog(this);
    playerdialog->setAuto1(player1_auto);
    playerdialog->setAuto2(player2_auto);
    if(!playerdialog->exec())
        return;
    player1_auto=playerdialog->getAuto1();
    player2_auto=playerdialog->getAuto2();
 }
 void BackGammon::loadgame()
 {
    FileDialog* file=new FileDialog(this,"Load Game",".game");
    if(!file->exec())
        return;
    game_name=file->filename();
-    QString game_file=QPEApplication::qpeDir()+"/backgammon/"+game_name+".game";
+    QString game_file=QPEApplication::qpeDir()+"backgammon/"+game_name+".game";
    Config game(game_file,Config::File);
    game.setGroup("dice");
    diceA1_value=game.readNumEntry("diceA1_value");
    diceA2_value=game.readNumEntry("diceA2_value");
    diceA3_value=game.readNumEntry("diceA3_value");
    diceA4_value=game.readNumEntry("diceA4_value");
    diceB1_value=game.readNumEntry("diceB1_value");
    diceB2_value=game.readNumEntry("diceB2_value");
    diceB3_value=game.readNumEntry("diceB3_value");
    diceB4_value=game.readNumEntry("diceB4_value");
    player=game.readNumEntry("player");
    dice1_played=game.readBoolEntry("dice1_played");
    dice2_played=game.readBoolEntry("dice2_played");
    dice3_played=game.readBoolEntry("dice3_played");
    dice4_played=game.readBoolEntry("dice4_played");
    dice_rolled=game.readBoolEntry("dice_rolled");
    player1_auto=game.readBoolEntry("player1_auto");
    player2_auto=game.readBoolEntry("player2_auto");
    game.setGroup("pieces");
    QString label;
    LoadSave load;
    for(int a=0;a<28;a++)
    {
        label.setNum(a);
        load.pop[a].total = game.readNumEntry(label,0);
    }
    move->loadGame(load);
    setplayer();
    showdice();
    draw();
    area->update();
 }
 void BackGammon::savegame()
 {
-    QString game_file=QPEApplication::qpeDir()+"/backgammon/"+game_name+".game";
+    QString game_file=QPEApplication::qpeDir()+"backgammon/"+game_name+".game";
    Config game(game_file,Config::File);
    game.setGroup("dice");
    game.writeEntry("diceA1_value",diceA1_value);
    game.writeEntry("diceA2_value",diceA2_value);
    game.writeEntry("diceA3_value",diceA3_value);
    game.writeEntry("diceA4_value",diceA4_value);
    game.writeEntry("diceB1_value",diceB1_value);
    game.writeEntry("diceB2_value",diceB3_value);
    game.writeEntry("diceB3_value",diceB4_value);
    game.writeEntry("diceB4_value",diceB4_value);
    game.writeEntry("player",player);
    game.writeEntry("dice1_played",dice1_played);
    game.writeEntry("dice2_played",dice2_played);
    game.writeEntry("dice3_played",dice3_played);
    game.writeEntry("dice4_played",dice4_played);
    game.writeEntry("dice_rolled",dice_rolled);
    game.writeEntry("player1_auto",player1_auto);
    game.writeEntry("player2_auto",player2_auto);
    game.setGroup("pieces");
    QString label;
    LoadSave save=move->saveGame();
    for(int a=0;a<28;a++)
    {
        label.setNum(a);
        game.writeEntry(label,save.pop[a].total);
    }
    QMessageBox::information(this,"Backgammon","Game saved","OK");
 }
 void BackGammon::deletegame()
 {
    FileDialog* file=new FileDialog(this,"Delete Game",".game");
    if(!file->exec())
        return;
    game_name=file->filename();
-    QString game_file=QPEApplication::qpeDir()+"/backgammon/"+game_name+".game";
+    QString game_file=QPEApplication::qpeDir()+"backgammon/"+game_name+".game";
    if(!QMessageBox::warning(this,"Backgammon","deleted game\n"+game_name+" ?","OK","Cancel"))
    {
      QFile(game_file).remove();
    }
 }
 void BackGammon::newtheme()
 {
    ThemeDialog* theme=new ThemeDialog(this);
    ImageNames names;
    names.theme=theme_name;
    names.board=board_name;
    names.pieces1=piecesA_name;
    names.pieces2=piecesB_name;
    names.dice1=diceA_name;
    names.dice2=diceB_name;
    names.odds=odds_name;
    names.table=table_name;
    theme->setCurrent(names);
    if(!theme->exec())
        return;
    names=theme->getNames();
    theme_name=names.theme;
    board_name=names.board;
    piecesA_name=names.pieces1;
    piecesB_name=names.pieces2;
    diceA_name=names.dice1;
    diceB_name=names.dice2;
    odds_name=names.odds;
    table_name=names.table;
    applytheme();
 }
 void BackGammon::loadtheme()
 {
    FileDialog* file=new FileDialog(this,"Load Theme",".theme");
    if(!file->exec())
        return;
    theme_name=file->filename();
-    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
+    QString theme_file=QPEApplication::qpeDir()+"backgammon/"+theme_name+".theme";
    Config theme(theme_file,Config::File);
    theme.setGroup("theme");
    board_name=theme.readEntry("board","board_1");
    piecesA_name=theme.readEntry("pieces1","pieces_1");
    piecesB_name=theme.readEntry("pieces2","pieces_2");
    diceA_name=theme.readEntry("dice1","dice_1");
    diceB_name=theme.readEntry("dice2","dice_2");
    table_name=theme.readEntry("table","table_1");
    odds_name=theme.readEntry("odds","odds_1");
    applytheme();
 }
 void BackGammon::savetheme()
 {
    if(theme_name=="default")
    {
        QMessageBox::information(this,"Backgammon","Sorry\nCannot overwrite default.theme","OK");
        return;
    }
-    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
+    QString theme_file=QPEApplication::qpeDir()+"backgammon/"+theme_name+".theme";
    if(QMessageBox::information(this,"Backgammon","Save Theme\n"+theme_name,"Yes","No"))
      return;
      
    Config theme(theme_file,Config::File);
    theme.setGroup("theme");
    theme.writeEntry("board",board_name);
    theme.writeEntry("pieces1",piecesA_name);
    theme.writeEntry("pieces2",piecesB_name);
    theme.writeEntry("dice1",diceA_name);
    theme.writeEntry("dice2",diceB_name);
    theme.writeEntry("table",table_name);
    theme.writeEntry("odds",odds_name);
    
 }
 void BackGammon::themedefault()
 {
    if(QMessageBox::information(this,"Backgammon","Make Theme\n"+theme_name+"\nthe default theme","Yes","No"))
      return;
    Config conf("backgammon");
    conf.setGroup("general");
    conf.writeEntry("theme",theme_name);    
 }
 void BackGammon::deletetheme()
 {
    FileDialog* file=new FileDialog(this,"Delete Theme",".theme");
    if(!file->exec())
        return;
    theme_name=file->filename();
-    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
+    QString theme_file=QPEApplication::qpeDir()+"backgammon/"+theme_name+".theme";
    if(!QMessageBox::warning(this,tr( "Backgammon" ),tr( "deleted theme %1?").arg(theme_name),tr( "OK" ),tr( "Cancel" )))
    {
      QFile(theme_file).remove();
    }
 }
 void BackGammon::modify_AI()
 {
    AI_Dialog* ai_mod=new AI_Dialog(this,tr( "Load Theme" ),".theme");
    ai_mod->setAISettings(move->getAISettings());
    if(!ai_mod->exec())
        return;
    
    //get the AI settings
    AISettings ai=ai_mod->getAISettings();
    move->setAISettings(ai);
    //write new settings to conf file
    Config conf("backgammon");
    conf.setGroup("ai");
    conf.writeEntry("rescue",ai.rescue);
    conf.writeEntry("eliminate",ai.eliminate);
    conf.writeEntry("expose",ai.expose);
    conf.writeEntry("protect",ai.protect);
diff --git a/noncore/games/backgammon/filedialog.cpp b/noncore/games/backgammon/filedialog.cpp
index e0a2914..f185188 100644
--- a/noncore/games/backgammon/filedialog.cpp
+++ b/noncore/games/backgammon/filedialog.cpp
@@ -16,46 +16,46 @@ FileDialog::FileDialog(QWidget* parent,QString header,QString extension,const ch
    getCurrentDir();
    file_name="user";
    fileinput=new QLineEdit(file_name,this);
    fileinput->setGeometry(1,220,235,20);
    QPEApplication::showDialog( this );
 }
 FileDialog::~FileDialog()
 {}
 void FileDialog::selectorclicked(QListViewItem* entry)
 {
    if(entry==NULL)
        return;
    file_name=entry->text(0);
    fileinput->setText(file_name);
 }
 void FileDialog::getCurrentDir()
 {
    dirselector->clear();
-    QDir dir(QPEApplication::qpeDir()+"/backgammon");
+    QDir dir(QPEApplication::qpeDir()+"backgammon");
    dir.setFilter(QDir::Files);
    QFileInfoListIterator it(*(dir.entryInfoList()));
    QFileInfo* fi;
    int ext_length=ext.length();
    while((fi=it.current())) // go through all file and subdirs
    {
        QString file=fi->fileName();
        if(file.right(ext_length)==ext && file)
        {
            file=file.left(file.length()-ext_length);
            new QListViewItem(dirselector,file);
        }
        ++it;
    }
 }
 QString FileDialog::filename()
 {
    return file_name;
 }
diff --git a/noncore/games/backgammon/themedialog.cpp b/noncore/games/backgammon/themedialog.cpp
index afd6a1b..9bdb6a9 100644
--- a/noncore/games/backgammon/themedialog.cpp
+++ b/noncore/games/backgammon/themedialog.cpp
@@ -122,40 +122,40 @@ void ThemeDialog::setCurrent(const ImageNames& current)
            break;
        }
    }
    for(a=0;a<boxodds->count();a++)
    {
        if(boxodds->text(a)==current.odds)
        {
            boxodds->setCurrentItem(a);
            break;
        }
    }
    for(a=0;a<boxtable->count();a++)
    {
        if(boxtable->text(a)==current.table)
        {
            boxtable->setCurrentItem(a);
            break;
        }
    }
 }
 void ThemeDialog::fillBox(QString dirname,QComboBox* thebox)
 {
    thebox->clear();
-    QDir dir(QPEApplication::qpeDir()+"/pics/backgammon/"+dirname);
+    QDir dir(QPEApplication::qpeDir()+"pics/backgammon/"+dirname);
    dir.setFilter(QDir::Dirs | QDir::Files);
    QFileInfoListIterator it(*(dir.entryInfoList()));
    QFileInfo* fi;
    while((fi=it.current())) // go through all file and subdirs
    {
        QString file=fi->fileName();
        if(file.right(4)==".png")
        {
            thebox->insertItem(file.left(file.find(".png")));
        }
        ++it;
    }
    delete fi;
 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index dc2c496..2e9553f 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -928,49 +928,49 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) {
 void PlayListWidget::pmViewActivated(int index) {
 //  odebug << "" << index << "" << oendl;
    switch(index) {
    case -16:
    {
        mediaPlayerState->toggleFullscreen();
        bool b=mediaPlayerState->isFullscreen();
        pmView->setItemChecked( index, b);
        Config cfg( "OpiePlayer" );
        cfg.writeEntry( "FullScreen", b );
    }
    break;
    };
 }
 void PlayListWidget::populateSkinsMenu() {
    int item = 0;
    defaultSkinIndex = 0;
    QString skinName;
    Config cfg( "OpiePlayer" );
    cfg.setGroup("Options" );
    QString skin = cfg.readEntry( "Skin", "default" );
-    QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" );
+    QDir skinsDir( QPEApplication::qpeDir() + "pics/opieplayer2/skins" );
    skinsDir.setFilter( QDir::Dirs );
    skinsDir.setSorting(QDir::Name );
    const QFileInfoList *skinslist = skinsDir.entryInfoList();
    QFileInfoListIterator it( *skinslist );
    QFileInfo *fi;
    while ( ( fi = it.current() ) ) {
        skinName =  fi->fileName();
 //        odebug << fi->fileName() << oendl;
        if( skinName != "." &&  skinName != ".." && skinName !="CVS" )  {
            item = skinsMenu->insertItem( fi->fileName() ) ;
        }
        if( skinName == "default" ) {
            defaultSkinIndex = item;
        }
        if( skinName == skin ) {
            skinsMenu->setItemChecked( item, TRUE );
        }
        ++it;
    }
 }
 void PlayListWidget::skinsMenuActivated( int item ) {
    for(unsigned int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
        skinsMenu->setItemChecked( i, FALSE );
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp
index 81d6717..14750ac 100644
--- a/noncore/settings/language/language.cpp
+++ b/noncore/settings/language/language.cpp
@@ -36,49 +36,49 @@
 #include <qtabwidget.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdatastream.h>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qlistbox.h>
 #include <qdir.h>
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #endif
 #include <stdlib.h>
 LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl )
                : LanguageSettingsBase( parent, name, TRUE, fl )
 {
        if ( FontManager::hasUnicodeFont() )
                languages->setFont(FontManager::unicodeFont(FontManager::Proportional));
-        QString tfn = QPEApplication::qpeDir() + "/i18n/";
+        QString tfn = QPEApplication::qpeDir() + "i18n/";
        QDir langDir = tfn;
        QStringList list = langDir.entryList("*", QDir::Dirs );
        QStringList::Iterator it;
        for ( it = list.begin(); it != list.end(); ++it ) {
                QString name = (*it);
                QFileInfo desktopFile( tfn + "/" + name + "/.directory" );
                if ( desktopFile.exists() ) {
                        langAvail.append(name);
                        Config conf( desktopFile.filePath(), Config::File );
                        QString langName = conf.readEntry( "Name" );
                        QString ownName = conf.readEntryDirect( "Name[" + name + "]" );
                        if ( ownName.isEmpty() )
                                ownName = conf.readEntryDirect( "Name" );
                        if ( !ownName.isEmpty() && ownName != langName )
                                langName = langName + " [" + ownName + "]";
                        languages->insertItem( langName );
                }
        }
        if ( langAvail. find ( "en" ) == -1 ) {
                langAvail. prepend ( "" ); // no tr
                languages-> insertItem ( QString ( "English [%1] (%2)" /* no tr (!) */ ). arg ( tr ( "English" )). arg ( tr( "default" )), 0 );
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index fb7d7c9..5f23aea 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -267,49 +267,49 @@ void MainWindowImp::getAllInterfaces()
 *  and attempts to load them
 */
 void MainWindowImp::loadModules(const QString &path)
 {
 #ifdef DEBUG
    odebug << "MainWindowImp::loadModules: " << path.latin1() << "" << oendl;
 #endif
    QDir d(path);
    if(!d.exists())
        return;
    QString lang = ::getenv("LANG");
    // Don't want sym links
    d.setFilter( QDir::Files | QDir::NoSymLinks );
    const QFileInfoList *list = d.entryInfoList();
    QFileInfoListIterator it( *list );
    QFileInfo *fi;
    while ( (fi=it.current()) )
    {
        if(fi->fileName().contains(".so"))
        {
            /* if loaded install translation */
            if( loadPlugin(path + "/" + fi->fileName()) != 0l ){
                QTranslator *trans = new QTranslator(qApp);
-                QString fn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+ fi->fileName().left( fi->fileName().find(".") )+".qm";
+                QString fn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+ fi->fileName().left( fi->fileName().find(".") )+".qm";
                if( trans->load( fn ) )
                    qApp->installTranslator( trans );
                else
                    delete trans;
            }
            odebug << "loaded plugin: >" << QString(path + "/" + fi->fileName()).latin1() << "< " << oendl;
        }
        ++it;
    }
 }
 /**
 * Attempt to load a function and resolve a function.
 * @param pluginFileName - the name of the file in which to attempt to load
 * @param resolveString - function pointer to resolve
 * @return pointer to the function with name resolveString or NULL
 */
 Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString)
 {
 #ifdef DEBUG
    odebug << "MainWindowImp::loadPlugin: " << pluginFileName.latin1() << ": resolving " << resolveString.latin1() << "" << oendl;
 #endif
    QLibrary *lib = new QLibrary(pluginFileName);
    void *functionPointer = lib->resolve(resolveString);
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 793fcb1..060185a 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -121,49 +121,49 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
    test_gfx->setText( 1, "n/a" );
    test_ram->setText( 1, "n/a" );
 #ifndef QT_QWS_RAMSES
    test_sd->setText( 1, "n/a" );
    test_cf->setText( 1, "n/a" );
 #endif
    test_alu->setText( 2, "n/a" );
    test_fpu->setText( 2, "n/a" );
    test_txt->setText( 2, "n/a" );
    test_gfx->setText( 2, "n/a" );
    test_ram->setText( 2, "n/a" );
 #ifndef QT_QWS_RAMSES
    test_sd->setText( 2, "n/a" );
    test_cf->setText( 2, "n/a" );
 #endif
    startButton = new QPushButton( tr( "&Start Tests!" ), this );
    QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) );
    connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
    vb->addWidget( tests, 2 );
    QHBoxLayout* hb = new QHBoxLayout( vb );
    hb->addWidget( startButton, 2 );
-    QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
+    QFile f( QPEApplication::qpeDir() + "share/sysinfo/results" );
    if ( f.open( IO_ReadOnly ) )
    {
        machineCombo = new QComboBox( this );
        QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) );
        QTextStream ts( &f );
        while( !ts.eof() )
        {
            QString machline = ts.readLine();
            odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl;
            QString resline = ts.readLine();
            machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) );
            machineCombo->insertItem( machline );
        }
        hb->addWidget( new QLabel( tr( "Compare:" ), this ) );
        hb->addWidget( machineCombo, 2 );
        connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) );
    }
 }
 BenchmarkInfo::~BenchmarkInfo()
 {}
diff --git a/noncore/settings/tabmanager/tabmanager.cpp b/noncore/settings/tabmanager/tabmanager.cpp
index 3eae424..85e5814 100644
--- a/noncore/settings/tabmanager/tabmanager.cpp
+++ b/noncore/settings/tabmanager/tabmanager.cpp
@@ -1,48 +1,48 @@
 #include "tabmanager.h"
 #include "app.h"
 #include "wait.h"
 #include "tabapplnk.h"
 #include <opie2/odebug.h>
 #include <qpe/applnk.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qlistview.h>
 #include <qheader.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <stdlib.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
-#define HOME_APP_DIR QPEApplication::qpeDir()+"/apps"
+#define HOME_APP_DIR QPEApplication::qpeDir()+"apps"
 #define HOME_APP_INSTALL_DIR "/usr/lib/ipkg/info"
 #define NEW_FOLDER "EmptyTab"
 #define NEW_APPLICATION "NewApp"
 #define APPLICATION_EXTENSION ".desktop"
 #define APPLICATION_EXTENSION_LENGTH 8
 /**
 * Constructor.  Sets up signals.  Performs initial scan of applications
 * and tabs
 */
 TabManager::TabManager( QWidget* parent, const char* name):TabManagerBase(parent, name), changed(false), application(NULL){
  rescanFolder(HOME_APP_DIR);
  // Connect the signals and slots
  connect(tabList, SIGNAL(doubleClicked(QListViewItem*)), this, SLOT(editItem(QListViewItem*)));
  (tabList->header())->hide();
  connect(tabList, SIGNAL(moveItem(QListViewItem*,QListViewItem*)), this, SLOT(moveApplication(QListViewItem*,QListViewItem*)));
 }
 /**
 * If anything in the tab's have been changed then update the system or alert
 * the user.
 */
 TabManager::~TabManager(){
@@ -237,49 +237,49 @@ void TabManager::editCurrentItem(){
 /**
 * Edit the item that is passed in.
 * Show application dialog and if anything changed
 * @param item the item to edit.
 */
 void TabManager::editItem( QListViewItem * item){
  if(!item)
    return;
  TabAppLnk app(itemList[item]);
  if(!app.isValid()){
    odebug << QString("editItem: Not a valid applnk file: ") + itemList[item].latin1() << oendl;
    return;
  }
  // Fill with all of the icons
  if(!application){
    Wait waitDialog(this, "Wait dialog");
    waitDialog.waitLabel->setText(tr("Gathering icons..."));
    waitDialog.show();
    qApp->processEvents();
    application = new AppEdit(this, "Application edit", true);
-    QDir d(QPEApplication::qpeDir() + "/pics/");
+    QDir d(QPEApplication::qpeDir() + "pics/");
    d.setFilter( QDir::Files);
    const QFileInfoList *list = d.entryInfoList();
    QFileInfoListIterator it( *list );      // create list iterator
    QFileInfo *fi;                          // pointer for traversing
    while ( (fi=it.current()) ) {           // for each file...
      QString fileName = fi->fileName();
      if(fileName.right(4) == ".png"){
        fileName = fileName.mid(0,fileName.length()-4);
        QPixmap imageOfFile(Resource::loadPixmap(fileName));
        QImage foo = imageOfFile.convertToImage();
        foo = foo.smoothScale(16,16);
        imageOfFile.convertFromImage(foo);
        application->iconLineEdit->insertItem(imageOfFile,fileName);
      }
      //odebug << fi->fileName().latin1() << oendl;
      ++it;
    }
    waitDialog.hide();
  }
  int pixmap = -1;
  QString pixmapText = app.pixmapString();
  QComboBox *f = application->iconLineEdit;
diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp
index d2226e6..4275dd6 100644
--- a/noncore/styles/theme/othemebase.cpp
+++ b/noncore/styles/theme/othemebase.cpp
@@ -285,49 +285,49 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
    for ( i = 0; i < WIDGETS; ++i )
        loaded[ i ] = false;
    btnXShift = btnYShift = focus3DOffset = 0;
    aTabLine = iTabLine = true;
    roundedButton = roundedCombo = roundedSlider = focus3D = false;
    splitterWidth = 10;
    for ( i = 0; i < WIDGETS; ++i ) {
        readResourceGroup( i, copyfrom, pixnames, brdnames, loaded );
    }
    // misc items
    readMiscResourceGroup();
    // Handle preblend items
    for ( i = 0; i < PREBLEND_ITEMS; ++i ) {
        if ( pixmaps[ preBlend[ i ] ] != NULL && blends[ preBlend[ i ] ] != 0.0 )
            blend( preBlend[ i ] );
    }
 }
 OThemeBase::OThemeBase( const QString & configFile )
        : QWindowsStyle()
 {
-    configFilePath = QPEApplication::qpeDir ( ) + "/plugins/styles/";
+    configFilePath = QPEApplication::qpeDir ( ) + "plugins/styles/";
    configFileName = configFile;
    readConfig( Qt::WindowsStyle );
    cache = new OThemeCache( cacheSize );
 }
 void OThemeBase::applyConfigFile( const QString &/*file*/ )
 {
 #if 0
    // handle std color scheme
    Config inConfig( file, Config::File );
    Config globalConfig ( "qpe" );
    globalConfig. setGroup ( "Apperance" );
    inConfig. setGroup( "General" );
    if ( inConfig.hasKey( "foreground" ) )
        globalConfig.writeEntry( "Text",                    inConfig.readEntry( "foreground", " " ) );
    if ( inConfig.hasKey( "background" ) )
        globalConfig.writeEntry( "Background",                    inConfig.readEntry( "background", " " ) );
    if ( inConfig.hasKey( "selectForeground" ) )
        globalConfig.writeEntry( "HighlightedText",              inConfig.readEntry( "selectForeground", " " ) );
    if ( inConfig.hasKey( "selectBackground" ) )
        globalConfig.writeEntry( "Highlight",                     inConfig.readEntry( "selectBackground", " " ) );
diff --git a/noncore/styles/theme/themeset.cpp b/noncore/styles/theme/themeset.cpp
index d4005bc..3205106 100644
--- a/noncore/styles/theme/themeset.cpp
+++ b/noncore/styles/theme/themeset.cpp
@@ -65,49 +65,49 @@ ThemeSettings::ThemeSettings ( QWidget* parent, const char *name, WFlags fl )
        setCaption ( tr( "Theme Style" ) );
        
        Config config ( "qpe" );
    config. setGroup ( "Appearance" );
        QString active = config. readEntry ( "Theme", "default" );
        QVBoxLayout *vbox = new QVBoxLayout ( this );
        vbox-> setSpacing ( 3 );
        vbox-> setMargin ( 6 );
        vbox-> addWidget ( new QLabel ( tr( "Select the theme to be used" ), this ));
        m_list = new QListView ( this );
        m_list-> addColumn ( tr( "Name" ));
        m_list-> addColumn ( tr( "Description" ));
        m_list-> setSelectionMode ( QListView::Single );
        m_list-> setAllColumnsShowFocus ( true );
        m_list-> setSorting ( -1 );
        vbox-> addWidget ( m_list, 10 );
                
        QListViewItem *item = new MyItem ( m_list, 0, tr( "[No theme]" ), "", "" );
        m_list-> setSelected ( item, true );
        
-        QString path = QPEApplication::qpeDir() + "/plugins/styles/themes";
+        QString path = QPEApplication::qpeDir() + "plugins/styles/themes";
        QStringList list = QDir ( path, "*.themerc" ). entryList ( );
        
        for ( QStringList::Iterator it = list. begin(); it != list. end ( ); ++it ) {
                MyConfig cfg ( path + "/" + *it, Config::File );
                
                if ( cfg. hasGroup ( "Misc" )) {
                        cfg. setGroup ( "Misc" );
                        
                        QString name = cfg. readEntry ( "Name" );
                        QString comm = cfg. readEntry ( "Comment" );
        
                                if ( !name. isEmpty ( )) {
                                QString fname = (*it). left ((*it). length ( ) - 8 );
                        
                                item = new MyItem ( m_list, item, name, comm, fname );
                                if ( active == fname ) {
                                        m_list-> setSelected ( item, true );
                                }
                        }
                }
        }
 }
 bool ThemeSettings::writeConfig ( )
diff --git a/noncore/tools/calc2/calc.cpp b/noncore/tools/calc2/calc.cpp
index 3dcdf6e..c7656bf 100644
--- a/noncore/tools/calc2/calc.cpp
+++ b/noncore/tools/calc2/calc.cpp
@@ -39,49 +39,49 @@ LCD->setSegmentStyle(QLCDNumber::Filled);
 // layout widgets
  calculatorLayout = new QVBoxLayout (this);
  calculatorLayout->addWidget (LCD);
  calculatorLayout->addWidget (pluginWidgetStack);
 // no formatting of display for now
  connect (&engine, SIGNAL(display(double)), LCD, SLOT(display(double)));
  connect (&engine, SIGNAL(display(const QString&)), LCD, SLOT(display(const QString&)));
    connect (&engine, SIGNAL(setBinMode()), LCD, SLOT(setBinMode()));
    connect (&engine, SIGNAL(setOctMode()), LCD, SLOT(setOctMode()));
    connect (&engine, SIGNAL(setDecMode()), LCD, SLOT(setDecMode()));
    connect (&engine, SIGNAL(setHexMode()), LCD, SLOT(setHexMode()));
 #ifndef NO_PLUGINS
 // load plugins
  QValueList < Plugin >::Iterator mit;
  for (mit = pluginList.begin (); mit != pluginList.end (); ++mit) {
    (*mit).interface->release ();
    (*mit).library->unload ();
    delete (*mit).library;
  }
  pluginList.clear ();
-  QString path = QPEApplication::qpeDir() + "/plugins/calculator";
+  QString path = QPEApplication::qpeDir() + "plugins/calculator";
  QDir dir (path, "lib*.so");
  QStringList list = dir.entryList ();
  QStringList::Iterator it;
  for (it = list.begin (); it != list.end (); ++it) {
    CalcInterface *iface = 0;
    QLibrary *lib = new QLibrary (path + "/" + *it);
    Plugin plugin;
    plugin.pluginWidget = 0;
    if (lib->queryInterface (IID_Calc, (QUnknownInterface **) & iface) ==
        QS_OK) {
      plugin.library = lib;
      plugin.interface = iface;
      plugin.pluginWidget = plugin.interface->getPlugin(&engine,pluginWidgetStack);
      if (plugin.pluginWidget) 
        pluginWidgetStack->addWidget (plugin.pluginWidget, pluginList.count());
      pluginList.append (plugin);
    } else {
      delete lib;
    }
  }
  setMode (1);
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp
index 3cb8faf..73e7ce4 100644
--- a/x11/libqpe-x11/qpe/qpeapplication.cpp
+++ b/x11/libqpe-x11/qpe/qpeapplication.cpp
@@ -119,70 +119,70 @@ void QPEApplication::Private::sendQCopQ() {
 }
 void QPEApplication::Private::show_mx(QWidget* mw, bool nomaximize ) {
    if (mw->layout() && mw->inherits("QDialog") ) {
        QPEApplication::showDialog( (QDialog*)mw, nomaximize );
    }else {
        if (!nomaximize )
            mw->showMaximized();
        else
            mw->show();
    }
 }
 void QPEApplication::Private::show( QWidget* mw, bool nomax ) {
    nomaximize = nomax;
    qpe_main_widget = mw;
    sendQCopQ();
    if ( preloaded ) {
        if (forceshow )
            show_mx(mw, nomax );
    }else if ( keep_running )
        show_mx( mw, nomax );
 }
 void QPEApplication::Private::loadTextCodecs() {
-    QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
+    QString path = QPEApplication::qpeDir() + "plugins/textcodecs";
    QDir dir( path, "lib*.so" );
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        TextCodecInterface *iface = 0;
        QLibrary *lib = new QLibrary( path + "/" + *it );
        if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
            QValueList<int> mibs = iface->mibEnums();
            for (QValueList<int>::ConstIterator i = mibs.begin(); i != mibs.end(); ++i) {
                (void)iface->createForMib(*i);
                // ### it exists now; need to remember if we can delete it
            }
        }
        else {
            lib->unload();
            delete lib;
        }
    }
 }
 void QPEApplication::Private::loadImageCodecs() {
-    QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
+    QString path = QPEApplication::qpeDir() + "plugins/imagecodecs";
    QDir dir( path, "lib*.so" );
    QStringList list = dir.entryList();
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        ImageCodecInterface *iface = 0;
        QLibrary *lib = new QLibrary( path + "/" + *it );
        if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
            QStringList formats = iface->keys();
            for (QStringList::ConstIterator i = formats.begin(); i != formats.end(); ++i) {
                (void)iface->installIOHandler(*i);
                // ### it exists now; need to remember if we can delete it
            }
        }
        else {
            lib->unload();
            delete lib;
        }
    }
 }
 // The Help System hook
 namespace {
    class ResourceMimeFactory : public QMimeSourceFactory
    {