From 64f9f964ef690806378d639118f79539a8934d40 Mon Sep 17 00:00:00 2001 From: zecke Date: Mon, 12 May 2003 13:09:39 +0000 Subject: dateTimeFromString and toString added --- (limited to 'libopie2') diff --git a/libopie2/opiepim/core/oconversion.cpp b/libopie2/opiepim/core/oconversion.cpp index c3aa89b..0d15414 100644 --- a/libopie2/opiepim/core/oconversion.cpp +++ b/libopie2/opiepim/core/oconversion.cpp @@ -40,7 +40,7 @@ QDate OConversion::dateFromString( const QString& s ) if ( s.isEmpty() ) return date; - // Be backward compatible to old Opie format: + // Be backward compatible to old Opie format: // Try to load old format. If it fails, try new ISO-Format! date = TimeConversion::fromString ( s ); if ( date.isValid() ) @@ -51,7 +51,8 @@ QDate OConversion::dateFromString( const QString& s ) int month = s.mid(4,2).toInt(); int day = s.mid(6,2).toInt(); - // do some quick sanity checking + // do some quick sanity checking -eilers + // but we isValid() again? -zecke if ( year < 1900 || year > 3000 ) { qWarning( "PimContact year is not in range"); return date; @@ -68,9 +69,45 @@ QDate OConversion::dateFromString( const QString& s ) date.setYMD( year, month, day ); if ( !date.isValid() ) { qWarning( "PimContact date is not valid"); - return QDate(); + return date; } return date; } +QString OConversion::dateTimeToString( const QDateTime& dt ) { + if (!dt.isValid() || dt.isNull() ) return QString::null; + + QString year = QString::number( dt.date().year() ); + QString month = QString::number( dt.date().month() ); + QString day = QString::number( dt.date().day() ); + + QString hour = QString::number( dt.time().hour() ); + QString min = QString::number( dt.time().minute() ); + QString sec = QString::number( dt.time().second() ); + + month = month.rightJustify( 2, '0' ); + day = day. rightJustify( 2, '0' ); + hour = hour. rightJustify( 2, '0' ); + min = min. rightJustify( 2, '0' ); + sec = sec. rightJustify( 2, '0' ); + + QString str = day + month + year + hour + min + sec; + + return str; +} +QDateTime OConversion::dateTimeFromString( const QString& str) { + + if ( str.isEmpty() ) return QDateTime(); + int day = str.mid(0, 2).toInt(); + int month = str.mid(2, 2).toInt(); + int year = str.mid(4, 4).toInt(); + int hour = str.mid(8, 2).toInt(); + int min = str.mid(10, 2).toInt(); + int sec = str.mid(12, 2).toInt(); + + QDate date( year, month, day ); + QTime time( hour, min, sec ); + QDateTime dt( date, time ); + return dt; +} diff --git a/libopie2/opiepim/core/oconversion.h b/libopie2/opiepim/core/oconversion.h index 6540889..13367e1 100644 --- a/libopie2/opiepim/core/oconversion.h +++ b/libopie2/opiepim/core/oconversion.h @@ -23,13 +23,20 @@ /* #include */ #include - +/* FIXME namespace? -zecke */ class OConversion { public: static QString dateToString( const QDate &d ); static QDate dateFromString( const QString &datestr ); + /** + * simple function to store DateTime as string and read from string + * no timezone changing is done + * DDMMYYYYHHMMSS is the simple format + */ + static QString dateTimeToString( const QDateTime& ); + static QDateTime dateTimeFromString( const QString& ); }; #endif // __oconversion_h__ -- cgit v0.9.0.2