author | zecke <zecke> | 2004-10-16 00:01:01 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-16 00:01:01 (UTC) |
commit | df14f647ff1a60ca82e0fa9bd91458be146153b8 (patch) (unidiff) | |
tree | 4859961352851a4392e1442f2080c15bff8ad7bc /library | |
parent | 419f9710c488f56a7a117eb1529970d3371e0094 (diff) | |
download | opie-df14f647ff1a60ca82e0fa9bd91458be146153b8.zip opie-df14f647ff1a60ca82e0fa9bd91458be146153b8.tar.gz opie-df14f647ff1a60ca82e0fa9bd91458be146153b8.tar.bz2 |
Replace QPEApplication::qpeDir() + "/ with
QPEApplication::qpeDir() + "
as it is guranteed that qpeDir() will have '/' as the last
charachter
-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 | |||
@@ -167,7 +167,7 @@ void FontDatabase::loadRenderers() | |||
167 | } | 167 | } |
168 | factoryList->clear(); | 168 | factoryList->clear(); |
169 | 169 | ||
170 | QString path = QPEApplication::qpeDir() + "/plugins/fontfactories"; | 170 | QString path = QPEApplication::qpeDir() + "plugins/fontfactories"; |
171 | #ifdef Q_OS_MACX | 171 | #ifdef Q_OS_MACX |
172 | QDir dir( path, "lib*.dylib" ); | 172 | QDir dir( path, "lib*.dylib" ); |
173 | #else | 173 | #else |
diff --git a/library/network.cpp b/library/network.cpp index f2a673c..0bbbec1 100644 --- a/library/network.cpp +++ b/library/network.cpp | |||
@@ -419,9 +419,9 @@ NetworkInterface* Network::loadPlugin(const QString& type) | |||
419 | NetworkInterface *iface = ifaces->find(type); | 419 | NetworkInterface *iface = ifaces->find(type); |
420 | if ( !iface ) { | 420 | if ( !iface ) { |
421 | #ifdef Q_OS_MACX | 421 | #ifdef Q_OS_MACX |
422 | QString libfile = QPEApplication::qpeDir() + "/plugins/network/lib" + type + ".dylib"; | 422 | QString libfile = QPEApplication::qpeDir() + "plugins/network/lib" + type + ".dylib"; |
423 | #else | 423 | #else |
424 | QString libfile = QPEApplication::qpeDir() + "/plugins/network/lib" + type + ".so"; | 424 | QString libfile = QPEApplication::qpeDir() + "plugins/network/lib" + type + ".so"; |
425 | #endif | 425 | #endif |
426 | QLibrary lib(libfile); | 426 | QLibrary lib(libfile); |
427 | if ( !lib.queryInterface( IID_Network, (QUnknownInterface**)&iface ) == QS_OK ) | 427 | if ( !lib.queryInterface( IID_Network, (QUnknownInterface**)&iface ) == QS_OK ) |
@@ -431,7 +431,7 @@ NetworkInterface* Network::loadPlugin(const QString& type) | |||
431 | for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { | 431 | for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) { |
432 | QString lang = *it; | 432 | QString lang = *it; |
433 | QTranslator * trans = new QTranslator(qApp); | 433 | QTranslator * trans = new QTranslator(qApp); |
434 | QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/lib"+type+".qm"; | 434 | QString tfn = QPEApplication::qpeDir()+"i18n/"+lang+"/lib"+type+".qm"; |
435 | if ( trans->load( tfn )) | 435 | if ( trans->load( tfn )) |
436 | qApp->installTranslator( trans ); | 436 | qApp->installTranslator( trans ); |
437 | else | 437 | 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 | |||
@@ -536,7 +536,7 @@ QPEDecoration::QPEDecoration( const QString &plugin ) | |||
536 | } | 536 | } |
537 | 537 | ||
538 | WindowDecorationInterface *iface = 0; | 538 | WindowDecorationInterface *iface = 0; |
539 | QString path = QPEApplication::qpeDir() + "/plugins/decorations/"; | 539 | QString path = QPEApplication::qpeDir() + "plugins/decorations/"; |
540 | 540 | ||
541 | #ifdef Q_OS_MACX | 541 | #ifdef Q_OS_MACX |
542 | if ( plugin.find( ".dylib" ) > 0 ) { | 542 | if ( plugin.find( ".dylib" ) > 0 ) { |