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
@@ -1,124 +1,127 @@
 /*
  * SQL Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * 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
  * whole stuff.
  * Thus, PIM-Database backend is finished, but highly experimental. And some
  * parts are still generic. For instance, the "queryByExample()" methods are
  * not (or not fully) implemented. Todo: custom-entries not stored.
  * The big show stopper: matchRegExp() (needed by OpieSearch) needs regular
  * expression search in the database, which is not supported by sqlite !
  * Therefore we need either an extended sqlite or a workaround which would
  * be very slow and memory consuming..
  *
  * Revision 1.3  2003/12/08 15:18:10  eilers
  * Committing unfinished sql implementation before merging to libopie2 starts..
  *
  * Revision 1.2  2003/09/29 07:44:26  eilers
  * Improvement of PIM-SQL Databases, but search queries are still limited.
  * Addressbook: Changed table layout. Now, we just need 1/3 of disk-space.
  * Todo: Started to add new attributes. Some type conversions missing.
  *
  * Revision 1.1  2003/09/22 14:31:16  eilers
  * Added first experimental incarnation of sql-backend for addressbook.
  * Some modifications to be able to compile the todo sql-backend.
  * A lot of changes fill follow...
  *
  */
 
 #include "ocontactaccessbackend_sql.h"
 
 #include <qarray.h>
 #include <qdatetime.h>
 #include <qstringlist.h>
 
 #include <qpe/global.h>
 #include <qpe/recordfields.h>
 
 #include <opie/ocontactfields.h>
 #include <opie/oconversion.h>
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #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
 // vertical like "uid, type, value".
 // DON'T DEACTIVATE THIS DEFINE IN PRODUCTIVE ENVIRONMENTS !!
 #define __STORE_HORIZONTAL_
 
 // Distinct loading is not very fast. If I expect that every person has just
 // one (and always one) 'Last Name', I can request all uid's for existing lastnames, 
 // which is faster..
 // But this may not be true for all entries, like company contacts..
 // The current AddressBook application handles this problem, but other may not.. (eilers)
 #define __USE_SUPERFAST_LOADQUERY
 
 
 /*
  * Implementation of used query types
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
         /**
          * CreateQuery for the Todolist Table
          */
         class CreateQuery : public OSQLQuery {
         public:
                 CreateQuery();
                 ~CreateQuery();
                 QString query()const;
         };
         
         /**
          * Clears (delete) a Table
          */
         class ClearQuery : public OSQLQuery {
         public:
                 ClearQuery();
                 ~ClearQuery();
                 QString query()const;
                 
         };
         
 
         /**
          * LoadQuery
          * this one queries for all uids
          */
         class LoadQuery : public OSQLQuery {
         public:
                 LoadQuery();
                 ~LoadQuery();
                 QString query()const;
         };
         
         /**
          * inserts/adds a OContact to the table
          */
         class InsertQuery : public OSQLQuery {
         public:
                 InsertQuery(const OContact& );
                 ~InsertQuery();
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
@@ -1,101 +1,107 @@
 /*
  * SQL Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * 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..
  *
  * Revision 1.1  2003/09/22 14:31:16  eilers
  * Added first experimental incarnation of sql-backend for addressbook.
  * Some modifications to be able to compile the todo sql-backend.
  * A lot of changes fill follow...
  *
  *
  */
 
 #ifndef _OContactAccessBackend_SQL_
 #define _OContactAccessBackend_SQL_
 
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 
 #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
  * it does implement everything available for OContact.
  * @see OPimAccessBackend for more information of available methods
  */
 class OContactAccessBackend_SQL : public OContactAccessBackend {
  public:
         OContactAccessBackend_SQL ( const QString& appname, const QString& filename = QString::null );
 
         ~OContactAccessBackend_SQL ();
 
         bool save();
 
         bool load ();
 
         void clear ();
 
         bool wasChangedExternally();
 
         QArray<int> allRecords() const;
 
         OContact find ( int uid ) const;
         // FIXME: Add lookahead-cache support !
         //OContact find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
 
         QArray<int> queryByExample ( const OContact &query, int settings, 
                                      const QDateTime& d );
 
         QArray<int> matchRegexp(  const QRegExp &r ) const;
 
         const uint querySettings();
 
         bool hasQuerySettings (uint querySettings) const;
 
         // Currently only asc implemented..
         QArray<int> sorted( bool asc,  int , int ,  int );
         bool add ( const OContact &newcontact );
 
         bool replace ( const OContact &contact );
 
         bool remove ( int uid );
         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();
 
  protected:
         bool m_changed;
         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
@@ -1,116 +1,120 @@
 /*
  * SQL Backend for the OPIE-Calender Database.
  *
  * Copyright (c) 2003 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * 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..
  *
  * Revision 1.2  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
  * whole stuff.
  * Thus, PIM-Database backend is finished, but highly experimental. And some
  * parts are still generic. For instance, the "queryByExample()" methods are
  * not (or not fully) implemented. Todo: custom-entries not stored.
  * The big show stopper: matchRegExp() (needed by OpieSearch) needs regular
  * expression search in the database, which is not supported by sqlite !
  * Therefore we need either an extended sqlite or a workaround which would
  * be very slow and memory consuming..
  *
  * Revision 1.1  2003/12/08 15:18:12  eilers
  * Committing unfinished sql implementation before merging to libopie2 starts..
  *
  *
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <qarray.h>
 #include <qstringlist.h>
 
 #include <qpe/global.h>
 
 #include <opie2/osqldriver.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include "orecur.h"
 #include "odatebookaccessbackend_sql.h"
 
+using namespace Opie::DB;
 
 
 ODateBookAccessBackend_SQL::ODateBookAccessBackend_SQL( const QString& ,
                                                         const QString& fileName )
         : ODateBookAccessBackend(), m_driver( NULL ) 
 {
         m_fileName = fileName.isEmpty() ? Global::applicationFileName( "datebook", "datebook.db" ) : fileName;
 
     // Get the standart sql-driver from the OSQLManager..
     OSQLManager man;
     m_driver = man.standard();
     m_driver->setUrl( m_fileName );
 
     initFields();
 
     load();
 }
 
 ODateBookAccessBackend_SQL::~ODateBookAccessBackend_SQL() {
         if( m_driver )
                 delete m_driver;
 }
 
 void ODateBookAccessBackend_SQL::initFields()
 {
 
         // This map contains the translation of the fieldtype id's to 
         // the names of the table columns
         m_fieldMap.insert( OEvent::FUid, "uid" );
         m_fieldMap.insert( OEvent::FCategories, "Categories" );
         m_fieldMap.insert( OEvent::FDescription, "Description" );
         m_fieldMap.insert( OEvent::FLocation, "Location" );
         m_fieldMap.insert( OEvent::FType, "Type" );
         m_fieldMap.insert( OEvent::FAlarm, "Alarm" );
         m_fieldMap.insert( OEvent::FSound, "Sound" );
         m_fieldMap.insert( OEvent::FRType, "RType" );
         m_fieldMap.insert( OEvent::FRWeekdays, "RWeekdays" );
         m_fieldMap.insert( OEvent::FRPosition, "RPosition" );
         m_fieldMap.insert( OEvent::FRFreq, "RFreq" );
         m_fieldMap.insert( OEvent::FRHasEndDate, "RHasEndDate" );
         m_fieldMap.insert( OEvent::FREndDate, "REndDate" );
         m_fieldMap.insert( OEvent::FRCreated, "RCreated" );
         m_fieldMap.insert( OEvent::FRExceptions, "RExceptions" );
         m_fieldMap.insert( OEvent::FStart, "Start" );
         m_fieldMap.insert( OEvent::FEnd, "End" );
         m_fieldMap.insert( OEvent::FNote, "Note" );
         m_fieldMap.insert( OEvent::FTimeZone, "TimeZone" );
         m_fieldMap.insert( OEvent::FRecParent, "RecParent" );
         m_fieldMap.insert( OEvent::FRecChildren, "Recchildren" );
 
         // Create a map that maps the column name to the id
         QMapConstIterator<int, QString> it;
         for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
                 m_reverseFieldMap.insert( it.data(), it.key() );
         }
         
 }
 
 bool ODateBookAccessBackend_SQL::load() 
 {
         if (!m_driver->open() )
                 return false;
 
         // Don't expect that the database exists.
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
@@ -1,62 +1,65 @@
 #ifndef OPIE_DATE_BOOK_ACCESS_BACKEND_SQL__H
 #define OPIE_DATE_BOOK_ACCESS_BACKEND_SQL__H
 
 #include <qmap.h>
 #include <opie2/osqlresult.h>
 
 #include "odatebookaccessbackend.h"
 
+namespace Opie { namespace DB {
 class OSQLDriver;
 
+}}
+
 /**
  * This is the default SQL implementation for DateBoook SQL storage
  * It fully implements the interface
  * @see ODateBookAccessBackend
  * @see OPimAccessBackend
  */
 class ODateBookAccessBackend_SQL : public ODateBookAccessBackend {
 public:
     ODateBookAccessBackend_SQL( const QString& appName,
                                 const QString& fileName = QString::null);
     ~ODateBookAccessBackend_SQL();
 
     bool load();
     bool reload();
     bool save();
 
     QArray<int> allRecords()const;
     QArray<int> matchRegexp(const QRegExp &r) const;
     QArray<int> queryByExample( const OEvent&, int, const QDateTime& d = QDateTime() );
     OEvent find( int uid )const;
     void clear();
     bool add( const OEvent& ev );
     bool remove( int uid );
     bool replace( const OEvent& ev );
 
     QArray<UID> rawEvents()const;
     QArray<UID> rawRepeats()const;
     QArray<UID> nonRepeats()const;
 
     OEvent::ValueList directNonRepeats();
     OEvent::ValueList directRawRepeats();
 
 private:
     bool loadFile();
     QString m_fileName;
     QArray<int> m_uids;
 
     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;
 
 };
 
 #endif
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
@@ -1,79 +1,80 @@
 
 #include <qdatetime.h>
 
 #include <qpe/global.h>
 
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include "otodoaccesssql.h"
 #include "opimstate.h"
 #include "opimnotifymanager.h"
 #include "orecur.h"
 
+using namespace Opie::DB;
 /*
  * first some query
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
     /**
      * CreateQuery for the Todolist Table
      */
     class CreateQuery : public OSQLQuery {
     public:
         CreateQuery();
         ~CreateQuery();
         QString query()const;
     };
 
     /**
      * LoadQuery
      * this one queries for all uids
      */
     class LoadQuery : public OSQLQuery {
     public:
         LoadQuery();
         ~LoadQuery();
         QString query()const;
     };
 
     /**
      * inserts/adds a OTodo to the table
      */
     class InsertQuery : public OSQLQuery {
     public:
         InsertQuery(const OTodo& );
         ~InsertQuery();
         QString query()const;
     private:
         OTodo m_todo;
     };
 
     /**
      * removes one from the table
      */
     class RemoveQuery : public OSQLQuery {
     public:
         RemoveQuery(int uid );
         ~RemoveQuery();
         QString query()const;
     private:
         int m_uid;
     };
 
     /**
      * Clears (delete) a Table
      */
     class ClearQuery : public OSQLQuery {
     public:
         ClearQuery();
         ~ClearQuery();
         QString query()const;
 
     };
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
@@ -1,56 +1,61 @@
 #ifndef OPIE_PIM_ACCESS_SQL_H
 #define OPIE_PIM_ACCESS_SQL_H
 
 #include <qasciidict.h>
 
 #include "otodoaccessbackend.h"
 
+namespace Opie{
+namespace DB {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
+}
+}
+
 class OTodoAccessBackendSQL : public OTodoAccessBackend {
 public:
     OTodoAccessBackendSQL( const QString& file );
     ~OTodoAccessBackendSQL();
 
     bool load();
     bool reload();
     bool save();
     QArray<int> allRecords()const;
 
     QArray<int> queryByExample( const OTodo& t, int settings, const QDateTime& d = QDateTime() );
     OTodo find(int uid)const;
     OTodo find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
     void clear();
     bool add( const OTodo& t );
     bool remove( int uid );
     bool replace( const OTodo& t );
 
     QArray<int> overDue();
     QArray<int> effectiveToDos( const QDate& start,
                                 const QDate& end, bool includeNoDates );
     QArray<int> sorted(bool asc, int sortOrder, int sortFilter, int cat );
 
     QBitArray supports()const;
     QArray<int> matchRegexp(  const QRegExp &r ) const;
     void removeAllCompleted();
     
 
 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;
 };
 
 
 #endif