OContact now uses QDate to avoid wrong interpreted strings

A lot of inline functions moved into the library..

2 files changed, 20 insertions, 19 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 4feadeb..5222f16 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -25,4 +25,5 @@
 #include <qpe/stringutil.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/timestring.h>
 
 #include <opie/orecordlist.h>
@@ -451,8 +452,8 @@ QString AbTable::findContactContact( const OContact &entry, int /* row */ )
 			break;
 		case Qtopia::Birthday:
-			value = entry.birthday();
+			value = TimeString::numberDateString( entry.birthday() );
 			break;
 		case Qtopia::Anniversary:
-			value = entry.anniversary();
+			value = TimeString::numberDateString( entry.anniversary() );
 			break;
 		case Qtopia::Nickname:
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 52ab0f2..e034b35 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1,4 +1,5 @@
 /*
  * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org>
+ * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
  *
  * This file is an add-on for the OPIE Palmtop Environment
@@ -1109,18 +1110,4 @@ void ContactEditor::loadFields() {
 			(*lit)->setText( tr( "Children" ) );
 	}
-	// Set DatePicker
-	qWarning ("**Info: %s", ent.birthday().latin1() );
-	if ( !ent.birthday().isEmpty() ){
-		birthdayButton->setText( ent.birthday() );
-		birthdayPicker->setDate( TimeConversion::fromString ( ent.birthday() ) );
-	} else
-		birthdayButton->setText( tr ("Unknown") );
-		
-	qWarning ("**Info: %s", ent.anniversary().latin1() );
-	if ( !ent.anniversary().isEmpty() ){
-		anniversaryButton->setText( ent.anniversary() );
-		anniversaryPicker->setDate( TimeConversion::fromString ( ent.birthday() ) );
-	} else
-		anniversaryButton->setText( tr ("Unknown") );
 
 }
@@ -1602,5 +1589,18 @@ void ContactEditor::setEntry( const OContact &entry ) {
 	slotAddressTypeChange( cmbAddress->currentItem() );
 
-	loadFields();
+	// loadFields(); :SX
+
+	// Set DatePicker
+	if ( !ent.birthday().isNull() ){
+		birthdayButton->setText( TimeString::numberDateString( ent.birthday() ) );
+		birthdayPicker->setDate( ent.birthday() );
+	} else
+		birthdayButton->setText( tr ("Unknown") );
+		
+	if ( !ent.anniversary().isNull() ){
+		anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) );
+		anniversaryPicker->setDate( ent.anniversary() );
+	} else
+		anniversaryButton->setText( tr ("Unknown") );
 
 }
@@ -1892,5 +1892,5 @@ void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
     QString dateString = TimeString::numberDateString( date );
     anniversaryButton->setText( dateString );
-    ent.setAnniversary ( dateString );
+    ent.setAnniversary ( date );
 }
 
@@ -1901,4 +1901,4 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
     QString dateString = TimeString::numberDateString( date );
     birthdayButton->setText( dateString );
-    ent.setBirthday ( dateString );
+    ent.setBirthday ( date );
 }