5 files changed, 121 insertions, 11 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 5550c20..c0ccdf2 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -1,121 +1,123 @@
 TEMPLATE        = lib
 CONFIG          += qte warn_on release
 HEADERS   = ofontmenu.h \
    ocolorbutton.h \
    ofiledialog.h ofileselector.h \
    ocheckitem.h  \
    xmltree.h \
    colordialog.h colorpopupmenu.h \
    oclickablelabel.h oprocctrl.h \
    oprocess.h odevice.h odevicebutton.h \
    otimepicker.h otabwidget.h \
    otabbar.h otabinfo.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 \
    pim/orecur.h \
    pim/opimstate.h \
    pim/opimxrefpartner.h \
    pim/opimxref.h \
    pim/opimxrefmanager.h \
    pim/opimmaintainer.h \
    pim/opimnotify.h \
    pim/opimnotifymanager.h \
    pim/opimmainwindow.h \
    pim/opimresolver.h \
    pim/oevent.h \
    pim/otimezone.h \
    pim/odatebookaccess.h \
    pim/odatebookaccessbackend.h \
    pim/odatebookaccessbackend_xml.h \
    orecurrancewidget.h \
    oticker.h owait.h
 #    pim/otodoaccesssql.h \
 SOURCES   = ofontmenu.cc  \
        ocolorbutton.cpp \
        sharp_compat.cpp \
      xmltree.cc \
      ofiledialog.cc ofileselector.cc \
            ocheckitem.cpp  \
      colordialog.cpp \
      colorpopupmenu.cpp oclickablelabel.cpp \
      oprocctrl.cpp oprocess.cpp \
      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 \
       pim/opimxref.cpp \
       pim/opimxrefmanager.cpp \
       pim/opimmaintainer.cpp \
       pim/opimnotify.cpp \
       pim/opimnotifymanager.cpp \
       pim/opimmainwindow.cpp \
       pim/opimresolver.cpp \
       pim/oevent.cpp \
       pim/otimezone.cpp \
       pim/odatebookaccess.cpp \
       pim/odatebookaccessbackend.cpp \
       pim/odatebookaccessbackend_xml.cpp \
       orecurrancewidget.cpp \
       oticker.cpp owait.cpp \
 #             pim/otodoaccesssql.cpp \
 TARGET    = opie
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
 #VERSION = 1.0.0
 LIBS += -lqpe
 # LIBS            += -lopiesql
 INTERFACES      = otimepickerbase.ui orecurrancebase.ui
 TARGET          = opie
 TRANSLATIONS = ../i18n/de/libopie.ts \
         ../i18n/nl/libopie.ts \
         ../i18n/xx/libopie.ts \
   ../i18n/en/libopie.ts \
   ../i18n/es/libopie.ts \
   ../i18n/fr/libopie.ts \
   ../i18n/hu/libopie.ts \
   ../i18n/ja/libopie.ts \
   ../i18n/ko/libopie.ts \
   ../i18n/no/libopie.ts \
   ../i18n/pl/libopie.ts \
   ../i18n/pt/libopie.ts \
   ../i18n/pt_BR/libopie.ts \
   ../i18n/sl/libopie.ts \
   ../i18n/zh_CN/libopie.ts \
   ../i18n/zh_TW/libopie.ts \
   ../i18n/da/libopie.ts
 include ( $(OPIEDIR)/include.pro )
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,1148 +1,1146 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-** Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
-**
-** This file is part of the Qtopia Environment.
 **
 ** 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.
 **
 **********************************************************************/
 #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>
 #include <stdio.h>
 /*!
  \class Contact contact.h
  \brief The Contact class holds the data of an address book entry.
  This data includes information the name of the person, contact
  information, and business information such as deparment and job title.
  \ingroup qtopiaemb
  \ingroup qtopiadesktop
 */
 /*!
  Creates a new, empty contact.
 */
 OContact::OContact()
    : OPimRecord(), mMap(), d( 0 )
 {
 }
 /*!
  \internal
  Creates a new contact.  The properties of the contact are
  set from \a fromMap.
 */
 OContact::OContact( const QMap<int, QString> &fromMap ) :
    OPimRecord(), mMap( fromMap ), d( 0 )
 {
    QString cats = mMap[ Qtopia::AddressCategory ];
    if ( !cats.isEmpty() )
        setCategories( idsFromString( cats ) );
    QString uidStr = find( Qtopia::AddressUid );
    if ( uidStr.isEmpty() || (uidStr.toInt() == 0) ){
            qWarning( "Invalid UID found. Generate new one.." );
        setUid( uidGen().generate() );
    }else
        setUid( uidStr.toInt() );
 //     if ( !uidStr.isEmpty() )
        // setUid( uidStr.toInt() );
 }
 /*!
  Destroys a contact.
 */
 OContact::~OContact()
 {
 }
 /*! \fn void OContact::setTitle( const QString &str )
  Sets the title of the contact to \a str.
 */
 /*! \fn void OContact::setFirstName( const QString &str )
  Sets the first name of the contact to \a str.
 */
 /*! \fn void OContact::setMiddleName( const QString &str )
  Sets the middle name of the contact to \a str.
 */
 /*! \fn void OContact::setLastName( const QString &str )
  Sets the last name of the contact to \a str.
 */
 /*! \fn void OContact::setSuffix( const QString &str )
  Sets the suffix of the contact to \a str.
 */
 /*! \fn void OContact::setFileAs( const QString &str )
  Sets the contact to filed as \a str.
 */
 /*! \fn void OContact::setDefaultEmail( const QString &str )
  Sets the default email of the contact to \a str.
 */
 /*! \fn void OContact::setHomeStreet( const QString &str )
  Sets the home street address of the contact to \a str.
 */
 /*! \fn void OContact::setHomeCity( const QString &str )
  Sets the home city of the contact to \a str.
 */
 /*! \fn void OContact::setHomeState( const QString &str )
  Sets the home state of the contact to \a str.
 */
 /*! \fn void OContact::setHomeZip( const QString &str )
  Sets the home zip code of the contact to \a str.
 */
 /*! \fn void OContact::setHomeCountry( const QString &str )
  Sets the home country of the contact to \a str.
 */
 /*! \fn void OContact::setHomePhone( const QString &str )
  Sets the home phone number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeFax( const QString &str )
  Sets the home fax number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeMobile( const QString &str )
  Sets the home mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setHomeWebpage( const QString &str )
  Sets the home webpage of the contact to \a str.
 */
 /*! \fn void OContact::setCompany( const QString &str )
  Sets the company for contact to \a str.
 */
 /*! \fn void OContact::setJobTitle( const QString &str )
  Sets the job title of the contact to \a str.
 */
 /*! \fn void OContact::setDepartment( const QString &str )
  Sets the department for contact to \a str.
 */
 /*! \fn void OContact::setOffice( const QString &str )
  Sets the office for contact to \a str.
 */
 /*! \fn void OContact::setBusinessStreet( const QString &str )
  Sets the business street address of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessCity( const QString &str )
  Sets the business city of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessState( const QString &str )
  Sets the business state of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessZip( const QString &str )
  Sets the business zip code of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessCountry( const QString &str )
  Sets the business country of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPhone( const QString &str )
  Sets the business phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessFax( const QString &str )
  Sets the business fax number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessMobile( const QString &str )
  Sets the business mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPager( const QString &str )
  Sets the business pager number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessWebpage( const QString &str )
  Sets the business webpage of the contact to \a str.
 */
 /*! \fn void OContact::setProfession( const QString &str )
  Sets the profession of the contact to \a str.
 */
 /*! \fn void OContact::setAssistant( const QString &str )
  Sets the assistant of the contact to \a str.
 */
 /*! \fn void OContact::setManager( const QString &str )
  Sets the manager of the contact to \a str.
 */
 /*! \fn void OContact::setSpouse( const QString &str )
  Sets the spouse of the contact to \a str.
 */
 /*! \fn void OContact::setGender( const QString &str )
  Sets the gender of the contact to \a str.
 */
 /*! \fn void OContact::setNickname( const QString &str )
  Sets the nickname of the contact to \a str.
 */
 /*! \fn void OContact::setNotes( const QString &str )
  Sets the notes about the contact to \a str.
 */
 /*! \fn QString OContact::title() const
  Returns the title of the contact.
 */
 /*! \fn QString OContact::firstName() const
  Returns the first name of the contact.
 */
 /*! \fn QString OContact::middleName() const
  Returns the middle name of the contact.
 */
 /*! \fn QString OContact::lastName() const
  Returns the last name of the contact.
 */
 /*! \fn QString OContact::suffix() const
  Returns the suffix of the contact.
 */
 /*! \fn QString OContact::fileAs() const
  Returns the string the contact is filed as.
 */
 /*! \fn QString OContact::defaultEmail() const
  Returns the default email address of the contact.
 */
 /*! \fn QString OContact::emails() const
  Returns the list of email address for a contact separated by ';'s in a single
  string.
 */
 /*! \fn QString OContact::homeStreet() const
  Returns the home street address of the contact.
 */
 /*! \fn QString OContact::homeCity() const
  Returns the home city of the contact.
 */
 /*! \fn QString OContact::homeState() const
  Returns the home state of the contact.
 */
 /*! \fn QString OContact::homeZip() const
  Returns the home zip of the contact.
 */
 /*! \fn QString OContact::homeCountry() const
  Returns the home country of the contact.
 */
 /*! \fn QString OContact::homePhone() const
  Returns the home phone number of the contact.
 */
 /*! \fn QString OContact::homeFax() const
  Returns the home fax number of the contact.
 */
 /*! \fn QString OContact::homeMobile() const
  Returns the home mobile number of the contact.
 */
 /*! \fn QString OContact::homeWebpage() const
  Returns the home webpage of the contact.
 */
 /*! \fn QString OContact::company() const
  Returns the company for the contact.
 */
 /*! \fn QString OContact::department() const
  Returns the department for the contact.
 */
 /*! \fn QString OContact::office() const
  Returns the office for the contact.
 */
 /*! \fn QString OContact::jobTitle() const
  Returns the job title of the contact.
 */
 /*! \fn QString OContact::profession() const
  Returns the profession of the contact.
 */
 /*! \fn QString OContact::assistant() const
  Returns the assistant of the contact.
 */
 /*! \fn QString OContact::manager() const
  Returns the manager of the contact.
 */
 /*! \fn QString OContact::businessStreet() const
  Returns the business street address of the contact.
 */
 /*! \fn QString OContact::businessCity() const
  Returns the business city of the contact.
 */
 /*! \fn QString OContact::businessState() const
  Returns the business state of the contact.
 */
 /*! \fn QString OContact::businessZip() const
  Returns the business zip of the contact.
 */
 /*! \fn QString OContact::businessCountry() const
  Returns the business country of the contact.
 */
 /*! \fn QString OContact::businessPhone() const
  Returns the business phone number of the contact.
 */
 /*! \fn QString OContact::businessFax() const
  Returns the business fax number of the contact.
 */
 /*! \fn QString OContact::businessMobile() const
  Returns the business mobile number of the contact.
 */
 /*! \fn QString OContact::businessPager() const
  Returns the business pager number of the contact.
 */
 /*! \fn QString OContact::businessWebpage() const
  Returns the business webpage of the contact.
 */
 /*! \fn QString OContact::spouse() const
  Returns the spouse of the contact.
 */
 /*! \fn QString OContact::gender() const
  Returns the gender of the contact.
 */
 /*! \fn QString OContact::nickname() const
  Returns the nickname of the contact.
 */
 /*! \fn QString OContact::children() const
  Returns the children of the contact.
 */
 /*! \fn QString OContact::notes() const
  Returns the notes relating to the the contact.
 */
 /*! \fn QString OContact::groups() const
  \internal
  Returns the groups for the contact.
 */
 /*! \fn QStringList OContact::groupList() const
  \internal
 */
 /*! \fn QString OContact::field(int) const
  \internal
 */
 /*! \fn void OContact::saveJournal( journal_action, const QString & = QString::null )
  \internal
 */
 /*! \fn void OContact::setUid( int id )
  \internal
  Sets the uid for this record to \a id.
 */
 /*! \enum OContact::journal_action
  \internal
 */
 /*!
  \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
    QMap<int, QString> map = mMap;
    QString cats = idsToString( categories() );
    if ( !cats.isEmpty() )
        map.insert( Qtopia::AddressCategory, cats );
    return map;
 }
 /*!
  Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
    QString text;
    QString value, comp, state;
    QString str;
    bool marker = false;
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
        text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>";
    if ( !(value = jobTitle()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    comp = company();
    if ( !(value = department()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( comp )
            text += ", ";
        else
            text += "<br>";
    }
    if ( !comp.isEmpty() )
        text += Qtopia::escapeString(comp) + "<br>";
    QString defEmail = defaultEmail();
    if ( !defEmail.isEmpty() )
        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
                + Qtopia::escapeString(defEmail) + "<br>";
    text += "<hr>";
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Work Address:</b>" );
        text +=  "<br>";
        marker = true;
    }
    if ( !(value = businessStreet()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    state =  businessState();
    if ( !(value = businessZip()).isEmpty() )
        text += Qtopia::escapeString(value) + " ";
    if ( !(value = businessCity()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( state )
            text += ", " + Qtopia::escapeString(state);
        text += "<br>";
    } else if ( !state.isEmpty() )
        text += Qtopia::escapeString(state) + "<br>";
    if ( !(value = businessCountry()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    // rest of Business data
    str = office();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Office: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = businessWebpage();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Business Web Page: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = businessPhone();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Business Phone: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = businessFax();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Business Fax: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = businessMobile();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Business Mobile: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = businessPager();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Business Pager: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    // home address
    if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
         !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Home Address:</b>" );
        text +=  "<br>";
    }
    if ( !(value = homeStreet()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    state =  homeState();
    if ( !(value = homeZip()).isEmpty() )
        text += Qtopia::escapeString(value) + " ";
    if ( !(value = homeCity()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( !state.isEmpty() )
            text += ", " + Qtopia::escapeString(state);
        text += "<br>";
    } else if (!state.isEmpty())
        text += Qtopia::escapeString(state) + "<br>";
    if ( !(value = homeCountry()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    // rest of Home data
    str = homeWebpage();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = homePhone();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = homeFax();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Home Fax: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    str = homeMobile();
    if ( !str.isEmpty() ){
        text += "<b>" + QObject::tr("Home Mobile: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
        marker = true;
    }
    if ( marker )
            text += "<br><hr><br>";
    // the others...
    str = emails();
    if ( !str.isEmpty() && ( str != defEmail ) )
        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = profession();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Profession: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = assistant();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Assistant: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = manager();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Manager: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = gender();
    if ( !str.isEmpty() && str.toInt() != 0 ) {
        if ( str.toInt() == 1 )
            str = QObject::tr( "Male" );
        else if ( str.toInt() == 2 )
            str = QObject::tr( "Female" );
        text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
    }
    str = spouse();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Spouse: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    if ( birthday().isValid() ){
            str = TimeString::numberDateString( birthday() );
            text += "<b>" + QObject::tr("Birthday: ") + "</b>"
                    + Qtopia::escapeString(str) + "<br>";
    }
    if ( anniversary().isValid() ){
            str = TimeString::numberDateString( anniversary() );
            text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
                    + Qtopia::escapeString(str) + "<br>";
    }
    str = children();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Children: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = nickname();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Nickname: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    if ( categoryNames("Contacts").count() ){
            text += "<b>" + QObject::tr( "Category:") + "</b> ";
            text += categoryNames("Contacts").join(", ");
            text += "<br>";
    }
    // notes last
    if ( !(value = notes()).isEmpty() ) {
            text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
            QRegExp reg("\n");
            //QString tmp = Qtopia::escapeString(value);
            QString tmp = QStyleSheet::convertFromPlainText(value);
            //tmp.replace( reg, "<br>" );
            text += "<br>" + tmp + "<br>";
    }
    return text;
 }
 /*!
  \internal
 */
 void OContact::insert( int key, const QString &v )
 {
    QString value = v.stripWhiteSpace();
    if ( value.isEmpty() )
        mMap.remove( key );
    else
        mMap.insert( key, value );
 }
 /*!
  \internal
 */
 void OContact::replace( int key, const QString & v )
 {
    QString value = v.stripWhiteSpace();
    if ( value.isEmpty() )
        mMap.remove( key );
    else
        mMap.replace( key, value );
 }
 /*!
  \internal
 */
 QString OContact::find( int key ) const
 {
    return mMap[key];
 }
 /*!
  \internal
 */
 QString OContact::displayAddress( const QString &street,
                                 const QString &city,
                                 const QString &state,
                                 const QString &zip,
                                 const QString &country ) const
 {
    QString s = street;
    if ( !street.isEmpty() )
        s+= "\n";
    s += city;
    if ( !city.isEmpty() && !state.isEmpty() )
        s += ", ";
    s += state;
    if ( !state.isEmpty() && !zip.isEmpty() )
        s += "  ";
    s += zip;
    if ( !country.isEmpty() && !s.isEmpty() )
        s += "\n";
    s += country;
    return s;
 }
 /*!
  \internal
 */
 QString OContact::displayBusinessAddress() const
 {
    return displayAddress( businessStreet(), businessCity(),
                           businessState(), businessZip(),
                           businessCountry() );
 }
 /*!
  \internal
 */
 QString OContact::displayHomeAddress() const
 {
    return displayAddress( homeStreet(), homeCity(),
                           homeState(), homeZip(),
                           homeCountry() );
 }
 /*!
  Returns the full name of the contact
 */
 QString OContact::fullName() const
 {
    QString title = find( Qtopia::Title );
    QString firstName = find( Qtopia::FirstName );
    QString middleName = find( Qtopia::MiddleName );
    QString lastName = find( Qtopia::LastName );
    QString suffix = find( Qtopia::Suffix );
    QString name = title;
    if ( !firstName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += firstName;
    }
    if ( !middleName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += middleName;
    }
    if ( !lastName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += lastName;
    }
    if ( !suffix.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += suffix;
    }
    return name.simplifyWhiteSpace();
 }
 /*!
  Returns a list of the names of the children of the contact.
 */
 QStringList OContact::childrenList() const
 {
    return QStringList::split( " ", find( Qtopia::Children ) );
 }
 /*! \fn void OContact::insertEmail( const QString &email )
  Insert \a email into the email list. Ensures \a email can only be added
  once. If there is no default email address set, it sets it to the \a email.
 */
 /*! \fn void OContact::removeEmail( const QString &email )
  Removes the \a email from the email list. If the default email was \a email,
  then the default email address is assigned to the first email in the
  email list
 */
 /*! \fn void OContact::clearEmails()
  Clears the email list.
 */
 /*! \fn void OContact::insertEmails( const QStringList &emailList )
  Appends the \a emailList to the exiting email list
 */
 /*!
  Returns a list of email addresses belonging to the contact, including
  the default email address.
 */
 QStringList OContact::emailList() const
 {
    QString emailStr = emails();
    QStringList r;
    if ( !emailStr.isEmpty() ) {
        qDebug(" emailstr ");
        QStringList l = QStringList::split( emailSeparator(), emailStr );
        for ( QStringList::ConstIterator it = l.begin();it != l.end();++it )
            r += (*it).simplifyWhiteSpace();
    }
    return r;
 }
 /*!
  \overload
  Generates the string for the contact to be filed as from the first,
  middle and last name of the contact.
 */
 void OContact::setFileAs()
 {
    QString lastName, firstName, middleName, fileas;
    lastName = find( Qtopia::LastName );
    firstName = find( Qtopia::FirstName );
    middleName = find( Qtopia::MiddleName );
    if ( !lastName.isEmpty() && !firstName.isEmpty()
         && !middleName.isEmpty() )
        fileas = lastName + ", " + firstName + " " + middleName;
    else if ( !lastName.isEmpty() && !firstName.isEmpty() )
        fileas = lastName + ", " + firstName;
    else if ( !lastName.isEmpty() || !firstName.isEmpty() ||
              !middleName.isEmpty() )
        fileas = firstName + ( firstName.isEmpty() ? "" : " " )
                 + middleName + ( middleName.isEmpty() ? "" : " " )
                 + lastName;
    replace( Qtopia::FileAs, fileas );
 }
 /*!
  \internal
  Appends the contact information to \a buf.
 */
 void OContact::save( QString &buf ) const
 {
    static const QStringList SLFIELDS = fields();
    // I'm expecting "<Contact " in front of this...
    for ( QMap<int, QString>::ConstIterator it = mMap.begin();
          it != mMap.end(); ++it ) {
        const QString &value = it.data();
        int key = it.key();
        if ( !value.isEmpty() ) {
            if ( key == Qtopia::AddressCategory || key == Qtopia::AddressUid)
                continue;
            key -= Qtopia::AddressCategory+1;
            buf += SLFIELDS[key];
            buf += "=\"" + Qtopia::escapeString(value) + "\" ";
        }
    }
    buf += customToXml();
    if ( categories().count() > 0 )
        buf += "Categories=\"" + idsToString( categories() ) + "\" ";
    buf += "Uid=\"" + QString::number( uid() ) + "\" ";
    // You need to close this yourself
 }
 /*!
  \internal
  Returns the list of fields belonging to a contact
  Never change order of this list ! It has to be regarding
  enum AddressBookFields !!
 */
 QStringList OContact::fields()
 {
    QStringList list;
    list.append( "Title" );  // Not Used!
    list.append( "FirstName" );
    list.append( "MiddleName" );
    list.append( "LastName" );
    list.append( "Suffix" );
    list.append( "FileAs" );
    list.append( "JobTitle" );
    list.append( "Department" );
    list.append( "Company" );
    list.append( "BusinessPhone" );
    list.append( "BusinessFax" );
    list.append( "BusinessMobile" );
    list.append( "DefaultEmail" );
    list.append( "Emails" );
    list.append( "HomePhone" );
    list.append( "HomeFax" );
    list.append( "HomeMobile" );
    list.append( "BusinessStreet" );
    list.append( "BusinessCity" );
    list.append( "BusinessState" );
    list.append( "BusinessZip" );
    list.append( "BusinessCountry" );
    list.append( "BusinessPager" );
    list.append( "BusinessWebPage" );
    list.append( "Office" );
    list.append( "Profession" );
    list.append( "Assistant" );
    list.append( "Manager" );
    list.append( "HomeStreet" );
    list.append( "HomeCity" );
    list.append( "HomeState" );
    list.append( "HomeZip" );
    list.append( "HomeCountry" );
    list.append( "HomeWebPage" );
    list.append( "Spouse" );
    list.append( "Gender" );
    list.append( "Birthday" );
    list.append( "Anniversary" );
    list.append( "Nickname" );
    list.append( "Children" );
    list.append( "Notes" );
    list.append( "Groups" );
    return list;
 }
 /*!
  Sets the list of email address for contact to those contained in \a str.
  Email address should be separated by ';'s.
 */
 void OContact::setEmails( const QString &str )
 {
    replace( Qtopia::Emails, str );
    if ( str.isEmpty() )
        setDefaultEmail( QString::null );
 }
 /*!
  Sets the list of children for the contact to those contained in \a str.
 */
 void OContact::setChildren( const QString &str )
 {
    replace( Qtopia::Children, str );
 }
 /*!
  Returns TRUE if the contact matches the regular expression \a regexp.
  Otherwise returns FALSE.
 */
 bool OContact::match( const QString &regexp ) const
 {
    return match(QRegExp(regexp));
 }
 /*!
  \overload
  Returns TRUE if the contact matches the regular expression \a regexp.
  Otherwise returns FALSE.
 */
 bool OContact::match( const QRegExp &r ) const
 {
    bool match;
    match = false;
    QMap<int, QString>::ConstIterator it;
    for ( it = mMap.begin(); it != mMap.end(); ++it ) {
        if ( (*it).find( r ) > -1 ) {
            match = true;
            break;
        }
    }
    return match;
 }
 QString OContact::toShortText() const
 {
        return ( fullName() );
 }
 QString OContact::type() const
 {
        return QString::fromLatin1( "OContact" );
 }
 // Definition is missing ! (se)
 QMap<QString,QString> OContact::toExtraMap() const
 {
        qWarning ("Function not implemented: OContact::toExtraMap()");
        QMap <QString,QString> useless;
        return useless;
 }
 class QString OContact::recordField( int pos ) const
 {
        QStringList SLFIELDS = fields(); // ?? why this ? (se)
        return SLFIELDS[pos];
 }
 // In future releases, we should store birthday and anniversary
 // internally as QDate instead of QString !
 // QString is always too complicate to interprete (DD.MM.YY, DD/MM/YY, MM/DD/YY, etc..)(se)
 /*! \fn void OContact::setBirthday( const QDate& date )
  Sets the birthday for the contact to \a date. If date is null
  the current stored date will be removed.
 */
 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.
 */
 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());
    QString e = v.simplifyWhiteSpace();
    QString def = defaultEmail();
    // if no default, set it as the default email and don't insert
    if ( def.isEmpty() ) {
        setDefaultEmail( e ); // will insert into the list for us
        return;
    }
    // otherwise, insert assuming doesn't already exist
    QString emailsStr = find( Qtopia::Emails );
    if ( emailsStr.contains( e ))
        return;
    if ( !emailsStr.isEmpty() )
        emailsStr += emailSeparator();
    emailsStr += e;
    replace( Qtopia::Emails, emailsStr );
 }
 void OContact::removeEmail( const QString &v )
 {
    QString e = v.simplifyWhiteSpace();
    QString def = defaultEmail();
    QString emailsStr = find( Qtopia::Emails );
    QStringList emails = emailList();
    // otherwise, must first contain it
    if ( !emailsStr.contains( e ) )
        return;
    // remove it
    //qDebug(" removing email from list %s", e.latin1());
    emails.remove( e );
    // reset the string
    emailsStr = emails.join(emailSeparator()); // Sharp's brain dead separator
    replace( Qtopia::Emails, emailsStr );
    // if default, then replace the default email with the first one
    if ( def == e ) {
        //qDebug("removeEmail is default; setting new default");
        if ( !emails.count() )
            clearEmails();
        else // setDefaultEmail will remove e from the list
            setDefaultEmail( emails.first() );
    }
 }
 void OContact::clearEmails()
 {
    mMap.remove( Qtopia::DefaultEmail );
    mMap.remove( Qtopia::Emails );
 }
 void OContact::setDefaultEmail( const QString &v )
 {
    QString e = v.simplifyWhiteSpace();
    //qDebug("OContact::setDefaultEmail %s", e.latin1());
    replace( Qtopia::DefaultEmail, e );
    if ( !e.isEmpty() )
        insertEmail( e );
 }
 void OContact::insertEmails( const QStringList &v )
 {
    for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
        insertEmail( *it );
 }
 int OContact::rtti() {
    return OPimResolver::AddressBook;
 }
 void OContact::setUid( int i )
 {
        OPimRecord::setUid(i);
        replace( Qtopia::AddressUid , QString::number(i));
 }
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,244 +1,242 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
-** Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
+** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
-**
-** This file is part of the Qtopia Environment.
 **
 ** 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 __OCONTACT_H__
 #define __OCONTACT_H__
 #include <opie/opimrecord.h>
 #include <qpe/recordfields.h>
 #include <qdatetime.h>
 #include <qstringlist.h>
 #if defined(QPC_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 // MOC_SKIP_END
 #endif
 class ContactPrivate;
 /**
 * OContact class represents a specialised PIM Record for contacts.
 * It does store all kind of persopn related information.
 *
 * @short Contact Container
 * @author TT, Stefan Eiler, Holger Freyther
 */
 class QPC_EXPORT OContact : public OPimRecord
 {
    friend class DataSet;
 public:
    OContact();
    OContact( const QMap<int, QString> &fromMap );
    virtual ~OContact();
    /*
     * do we need to inline them
     * if yes do we need to inline them this way?
     * -zecke
     */
    void setTitle( const QString &v ) { replace( Qtopia::Title, v ); }
    void setFirstName( const QString &v ) { replace( Qtopia::FirstName, v ); }
    void setMiddleName( const QString &v ) { replace( Qtopia::MiddleName, v ); }
    void setLastName( const QString &v ) { replace( Qtopia::LastName, v ); }
    void setSuffix( const QString &v ) { replace( Qtopia::Suffix, v ); }
    void setFileAs( const QString &v ) { replace( Qtopia::FileAs, v ); }
    void setFileAs();
    // default email address
    void setDefaultEmail( const QString &v );
    // inserts email to list and ensure's doesn't already exist
    void insertEmail( const QString &v );
    void removeEmail( const QString &v );
    void clearEmails();
    void insertEmails( const QStringList &v );
    // home
    void setHomeStreet( const QString &v ) { replace( Qtopia::HomeStreet, v ); }
    void setHomeCity( const QString &v ) { replace( Qtopia::HomeCity, v ); }
    void setHomeState( const QString &v ) { replace( Qtopia::HomeState, v ); }
    void setHomeZip( const QString &v ) { replace( Qtopia::HomeZip, v ); }
    void setHomeCountry( const QString &v ) { replace( Qtopia::HomeCountry, v ); }
    void setHomePhone( const QString &v ) { replace( Qtopia::HomePhone, v ); }
    void setHomeFax( const QString &v ) { replace( Qtopia::HomeFax, v ); }
    void setHomeMobile( const QString &v ) { replace( Qtopia::HomeMobile, v ); }
    void setHomeWebpage( const QString &v ) { replace( Qtopia::HomeWebPage, v ); }
    // business
    void setCompany( const QString &v ) { replace( Qtopia::Company, v ); }
    void setBusinessStreet( const QString &v ) { replace( Qtopia::BusinessStreet, v ); }
    void setBusinessCity( const QString &v ) { replace( Qtopia::BusinessCity, v ); }
    void setBusinessState( const QString &v ) { replace( Qtopia::BusinessState, v ); }
    void setBusinessZip( const QString &v ) { replace( Qtopia::BusinessZip, v ); }
    void setBusinessCountry( const QString &v ) { replace( Qtopia::BusinessCountry, v ); }
    void setBusinessWebpage( const QString &v ) { replace( Qtopia::BusinessWebPage, v ); }
    void setJobTitle( const QString &v ) { replace( Qtopia::JobTitle, v ); }
    void setDepartment( const QString &v ) { replace( Qtopia::Department, v ); }
    void setOffice( const QString &v ) { replace( Qtopia::Office, v ); }
    void setBusinessPhone( const QString &v ) { replace( Qtopia::BusinessPhone, v ); }
    void setBusinessFax( const QString &v ) { replace( Qtopia::BusinessFax, v ); }
    void setBusinessMobile( const QString &v ) { replace( Qtopia::BusinessMobile, v ); }
    void setBusinessPager( const QString &v ) { replace( Qtopia::BusinessPager, v ); }
    void setProfession( const QString &v ) { replace( Qtopia::Profession, v ); }
    void setAssistant( const QString &v ) { replace( Qtopia::Assistant, v ); }
    void setManager( const QString &v ) { replace( Qtopia::Manager, v ); }
    // personal
    void setSpouse( const QString &v ) { replace( Qtopia::Spouse, v ); }
    void setGender( const QString &v ) { replace( Qtopia::Gender, v ); }
    void setBirthday( const QDate &v );
    void setAnniversary( const QDate &v );
    void setNickname( const QString &v ) { replace( Qtopia::Nickname, v ); }
    void setChildren( const QString &v );
    // other
    void setNotes( const QString &v ) { replace( Qtopia::Notes, v); }
    bool match( const QString &regexp ) const;
    bool match( const QRegExp &regexp ) const;
 //     // custom
 //     void setCustomField( const QString &key, const QString &v )
 //         { replace(Custom- + key, v ); }
    // name
    QString fullName() const;
    QString title() const { return find( Qtopia::Title ); }
    QString firstName() const { return find( Qtopia::FirstName ); }
    QString middleName() const { return find( Qtopia::MiddleName ); }
    QString lastName() const { return find( Qtopia::LastName ); }
    QString suffix() const { return find( Qtopia::Suffix ); }
    QString fileAs() const { return find( Qtopia::FileAs ); }
    // email
    QString defaultEmail() const { return find( Qtopia::DefaultEmail ); }
    QStringList emailList() const;
    // home
    /*
     * OPimAddress address(enum Location)const;
     * would be some how nicer...
     *  -zecke
     */
    QString homeStreet() const { return find( Qtopia::HomeStreet ); }
    QString homeCity() const { return find( Qtopia::HomeCity ); }
    QString homeState() const { return find( Qtopia::HomeState ); }
    QString homeZip() const { return find( Qtopia::HomeZip ); }
    QString homeCountry() const { return find( Qtopia::HomeCountry ); }
    QString homePhone() const { return find( Qtopia::HomePhone ); }
    QString homeFax() const { return find( Qtopia::HomeFax ); }
    QString homeMobile() const { return find( Qtopia::HomeMobile ); }
    QString homeWebpage() const { return find( Qtopia::HomeWebPage ); }
    /** Multi line string containing all non-empty address info in the form
    * Street
    * City, State Zip
    * Country
    */
    QString displayHomeAddress() const;
    // business
    QString company() const { return find( Qtopia::Company ); }
    QString businessStreet() const { return find( Qtopia::BusinessStreet ); }
    QString businessCity() const { return find( Qtopia::BusinessCity ); }
    QString businessState() const { return find( Qtopia::BusinessState ); }
    QString businessZip() const { return find( Qtopia::BusinessZip ); }
    QString businessCountry() const { return find( Qtopia::BusinessCountry ); }
    QString businessWebpage() const { return find( Qtopia::BusinessWebPage ); }
    QString jobTitle() const { return find( Qtopia::JobTitle ); }
    QString department() const { return find( Qtopia::Department ); }
    QString office() const { return find( Qtopia::Office ); }
    QString businessPhone() const { return find( Qtopia::BusinessPhone ); }
    QString businessFax() const { return find( Qtopia::BusinessFax ); }
    QString businessMobile() const { return find( Qtopia::BusinessMobile ); }
    QString businessPager() const { return find( Qtopia::BusinessPager ); }
    QString profession() const { return find( Qtopia::Profession ); }
    QString assistant() const { return find( Qtopia::Assistant ); }
    QString manager() const { return find( Qtopia::Manager ); }
     /** Multi line string containing all non-empty address info in the form
    * Street
    * City, State Zip
    * Country
    */
    QString displayBusinessAddress() const;
    //personal
    QString spouse() const { return find( Qtopia::Spouse ); }
    QString gender() const { return find( Qtopia::Gender ); }
    QDate birthday() const;
    QDate anniversary() const;
    QString nickname() const { return find( Qtopia::Nickname ); }
    QString children() const { return find( Qtopia::Children ); }
    QStringList childrenList() const;
    // other
    QString notes() const { return find( Qtopia::Notes ); }
    QString groups() const { return find( Qtopia::Groups ); }
    QStringList groupList() const;
 //     // custom
 //     const QString &customField( const QString &key )
 //         { return find( Custom- + key ); }
    QString toRichText() const;
    QMap<int, QString> toMap() const;
    QString field( int key ) const { return find( key ); }
    void setUid( int i );
    QString toShortText()const;
    QString OContact::type()const;
    QMap<QString,QString> OContact::toExtraMap() const;
    class QString OContact::recordField(int) const;
    // Why private ? (eilers,se)
    QString emailSeparator() const { return " "; }
    // the emails should be seperated by a comma
    void setEmails( const QString &v );
    QString emails() const { return find( Qtopia::Emails ); }
    static int rtti();
 private:
    // The XML-Backend needs some access to the private functions
    friend class OContactAccessBackend_XML;
    void insert( int key, const QString &value );
    void replace( int key, const QString &value );
    QString find( int key ) const;
    static QStringList fields();
    void save( QString &buf ) const;
    QString displayAddress( const QString &street,
                            const QString &city,
                            const QString &state,
                            const QString &zip,
                            const QString &country ) const;
    QMap<int, QString> mMap;
    ContactPrivate *d;
 };
 #endif
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__