14 files changed, 26 insertions, 26 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
@@ -83,7 +83,7 @@ void Multikey::message(const QCString &message, const QByteArray &data)
         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();
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
@@ -17,7 +17,7 @@ int main( int argc, char **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();
@@ -44,7 +44,7 @@ int main( int argc, char **argv )
         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
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
@@ -217,7 +217,7 @@ void InputMethods::unloadMethod( QValueList<InputMethod>& list ) {
 
 
 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
@@ -233,7 +233,7 @@ void InputMethods::installTranslator( const QString& type ) {
         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 );
@@ -276,7 +276,7 @@ void InputMethods::loadInputMethods()
 
     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 ) {
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
@@ -34,7 +34,7 @@ IrServer::IrServer( QObject *parent, const char *name )
 {
     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
@@ -51,7 +51,7 @@ IrServer::IrServer( QObject *parent, const char *name )
             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 );
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
@@ -315,7 +315,7 @@ void StartMenu::loadApplets()
     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;

@@ -334,7 +334,7 @@ void StartMenu::loadApplets()
 

             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

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
@@ -97,7 +97,7 @@ void SysTray::addApplets()
     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
@@ -121,7 +121,7 @@ void SysTray::addApplets()
 
             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
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
@@ -139,7 +139,7 @@ void MediaPlayerState::loadPlugins() {
     }
     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;
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
@@ -1382,7 +1382,7 @@ void PlayListWidget::populateSkinsMenu() {
    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();
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
@@ -98,7 +98,7 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
                 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 );
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
@@ -180,7 +180,7 @@ int main ( int argc, char **argv )
                 }
                 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" );
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
@@ -81,7 +81,7 @@ void MenuSettings::init ( )
         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
@@ -99,7 +99,7 @@ void MenuSettings::init ( )
                         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
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
@@ -77,7 +77,7 @@ void TaskbarSettings::init ( )
     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
@@ -98,7 +98,7 @@ void TaskbarSettings::init ( )
             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
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
@@ -154,7 +154,7 @@ static void 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();
     
@@ -374,7 +374,7 @@ void MultiauthConfig::readConfig()
 
 
 
-    QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
+    QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf";
     Config loginCfg(configFile,Config::File);
 
     loginCfg.setGroup("General");
@@ -489,7 +489,7 @@ void MultiauthConfig::writeConfig()
     //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");
 
@@ -509,7 +509,7 @@ void MultiauthConfig::pluginsChanged() {
 /// 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();
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
@@ -45,9 +45,9 @@ namespace QuickPrivate {
                 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 );