8 files changed, 31 insertions, 12 deletions

diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro
index 4231a00..d4867ba 100644
--- a/libopie2/opiepim/backend/backends.pro
+++ b/libopie2/opiepim/backend/backends.pro
@@ -11,5 +11,6 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
         core/backends/otodoaccessxml.cpp \
         core/backends/odatebookaccess.cpp \
-        core/backends/odatebookaccessbackend_sql.cpp
+        core/backends/odatebookaccessbackend_sql.cpp \
+        core/backends/private/xmltree.cc
         
 HEADERS += core/backends/obackendfactory.h \
@@ -29,3 +30,4 @@ HEADERS += core/backends/obackendfactory.h \
         core/backends/otodoaccessvcal.h \
         core/backends/otodoaccessxml.h \
-        core/backends/odatebookaccess.h
+        core/backends/odatebookaccess.h \
+        core/backends/private/xmltree.h
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index f121cc2..d16d692 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -47,5 +47,5 @@
 #include <opie2/osqlquery.h>
 
-
+using namespace Opie::DB;
 
 
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
index 58ae2ae..ba122ec 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h
@@ -41,7 +41,11 @@
 
 /* aren't in namespace Opie yet - alwin */
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 
 namespace Opie {
@@ -92,5 +96,5 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
 
  private:
-        QArray<int> extractUids( OSQLResult& res ) const;
+        QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
         QMap<int, QString>  requestNonCustom( int uid ) const;
         QMap<QString, QString>  requestCustom( int uid ) const;
@@ -102,5 +106,5 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
         QArray<int> m_uids;
 
-        OSQLDriver* m_driver;
+        Opie::DB::OSQLDriver* m_driver;
 };
 
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 5d92b8f..f5e76d5 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -42,5 +42,5 @@
 #include <qpe/global.h>
 
-#include <opie2/xmltree.h>
+#include "private/xmltree.h"
 #include <opie2/ocontactaccessbackend.h>
 #include <opie2/ocontactaccess.h>
@@ -50,4 +50,5 @@
 
 using namespace Opie;
+using namespace Opie::Pim::Private;
 
 
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
index 2ee76cc..a779dc1 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
@@ -47,4 +47,6 @@
 #include <opie2/odatebookaccessbackend_sql.h>
 
+using namespace Opie::DB;
+
 namespace Opie {
 
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
index cbfeb97..60d7f21 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
@@ -35,5 +35,9 @@
 #include <opie2/odatebookaccessbackend.h>
 
+namespace Opie {
+namespace DB {
 class OSQLDriver;
+}
+}
 
 namespace Opie {
@@ -78,5 +82,5 @@ private:
     QMap<QString, int> m_reverseFieldMap;
 
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
 
     class Private;
@@ -85,5 +89,5 @@ private:
     void initFields();
     void update();
-    QArray<int> extractUids( OSQLResult& res ) const;
+    QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
 
 };
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 72232e5..d218090 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -42,4 +42,6 @@
 #include <opie2/opimrecurrence.h>
 
+using namespace Opie::DB;
+
 using namespace Opie;
 /*
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index e945863..0ae2591 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -34,7 +34,11 @@
 #include <opie2/otodoaccessbackend.h>
 
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 
 namespace Opie {
@@ -72,12 +76,12 @@ private:
     void fillDict();
     inline bool date( QDate& date, const QString& )const;
-    inline OPimTodo todo( const OSQLResult& )const;
-    inline OPimTodo todo( OSQLResultItem& )const;
-    inline QArray<int> uids( const OSQLResult& )const;
+    inline OPimTodo todo( const Opie::DB::OSQLResult& )const;
+    inline OPimTodo todo( Opie::DB::OSQLResultItem& )const;
+    inline QArray<int> uids( const Opie::DB::OSQLResult& )const;
     OPimTodo todo( int uid )const;
     QBitArray sup() const;
 
     QAsciiDict<int> m_dict;
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
     QArray<int> m_uids;
     bool m_dirty : 1;