| -rw-r--r-- | libopie2/opiepim/core/oconversion.cpp | 76 | ||||
| -rw-r--r-- | libopie2/opiepim/core/oconversion.h | 36 | ||||
| -rw-r--r-- | libopie2/opiepim/ocontact.cpp | 14 | ||||
| -rw-r--r-- | libopie2/opiepim/ocontact.h | 4 |
4 files changed, 119 insertions, 11 deletions
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 @@ -2,5 +2,3 @@ ** 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) ** @@ -27,3 +25,3 @@ #include <qpe/stringutil.h> -#include <qpe/timeconversion.h> +#include "oconversion.h" #include <qpe/timestring.h> @@ -1019,3 +1017,3 @@ void OContact::setBirthday( const QDate &v ) if ( v.isValid() ) - replace( Qtopia::Birthday, TimeConversion::toString( v ) ); + replace( Qtopia::Birthday, OConversion::dateToString( v ) ); @@ -1037,3 +1035,3 @@ void OContact::setAnniversary( const QDate &v ) if ( v.isValid() ) - replace( Qtopia::Anniversary, TimeConversion::toString( v ) ); + replace( Qtopia::Anniversary, OConversion::dateToString( v ) ); } @@ -1048,3 +1046,3 @@ QDate OContact::birthday() const if ( !str.isEmpty() ) - return TimeConversion::fromString ( str ); + return OConversion::dateFromString ( str ); else @@ -1063,3 +1061,3 @@ QDate OContact::anniversary() const if ( !str.isEmpty() ) - return TimeConversion::fromString ( str ); + return OConversion::dateFromString ( str ); else 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 @@ -2,5 +2,3 @@ ** 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) ** |