6 files changed, 31 insertions, 9 deletions

diff --git a/libopie/pim/ocontactaccessbackend_sql.cpp b/libopie/pim/ocontactaccessbackend_sql.cpp
index a5be4c8..d20df56 100644
--- a/libopie/pim/ocontactaccessbackend_sql.cpp
+++ b/libopie/pim/ocontactaccessbackend_sql.cpp
@@ -14,6 +14,9 @@
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.5  2004/03/14 13:50:35  alwin
+ * namespace correction
+ *
  * Revision 1.4  2003/12/22 10:19:26  eilers
  * Finishing implementation of sql-backend for datebook. But I have to
  * port the PIM datebook application to use it, before I could debug the
@@ -57,7 +60,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/libopie/pim/ocontactaccessbackend_sql.h b/libopie/pim/ocontactaccessbackend_sql.h
index b8f1d8d..f553760 100644
--- a/libopie/pim/ocontactaccessbackend_sql.h
+++ b/libopie/pim/ocontactaccessbackend_sql.h
@@ -16,6 +16,9 @@
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.3  2004/03/14 13:50:35  alwin
+ * namespace correction
+ *
  * Revision 1.2  2003/12/08 15:18:11  eilers
  * Committing unfinished sql implementation before merging to libopie2 starts..
  *
@@ -36,10 +39,13 @@
 #include <qlist.h>
 #include <qdict.h>
 
+namespace Opie { namespace DB {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
 
+}}
+
 /* the default xml implementation */
 /**
  * This class is the SQL implementation of a Contact backend
@@ -85,7 +91,7 @@ class OContactAccessBackend_SQL : public OContactAccessBackend {
 	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();
@@ -95,7 +101,7 @@ class OContactAccessBackend_SQL : public OContactAccessBackend {
 	QString m_fileName;
 	QArray<int> m_uids;
 
-	OSQLDriver* m_driver;
+	Opie::DB::OSQLDriver* m_driver;
 };
 
 #endif
diff --git a/libopie/pim/odatebookaccessbackend_sql.cpp b/libopie/pim/odatebookaccessbackend_sql.cpp
index 756f405..44dd2bc 100644
--- a/libopie/pim/odatebookaccessbackend_sql.cpp
+++ b/libopie/pim/odatebookaccessbackend_sql.cpp
@@ -14,6 +14,9 @@
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.4  2004/03/14 13:50:35  alwin
+ * namespace correction
+ *
  * Revision 1.3  2003/12/22 11:41:39  eilers
  * Fixing stupid bug, found by sourcode review..
  *
@@ -50,6 +53,7 @@
 #include "orecur.h"
 #include "odatebookaccessbackend_sql.h"
 
+using namespace Opie::DB;
 
 
 ODateBookAccessBackend_SQL::ODateBookAccessBackend_SQL( const QString& ,
diff --git a/libopie/pim/odatebookaccessbackend_sql.h b/libopie/pim/odatebookaccessbackend_sql.h
index f39e154..ba514bc 100644
--- a/libopie/pim/odatebookaccessbackend_sql.h
+++ b/libopie/pim/odatebookaccessbackend_sql.h
@@ -6,8 +6,11 @@
 
 #include "odatebookaccessbackend.h"
 
+namespace Opie { namespace DB {
 class OSQLDriver;
 
+}}
+
 /**
  * This is the default SQL implementation for DateBoook SQL storage
  * It fully implements the interface
@@ -48,14 +51,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/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp
index 3764c7e..fd01a42 100644
--- a/libopie/pim/otodoaccesssql.cpp
+++ b/libopie/pim/otodoaccesssql.cpp
@@ -13,6 +13,7 @@
 #include "opimnotifymanager.h"
 #include "orecur.h"
 
+using namespace Opie::DB;
 /*
  * first some query
  * CREATE query
diff --git a/libopie/pim/otodoaccesssql.h b/libopie/pim/otodoaccesssql.h
index 1c55567..72214de 100644
--- a/libopie/pim/otodoaccesssql.h
+++ b/libopie/pim/otodoaccesssql.h
@@ -5,9 +5,14 @@
 
 #include "otodoaccessbackend.h"
 
+namespace Opie{
+namespace DB {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
+
 class OTodoAccessBackendSQL : public OTodoAccessBackend {
 public:
     OTodoAccessBackendSQL( const QString& file );
@@ -40,14 +45,14 @@ private:
     void update()const;
     void fillDict();
     inline bool date( QDate& date, const QString& )const;
-    inline OTodo todo( const OSQLResult& )const;
-    inline OTodo todo( OSQLResultItem& )const;
-    inline QArray<int> uids( const OSQLResult& )const;
+    inline OTodo todo( const Opie::DB::OSQLResult& )const;
+    inline OTodo todo( Opie::DB::OSQLResultItem& )const;
+    inline QArray<int> uids( const Opie::DB::OSQLResult& )const;
     OTodo 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;
 };