-rw-r--r-- | library/fontdatabase.cpp | 2 | ||||
-rw-r--r-- | library/network.cpp | 6 | ||||
-rw-r--r-- | library/qpedecoration_qws.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/library/fontdatabase.cpp b/library/fontdatabase.cpp index d94e338..7934a09 100644 --- a/library/fontdatabase.cpp +++ b/library/fontdatabase.cpp @@ -162,17 +162,17 @@ void FontDatabase::loadRenderers() qt_fontmanager->factories.removeRef( (*mit).factory ); qt_fontmanager->factories.setAutoDelete( true ); (*mit).interface->release(); (*mit).library->unload(); delete (*mit).library; } factoryList->clear(); - QString path = QPEApplication::qpeDir() + "/plugins/fontfactories"; + QString path = QPEApplication::qpeDir() + "plugins/fontfactories"; #ifdef Q_OS_MACX QDir dir( path, "lib*.dylib" ); #else QDir dir( path, "lib*.so" ); #endif if ( !dir.exists()) return; diff --git a/library/network.cpp b/library/network.cpp index f2a673c..0bbbec1 100644 --- a/library/network.cpp +++ b/library/network.cpp @@ -414,29 +414,29 @@ static QDict<NetworkInterface> *ifaces; */ NetworkInterface* Network::loadPlugin(const QString& type) { #ifndef QT_NO_COMPONENT if ( !ifaces ) ifaces = new QDict<NetworkInterface>; NetworkInterface *iface = ifaces->find(type); if ( !iface ) { #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 QLibrary lib(libfile); if ( !lib.queryInterface( IID_Network, (QUnknownInterface**)&iface ) == QS_OK ) return 0; ifaces->insert(type,iface); QStringList langs = Global::languageList(); for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { QString lang = *it; 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 )) qApp->installTranslator( trans ); else delete trans; } } return iface; #else 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 @@ -531,17 +531,17 @@ QPEDecoration::QPEDecoration( const QString &plugin ) wdlib->unload(); delete wdlib; wdlib = 0; } else { delete wdiface; } WindowDecorationInterface *iface = 0; - QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; + QString path = QPEApplication::qpeDir() + "plugins/decorations/"; #ifdef Q_OS_MACX if ( plugin.find( ".dylib" ) > 0 ) { #else if ( plugin.find( ".so" ) > 0 ) { #endif // full library name supplied path += plugin; |