| -rw-r--r-- | library/timestring.h | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/library/timestring.h b/library/timestring.h index b8d1aea..9a2889b 100644 --- a/library/timestring.h +++ b/library/timestring.h @@ -1,36 +1,26 @@ /********************************************************************** ** Copyright (C) 2000-2006 Trolltech AS. All rights reserved. ** ** This file is part of the Qtopia Environment. -** +** ** This program is free software; you can redistribute it and/or modify it ** under the terms of the GNU General Public License as published by the ** Free Software Foundation; either version 2 of the License, or (at your ** option) any later version. -** -** A copy of the GNU GPL license version 2 is included in this package as +** +** A copy of the GNU GPL license version 2 is included in this package as ** LICENSE.GPL. ** ** This program is distributed in the hope that it will be useful, but ** WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ** See the GNU General Public License for more details. ** -** In addition, as a special exception Trolltech gives permission to link -** the code of this program with Qtopia applications copyrighted, developed -** and distributed by Trolltech under the terms of the Qtopia Personal Use -** License Agreement. You must comply with the GNU General Public License -** in all respects for all of the code used other than the applications -** licensed under the Qtopia Personal Use License Agreement. If you modify -** this file, you may extend this exception to your version of the file, -** but you are not obligated to do so. If you do not wish to do so, delete -** this exception statement from your version. -** ** 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 _TIMESTRING_H_ @@ -46,17 +36,17 @@ #include <qtopia/qpeglobal.h> class QObject; // return a string with the time based on whether or not you want // you want it in 12 hour form. if ampm is true, then return // it in 12 hour (am/pm) form otherwise return it in 24 hour form // in theory Qt 3,0 handles this better (hopefully obsoleteing this) -class DateFormat +class DateFormat { public: // date format type 1,2,4 = day,month,year enum Order { DayMonthYear = 0421, // right-to-left MonthDayYear = 0412, YearMonthDay = 0124 }; @@ -114,22 +104,22 @@ private: QDataStream &operator<<(QDataStream &s, const DateFormat&df); QDataStream &operator>>(QDataStream &s, DateFormat&df); #endif class TimeString { public: - //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601, + //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601, //YearMonthDay = ISO8601 }; //private: - static QString shortDate( const QDate &d ) + static QString shortDate( const QDate &d ) { return shortDate( d, currentDateFormat() ); } static QString dateString( const QDate &d ) { return dateString( d, currentDateFormat() ); } static QString longDateString( const QDate &d ) { return longDateString( d, currentDateFormat() ); } static QString dateString( const QDateTime &dt, bool ampm, bool seconds ) { return dateString( dt, ampm, seconds, currentDateFormat() ); } @@ -151,32 +141,32 @@ public: static bool currentAMPM(); static DateFormat currentDateFormat(); static QArray<DateFormat> formatOptions(); // qtopia 1.6.0 static void connectChange(QObject*,const char* member); static void disconnectChange(QObject*,const char* member); // Not recommended to call these (they don't honor system ampm) - static QString dateString( const QDateTime &t, bool ampm ); + static QString dateString( const QDateTime &t, bool ampm = false); static QString timeString( const QTime &t, bool ampm, bool seconds ); - static QString timeString( const QTime &t, bool ampm ); + static QString timeString( const QTime &t, bool ampm = false); static QString shortTime( bool ampm, bool seconds ); - static QString shortTime( bool ampm ); + static QString shortTime( bool ampm = false); static QString numberDateString( const QDate &d, DateFormat ); static QString numberDateString( const QDate &d ) { return numberDateString( d, currentDateFormat() ); } static QString longNumberDateString( const QDate &d, DateFormat ); static QString longNumberDateString( const QDate &d ) { return longNumberDateString( d, currentDateFormat() ); } static QString shortDate( const QDate &, DateFormat ); static QString dateString( const QDate &, DateFormat ); static QString longDateString( const QDate &, DateFormat ); private: static QString dateString( const QDateTime &t, bool ampm, bool seconds, DateFormat ); - + }; #endif |