added

2 files changed, 11 insertions, 2 deletions

diff --git a/library/backend/contact.h b/library/backend/contact.h
index 4999430..2294986 100644
--- a/library/backend/contact.h
+++ b/library/backend/contact.h
@@ -194,34 +194,34 @@ public:
     QString toRichText() const;
     QMap<int, QString> toMap() const;
     QString field( int key ) const { return find( key ); }
 
 
     // journaling...
     void saveJournal( journal_action action, const QString &key = QString::null );
     void save( QString &buf ) const;
 
     void setUid( int i )
 { Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); }
 
+    void setEmails( const QString &v );
+    QString emails() const { return find( Qtopia::Emails ); }
 private:
     friend class AbEditor;
     friend class AbTable;
     friend class AddressBookAccessPrivate;
     friend class XMLIO;
 
     QString emailSeparator() const { return " "; }
      // the emails should be seperated by a comma
-    void setEmails( const QString &v );
-    QString emails() const { return find( Qtopia::Emails ); }
 
     void insert( int key, const QString &value );
     void replace( int key, const QString &value );
     QString find( int key ) const;
 
     QString displayAddress( const QString &street,
 			    const QString &city,
 			    const QString &state,
 			    const QString &zip,
 			    const QString &country ) const;
 
     Qtopia::UidGen &uidGen() { return sUidGen; }
diff --git a/library/backend/timeconversion.cpp b/library/backend/timeconversion.cpp
index 3c25922..df7b0d5 100644
--- a/library/backend/timeconversion.cpp
+++ b/library/backend/timeconversion.cpp
@@ -16,33 +16,42 @@
 ** Contact info@trolltech.com if any conditions of this licensing are

 ** not clear to you.

 **

 **********************************************************************/

 

 #include <qglobal.h>

 #include <qtopia/timeconversion.h>

 #include <qregexp.h>

 #include <stdlib.h>

 

 QString TimeConversion::toString( const QDate &d )

 {

+	QString empty;

+	if ( d.isNull() )

+		return empty;

+

     QString r = QString::number( d.day() ) + "." +

 		QString::number( d.month() ) + "." +

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

     //qDebug("TimeConversion::toString %s", r.latin1());

+

     return r;

 }

 

 QDate TimeConversion::fromString( const QString &datestr )

 {

+    QDate empty;

+    if ( datestr.isEmpty() )

+	    return empty;

+

     int monthPos = datestr.find('.');

     int yearPos = datestr.find('.', monthPos+1 );

     if ( monthPos == -1 || yearPos == -1 ) {

 	qDebug("fromString didn't find . in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, yearPos );

 	return QDate();

     }

     int d = datestr.left( monthPos ).toInt();

     int m = datestr.mid( monthPos+1, yearPos - monthPos - 1 ).toInt();

     int y = datestr.mid( yearPos+1 ).toInt();

     QDate date ( y,m,d );

     //qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, yearPos);

     return date;