summaryrefslogtreecommitdiff
authoralwin <alwin>2004-03-14 13:50:35 (UTC)
committer alwin <alwin>2004-03-14 13:50:35 (UTC)
commit346288b5a95b72a84fabe9acb2e32aa8a8388c8c (patch) (side-by-side diff)
treedd8a5e79020d05452d8568d626e77fed7d0f4e74
parent0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44 (diff)
downloadopie-346288b5a95b72a84fabe9acb2e32aa8a8388c8c.zip
opie-346288b5a95b72a84fabe9acb2e32aa8a8388c8c.tar.gz
opie-346288b5a95b72a84fabe9acb2e32aa8a8388c8c.tar.bz2
namespace correction
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/pim/ocontactaccessbackend_sql.cpp5
-rw-r--r--libopie/pim/ocontactaccessbackend_sql.h10
-rw-r--r--libopie/pim/odatebookaccessbackend_sql.cpp4
-rw-r--r--libopie/pim/odatebookaccessbackend_sql.h7
-rw-r--r--libopie/pim/otodoaccesssql.cpp1
-rw-r--r--libopie/pim/otodoaccesssql.h13
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
@@ -16,2 +16,5 @@
* $Log$
+ * Revision 1.5 2004/03/14 13:50:35 alwin
+ * namespace correction
+ *
* Revision 1.4 2003/12/22 10:19:26 eilers
@@ -59,3 +62,3 @@
-
+using namespace Opie::DB;
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
@@ -18,2 +18,5 @@
* $Log$
+ * Revision 1.3 2004/03/14 13:50:35 alwin
+ * namespace correction
+ *
* Revision 1.2 2003/12/08 15:18:11 eilers
@@ -38,2 +41,3 @@
+namespace Opie { namespace DB {
class OSQLDriver;
@@ -42,2 +46,4 @@ class OSQLResultItem;
+}}
+
/* the default xml implementation */
@@ -87,3 +93,3 @@ class OContactAccessBackend_SQL : public OContactAccessBackend {
private:
- QArray<int> extractUids( OSQLResult& res ) const;
+ QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
QMap<int, QString> requestNonCustom( int uid ) const;
@@ -97,3 +103,3 @@ class OContactAccessBackend_SQL : public OContactAccessBackend {
- OSQLDriver* m_driver;
+ Opie::DB::OSQLDriver* m_driver;
};
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
@@ -16,2 +16,5 @@
* $Log$
+ * Revision 1.4 2004/03/14 13:50:35 alwin
+ * namespace correction
+ *
* Revision 1.3 2003/12/22 11:41:39 eilers
@@ -52,2 +55,3 @@
+using namespace Opie::DB;
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
@@ -8,4 +8,7 @@
+namespace Opie { namespace DB {
class OSQLDriver;
+}}
+
/**
@@ -50,3 +53,3 @@ private:
- OSQLDriver* m_driver;
+ Opie::DB::OSQLDriver* m_driver;
@@ -57,3 +60,3 @@ private:
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
@@ -15,2 +15,3 @@
+using namespace Opie::DB;
/*
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
@@ -7,2 +7,4 @@
+namespace Opie{
+namespace DB {
class OSQLDriver;
@@ -10,2 +12,5 @@ class OSQLResult;
class OSQLResultItem;
+}
+}
+
class OTodoAccessBackendSQL : public OTodoAccessBackend {
@@ -42,5 +47,5 @@ private:
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;
@@ -49,3 +54,3 @@ private:
QAsciiDict<int> m_dict;
- OSQLDriver* m_driver;
+ Opie::DB::OSQLDriver* m_driver;
QArray<int> m_uids;