summaryrefslogtreecommitdiff
path: root/libopie/pim
authoreilers <eilers>2003-04-22 14:09:11 (UTC)
committer eilers <eilers>2003-04-22 14:09:11 (UTC)
commit84be228e70b7d36627a8610386f44b6928d35d6a (patch) (side-by-side diff)
tree033bed687c526700661df02f412582a5fc8ac8ab /libopie/pim
parent93aa0affde672012c65dcde0df2f5a11078aa376 (diff)
downloadopie-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...
Diffstat (limited to 'libopie/pim') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.cpp14
-rw-r--r--libopie/pim/ocontact.h4
-rw-r--r--libopie/pim/oconversion.cpp76
-rw-r--r--libopie/pim/oconversion.h36
4 files changed, 119 insertions, 11 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
@@ -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/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 25fa0e7..50f6176 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/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)
**
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__
+