Added some odebug includes and namespaces refs

opiepim links with opiedb2 -> needs depend in config.in
qlibrary_unix -> print dlopen errors ALWAYS not only indebug

BTmanager.pro needs opieui2

1 files changed, 2 insertions, 2 deletions

diff --git a/library/qlibrary_unix.cpp b/library/qlibrary_unix.cpp
index ff69286..2181153 100644
--- a/library/qlibrary_unix.cpp
+++ b/library/qlibrary_unix.cpp
@@ -106,138 +106,138 @@ typedef struct {
 	NSObjectFileImage img;
 	NSModule mod;
 } DyldLibDesc;
 
 bool QLibraryPrivate::loadLibrary()
 {
 	// qDebug("QLibraryPrivate::loadLibrary\n");
 	// return FALSE;
     if ( pHnd )
 	return TRUE;
 
     QString filename = library->library();
 
     NSObjectFileImage img = 0;
     NSModule mod = 0;
     NSObjectFileImageReturnCode ret = NSCreateObjectFileImageFromFile( filename.latin1() , &img );
     if ( ret != NSObjectFileImageSuccess ) {
 		qWarning( "Error in NSCreateObjectFileImageFromFile(): %d; Filename: %s", ret, filename.latin1() );
 		if (ret == NSObjectFileImageAccess) {
 			qWarning ("(NSObjectFileImageAccess)" );
 		}
 	} else {
 		mod = NSLinkModule(img, filename.latin1(), NSLINKMODULE_OPTION_BINDNOW |
 				                                    NSLINKMODULE_OPTION_PRIVATE |
 													NSLINKMODULE_OPTION_RETURN_ON_ERROR);
 		if (mod == 0) {
 			qWarning( "Error in NSLinkModule()" );
 			NSDestroyObjectFileImage(img);
 		}
 	}
 	DyldLibDesc* desc = 0;
 	if (img != 0 && mod != 0) {
 		desc = new DyldLibDesc;
 		desc->img = img;
 		desc->mod = mod;
 	}
 	pHnd = desc;
     return pHnd != 0;
 }
 
 bool QLibraryPrivate::freeLibrary()
 {
 	//qDebug("QLibraryPrivate::freeLibrary\n");
 	//return FALSE;
     if ( !pHnd )
 	return TRUE;
 
 	DyldLibDesc* desc = (DyldLibDesc*) pHnd;
 	NSModule mod = desc->mod;
 	NSObjectFileImage img = desc->img;
 	DYLD_BOOL success = NSUnLinkModule(mod, NSUNLINKMODULE_OPTION_NONE);
 	if ( success ) {
 	NSDestroyObjectFileImage(img);
 	delete desc;
 	pHnd = 0;
 	}
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     else {
 	    qWarning( "Error in NSUnLinkModule()" );
     }
 #endif
     return pHnd == 0;
 }
 
 void* QLibraryPrivate::resolveSymbol( const char* symbol )
 {
 	//qDebug("QLibraryPrivate::resolveSymbol\n");
 	//return FALSE;
     if ( !pHnd )
 	return 0;
 
 	DyldLibDesc* desc = (DyldLibDesc*) pHnd;
 	NSSymbol sym = NSLookupSymbolInModule(desc->mod, symbol);
 	void* address = 0;
 	if (sym != 0) {
 		address = NSAddressOfSymbol(sym);
 	}
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     if ( address == 0 )
 	qWarning( "Cannot find symbol: %s", symbol );
 #endif
     return address;
 }
 
 #else
 // Something else, assuming POSIX
 #include <dlfcn.h>
 
 bool QLibraryPrivate::loadLibrary()
 {
     if ( pHnd )
 	return TRUE;
 
     QString filename = library->library();
 
     pHnd = dlopen( filename.latin1() , RTLD_LAZY );
-#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
+// #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     if ( !pHnd )
 	qWarning( "%s", dlerror() );
-#endif
+// #endif
     return pHnd != 0;
 }
 
 bool QLibraryPrivate::freeLibrary()
 {
     if ( !pHnd )
 	return TRUE;
 
     int ec = dlclose( pHnd );
     if ( !ec )
 	pHnd = 0;
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     else {
 	const char* error = dlerror();
 	if ( error )
 	    qWarning( "%s", error );
     }
 #endif
     return pHnd == 0;
 }
 
 void* QLibraryPrivate::resolveSymbol( const char* f )
 {
     if ( !pHnd )
 	return 0;
 
     void* address = dlsym( pHnd, f );
 #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
     const char* error = dlerror();
     if ( error )
 	qWarning( "%s", error );
 #endif
     return address;
 }
 
 #endif // POSIX
 
 #endif // QT_NO_COMPONENT