-rw-r--r-- | core/applets/multikeyapplet/multikey.cpp | 2 | ||||
-rw-r--r-- | core/apps/taboapp/main.cpp | 4 | ||||
-rw-r--r-- | core/launcher/inputmethods.cpp | 6 | ||||
-rw-r--r-- | core/launcher/irserver.cpp | 4 | ||||
-rw-r--r-- | core/launcher/startmenu.cpp | 4 | ||||
-rw-r--r-- | core/launcher/systray.cpp | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 2 | ||||
-rw-r--r-- | core/opie-login/main.cpp | 2 | ||||
-rw-r--r-- | core/settings/launcher/menusettings.cpp | 4 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 4 | ||||
-rw-r--r-- | core/settings/security/multiauthconfig.cpp | 8 | ||||
-rw-r--r-- | core/tools/quicklauncher/dropins.h | 4 |
14 files changed, 26 insertions, 26 deletions
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index 195d8a4..8cb9083 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp @@ -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 |