From df14f647ff1a60ca82e0fa9bd91458be146153b8 Mon Sep 17 00:00:00 2001 From: zecke Date: Sat, 16 Oct 2004 00:01:01 +0000 Subject: Replace QPEApplication::qpeDir() + "/ with QPEApplication::qpeDir() + " as it is guranteed that qpeDir() will have '/' as the last charachter --- (limited to 'noncore') 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 @@ -41,7 +41,7 @@ int ZkbWidget::position() } bool ZkbWidget::loadKeymap() { - ZkbConfig c(QPEApplication::qpeDir()+"/share/zkb"); + ZkbConfig c(QPEApplication::qpeDir()+"share/zkb"); QFontMetrics fm(font()); if (keymap != 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 @@ -68,7 +68,7 @@ CfgDlg::CfgDlg(QWidget* parent, CfgFile* cf, QApplication* app, bool mod): 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) { @@ -124,7 +124,7 @@ void CfgDlg::accept() { 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 @@ -9,7 +9,7 @@ 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); 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 @@ -113,7 +113,7 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) 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(); } 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 @@ -54,7 +54,7 @@ FixIt::FixIt() { */ 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) ); @@ -65,7 +65,7 @@ void FixIt::fixIt() { #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) ) { @@ -80,7 +80,7 @@ void FixIt::fixIt() { 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) ) { 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 @@ -50,11 +50,11 @@ LibraryDialog::LibraryDialog( QWidget* parent, const char* name , bool /*modal* 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"; 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 @@ -38,7 +38,7 @@ void optionsDialog::ftpSiteDlg( ) // 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); 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 @@ -142,12 +142,12 @@ 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 ); 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); } 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 @@ -58,7 +58,7 @@ HelpMe::HelpMe(QWidget *parent, QString name ) : QDialog(parent,name) 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")); 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 @@ -2776,7 +2776,7 @@ void ZSafe::addCategory() #ifdef DESKTOP QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "pics/"); #endif d.setFilter( QDir::Files); @@ -2960,7 +2960,7 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) #ifdef DESKTOP QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "pics/"); #endif d.setFilter( QDir::Files); @@ -3017,7 +3017,7 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) #ifdef DESKTOP QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "pics/"); #endif d.setFilter( QDir::Files); @@ -3196,7 +3196,7 @@ void ZSafe::editCategory() #ifdef DESKTOP QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "pics/"); #endif d.setFilter( QDir::Files); @@ -3239,7 +3239,7 @@ void ZSafe::editCategory() // QDir d(QDir::homeDirPath() + "/pics/"); QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "pics/"); #endif d.setFilter( QDir::Files); 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 @@ -57,7 +57,7 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) } 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"); @@ -328,7 +328,7 @@ void BackGammon::loadgame() 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"); @@ -367,7 +367,7 @@ void BackGammon::loadgame() 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"); @@ -406,7 +406,7 @@ void BackGammon::deletegame() 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")) { @@ -453,7 +453,7 @@ void BackGammon::loadtheme() 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"); @@ -476,7 +476,7 @@ void BackGammon::savetheme() 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; @@ -509,7 +509,7 @@ void BackGammon::deletetheme() 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" ))) { 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 @@ -37,7 +37,7 @@ void FileDialog::selectorclicked(QListViewItem* entry) 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; 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 @@ -143,7 +143,7 @@ void ThemeDialog::setCurrent(const ImageNames& current) 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; 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 @@ -949,7 +949,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/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 @@ -57,7 +57,7 @@ LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl 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 ); 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 @@ -288,7 +288,7 @@ void MainWindowImp::loadModules(const QString &path) /* 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 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 @@ -142,7 +142,7 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) 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 ); 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 @@ -21,7 +21,7 @@ #include -#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" @@ -258,7 +258,7 @@ void TabManager::editItem( QListViewItem * item){ 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(); 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 @@ -306,7 +306,7 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ ) OThemeBase::OThemeBase( const QString & configFile ) : QWindowsStyle() { - configFilePath = QPEApplication::qpeDir ( ) + "/plugins/styles/"; + configFilePath = QPEApplication::qpeDir ( ) + "plugins/styles/"; configFileName = configFile; readConfig( Qt::WindowsStyle ); 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 @@ -86,7 +86,7 @@ ThemeSettings::ThemeSettings ( QWidget* parent, const char *name, WFlags fl ) 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 ) { 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 @@ -60,7 +60,7 @@ LCD->setSegmentStyle(QLCDNumber::Filled); } pluginList.clear (); - QString path = QPEApplication::qpeDir() + "/plugins/calculator"; + QString path = QPEApplication::qpeDir() + "plugins/calculator"; QDir dir (path, "lib*.so"); QStringList list = dir.entryList (); -- cgit v0.9.0.2