added

3 files changed, 16 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
@@ -202,18 +202,18 @@ 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;
     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;
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
@@ -24,17 +24,26 @@
 #include <stdlib.h>

 

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

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

diff --git a/library/library.pro b/library/library.pro
index fba98f8..142c609 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -112,8 +112,10 @@ SOURCES	=   calendar.cpp \
         backend/vobject.cpp \
         findwidget_p.cpp \
         finddialog.cpp \
         lnkproperties.cpp
+# QPE crashes on my Notebook if it tries to play sound
+DEFINES = QT_NO_SOUND
 # Qt 3 compatibility
 HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend