Fixing incompatibility to Qtopia 1.6 (especially syncing with QTDesktop 1.6):

They using a special format for storing birthdays/anniversaries.
This patch does not convert all entries, just new/modificated contacts
will be stored in this new format ! Addressbook is able to work with
both formats (new and old)
Complete conversion will be done by the new kitchensync release, provided
soon...

9 files changed, 240 insertions, 22 deletions

diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 5550c20..c0ccdf2 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -13,16 +13,17 @@ HEADERS   = ofontmenu.h \
     ofontselector.h \
     pim/opimrecord.h \
     pim/otodo.h \
     pim/orecordlist.h \
     pim/opimaccesstemplate.h \
     pim/opimaccessbackend.h \
     pim/otodoaccess.h \
     pim/otodoaccessbackend.h \
+    pim/oconversion.h \
     pim/ocontact.h \
     pim/ocontactaccess.h \
     pim/ocontactaccessbackend.h \
     pim/ocontactaccessbackend_xml.h \
     pim/ocontactaccessbackend_vcard.h \
     pim/obackendfactory.h \
     pim/opimcache.h \ 
     pim/otodoaccessvcal.h \
@@ -57,16 +58,17 @@ SOURCES   = ofontmenu.cc  \
       odevice.cpp odevicebutton.cpp otimepicker.cpp \
        otabwidget.cpp otabbar.cpp \
              ofontselector.cpp \
              pim/otodo.cpp \
              pim/opimrecord.cpp \
        pim/otodoaccess.cpp \
        pim/otodoaccessbackend.cpp \
              pim/otodoaccessxml.cpp \
+             pim/oconversion.cpp \
              pim/ocontact.cpp \
              pim/ocontactaccess.cpp \
              pim/ocontactaccessbackend_vcard.cpp \
              pim/ocontactaccessbackend_xml.cpp \
        pim/otodoaccessvcal.cpp \
        pim/orecur.cpp \
        pim/opimstate.cpp \
        pim/opimxrefpartner.cpp \
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 9cccfc8..96a5f65 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -1,13 +1,11 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-** Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
-**
-** This file is part of the Qtopia Environment.
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -20,17 +18,17 @@
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_CONTACT_MRE
 
 #include "ocontact.h"
 #include "opimresolver.h"
 
 #include <qpe/stringutil.h>
-#include <qpe/timeconversion.h>
+#include "oconversion.h"
 #include <qpe/timestring.h>
 
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 #include <qmap.h>
 
@@ -1012,17 +1010,17 @@ void OContact::setBirthday( const QDate &v )
 {
         if ( v.isNull() ){
                 qWarning( "Remove Birthday");
                 replace( Qtopia::Birthday, QString::null );
                 return;
         }
 
         if ( v.isValid() )
-                replace( Qtopia::Birthday, TimeConversion::toString( v ) );
+                replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date. If date is
   null, the current stored date will be removed.
 */
@@ -1030,43 +1028,43 @@ void OContact::setAnniversary( const QDate &v )
 {
         if ( v.isNull() ){
                 qWarning( "Remove Anniversary");
                 replace( Qtopia::Anniversary, QString::null );
                 return;
         }
 
         if ( v.isValid() )
-                replace( Qtopia::Anniversary, TimeConversion::toString( v ) );
+                replace( Qtopia::Anniversary, OConversion::dateToString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OContact::birthday() const
 {
         QString str = find( Qtopia::Birthday );
         qWarning ("Birthday %s", str.latin1() );
         if ( !str.isEmpty() )
-                return  TimeConversion::fromString ( str );
+                return  OConversion::dateFromString ( str );
         else
                 return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
 QDate OContact::anniversary() const
 {
         QDate empty;
         QString str = find( Qtopia::Anniversary );
         qWarning ("Anniversary %s", str.latin1() );
         if ( !str.isEmpty() )
-                return TimeConversion::fromString ( str );
+                return OConversion::dateFromString ( str );
         else
                 return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )
 {
     //qDebug("insertEmail %s", v.latin1());
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 25fa0e7..50f6176 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -1,13 +1,11 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-** Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
-**
-** This file is part of the Qtopia Environment.
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/libopie/pim/oconversion.cpp b/libopie/pim/oconversion.cpp
new file mode 100644
index 0000000..c3aa89b
--- a/dev/null
+++ b/libopie/pim/oconversion.cpp
@@ -0,0 +1,76 @@
+/**********************************************************************

+** Copyright (C) 2003 by Stefan Eilers (eilers.stefan@epost.de)

+**

+** This file may be distributed and/or modified under the terms of the

+** GNU Lesser General Public License version 2 as published by the Free Software

+** Foundation and appearing in the file LICENSE.GPL included in the

+** packaging of this file.

+**

+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

+**

+**********************************************************************/

+

+#include "oconversion.h"

+#include <qpe/timeconversion.h>

+

+

+QString OConversion::dateToString( const QDate &d )

+{

+        if ( d.isNull() || !d.isValid() )

+                return QString::null;

+

+        // ISO format in year, month, day (YYYYMMDD); e.g. 20021231

+        QString year = QString::number( d.year() );

+        QString month = QString::number( d.month() );

+        month = month.rightJustify( 2, '0' );

+        QString day = QString::number( d.day() );

+        day = day.rightJustify( 2, '0' );

+

+        QString str = year + month + day;

+        //qDebug( "\tPimContact dateToStr = %s", str.latin1() );

+

+        return str;

+}

+

+QDate OConversion::dateFromString( const QString& s )

+{

+        QDate date;

+

+        if ( s.isEmpty() )

+                return date;

+

+        // Be backward compatible to old Opie format: 

+        // Try to load old format. If it fails, try new ISO-Format!

+        date = TimeConversion::fromString ( s );

+        if ( date.isValid() )

+                return date;

+

+        // Read ISO-Format (YYYYMMDD)

+        int year = s.mid(0, 4).toInt();

+        int month = s.mid(4,2).toInt();

+        int day = s.mid(6,2).toInt();

+

+        // do some quick sanity checking

+        if ( year < 1900 || year > 3000 ) {

+                qWarning( "PimContact year is not in range");

+                return date;

+        }

+        if ( month < 0 || month > 12 ) {

+                qWarning( "PimContact month is not in range");

+                return date;

+        }

+        if ( day < 0 || day > 31 ) {

+                qWarning( "PimContact day is not in range");

+                return date;

+        }

+

+        date.setYMD( year, month, day );

+        if ( !date.isValid() ) {

+                qWarning( "PimContact date is not valid");

+                return QDate();

+        }

+

+        return date;

+}

+

diff --git a/libopie/pim/oconversion.h b/libopie/pim/oconversion.h
new file mode 100644
index 0000000..6540889
--- a/dev/null
+++ b/libopie/pim/oconversion.h
@@ -0,0 +1,36 @@
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**********************************************************************/
+
+#ifndef __oconversion_h__
+#define __oconversion_h__
+
+/* #include <time.h> */
+/* #include <sys/types.h> */
+#include <qdatetime.h>
+
+
+class OConversion
+{
+public:
+    static QString dateToString( const QDate &d );
+    static QDate dateFromString( const QString &datestr );
+
+};
+
+#endif // __oconversion_h__
+
diff --git a/libopie2/opiepim/core/oconversion.cpp b/libopie2/opiepim/core/oconversion.cpp
new file mode 100644
index 0000000..c3aa89b
--- a/dev/null
+++ b/libopie2/opiepim/core/oconversion.cpp
@@ -0,0 +1,76 @@
+/**********************************************************************

+** Copyright (C) 2003 by Stefan Eilers (eilers.stefan@epost.de)

+**

+** This file may be distributed and/or modified under the terms of the

+** GNU Lesser General Public License version 2 as published by the Free Software

+** Foundation and appearing in the file LICENSE.GPL included in the

+** packaging of this file.

+**

+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

+**

+**********************************************************************/

+

+#include "oconversion.h"

+#include <qpe/timeconversion.h>

+

+

+QString OConversion::dateToString( const QDate &d )

+{

+        if ( d.isNull() || !d.isValid() )

+                return QString::null;

+

+        // ISO format in year, month, day (YYYYMMDD); e.g. 20021231

+        QString year = QString::number( d.year() );

+        QString month = QString::number( d.month() );

+        month = month.rightJustify( 2, '0' );

+        QString day = QString::number( d.day() );

+        day = day.rightJustify( 2, '0' );

+

+        QString str = year + month + day;

+        //qDebug( "\tPimContact dateToStr = %s", str.latin1() );

+

+        return str;

+}

+

+QDate OConversion::dateFromString( const QString& s )

+{

+        QDate date;

+

+        if ( s.isEmpty() )

+                return date;

+

+        // Be backward compatible to old Opie format: 

+        // Try to load old format. If it fails, try new ISO-Format!

+        date = TimeConversion::fromString ( s );

+        if ( date.isValid() )

+                return date;

+

+        // Read ISO-Format (YYYYMMDD)

+        int year = s.mid(0, 4).toInt();

+        int month = s.mid(4,2).toInt();

+        int day = s.mid(6,2).toInt();

+

+        // do some quick sanity checking

+        if ( year < 1900 || year > 3000 ) {

+                qWarning( "PimContact year is not in range");

+                return date;

+        }

+        if ( month < 0 || month > 12 ) {

+                qWarning( "PimContact month is not in range");

+                return date;

+        }

+        if ( day < 0 || day > 31 ) {

+                qWarning( "PimContact day is not in range");

+                return date;

+        }

+

+        date.setYMD( year, month, day );

+        if ( !date.isValid() ) {

+                qWarning( "PimContact date is not valid");

+                return QDate();

+        }

+

+        return date;

+}

+

diff --git a/libopie2/opiepim/core/oconversion.h b/libopie2/opiepim/core/oconversion.h
new file mode 100644
index 0000000..6540889
--- a/dev/null
+++ b/libopie2/opiepim/core/oconversion.h
@@ -0,0 +1,36 @@
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**********************************************************************/
+
+#ifndef __oconversion_h__
+#define __oconversion_h__
+
+/* #include <time.h> */
+/* #include <sys/types.h> */
+#include <qdatetime.h>
+
+
+class OConversion
+{
+public:
+    static QString dateToString( const QDate &d );
+    static QDate dateFromString( const QString &datestr );
+
+};
+
+#endif // __oconversion_h__
+
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 9cccfc8..96a5f65 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1,13 +1,11 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-** Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
-**
-** This file is part of the Qtopia Environment.
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -20,17 +18,17 @@
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_CONTACT_MRE
 
 #include "ocontact.h"
 #include "opimresolver.h"
 
 #include <qpe/stringutil.h>
-#include <qpe/timeconversion.h>
+#include "oconversion.h"
 #include <qpe/timestring.h>
 
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
 #include <qmap.h>
 
@@ -1012,17 +1010,17 @@ void OContact::setBirthday( const QDate &v )
 {
         if ( v.isNull() ){
                 qWarning( "Remove Birthday");
                 replace( Qtopia::Birthday, QString::null );
                 return;
         }
 
         if ( v.isValid() )
-                replace( Qtopia::Birthday, TimeConversion::toString( v ) );
+                replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date. If date is
   null, the current stored date will be removed.
 */
@@ -1030,43 +1028,43 @@ void OContact::setAnniversary( const QDate &v )
 {
         if ( v.isNull() ){
                 qWarning( "Remove Anniversary");
                 replace( Qtopia::Anniversary, QString::null );
                 return;
         }
 
         if ( v.isValid() )
-                replace( Qtopia::Anniversary, TimeConversion::toString( v ) );
+                replace( Qtopia::Anniversary, OConversion::dateToString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OContact::birthday() const
 {
         QString str = find( Qtopia::Birthday );
         qWarning ("Birthday %s", str.latin1() );
         if ( !str.isEmpty() )
-                return  TimeConversion::fromString ( str );
+                return  OConversion::dateFromString ( str );
         else
                 return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
   Returns the anniversary of the contact.
 */
 QDate OContact::anniversary() const
 {
         QDate empty;
         QString str = find( Qtopia::Anniversary );
         qWarning ("Anniversary %s", str.latin1() );
         if ( !str.isEmpty() )
-                return TimeConversion::fromString ( str );
+                return OConversion::dateFromString ( str );
         else
                 return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )
 {
     //qDebug("insertEmail %s", v.latin1());
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index 25fa0e7..50f6176 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -1,13 +1,11 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-** Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
-**
-** This file is part of the Qtopia Environment.
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.