author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/timestring.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/timestring.h | 13 |
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,6 +1,6 @@ | |||
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 |
@@ -115,5 +115,10 @@ public: | |||
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 ); |
@@ -128,4 +133,4 @@ private: | |||
128 | 133 | ||
129 | }; | 134 | }; |
130 | #endif | ||
131 | 135 | ||
136 | #endif | ||