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 @@ -12,3 +12,4 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ core/backends/odatebookaccess.cpp \ - core/backends/odatebookaccessbackend_sql.cpp + core/backends/odatebookaccessbackend_sql.cpp \ + core/backends/private/xmltree.cc @@ -30,2 +31,3 @@ HEADERS += core/backends/obackendfactory.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 @@ -48,3 +48,3 @@ - +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 @@ -42,2 +42,4 @@ /* aren't in namespace Opie yet - alwin */ +namespace Opie { +namespace DB { class OSQLDriver; @@ -45,2 +47,4 @@ class OSQLResult; class OSQLResultItem; +} +} @@ -93,3 +97,3 @@ 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; @@ -103,3 +107,3 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend { - 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 @@ -43,3 +43,3 @@ -#include <opie2/xmltree.h> +#include "private/xmltree.h" #include <opie2/ocontactaccessbackend.h> @@ -51,2 +51,3 @@ 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 @@ -48,2 +48,4 @@ +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 @@ -36,3 +36,7 @@ +namespace Opie { +namespace DB { class OSQLDriver; +} +} @@ -79,3 +83,3 @@ private: - OSQLDriver* m_driver; + Opie::DB::OSQLDriver* m_driver; @@ -86,3 +90,3 @@ private: 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 @@ -43,2 +43,4 @@ +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 @@ -35,2 +35,4 @@ +namespace Opie { +namespace DB { class OSQLDriver; @@ -38,2 +40,4 @@ class OSQLResult; class OSQLResultItem; +} +} @@ -73,5 +77,5 @@ private: 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; @@ -80,3 +84,3 @@ private: QAsciiDict<int> m_dict; - OSQLDriver* m_driver; + Opie::DB::OSQLDriver* m_driver; QArray<int> m_uids; |