19 files changed, 34 insertions, 6 deletions

diff --git a/libopie2/opiepim/config.in b/libopie2/opiepim/config.in
index 33ef9b2..8ac8ad6 100644
--- a/libopie2/opiepim/config.in
+++ b/libopie2/opiepim/config.in
@@ -3,3 +3,3 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIEDB2
     comment "libopie2pim needs a libqpe and libopie2core"
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
@@ -201,6 +201,6 @@ bool QLibraryPrivate::loadLibrary()
     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;
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 1d93f5c..66e8f01 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -37,2 +37,3 @@
 #include <opie2/odevice.h>
+#include <opie2/odebug.h>
 
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp
index 37f2ae7..2d23b3a 100644
--- a/noncore/net/opietooth/lib/startdunconnection.cpp
+++ b/noncore/net/opietooth/lib/startdunconnection.cpp
@@ -1 +1,2 @@
+#include <opie2/odebug.h>
 
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp
index 50afc9f..29b95e9 100644
--- a/noncore/net/opietooth/lib/startpanconnection.cpp
+++ b/noncore/net/opietooth/lib/startpanconnection.cpp
@@ -1,2 +1,2 @@
-
+#include <opie2/odebug.h>
 #include "startpanconnection.h"
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index b1cddd2..ee01b61 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -28,2 +28,4 @@
 #include <qpe/config.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/config.in b/noncore/net/opietooth/manager/config.in
index ecebb9b..56d8b78 100644
--- a/noncore/net/opietooth/manager/config.in
+++ b/noncore/net/opietooth/manager/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && OPIETOOTH && LIBOPIETOOTH && LIBOPIE2UI
diff --git a/noncore/net/opietooth/manager/devicehandler.cpp b/noncore/net/opietooth/manager/devicehandler.cpp
index bd34351..320ad44 100644
--- a/noncore/net/opietooth/manager/devicehandler.cpp
+++ b/noncore/net/opietooth/manager/devicehandler.cpp
@@ -5,2 +5,4 @@
 #include <qpe/config.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/dunpopup.cpp b/noncore/net/opietooth/manager/dunpopup.cpp
index 5b01d2f..10505a9 100644
--- a/noncore/net/opietooth/manager/dunpopup.cpp
+++ b/noncore/net/opietooth/manager/dunpopup.cpp
@@ -3,2 +3,4 @@
 #include <qtimer.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index 71c935c..ca2e7bd 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -6,2 +6,5 @@
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 namespace OpieTooth {
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 238acb3..5c05b4d 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -24,3 +24,3 @@ INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -lqpe -lopietooth -lopiecore2
+LIBS            += -lqpe -lopietooth -lopiecore2 -lopieui2
 INTERFACES      = bluetoothbase.ui  devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp
index 3a3dbb0..951d87a 100644
--- a/noncore/net/opietooth/manager/obexdialog.cpp
+++ b/noncore/net/opietooth/manager/obexdialog.cpp
@@ -13,2 +13,4 @@
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/obexpopup.cpp b/noncore/net/opietooth/manager/obexpopup.cpp
index 9a50199..010f7de 100644
--- a/noncore/net/opietooth/manager/obexpopup.cpp
+++ b/noncore/net/opietooth/manager/obexpopup.cpp
@@ -6,2 +6,4 @@
 #include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp
index 43c2777..f02a58c 100644
--- a/noncore/net/opietooth/manager/panpopup.cpp
+++ b/noncore/net/opietooth/manager/panpopup.cpp
@@ -1,2 +1,4 @@
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 989bf45..ef007f5 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -8,2 +8,4 @@
 #include <opie2/oprocess.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
index 4469129..3fe2ea6 100644
--- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
+++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
@@ -8,2 +8,4 @@
 #include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
index 2ef95ff..1f7ba65 100644
--- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp
+++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
@@ -2,2 +2,4 @@
 #include <qtextstream.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp
index 01ad616..54f1eb7 100644
--- a/noncore/net/opietooth/manager/rfcpopup.cpp
+++ b/noncore/net/opietooth/manager/rfcpopup.cpp
@@ -7,2 +7,4 @@
 #include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 3b005c4..bccc6c2 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -33,2 +33,5 @@
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+