1 files changed, 6 insertions, 8 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
@@ -1,11 +1,9 @@
 /**********************************************************************
 ** 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)
 **
 ** 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.
 **
@@ -22,13 +20,13 @@
 #define QTOPIA_INTERNAL_CONTACT_MRE
 
 #include "ocontact.h"
 #include "opimresolver.h"
 
 #include <qpe/stringutil.h>
-#include <qpe/timeconversion.h>
+#include "oconversion.h"
 #include <qpe/timestring.h>
 
 #include <qobject.h>
 #include <qregexp.h>
 #include <qstylesheet.h>
 #include <qfileinfo.h>
@@ -1014,13 +1012,13 @@ void OContact::setBirthday( const QDate &v )
                 qWarning( "Remove Birthday");
                 replace( Qtopia::Birthday, QString::null );
                 return;
         }
 
         if ( v.isValid() )
-                replace( Qtopia::Birthday, TimeConversion::toString( v ) );
+                replace( Qtopia::Birthday, OConversion::dateToString( v ) );
 
 }
 
 
 /*! \fn void OContact::setAnniversary( const QDate &date )
   Sets the anniversary of the contact to \a date. If date is
@@ -1032,24 +1030,24 @@ void OContact::setAnniversary( const QDate &v )
                 qWarning( "Remove Anniversary");
                 replace( Qtopia::Anniversary, QString::null );
                 return;
         }
 
         if ( v.isValid() )
-                replace( Qtopia::Anniversary, TimeConversion::toString( v ) );
+                replace( Qtopia::Anniversary, OConversion::dateToString( v ) );
 }
 
 /*! \fn QDate OContact::birthday() const
   Returns the birthday of the contact.
 */
 QDate OContact::birthday() const
 {
         QString str = find( Qtopia::Birthday );
         qWarning ("Birthday %s", str.latin1() );
         if ( !str.isEmpty() )
-                return  TimeConversion::fromString ( str );
+                return  OConversion::dateFromString ( str );
         else
                 return QDate();
 }
 
 
 /*! \fn QDate OContact::anniversary() const
@@ -1058,13 +1056,13 @@ QDate OContact::birthday() const
 QDate OContact::anniversary() const
 {
         QDate empty;
         QString str = find( Qtopia::Anniversary );
         qWarning ("Anniversary %s", str.latin1() );
         if ( !str.isEmpty() )
-                return TimeConversion::fromString ( str );
+                return OConversion::dateFromString ( str );
         else
                 return empty;
 }
 
 
 void OContact::insertEmail( const QString &v )