21 files changed, 38 insertions, 38 deletions

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);