author | ulf69 <ulf69> | 2004-06-29 05:03:25 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 05:03:25 (UTC) |
commit | 0538ac1cc17ad4249d27d686b4bc7e80663f475f (patch) (side-by-side diff) | |
tree | abf571d0e2640bbb7ce14818a376ad980492ea05 /microkde/kdecore/klibloader.cpp | |
parent | 61ef87224517601f8754dd9da1b521a7b0094558 (diff) | |
download | kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.zip kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.tar.gz kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'microkde/kdecore/klibloader.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | microkde/kdecore/klibloader.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp index 1410308..130cc7c 100644 --- a/microkde/kdecore/klibloader.cpp +++ b/microkde/kdecore/klibloader.cpp @@ -157,7 +157,8 @@ KLibFactory* KLibrary::factory() void* sym = symbol( symname ); if ( !sym ) { - kdWarning(150) << "KLibrary: The library " << name() << " does not offer an init_" << name() << " function" << endl; + qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data()); + kdWarning(150) << "KLibrary: The library " << name().latin1() << " does not offer an init_" << name().latin1() << " function" << endl; return 0; } @@ -368,8 +369,15 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta int pos = libname.findRev('/'); if (pos < 0) pos = 0; - if (libname.find('.', pos) < 0) +/*US + if (libname.find('.', pos) < 0) { libname += ".la"; + } +*/ +//US in the microedition we work only with shared libraries. + if (libname.find('.', pos) < 0) { + libname += ".so"; + } // only look up the file if it is not an absolute filename // (mhk, 20000228) @@ -378,6 +386,12 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta libfile = libname; else { +//US at this point the libname must exist as real filesname. No expansions will be made later +// in findResources. Because of that we prepend the lib prefix here to the name +//US I add also the "lib" prefix. I do not how could this could have worked before without it? + libname.insert(pos, "lib"); + + //US libfile = instance->dirs()->findResource( "module", libname ); libfile = KGlobal::dirs()->findResource( "module", libname ); if ( libfile.isEmpty() ) @@ -395,6 +409,9 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl; #endif self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); + + qDebug("KLibLoader::library could not find library: %s", libname.data()); + } else self()->d->errorMessage = QString::null; @@ -454,9 +471,6 @@ KLibrary* KLibLoader::library( const char *name ) if ( libfile.isEmpty() ) return 0; - const QString & qpeDir = QPEApplication::qpeDir(); - libfile = qpeDir + libfile; -//US QLibrary *lib = new QLibrary( qpeDir + "/plugins/korganizer/libopiekabc.so", QLibrary::Immediately ); QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately ); //US lt_dlhandle handle = lt_dlopen( libfile.latin1() ); |