author | eilers <eilers> | 2003-04-22 14:09:11 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-04-22 14:09:11 (UTC) |
commit | 84be228e70b7d36627a8610386f44b6928d35d6a (patch) (side-by-side diff) | |
tree | 033bed687c526700661df02f412582a5fc8ac8ab /libopie/pim/ocontact.cpp | |
parent | 93aa0affde672012c65dcde0df2f5a11078aa376 (diff) | |
download | opie-84be228e70b7d36627a8610386f44b6928d35d6a.zip opie-84be228e70b7d36627a8610386f44b6928d35d6a.tar.gz opie-84be228e70b7d36627a8610386f44b6928d35d6a.tar.bz2 |
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...
-rw-r--r-- | libopie/pim/ocontact.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
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,8 +1,6 @@ /********************************************************************** ** 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 @@ -25,7 +23,7 @@ #include "opimresolver.h" #include <qpe/stringutil.h> -#include <qpe/timeconversion.h> +#include "oconversion.h" #include <qpe/timestring.h> #include <qobject.h> @@ -1017,7 +1015,7 @@ void OContact::setBirthday( const QDate &v ) } if ( v.isValid() ) - replace( Qtopia::Birthday, TimeConversion::toString( v ) ); + replace( Qtopia::Birthday, OConversion::dateToString( v ) ); } @@ -1035,7 +1033,7 @@ void OContact::setAnniversary( const QDate &v ) } if ( v.isValid() ) - replace( Qtopia::Anniversary, TimeConversion::toString( v ) ); + replace( Qtopia::Anniversary, OConversion::dateToString( v ) ); } /*! \fn QDate OContact::birthday() const @@ -1046,7 +1044,7 @@ 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(); } @@ -1061,7 +1059,7 @@ QDate OContact::anniversary() const QString str = find( Qtopia::Anniversary ); qWarning ("Anniversary %s", str.latin1() ); if ( !str.isEmpty() ) - return TimeConversion::fromString ( str ); + return OConversion::dateFromString ( str ); else return empty; } |