summaryrefslogtreecommitdiff
path: root/library/timestring.h
Unidiff
Diffstat (limited to 'library/timestring.h') (more/less context) (show whitespace changes)
-rw-r--r--library/timestring.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/library/timestring.h b/library/timestring.h
index fd06d5b..f8cb3e6 100644
--- a/library/timestring.h
+++ b/library/timestring.h
@@ -1,16 +1,16 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
@@ -105,27 +105,32 @@ public:
105 { return dateString( d, currentDateFormat() ); } 105 { return dateString( d, currentDateFormat() ); }
106 static QString longDateString( const QDate &d ) 106 static QString longDateString( const QDate &d )
107 { return longDateString( d, currentDateFormat() ); } 107 { return longDateString( d, currentDateFormat() ); }
108 static QString dateString( const QDateTime &dt, bool ampm, bool seconds ) 108 static QString dateString( const QDateTime &dt, bool ampm, bool seconds )
109 { return dateString( dt, ampm, seconds, currentDateFormat() ); } 109 { return dateString( dt, ampm, seconds, currentDateFormat() ); }
110 110
111 static QString dateString( const QDateTime &t, bool ampm = false ); 111 static QString dateString( const QDateTime &t, bool ampm = false );
112 static QString timeString( const QTime &t, bool ampm, bool seconds ); 112 static QString timeString( const QTime &t, bool ampm, bool seconds );
113 static QString timeString( const QTime &t, bool ampm = false ); 113 static QString timeString( const QTime &t, bool ampm = false );
114 static QString shortTime( bool ampm, bool seconds ); 114 static QString shortTime( bool ampm, bool seconds );
115 static QString shortTime( bool ampm = false ); 115 static QString shortTime( bool ampm = false );
116 116
117 117 static QString numberDateString( const QDate &d, DateFormat );
118 static QString numberDateString( const QDate &d )
119 { return numberDateString( d, currentDateFormat() ); }
120 static QString longNumberDateString( const QDate &d, DateFormat );
121 static QString longNumberDateString( const QDate &d )
122 { return longNumberDateString( d, currentDateFormat() ); }
118 123
119 static QString shortDate( const QDate &, DateFormat ); 124 static QString shortDate( const QDate &, DateFormat );
120 static QString dateString( const QDate &, DateFormat ); 125 static QString dateString( const QDate &, DateFormat );
121 static QString longDateString( const QDate &, DateFormat ); 126 static QString longDateString( const QDate &, DateFormat );
122 127
123 static DateFormat currentDateFormat(); 128 static DateFormat currentDateFormat();
124 129
125private: 130private:
126 static QString dateString( const QDateTime &t, bool ampm, bool seconds, DateFormat ); 131 static QString dateString( const QDateTime &t, bool ampm, bool seconds, DateFormat );
127 132
128 133
129}; 134};
130#endif
131 135
136#endif