Move XML class to internal PIM

Add namespaces!!!

Opie::Core and Opie::Core::Private
Opie::Net  and Opie::Net::Private
Opie::Ui   and Opie::Ui::Private
Opie::MM   and Opie::MM::Private
Opie::DB   and Opie::DB::Private

PIM classes are not yet converted because we will do other work
on it as well

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
@@ -10,7 +10,8 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \
         core/backends/otodoaccessvcal.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 \
         core/backends/ocontactaccessbackend.h \
@@ -28,4 +29,5 @@ HEADERS += core/backends/obackendfactory.h \
         core/backends/otodoaccesssql.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
@@ -46,7 +46,7 @@
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
-
+using namespace Opie::DB;
 
 
 // If defined, we use a horizontal table ( uid, attr1, attr2, attr3, ..., attrn ) instead
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
@@ -40,9 +40,13 @@
 #include <qdict.h>
 
 /* aren't in namespace Opie yet - alwin */
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 
 namespace Opie {
 
@@ -91,7 +95,7 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
 	bool reload();
 
  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;
 	void update();
@@ -101,7 +105,7 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend {
 	QString m_fileName;
 	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
@@ -41,7 +41,7 @@
 
 #include <qpe/global.h>
 
-#include <opie2/xmltree.h>
+#include "private/xmltree.h"
 #include <opie2/ocontactaccessbackend.h>
 #include <opie2/ocontactaccess.h>
 
@@ -49,6 +49,7 @@
 #include <errno.h>
 
 using namespace Opie;
+using namespace Opie::Pim::Private;
 
 
 namespace Opie {
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
@@ -46,6 +46,8 @@
 #include <opie2/opimrecurrence.h>
 #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
@@ -34,7 +34,11 @@
 
 #include <opie2/odatebookaccessbackend.h>
 
+namespace Opie {
+namespace DB {
 class OSQLDriver;
+}
+}
 
 namespace Opie {
 /**
@@ -77,14 +81,14 @@ private:
     QMap<int, QString> m_fieldMap;
     QMap<QString, int> m_reverseFieldMap;
 
-    OSQLDriver* m_driver;
+    Opie::DB::OSQLDriver* m_driver;
 
     class Private;
     Private *d;
 
     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
@@ -41,6 +41,8 @@
 #include <opie2/opimnotifymanager.h>
 #include <opie2/opimrecurrence.h>
 
+using namespace Opie::DB;
+
 using namespace Opie;
 /*
  * first some query
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
@@ -33,9 +33,13 @@
 
 #include <opie2/otodoaccessbackend.h>
 
+namespace Opie {
+namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
 
 namespace Opie {
 
@@ -71,14 +75,14 @@ private:
     void update()const;
     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;
 };