author | ulf69 <ulf69> | 2004-06-30 21:52:47 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-06-30 21:52:47 (UTC) |
commit | b8957d8d6437880355312cb008addceac66e9eb2 (patch) (unidiff) | |
tree | b0b65cc826e57e2466f7240ca53f703b3cf6b333 | |
parent | 294b21a5360fdffec72c73bd2513837f14271a01 (diff) | |
download | kdepimpi-b8957d8d6437880355312cb008addceac66e9eb2.zip kdepimpi-b8957d8d6437880355312cb008addceac66e9eb2.tar.gz kdepimpi-b8957d8d6437880355312cb008addceac66e9eb2.tar.bz2 |
added debug information in case of errors
-rw-r--r-- | microkde/kdecore/klibloader.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp index 130cc7c..c07d50f 100644 --- a/microkde/kdecore/klibloader.cpp +++ b/microkde/kdecore/klibloader.cpp | |||
@@ -17,33 +17,37 @@ | |||
17 | Boston, MA 02111-1307, USA. | 17 | Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | //US #include <config.h> | 19 | //US #include <config.h> |
20 | #include <qclipboard.h> | 20 | #include <qclipboard.h> |
21 | #include <qfile.h> | 21 | #include <qfile.h> |
22 | #include <qtimer.h> | 22 | #include <qtimer.h> |
23 | #include <qobjectdict.h> | 23 | #include <qobjectdict.h> |
24 | #include <qwidgetlist.h> | 24 | #include <qwidgetlist.h> |
25 | #include <qwidget.h> | 25 | #include <qwidget.h> |
26 | 26 | ||
27 | #include "kapplication.h" | 27 | #include "kapplication.h" |
28 | #include "klibloader.h" | 28 | #include "klibloader.h" |
29 | #include "kstandarddirs.h" | 29 | #include "kstandarddirs.h" |
30 | #include "kdebug.h" | 30 | #include "kdebug.h" |
31 | #include "klocale.h" | 31 | #include "klocale.h" |
32 | 32 | ||
33 | //US #include "ltdl.h" | 33 | /*US |
34 | #ifndef NDEBUG | ||
35 | #include "ltdl.h" | ||
36 | #endif | ||
37 | */ | ||
34 | 38 | ||
35 | //US do everything through qlibrary | 39 | //US do everything through qlibrary |
36 | #ifndef DESKTOP_VERSION | 40 | #ifndef DESKTOP_VERSION |
37 | #include <qpe/qpeapplication.h> | 41 | #include <qpe/qpeapplication.h> |
38 | #include <qtopia/qlibrary.h> | 42 | #include <qtopia/qlibrary.h> |
39 | #endif | 43 | #endif |
40 | 44 | ||
41 | /*US | 45 | /*US |
42 | #ifdef Q_WS_X11 | 46 | #ifdef Q_WS_X11 |
43 | #include <X11/Xlib.h> | 47 | #include <X11/Xlib.h> |
44 | #include <X11/Xatom.h> | 48 | #include <X11/Xatom.h> |
45 | #endif | 49 | #endif |
46 | */ | 50 | */ |
47 | template class QAsciiDict<KLibrary>; | 51 | template class QAsciiDict<KLibrary>; |
48 | 52 | ||
49 | #include <stdlib.h> //getenv | 53 | #include <stdlib.h> //getenv |
@@ -140,37 +144,40 @@ QString KLibrary::name() const | |||
140 | { | 144 | { |
141 | return m_libname; | 145 | return m_libname; |
142 | } | 146 | } |
143 | 147 | ||
144 | QString KLibrary::fileName() const | 148 | QString KLibrary::fileName() const |
145 | { | 149 | { |
146 | return m_filename; | 150 | return m_filename; |
147 | } | 151 | } |
148 | 152 | ||
149 | KLibFactory* KLibrary::factory() | 153 | KLibFactory* KLibrary::factory() |
150 | { | 154 | { |
151 | if ( m_factory ) | 155 | if ( m_factory ) |
152 | return m_factory; | 156 | return m_factory; |
153 | 157 | ||
154 | QCString symname; | 158 | QCString symname; |
155 | symname.sprintf("init_%s", name().latin1() ); | 159 | symname.sprintf("init_%s", name().latin1() ); |
156 | 160 | ||
157 | void* sym = symbol( symname ); | 161 | void* sym = symbol( symname ); |
158 | if ( !sym ) | 162 | if ( !sym ) |
159 | { | 163 | { |
160 | qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data()); | 164 | qDebug("KLibrary: The library %s does not offer an %s function", name().latin1(), symname.data()); |
165 | #ifndef NDEBUG | ||
166 | //US qDebug("KLibrary: errorcode: %s", lt_dlerror()); | ||
167 | #endif | ||
161 | kdWarning(150) << "KLibrary: The library " << name().latin1() << " does not offer an init_" << name().latin1() << " function" << endl; | 168 | kdWarning(150) << "KLibrary: The library " << name().latin1() << " does not offer an init_" << name().latin1() << " function" << endl; |
162 | return 0; | 169 | return 0; |
163 | } | 170 | } |
164 | 171 | ||
165 | typedef KLibFactory* (*t_func)(); | 172 | typedef KLibFactory* (*t_func)(); |
166 | t_func func = (t_func)sym; | 173 | t_func func = (t_func)sym; |
167 | m_factory = func(); | 174 | m_factory = func(); |
168 | 175 | ||
169 | if( !m_factory ) | 176 | if( !m_factory ) |
170 | { | 177 | { |
171 | kdWarning(150) << "KLibrary: The library " << name() << " does not offer a KDE compatible factory" << endl; | 178 | kdWarning(150) << "KLibrary: The library " << name() << " does not offer a KDE compatible factory" << endl; |
172 | return 0; | 179 | return 0; |
173 | } | 180 | } |
174 | 181 | ||
175 | connect( m_factory, SIGNAL( objectCreated( QObject * ) ), | 182 | connect( m_factory, SIGNAL( objectCreated( QObject * ) ), |
176 | this, SLOT( slotObjectCreated( QObject * ) ) ); | 183 | this, SLOT( slotObjectCreated( QObject * ) ) ); |
@@ -394,36 +401,36 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta | |||
394 | 401 | ||
395 | //US libfile = instance->dirs()->findResource( "module", libname ); | 402 | //US libfile = instance->dirs()->findResource( "module", libname ); |
396 | libfile = KGlobal::dirs()->findResource( "module", libname ); | 403 | libfile = KGlobal::dirs()->findResource( "module", libname ); |
397 | if ( libfile.isEmpty() ) | 404 | if ( libfile.isEmpty() ) |
398 | { | 405 | { |
399 | //US libfile = instance->dirs()->findResource( "lib", libname ); | 406 | //US libfile = instance->dirs()->findResource( "lib", libname ); |
400 | libfile = KGlobal::dirs()->findResource( "lib", libname ); | 407 | libfile = KGlobal::dirs()->findResource( "lib", libname ); |
401 | #ifndef NDEBUG | 408 | #ifndef NDEBUG |
402 | if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules | 409 | if ( !libfile.isEmpty() && libname.left(3) == "lib" ) // don't warn for kdeinit modules |
403 | kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl; | 410 | kdDebug(150) << "library " << libname << " not found under 'module' but under 'lib'" << endl; |
404 | #endif | 411 | #endif |
405 | } | 412 | } |
406 | if ( libfile.isEmpty() ) | 413 | if ( libfile.isEmpty() ) |
407 | { | 414 | { |
408 | #ifndef NDEBUG | 415 | #ifndef NDEBUG |
409 | kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl; | 416 | kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl; |
410 | #endif | 417 | 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 | 418 | ||
413 | qDebug("KLibLoader::library could not find library: %s", libname.data()); | 419 | qDebug("KLibLoader::library could not find library: %s", libname.data()); |
420 | #endif | ||
414 | 421 | ||
415 | } | 422 | } |
416 | else | 423 | else |
417 | self()->d->errorMessage = QString::null; | 424 | self()->d->errorMessage = QString::null; |
418 | } | 425 | } |
419 | return libfile; | 426 | return libfile; |
420 | } | 427 | } |
421 | 428 | ||
422 | 429 | ||
423 | KLibrary* KLibLoader::globalLibrary( const char *name ) | 430 | KLibrary* KLibLoader::globalLibrary( const char *name ) |
424 | { | 431 | { |
425 | KLibrary *tmp; | 432 | KLibrary *tmp; |
426 | /*US | 433 | /*US |
427 | int olt_dlopen_flag = lt_dlopen_flag; | 434 | int olt_dlopen_flag = lt_dlopen_flag; |
428 | 435 | ||
429 | lt_dlopen_flag |= LT_GLOBAL; | 436 | lt_dlopen_flag |= LT_GLOBAL; |