10 files changed, 89 insertions, 10 deletions

diff --git a/libopie2/opiepim/backend/obackendfactory.h b/libopie2/opiepim/backend/obackendfactory.h
index ad6cf5a..f3c339d 100644
--- a/libopie2/opiepim/backend/obackendfactory.h
+++ b/libopie2/opiepim/backend/obackendfactory.h
@@ -7,24 +7,32 @@
          *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.
  * =====================================================================
  * ToDo: Use plugins
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.7  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.6.4.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
  * Revision 1.6  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.5  2003/02/21 23:31:52  zecke
  * Add XML datebookresource
  * -clean up todoaccessxml header
  * -implement some more stuff in the oeven tester
  * -extend DefaultFactory to not crash and to use datebook
  *
  * -reading of OEvents is working nicely.. saving will be added
@@ -59,24 +67,26 @@
 #include <qstring.h>
 #include <qasciidict.h>
 #include <qpe/config.h>
 
 #include "otodoaccessxml.h"
 #include "ocontactaccessbackend_xml.h"
 #include "odatebookaccessbackend_xml.h"
 
 #ifdef __USE_SQL
 #include "otodoaccesssql.h"
 #endif
 
+class OBackendPrivate;
+
 /**
  * This class is our factory. It will give us the default implementations
  * of at least Todolist, Contacts and Datebook. In the future this class will
  * allow users to switch the backend with ( XML->SQLite ) without the need
  * to recompile.#
  * This class as the whole PIM Api is making use of templates
  *
  * <pre>
  *   OTodoAccessBackend* backend = OBackEndFactory<OTodoAccessBackend>::Default("todo", QString::null );
  *   backend->load();
  * </pre>
  *
@@ -139,16 +149,18 @@ class OBackendFactory
                         return (T*) new OContactAccessBackend_XML( appName );
                 case DATE:
                         if ( backend == "sql" )
                             qWarning("OBackendFactory:: sql Backend not implemented! Using XML instead!");
 
                         return (T*) new ODateBookAccessBackend_XML( appName );
                 default:
                         return NULL;
                 }
 
 
         }
+    private:
+        OBackendPrivate* d;
 };
 
 
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.h b/libopie2/opiepim/backend/ocontactaccessbackend.h
index ebeb42d..280e05c 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend.h
@@ -10,24 +10,32 @@
          *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.
  * =====================================================================
  * ToDo: Define enum for query settings
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.6  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.5.4.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.4  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.3  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.2  2002/10/07 17:34:24  eilers
@@ -94,14 +102,18 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
         /**
          * Check whether settings are correct.
          * @return <i>true</i> if the given settings are correct and possible.
          */
         virtual bool hasQuerySettings (uint querySettings) const = 0;
 
         /**
          * FIXME!!!
          * Returns a sorted list of records either ascendinf or descending for a giving criteria and category
          */
         virtual QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ) = 0;
 
+        
+private:
+        class Private;
+        Private *d;
 };
 #endif
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index 270bef3..b60c5be 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -8,24 +8,39 @@
          *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.
  * =====================================================================
  * ToDo:
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.11  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.10.4.3  2003/07/23 08:54:37  eilers
+ * Default email was added to the list of all emails, which already contains
+ * the default email..
+ * This closes bug #1045
+ *
+ * Revision 1.10.4.2  2003/07/23 08:44:45  eilers
+ * Importing of Notes in vcard files wasn't implemented.
+ * Closes bug #1044
+ *
+ * Revision 1.10.4.1  2003/06/02 13:37:49  eilers
+ * Fixing memory leak
+ *
  * Revision 1.10  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.9  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
@@ -142,24 +157,25 @@ bool OContactAccessBackend_VCard::save()
 
         VObject *obj;
         obj = newVObject( VCCalProp );
         addPropValue( obj, VCVersionProp, "1.0" );
 
         VObject *vo;
         for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                 vo = createVObject( *it );
                 writeVObject( file.directHandle() , vo );
                 cleanVObject( vo );
         }
         cleanStrTbl();
+        deleteVObject( obj );
 
         m_dirty = false;
         return true;
 
 
 }
 void OContactAccessBackend_VCard::clear ()
 {
         m_map.clear();
         m_dirty = true; // ??? sure ? (se)
 }
 
@@ -437,25 +453,27 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
                 }
                 else if ( name == "X-Qtopia-Nickname" ) {
                         c.setNickname( value );
                 }
                 else if ( name == "X-Qtopia-Children" ) {
                         c.setChildren( value );
                 }
                 else if ( name == VCBirthDateProp ) {
                         // Reading Birthdate regarding RFC 2425 (5.8.4)
                         c.setBirthday( convVCardDateToDate( value ) );
 
                 }
-
+                else if ( name == VCCommentProp ) {
+                        c.setNotes( value );
+                }
 #if 0
                 else {
                         printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
                         VObjectIterator nit;
                         initPropIterator( &nit, o );
                         while( moreIteration( &nit ) ) {
                                 VObject *o = nextVObject( &nit );
                                 QCString name = vObjectName( o );
                                 QString value = vObjectStringZValue( o );
                                 printf(" subprop: %s = %s\n", name.data(), value.latin1() );
                         }
                 }
@@ -525,25 +543,25 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
         work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
         safeAddProp( work_phone, VCWorkProp );
         safeAddProp( work_phone, VCPagerProp );
 
         url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() );
         safeAddProp( url, VCWorkProp );
 
         VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
         safeAddProp( title, VCWorkProp );
 
 
         QStringList emails = c.emailList();
-        emails.prepend( c.defaultEmail() );
+        // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
         for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
                 VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
                 safeAddProp( email, VCInternetProp );
         }
 
         safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
         // Exporting Birthday regarding RFC 2425 (5.8.4)
         if ( c.birthday().isValid() ){
                 qWarning("Exporting birthday as: %s", convDateToVCardDate( c.birthday() ).latin1() );
                 safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
         }
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 097142b..1c21619 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -8,24 +8,27 @@
          *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.
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.7  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
  * Revision 1.6  2003/07/07 16:19:47  eilers
  * Fixing serious bug in hasQuerySettings()
  *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.4  2003/03/21 14:32:54  mickeyl
  * g++ compliance fix: default arguments belong into the declaration, but not the definition
  *
  * Revision 1.3  2003/03/21 12:26:28  eilers
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend.h b/libopie2/opiepim/backend/odatebookaccessbackend.h
index 86ff298..3c02c42 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend.h
@@ -59,15 +59,19 @@ public:
      * Effective Events are special event occuring during a time frame. This method does calcualte
      * EffectiveEvents bases on the directNonRepeats and directRawRepeats. You may implement this method
      * yourself
      */
     virtual OEffectiveEvent::ValueList effecticeEvents( const QDate& from, const QDate& to );
 
     /**
      * this is an overloaded member function
      * @see effecticeEvents
      */
     virtual OEffectiveEvent::ValueList effecticeEvents( const QDateTime& start );
 
+private:
+    class Private;
+    Private *d;
+
 };
 
 #endif
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
index ab2eea4..5ea945c 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
@@ -421,48 +421,48 @@ bool ODateBookAccessBackend_XML::loadFile() {
             i = j + 1;
 
             QString str = (haveUtf ? QString::fromUtf8( value )
                     : QString::fromLatin1( value ) );
             if ( haveEnt )
                 str = Qtopia::plainString( str );
 
             /*
              * add key + value
              */
             find = dict[attr.data()];
             if (!find)
-                ev.setCustomField( attr, value );
+                ev.setCustomField( attr, str );
             else {
-                setField( ev, *find, value );
+                setField( ev, *find, str );
             }
         }
         /* time to finalize */
         finalizeRecord( ev );
         delete rec;
     }
     ::munmap(map_addr, attribute.st_size );
     m_changed = false; // changed during add
 
     return true;
 }
 void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) {
     /* AllDay is alway in UTC */
     if ( ev.isAllDay() ) {
         OTimeZone utc = OTimeZone::utc();
         ev.setStartDateTime( utc.fromUTCDateTime( start ) );
         ev.setEndDateTime  ( utc.fromUTCDateTime( end   ) );
         ev.setTimeZone( "UTC"); // make sure it is really utc
     }else {
         /* to current date time */
-        qWarning(" Start is %d", start );
+        // qWarning(" Start is %d", start );
         OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
         QDateTime date = zone.toDateTime( start );
         qWarning(" Start is %s", date.toString().latin1() );
         ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
 
         date = zone.toDateTime( end );
         ev.setEndDateTime  ( zone.toDateTime( date, OTimeZone::current()   ) );
     }
     if ( rec && rec->doesRecur() ) {
         OTimeZone utc = OTimeZone::utc();
         ORecur recu( *rec ); // call copy c'tor;
         recu.setEndDate ( utc.fromUTCDateTime( rp_end ).date() );
diff --git a/libopie2/opiepim/backend/opimaccessbackend.h b/libopie2/opiepim/backend/opimaccessbackend.h
index f4bbe35..c3d91f7 100644
--- a/libopie2/opiepim/backend/opimaccessbackend.h
+++ b/libopie2/opiepim/backend/opimaccessbackend.h
@@ -1,21 +1,22 @@
 #ifndef OPIE_PIM_ACCESS_BACKEND
 #define OPIE_PIM_ACCESS_BACKEND
 
 #include <qarray.h>
 
 #include <opie/otemplatebase.h>
 #include <opie/opimrecord.h>
 
 
+class OPimAccessBackendPrivate;
 /**
  * OPimAccessBackend is the base class
  * for all private backends
  * it operates on OPimRecord as the base class
  * and it's responsible for fast manipulating
  * the resource the implementation takes care
  *  of
  */
 template <class T = OPimRecord>
 class OPimAccessBackend {
 public:
     typedef OTemplateBase<T> Frontend;
@@ -98,26 +99,25 @@ public:
 protected:
     int access()const;
     void cache( const T& t )const;
 
     /**
      * use a prime number here!
      */
     void setSaneCacheSize( int );
 
     uint readAhead()const;
 
 private:
-    class Private;
-    Private* d;
+    OPimAccessBackendPrivate *d;
     Frontend* m_front;
     uint m_read;
     int m_acc;
 
 };
 
 template <class T>
 OPimAccessBackend<T>::OPimAccessBackend(int acc)
     : m_acc( acc )
 {
     m_front = 0l;
 }
diff --git a/libopie2/opiepim/backend/otodoaccessbackend.h b/libopie2/opiepim/backend/otodoaccessbackend.h
index 05e8ca9..6be95bc 100644
--- a/libopie2/opiepim/backend/otodoaccessbackend.h
+++ b/libopie2/opiepim/backend/otodoaccessbackend.h
@@ -10,15 +10,19 @@ class OTodoAccessBackend : public OPimAccessBackend<OTodo> {
 public:
     OTodoAccessBackend();
     ~OTodoAccessBackend();
     virtual QArray<int> effectiveToDos( const QDate& start,
                                         const QDate& end,
                                         bool includeNoDates ) = 0;
     virtual QArray<int> overDue() = 0;
     virtual QArray<int> sorted( bool asc, int sortOrder, int sortFilter,
                                 int cat ) = 0;
     virtual void        removeAllCompleted() = 0;
     virtual QBitArray supports()const = 0;
 
+private:
+    class Private;
+    Private *d;
+
 };
 
 #endif
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp
index 3577e14..6415952 100644
--- a/libopie2/opiepim/backend/otodoaccessvcal.cpp
+++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp
@@ -6,30 +6,38 @@
 
 #include "otodoaccessvcal.h"
 
 namespace {
     static OTodo eventByVObj( VObject *obj ){
         OTodo event;
         VObject *ob;
         QCString name;
         // no uid, attendees, ... and no fun
         // description
         if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){
             name = vObjectStringZValue( ob );
+#if 0
             event.setDescription( name );
+#else
+            event.setSummary( name );
+#endif
         }
         // summary
         if ( ( ob = isAPropertyOf( obj,  VCSummaryProp ) ) != 0 ) {
             name = vObjectStringZValue( ob );
+#if 0
             event.setSummary( name );
+#else
+            event.setDescription( name );
+#endif
         }
         // completed
         if( ( ob = isAPropertyOf( obj, VCStatusProp )) != 0 ){
             name = vObjectStringZValue( ob );
             if( name == "COMPLETED" ){
                 event.setCompleted( true );
             }else{
                 event.setCompleted( false );
             }
         }else
             event.setCompleted( false );
         // priority
@@ -65,29 +73,45 @@ namespace {
                           TimeConversion::toISO8601( date ) );
         }
 
         if( event.isCompleted() )
             addPropValue( task, VCStatusProp, "COMPLETED");
 
         QString string = QString::number(event.priority() );
         addPropValue( task, VCPriorityProp, string.local8Bit() );
 
         addPropValue( task, VCCategoriesProp,
                       event.idsToString( event.categories() ).local8Bit() );
 
+#if 0
+
+        // There seems a misrepresentation between summary in otodoevent
+        // and summary in vcard. 
+        // The same with description..
+        // Description is summary and vice versa.. Argh.. (eilers)
+
+
         addPropValue( task, VCDescriptionProp,
                       event.description().local8Bit() );
 
         addPropValue( task, VCSummaryProp,
                       event.summary().local8Bit() );
+
+#else
+        addPropValue( task, VCDescriptionProp,
+                      event.summary().local8Bit() );
+
+        addPropValue( task, VCSummaryProp,
+                      event.description().local8Bit() );
+#endif 
   return task;
 };
 }
 
 OTodoAccessVCal::OTodoAccessVCal( const QString& path )
     : m_dirty(false), m_file( path )
 {
 }
 OTodoAccessVCal::~OTodoAccessVCal() {
 }
 bool OTodoAccessVCal::load() {
     m_map.clear();
@@ -176,25 +200,25 @@ QArray<int> OTodoAccessVCal::sorted( bool, int, int, int ) {
     return ar;
 }
 QArray<int> OTodoAccessVCal::allRecords()const {
     QArray<int> ar( m_map.count() );
     QMap<int, OTodo>::ConstIterator it;
     int i = 0;
     for ( it = m_map.begin(); it != m_map.end(); ++it ) {
         ar[i] = it.key();
         i++;
     }
     return ar;
 }
-QArray<int> OTodoAccessVCal::matchRegexp(const QRegExp &r)const {
+QArray<int> OTodoAccessVCal::matchRegexp(const QRegExp& /* r */)const {
     QArray<int> ar(0);
     return ar;
 }
 QArray<int> OTodoAccessVCal::queryByExample( const OTodo&, int, const QDateTime& ) {
     QArray<int> ar(0);
     return ar;
 }
 QArray<int> OTodoAccessVCal::effectiveToDos( const QDate& ,
                                              const QDate& ,
                                              bool  ) {
     QArray<int> ar(0);
     return ar;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 3d15354..f688735 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -78,25 +78,25 @@ OTodoAccessXML::OTodoAccessXML( const QString& appName,
 }
 OTodoAccessXML::~OTodoAccessXML() {
 
 }
 bool OTodoAccessXML::load() {
     rec = 0;
     m_opened = true;
     m_changed = false;
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
      */
-    QAsciiDict<int> dict(21);
+    QAsciiDict<int> dict(26);
     dict.setAutoDelete( TRUE );
     dict.insert("Categories" ,     new int(OTodo::Category)         );
     dict.insert("Uid" ,            new int(OTodo::Uid)              );
     dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
     dict.insert("Completed" ,      new int(OTodo::Completed)        );
     dict.insert("Description" ,    new int(OTodo::Description)      );
     dict.insert("Summary" ,        new int(OTodo::Summary)          );
     dict.insert("Priority" ,       new int(OTodo::Priority)         );
     dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
     dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
     dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
     dict.insert("Progress" ,       new int(OTodo::Progress)         );
@@ -827,28 +827,30 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
     }
     vector.resize( item );
     /* sort it now */
     vector.sort();
     /* now get the uids */
     QArray<int> array( vector.count() );
     for (uint i= 0; i < vector.count(); i++ ) {
         array[i] = ( vector.at(i) )->todo.uid();
     }
     return array;
 };
 void OTodoAccessXML::removeAllCompleted() {
+    QMap<int, OTodo> events = m_events;
     for ( QMap<int, OTodo>::Iterator it = m_events.begin(); it != m_events.end(); ++it ) {
         if ( (*it).isCompleted() )
-            m_events.remove( it );
+            events.remove( it.key() );
     }
+    m_events = events;
 }
 QBitArray OTodoAccessXML::supports()const {
     static QBitArray ar = sup();
     return ar;
 }
 QBitArray OTodoAccessXML::sup() {
     QBitArray ar( OTodo::CompletedDate +1 );
     ar.fill( true );
     ar[OTodo::CrossReference] = false;
     ar[OTodo::State ] = false;
     ar[OTodo::Reminders] = false;
     ar[OTodo::Notifiers] = false;