summaryrefslogtreecommitdiff
authorzecke <zecke>2004-02-18 23:25:18 (UTC)
committer zecke <zecke>2004-02-18 23:25:18 (UTC)
commitab41e301eb7f06af0869844d197e38a7838f3f2d (patch) (unidiff)
tree65fb4cf5e4af1cb2c8d85ec46bc53096a97d110a
parent28b63b3270b8162fcea4449b53b75fa325d740ad (diff)
downloadopie-ab41e301eb7f06af0869844d197e38a7838f3f2d.zip
opie-ab41e301eb7f06af0869844d197e38a7838f3f2d.tar.gz
opie-ab41e301eb7f06af0869844d197e38a7838f3f2d.tar.bz2
Gross hack to allow compilation with Qt3 more easily
Qt got a DateFormat as well so we use a define to call our QPEDateFormat
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/timestring.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/library/timestring.h b/library/timestring.h
index f8cb3e6..0335715 100644
--- a/library/timestring.h
+++ b/library/timestring.h
@@ -25,2 +25,6 @@
25 25
26#if (QT_VERSION-0 >= 0x030000)
27#define DateFormat QPEDateFormat
28#endif
29
26// return a string with the time based on whether or not you want 30// return a string with the time based on whether or not you want
@@ -29,3 +33,3 @@
29// in theory Qt 3,0 handles this better (hopefully obsoleteing this) 33// in theory Qt 3,0 handles this better (hopefully obsoleteing this)
30class DateFormat 34class DateFormat
31{ 35{
@@ -97,3 +101,3 @@ public:
97 101
98 //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601, 102 //enum DateFormat { MonthDayYear, DayMonthYear, ISO8601,
99 //YearMonthDay = ISO8601 }; 103 //YearMonthDay = ISO8601 };
@@ -101,3 +105,3 @@ public:
101 105
102 static QString shortDate( const QDate &d ) 106 static QString shortDate( const QDate &d )
103 { return shortDate( d, currentDateFormat() ); } 107 { return shortDate( d, currentDateFormat() ); }
@@ -131,3 +135,3 @@ private:
131 static QString dateString( const QDateTime &t, bool ampm, bool seconds, DateFormat ); 135 static QString dateString( const QDateTime &t, bool ampm, bool seconds, DateFormat );
132 136
133 137