summaryrefslogtreecommitdiff
authorzecke <zecke>2003-05-12 13:09:39 (UTC)
committer zecke <zecke>2003-05-12 13:09:39 (UTC)
commit64f9f964ef690806378d639118f79539a8934d40 (patch) (side-by-side diff)
treed49f33713aaa4078a9d51ab6f099671c72226eb5
parent41ce7d75884224eb6fff131cc950744cb5adc0e2 (diff)
downloadopie-64f9f964ef690806378d639118f79539a8934d40.zip
opie-64f9f964ef690806378d639118f79539a8934d40.tar.gz
opie-64f9f964ef690806378d639118f79539a8934d40.tar.bz2
dateTimeFromString
and toString added
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/oconversion.cpp43
-rw-r--r--libopie/pim/oconversion.h9
-rw-r--r--libopie2/opiepim/core/oconversion.cpp43
-rw-r--r--libopie2/opiepim/core/oconversion.h9
4 files changed, 96 insertions, 8 deletions
diff --git a/libopie/pim/oconversion.cpp b/libopie/pim/oconversion.cpp
index c3aa89b..0d15414 100644
--- a/libopie/pim/oconversion.cpp
+++ b/libopie/pim/oconversion.cpp
@@ -19,58 +19,95 @@ QString OConversion::dateToString( const QDate &d )
{
if ( d.isNull() || !d.isValid() )
return QString::null;
// ISO format in year, month, day (YYYYMMDD); e.g. 20021231
QString year = QString::number( d.year() );
QString month = QString::number( d.month() );
month = month.rightJustify( 2, '0' );
QString day = QString::number( d.day() );
day = day.rightJustify( 2, '0' );
QString str = year + month + day;
//qDebug( "\tPimContact dateToStr = %s", str.latin1() );
return str;
}
QDate OConversion::dateFromString( const QString& s )
{
QDate date;
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() )
return date;
// Read ISO-Format (YYYYMMDD)
int year = s.mid(0, 4).toInt();
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;
}
if ( month < 0 || month > 12 ) {
qWarning( "PimContact month is not in range");
return date;
}
if ( day < 0 || day > 31 ) {
qWarning( "PimContact day is not in range");
return date;
}
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/libopie/pim/oconversion.h b/libopie/pim/oconversion.h
index 6540889..13367e1 100644
--- a/libopie/pim/oconversion.h
+++ b/libopie/pim/oconversion.h
@@ -2,35 +2,42 @@
** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
** 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.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**********************************************************************/
#ifndef __oconversion_h__
#define __oconversion_h__
/* #include <time.h> */
/* #include <sys/types.h> */
#include <qdatetime.h>
-
+/* 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__
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
@@ -19,58 +19,95 @@ QString OConversion::dateToString( const QDate &d )
{
if ( d.isNull() || !d.isValid() )
return QString::null;
// ISO format in year, month, day (YYYYMMDD); e.g. 20021231
QString year = QString::number( d.year() );
QString month = QString::number( d.month() );
month = month.rightJustify( 2, '0' );
QString day = QString::number( d.day() );
day = day.rightJustify( 2, '0' );
QString str = year + month + day;
//qDebug( "\tPimContact dateToStr = %s", str.latin1() );
return str;
}
QDate OConversion::dateFromString( const QString& s )
{
QDate date;
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() )
return date;
// Read ISO-Format (YYYYMMDD)
int year = s.mid(0, 4).toInt();
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;
}
if ( month < 0 || month > 12 ) {
qWarning( "PimContact month is not in range");
return date;
}
if ( day < 0 || day > 31 ) {
qWarning( "PimContact day is not in range");
return date;
}
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
@@ -2,35 +2,42 @@
** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
** 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.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**********************************************************************/
#ifndef __oconversion_h__
#define __oconversion_h__
/* #include <time.h> */
/* #include <sys/types.h> */
#include <qdatetime.h>
-
+/* 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__