Replace QPEApplication::qpeDir() + "/ with

	QPEApplication::qpeDir() + "

as it is guranteed that qpeDir() will have '/' as the last
charachter

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
@@ -85,3 +85,3 @@ void Multikey::message(const QCString &message, const QByteArray &data)
 
-	QDir map_dir(QPEApplication::qpeDir() + "/share/multikey/", "*.keymap");
+	QDir map_dir(QPEApplication::qpeDir() + "share/multikey/", "*.keymap");
 	lang = 0;
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
@@ -19,3 +19,3 @@ int main( int argc, char **argv )
 
-    QString path = QPEApplication::qpeDir() + "/plugins/app";
+    QString path = QPEApplication::qpeDir() + "plugins/app";
     QDir dir( path, "lib*.so" );
@@ -46,3 +46,3 @@ int main( int argc, char **argv )
         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 ))
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
@@ -219,3 +219,3 @@ 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
@@ -235,3 +235,3 @@ void InputMethods::installTranslator( const QString& type ) {
 
-        QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
+        QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/"+type+".qm";
 
@@ -278,3 +278,3 @@ void InputMethods::loadInputMethods()
 
-    QString path = QPEApplication::qpeDir() + "/plugins/inputmethods";
+    QString path = QPEApplication::qpeDir() + "plugins/inputmethods";
     QStringList list = plugins();
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
@@ -36,3 +36,3 @@ IrServer::IrServer( QObject *parent, const char *name )
     obexIface = 0;
-    QString path = QPEApplication::qpeDir() + "/plugins/obex/";
+    QString path = QPEApplication::qpeDir() + "plugins/obex/";
 #ifdef Q_OS_MACX
@@ -53,3 +53,3 @@ IrServer::IrServer( QObject *parent, const char *name )
 	    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;
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
@@ -317,3 +317,3 @@ void StartMenu::loadApplets()
     QString lang = getenv( "LANG" );

-    QString path = QPEApplication::qpeDir() + "/plugins/applets";

+    QString path = QPEApplication::qpeDir() + "plugins/applets";

     QDir dir( path, "lib*.so" );

@@ -336,3 +336,3 @@ void StartMenu::loadApplets()
             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 ))

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
@@ -99,3 +99,3 @@ void SysTray::addApplets()
     QString lang = getenv( "LANG" );
-    QString path = QPEApplication::qpeDir() + "/plugins/applets";
+    QString path = QPEApplication::qpeDir() + "plugins/applets";
 #ifdef Q_OS_MACX
@@ -123,3 +123,3 @@ void SysTray::addApplets()
 	    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 ))
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
@@ -141,3 +141,3 @@ void MediaPlayerState::loadPlugins() {
 
-    QString path = QPEApplication::qpeDir() + "/plugins/codecs";
+    QString path = QPEApplication::qpeDir() + "plugins/codecs";
     QDir dir( path, "lib*.so" );
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
@@ -1384,3 +1384,3 @@ void PlayListWidget::populateSkinsMenu() {
 
-   QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" );
+   QDir skinsDir( QPEApplication::qpeDir() + "pics/opieplayer2/skins" );
    skinsDir.setFilter( QDir::Dirs );
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
@@ -100,3 +100,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 		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" );
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
@@ -182,3 +182,3 @@ int main ( int argc, char **argv )
 			if ( !autolog ) {
-                QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf";
+                QString confFile=QPEApplication::qpeDir() + "etc/opie-login.conf";
 				Config cfg ( confFile, Config::File );
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
@@ -83,3 +83,3 @@ void MenuSettings::init ( )
 
-	QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+	QString path = QPEApplication::qpeDir ( ) + "plugins/applets";
 #ifdef Q_OS_MACX
@@ -101,3 +101,3 @@ void MenuSettings::init ( )
 			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 ))
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
@@ -79,3 +79,3 @@ void TaskbarSettings::init ( )
 
-    QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+    QString path = QPEApplication::qpeDir ( ) + "plugins/applets";
 #ifdef Q_OS_MACX
@@ -100,3 +100,3 @@ void TaskbarSettings::init ( )
             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 ))
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
@@ -156,3 +156,3 @@ static void test_and_start() {
      */
-    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QString path = QPEApplication::qpeDir() + "plugins/security";
     QDir dir( path, "lib*.so" );
@@ -376,3 +376,3 @@ void MultiauthConfig::readConfig()
 
-    QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
+    QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf";
     Config loginCfg(configFile,Config::File);
@@ -491,3 +491,3 @@ void MultiauthConfig::writeConfig()
 
-    QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
+    QString configFile = QPEApplication::qpeDir() + "etc/opie-login.conf";
     Config loginCfg(configFile,Config::File);
@@ -511,3 +511,3 @@ void MultiauthConfig::loadPlugins() {
 
-    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QString path = QPEApplication::qpeDir() + "plugins/security";
     QDir dir( path, "lib*.so" );
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
@@ -47,5 +47,5 @@ namespace QuickPrivate {
 #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
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
@@ -81,3 +81,3 @@ ConfigDlg::ConfigDlg () : QDialog ()
     
-    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
@@ -250,3 +250,3 @@ QStringList ConfigDlg::loadSw()
     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
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
@@ -1379,3 +1379,3 @@ Keys::Keys() {
     
-        map = QPEApplication::qpeDir() + "/share/multikey/" 
+        map = QPEApplication::qpeDir() + "share/multikey/" 
                 + l + ".keymap";
@@ -1384,3 +1384,3 @@ Keys::Keys() {
     if (map.isNull() || !(QFile(map).exists())) {
-        map = QPEApplication::qpeDir() + "/share/multikey/en.keymap";
+        map = QPEApplication::qpeDir() + "share/multikey/en.keymap";
     }
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
@@ -475,3 +475,3 @@ void OGenericPluginLoader::setSafeMode(const QString& str, bool b) {
  *
- * 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
@@ -640,3 +640,3 @@ void OGenericPluginLoader::installTranslators(const QString& type) {
         QTranslator* trans = new QTranslator(  qApp );
-        QString tfn = QPEApplication::qpeDir()+"/i18n/" + *it + "/lib" + type + ".qm" ;
+        QString tfn = QPEApplication::qpeDir()+"i18n/" + *it + "/lib" + type + ".qm" ;
 
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
@@ -72,3 +72,3 @@ OManufacturerDB::OManufacturerDB()
     {
-        filename = QPEApplication::qpeDir()+"/etc/manufacturers";
+        filename = QPEApplication::qpeDir()+"etc/manufacturers";
         odebug << "OManufacturerDB: trying to read " << filename << oendl;
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
@@ -91,3 +91,3 @@ int runPlugins() {
      */
-    QString path = QPEApplication::qpeDir() + "/plugins/security";
+    QString path = QPEApplication::qpeDir() + "plugins/security";
     QStringList::Iterator libIt;
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp
index d94e338..7934a09 100644
--- a/library/fontdatabase.cpp
+++ b/library/fontdatabase.cpp
@@ -169,3 +169,3 @@ void FontDatabase::loadRenderers()
 
-    QString path = QPEApplication::qpeDir() + "/plugins/fontfactories";
+    QString path = QPEApplication::qpeDir() + "plugins/fontfactories";
 #ifdef Q_OS_MACX
diff --git a/library/network.cpp b/library/network.cpp
index f2a673c..0bbbec1 100644
--- a/library/network.cpp
+++ b/library/network.cpp
@@ -421,5 +421,5 @@ NetworkInterface* Network::loadPlugin(const QString& type)
 #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
@@ -433,3 +433,3 @@ NetworkInterface* Network::loadPlugin(const QString& type)
 	    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 ))
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
@@ -538,3 +538,3 @@ QPEDecoration::QPEDecoration( const QString &plugin )
     WindowDecorationInterface *iface = 0;
-    QString path = QPEApplication::qpeDir() + "/plugins/decorations/";
+    QString path = QPEApplication::qpeDir() + "plugins/decorations/";
 
diff --git a/libslcompat/slmisc.h b/libslcompat/slmisc.h
index 20ba988..442b098 100644
--- a/libslcompat/slmisc.h
+++ b/libslcompat/slmisc.h
@@ -28,3 +28,3 @@ public:
 	static bool isExecutable(const QString &c) {
-		QFileInfo exec(QPEApplication::qpeDir() + "/bin/" + c);
+		QFileInfo exec(QPEApplication::qpeDir() + "bin/" + c);
 		return exec.isExecutable();
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
@@ -43,3 +43,3 @@ int ZkbWidget::position()
 bool ZkbWidget::loadKeymap() {
-    ZkbConfig c(QPEApplication::qpeDir()+"/share/zkb");
+    ZkbConfig c(QPEApplication::qpeDir()+"share/zkb");
     QFontMetrics fm(font());
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
@@ -70,3 +70,3 @@ CfgDlg::CfgDlg(QWidget* parent, CfgFile* cf, QApplication* app, bool mod):
 
-	QDir dir(QPEApplication::qpeDir()+"/share/zkb", "*.xml");
+	QDir dir(QPEApplication::qpeDir()+"share/zkb", "*.xml");
 	QStringList flist = dir.entryList();
@@ -126,3 +126,3 @@ void CfgDlg::accept() {
 	CfgParser p;
-	p.save(QPEApplication::qpeDir()+"/share/zkb/zkb.xml", *cfile);
+	p.save(QPEApplication::qpeDir()+"share/zkb/zkb.xml", *cfile);
 	QCopEnvelope("QPE/zkb", "reload()");
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
@@ -11,3 +11,3 @@ int main( int argc, char **argv ) {
 	CfgParser cp;
-	cp.load(QPEApplication::qpeDir()+"/share/zkb/zkb.xml", cfile);
+	cp.load(QPEApplication::qpeDir()+"share/zkb/zkb.xml", cfile);
 
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
@@ -115,3 +115,3 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     } else
-        dbFile.setName( QPEApplication::qpeDir()+"/etc/bartender/drinkdb.txt");
+        dbFile.setName( QPEApplication::qpeDir()+"etc/bartender/drinkdb.txt");
     initDrinkDb();
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
@@ -56,3 +56,3 @@ void FixIt::fixIt() {
 	#ifndef EAST
-    ::rename("/etc/inittab", QPEApplication::qpeDir() + "/etc/inittab" );
+    ::rename("/etc/inittab", QPEApplication::qpeDir() + "etc/inittab" );
     QFile file( "/etc/inittab" );
@@ -67,3 +67,3 @@ void FixIt::fixIt() {
     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";
     
@@ -82,3 +82,3 @@ void FixIt::breakIt() {
 	 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";
          
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
@@ -52,7 +52,7 @@ LibraryDialog::LibraryDialog( QWidget* parent,  const char* name , bool /*modal*
         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";
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
@@ -40,3 +40,3 @@ void optionsDialog::ftpSiteDlg( )
 //    ListFile = local_library + "ftpList";
-    ListFile = QPEApplication::qpeDir() + "/etc/gutenbrowser";
+    ListFile = QPEApplication::qpeDir() + "etc/gutenbrowser";
     QDir dir(ListFile);
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
@@ -144,3 +144,3 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 			//    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 );
@@ -149,3 +149,3 @@ Gutenbrowser::Gutenbrowser(QWidget *,const char*, WFlags )
 		} else {
-				QString localLibIndexFile = QPEApplication::qpeDir()+ "/etc/gutenbrowser/PGWHOLE.TXT";
+				QString localLibIndexFile = QPEApplication::qpeDir()+ "etc/gutenbrowser/PGWHOLE.TXT";
 					//        QString localLibIndexFile= local_library + "PGWHOLE.TXT";
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
@@ -60,3 +60,3 @@ HelpMe::HelpMe(QWidget *parent,  QString name ) : QDialog(parent,name)
   QString pixDir;
-  pixDir=QPEApplication::qpeDir()+"/pics/";
+  pixDir=QPEApplication::qpeDir()+"pics/";
     QPushButton *help;
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
@@ -2778,3 +2778,3 @@ void ZSafe::addCategory()
 #else
-        QDir d(QPEApplication::qpeDir() + "/pics/");
+        QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
@@ -2962,3 +2962,3 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog)
 #else
-    QDir d(QPEApplication::qpeDir() + "/pics/");
+    QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
@@ -3019,3 +3019,3 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category)
 #else
-    QDir d(QPEApplication::qpeDir() + "/pics/");
+    QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
@@ -3198,3 +3198,3 @@ void ZSafe::editCategory()
 #else
-        QDir d(QPEApplication::qpeDir() + "/pics/");
+        QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
@@ -3241,3 +3241,3 @@ void ZSafe::editCategory()
 #else
-        QDir d(QPEApplication::qpeDir() + "/pics/");
+        QDir d(QPEApplication::qpeDir() + "pics/");
 #endif
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
@@ -59,3 +59,3 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
     theme_name=conf.readEntry("theme","default");
-    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
+    QString theme_file=QPEApplication::qpeDir()+"backgammon/"+theme_name+".theme";
 
@@ -330,3 +330,3 @@ void BackGammon::loadgame()
     game_name=file->filename();
-    QString game_file=QPEApplication::qpeDir()+"/backgammon/"+game_name+".game";
+    QString game_file=QPEApplication::qpeDir()+"backgammon/"+game_name+".game";
 
@@ -369,3 +369,3 @@ void BackGammon::savegame()
 {
-    QString game_file=QPEApplication::qpeDir()+"/backgammon/"+game_name+".game";
+    QString game_file=QPEApplication::qpeDir()+"backgammon/"+game_name+".game";
 
@@ -408,3 +408,3 @@ void BackGammon::deletegame()
     game_name=file->filename();
-    QString game_file=QPEApplication::qpeDir()+"/backgammon/"+game_name+".game";
+    QString game_file=QPEApplication::qpeDir()+"backgammon/"+game_name+".game";
 
@@ -455,3 +455,3 @@ void BackGammon::loadtheme()
     theme_name=file->filename();
-    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
+    QString theme_file=QPEApplication::qpeDir()+"backgammon/"+theme_name+".theme";
 
@@ -478,3 +478,3 @@ void BackGammon::savetheme()
     }
-    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"))
@@ -511,3 +511,3 @@ void BackGammon::deletetheme()
     theme_name=file->filename();
-    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
+    QString theme_file=QPEApplication::qpeDir()+"backgammon/"+theme_name+".theme";
 
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
@@ -39,3 +39,3 @@ void FileDialog::getCurrentDir()
     dirselector->clear();

-    QDir dir(QPEApplication::qpeDir()+"/backgammon");

+    QDir dir(QPEApplication::qpeDir()+"backgammon");

     dir.setFilter(QDir::Files);

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
@@ -145,3 +145,3 @@ 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);
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
@@ -951,3 +951,3 @@ void PlayListWidget::populateSkinsMenu() {
 
-    QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" );
+    QDir skinsDir( QPEApplication::qpeDir() + "pics/opieplayer2/skins" );
     skinsDir.setFilter( QDir::Dirs );
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
@@ -59,3 +59,3 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl
 
-	QString tfn = QPEApplication::qpeDir() + "/i18n/";
+	QString tfn = QPEApplication::qpeDir() + "i18n/";
 	QDir langDir = tfn;
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
@@ -290,3 +290,3 @@ void MainWindowImp::loadModules(const QString &path)
                 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 ) )
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
@@ -144,3 +144,3 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
 
-    QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
+    QFile f( QPEApplication::qpeDir() + "share/sysinfo/results" );
     if ( f.open( IO_ReadOnly ) )
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
@@ -23,3 +23,3 @@
 
-#define HOME_APP_DIR QPEApplication::qpeDir()+"/apps"
+#define HOME_APP_DIR QPEApplication::qpeDir()+"apps"
 #define HOME_APP_INSTALL_DIR "/usr/lib/ipkg/info"
@@ -260,3 +260,3 @@ void TabManager::editItem( QListViewItem * item){
 
-    QDir d(QPEApplication::qpeDir() + "/pics/");
+    QDir d(QPEApplication::qpeDir() + "pics/");
     d.setFilter( QDir::Files);
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
@@ -308,3 +308,3 @@ OThemeBase::OThemeBase( const QString & configFile )
 {
-    configFilePath = QPEApplication::qpeDir ( ) + "/plugins/styles/";
+    configFilePath = QPEApplication::qpeDir ( ) + "plugins/styles/";
     configFileName = configFile;
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
@@ -88,3 +88,3 @@ ThemeSettings::ThemeSettings ( QWidget* parent, const char *name, WFlags fl )
 	
-	QString path = QPEApplication::qpeDir() + "/plugins/styles/themes";
+	QString path = QPEApplication::qpeDir() + "plugins/styles/themes";
 	QStringList list = QDir ( path, "*.themerc" ). entryList ( );
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
@@ -62,3 +62,3 @@ LCD->setSegmentStyle(QLCDNumber::Filled);
 
-  QString path = QPEApplication::qpeDir() + "/plugins/calculator";
+  QString path = QPEApplication::qpeDir() + "plugins/calculator";
   QDir dir (path, "lib*.so");
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
@@ -142,3 +142,3 @@ void QPEApplication::Private::show( QWidget* mw, bool nomax ) {
 void QPEApplication::Private::loadTextCodecs() {
-    QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
+    QString path = QPEApplication::qpeDir() + "plugins/textcodecs";
     QDir dir( path, "lib*.so" );
@@ -163,3 +163,3 @@ void QPEApplication::Private::loadTextCodecs() {
 void QPEApplication::Private::loadImageCodecs() {
-    QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
+    QString path = QPEApplication::qpeDir() + "plugins/imagecodecs";
     QDir dir( path, "lib*.so" );