author | ulf69 <ulf69> | 2004-06-29 05:03:25 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-29 05:03:25 (UTC) |
commit | 0538ac1cc17ad4249d27d686b4bc7e80663f475f (patch) (unidiff) | |
tree | abf571d0e2640bbb7ce14818a376ad980492ea05 | |
parent | 61ef87224517601f8754dd9da1b521a7b0094558 (diff) | |
download | kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.zip kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.tar.gz kdepimpi-0538ac1cc17ad4249d27d686b4bc7e80663f475f.tar.bz2 |
*** empty log message ***
-rw-r--r-- | kabc/stdaddressbook.cpp | 22 | ||||
-rw-r--r-- | microkde/kdecore/klibloader.cpp | 24 |
2 files changed, 22 insertions, 24 deletions
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index f9fc70b..8faaaef 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -23,28 +23,16 @@ Enhanced Version of the file for platform independent KDE tools. | |||
23 | Copyright (c) 2004 Ulf Schenk | 23 | Copyright (c) 2004 Ulf Schenk |
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | #ifndef DESKTOP_VERSION | ||
28 | #include <qpe/global.h> | ||
29 | #else | ||
30 | |||
31 | #include <qdir.h> | ||
32 | #endif | ||
33 | #ifdef KAB_EMBEDDED | ||
34 | 27 | ||
28 | /*US | ||
35 | #include <stdlib.h> | 29 | #include <stdlib.h> |
36 | #else //KAB_EMBEDDED | ||
37 | 30 | ||
38 | #include <stdlib.h> | ||
39 | |||
40 | //US#include <kresources/manager.h> | ||
41 | #include <kapplication.h> | 31 | #include <kapplication.h> |
42 | #include <kcrash.h> | 32 | #include <kcrash.h> |
43 | #include <ksimpleconfig.h> | 33 | #include <ksimpleconfig.h> |
44 | 34 | */ | |
45 | |||
46 | #endif //KAB_EMBEDDED | ||
47 | 35 | ||
48 | #include "resource.h" | 36 | #include "resource.h" |
49 | #include <kresources/manager.h> | 37 | #include <kresources/manager.h> |
50 | #include <kdebug.h> | 38 | #include <kdebug.h> |
@@ -67,9 +55,8 @@ QString StdAddressBook::fileName() | |||
67 | } | 55 | } |
68 | 56 | ||
69 | QString StdAddressBook::directoryName() | 57 | QString StdAddressBook::directoryName() |
70 | { | 58 | { |
71 | qDebug("StdAddressBook::directoryName() WILL FAIL OR NOT" ); | ||
72 | return locateLocal( "data", "kabc/stdvcf" ); | 59 | return locateLocal( "data", "kabc/stdvcf" ); |
73 | } | 60 | } |
74 | 61 | ||
75 | void StdAddressBook::handleCrash() | 62 | void StdAddressBook::handleCrash() |
@@ -210,13 +197,10 @@ bool StdAddressBook::save() | |||
210 | 197 | ||
211 | void StdAddressBook::close() | 198 | void StdAddressBook::close() |
212 | { | 199 | { |
213 | //US destructObject is not defined on my system???. Is setObject(0) the same ??? | 200 | //US destructObject is not defined on my system???. Is setObject(0) the same ??? |
214 | #ifndef KAB_EMBEDDED | 201 | //US addressBookDeleter.destructObject(); |
215 | addressBookDeleter.destructObject(); | ||
216 | #else //KAB_EMBEDDED | ||
217 | addressBookDeleter.setObject(0); | 202 | addressBookDeleter.setObject(0); |
218 | #endif //KAB_EMBEDDED | ||
219 | 203 | ||
220 | } | 204 | } |
221 | 205 | ||
222 | void StdAddressBook::setAutomaticSave( bool enable ) | 206 | void StdAddressBook::setAutomaticSave( bool enable ) |
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 | |||
@@ -156,9 +156,10 @@ KLibFactory* KLibrary::factory() | |||
156 | 156 | ||
157 | void* sym = symbol( symname ); | 157 | void* sym = symbol( symname ); |
158 | if ( !sym ) | 158 | if ( !sym ) |
159 | { | 159 | { |
160 | kdWarning(150) << "KLibrary: The library " << name() << " does not offer an init_" << name() << " function" << endl; | 160 | qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data()); |
161 | kdWarning(150) << "KLibrary: The library " << name().latin1() << " does not offer an init_" << name().latin1() << " function" << endl; | ||
161 | return 0; | 162 | return 0; |
162 | } | 163 | } |
163 | 164 | ||
164 | typedef KLibFactory* (*t_func)(); | 165 | typedef KLibFactory* (*t_func)(); |
@@ -367,18 +368,31 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta | |||
367 | // (mhk, 20000228) | 368 | // (mhk, 20000228) |
368 | int pos = libname.findRev('/'); | 369 | int pos = libname.findRev('/'); |
369 | if (pos < 0) | 370 | if (pos < 0) |
370 | pos = 0; | 371 | pos = 0; |
371 | if (libname.find('.', pos) < 0) | 372 | /*US |
373 | if (libname.find('.', pos) < 0) { | ||
372 | libname += ".la"; | 374 | libname += ".la"; |
375 | } | ||
376 | */ | ||
377 | //US in the microedition we work only with shared libraries. | ||
378 | if (libname.find('.', pos) < 0) { | ||
379 | libname += ".so"; | ||
380 | } | ||
373 | 381 | ||
374 | // only look up the file if it is not an absolute filename | 382 | // only look up the file if it is not an absolute filename |
375 | // (mhk, 20000228) | 383 | // (mhk, 20000228) |
376 | QString libfile; | 384 | QString libfile; |
377 | if (libname[0] == '/') | 385 | if (libname[0] == '/') |
378 | libfile = libname; | 386 | libfile = libname; |
379 | else | 387 | else |
380 | { | 388 | { |
389 | //US at this point the libname must exist as real filesname. No expansions will be made later | ||
390 | // in findResources. Because of that we prepend the lib prefix here to the name | ||
391 | //US I add also the "lib" prefix. I do not how could this could have worked before without it? | ||
392 | libname.insert(pos, "lib"); | ||
393 | |||
394 | |||
381 | //US libfile = instance->dirs()->findResource( "module", libname ); | 395 | //US libfile = instance->dirs()->findResource( "module", libname ); |
382 | libfile = KGlobal::dirs()->findResource( "module", libname ); | 396 | libfile = KGlobal::dirs()->findResource( "module", libname ); |
383 | if ( libfile.isEmpty() ) | 397 | if ( libfile.isEmpty() ) |
384 | { | 398 | { |
@@ -394,8 +408,11 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta | |||
394 | #ifndef NDEBUG | 408 | #ifndef NDEBUG |
395 | kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl; | 409 | kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl; |
396 | #endif | 410 | #endif |
397 | self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); | 411 | self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); |
412 | |||
413 | qDebug("KLibLoader::library could not find library: %s", libname.data()); | ||
414 | |||
398 | } | 415 | } |
399 | else | 416 | else |
400 | self()->d->errorMessage = QString::null; | 417 | self()->d->errorMessage = QString::null; |
401 | } | 418 | } |
@@ -453,11 +470,8 @@ KLibrary* KLibLoader::library( const char *name ) | |||
453 | QString libfile = findLibrary( name ); | 470 | QString libfile = findLibrary( name ); |
454 | if ( libfile.isEmpty() ) | 471 | if ( libfile.isEmpty() ) |
455 | return 0; | 472 | return 0; |
456 | 473 | ||
457 | const QString & qpeDir = QPEApplication::qpeDir(); | ||
458 | libfile = qpeDir + libfile; | ||
459 | //US QLibrary *lib = new QLibrary( qpeDir + "/plugins/korganizer/libopiekabc.so", QLibrary::Immediately ); | ||
460 | QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately ); | 474 | QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately ); |
461 | 475 | ||
462 | //US lt_dlhandle handle = lt_dlopen( libfile.latin1() ); | 476 | //US lt_dlhandle handle = lt_dlopen( libfile.latin1() ); |
463 | //US if ( !handle ) | 477 | //US if ( !handle ) |