Diffstat (limited to 'microkde/kdecore/klibloader.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | microkde/kdecore/klibloader.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp index c07d50f..c091e05 100644 --- a/microkde/kdecore/klibloader.cpp +++ b/microkde/kdecore/klibloader.cpp @@ -42,10 +42,7 @@ #include <qtopia/qlibrary.h> +#else +#include <qlibrary.h> #endif -/*US -#ifdef Q_WS_X11 -#include <X11/Xlib.h> -#include <X11/Xatom.h> -#endif -*/ + template class QAsciiDict<KLibrary>; @@ -194,3 +191,2 @@ void* KLibrary::symbol( const char* symname ) const //US kdWarning(150) << "KLibrary: " << lt_dlerror() << endl; - kdWarning(150) << "KLibrary: " << m_libname << ", symbol:" << symname << " not found " << endl; return 0; @@ -479,4 +475,7 @@ KLibrary* KLibLoader::library( const char *name ) return 0; - +#ifdef DESKTOP_VERSION + QLibrary *qlib = new QLibrary( libfile.latin1() ); +#else QLibrary *qlib = new QLibrary( libfile.latin1(), QLibrary::Immediately ); +#endif @@ -601,2 +600,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) +#if 0 #ifndef Q_WS_QWS @@ -630,2 +630,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) +#endif // 0 deleted_one = true; |