| -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 @@ -4,3 +4,3 @@ ** This file is part of the Qtopia Environment. -** +** ** This program is free software; you can redistribute it and/or modify it @@ -9,4 +9,4 @@ ** 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. @@ -15,15 +15,5 @@ ** 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. @@ -53,3 +43,3 @@ class QObject; // in theory Qt 3,0 handles this better (hopefully obsoleteing this) -class DateFormat +class DateFormat { @@ -121,3 +111,3 @@ public: - //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601, + //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601, //YearMonthDay = ISO8601 }; @@ -126,3 +116,3 @@ public: //private: - static QString shortDate( const QDate &d ) + static QString shortDate( const QDate &d ) { return shortDate( d, currentDateFormat() ); } @@ -158,7 +148,7 @@ public: // 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); @@ -177,3 +167,3 @@ private: static QString dateString( const QDateTime &t, bool ampm, bool seconds, DateFormat ); - + |