added

2 files changed, 14 insertions, 5 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
@@ -203,6 +203,8 @@ public:
     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;
@@ -211,8 +213,6 @@ private:
 
     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 );
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
@@ -25,15 +25,24 @@
 

 QString TimeConversion::toString( const QDate &d )

 {

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

+        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;

+        //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 ) {