-rw-r--r-- | microkde/kdecore/klocale.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h index 7470cd2..f6c0253 100644 --- a/microkde/kdecore/klocale.h +++ b/microkde/kdecore/klocale.h | |||
@@ -38,13 +38,15 @@ class KLocale | |||
38 | QString negativeSign() const; | 38 | QString negativeSign() const; |
39 | 39 | ||
40 | 40 | ||
41 | QString translate( const char *index ) const; | 41 | QString translate( const char *index ) const; |
42 | QString translate( const char *index, const char *fallback) const; | 42 | QString translate( const char *index, const char *fallback) const; |
43 | 43 | ||
44 | QString formatDate(const QDate &pDate, bool shortFormat = false) const; | 44 | enum IntDateFormat { Undefined=-1, Default=0, Format1=1, ISODate=2, Userdefined=3 }; |
45 | |||
46 | QString formatDate(const QDate &pDate, bool shortFormat = false, IntDateFormat intIntDateFormat = Undefined) const; | ||
45 | QString formatTime(const QTime &pTime, bool includeSecs = false) const; | 47 | QString formatTime(const QTime &pTime, bool includeSecs = false) const; |
46 | QString formatDateTime(const QDateTime &pDateTime) const; | 48 | QString formatDateTime(const QDateTime &pDateTime) const; |
47 | QString formatDateTime(const QDateTime &pDateTime, | 49 | QString formatDateTime(const QDateTime &pDateTime, |
48 | bool shortFormat, | 50 | bool shortFormat, |
49 | bool includeSecs = false) const; | 51 | bool includeSecs = false) const; |
50 | 52 | ||
@@ -58,23 +60,23 @@ class KLocale | |||
58 | 60 | ||
59 | QString weekDayName(int,bool=false) const; | 61 | QString weekDayName(int,bool=false) const; |
60 | QString monthName(int,bool=false) const; | 62 | QString monthName(int,bool=false) const; |
61 | 63 | ||
62 | QString country() const; | 64 | QString country() const; |
63 | 65 | ||
64 | QString dateFormat() const; | 66 | QString dateFormat(IntDateFormat intIntDateFormat = Undefined) const; |
65 | QString dateFormatShort() const; | 67 | QString dateFormatShort(IntDateFormat intIntDateFormat = Undefined) const; |
66 | QString timeFormat() const; | 68 | QString timeFormat() const; |
67 | 69 | ||
68 | void insertCatalogue ( const QString & ); | 70 | void insertCatalogue ( const QString & ); |
69 | 71 | ||
70 | KCalendarSystem *calendar(); | 72 | KCalendarSystem *calendar(); |
71 | void setHore24Format ( bool ); | 73 | void setHore24Format ( bool ); |
72 | void setWeekStartMonday( bool ); | 74 | void setWeekStartMonday( bool ); |
73 | void setIntDateFormat( int ); | 75 | void setIntDateFormat( IntDateFormat ); |
74 | int getIntDateFormat( ); | 76 | IntDateFormat getIntDateFormat( ); |
75 | void setLanguage( int ); | 77 | void setLanguage( int ); |
76 | void setDateFormat( QString ); | 78 | void setDateFormat( QString ); |
77 | void setDateFormatShort( QString ); | 79 | void setDateFormatShort( QString ); |
78 | 80 | ||
79 | QString m_decimalSymbol; | 81 | QString m_decimalSymbol; |
80 | QString m_thousandsSeparator; | 82 | QString m_thousandsSeparator; |
@@ -92,13 +94,13 @@ class KLocale | |||
92 | private: | 94 | private: |
93 | QTime readTime(const QString &str, bool seconds, bool *ok) const; | 95 | QTime readTime(const QString &str, bool seconds, bool *ok) const; |
94 | QDate readDate(const QString &str, bool shortFormat, bool *ok) const; | 96 | QDate readDate(const QString &str, bool shortFormat, bool *ok) const; |
95 | KCalendarSystem *mCalendarSystem; | 97 | KCalendarSystem *mCalendarSystem; |
96 | bool mWeekStartsMonday; | 98 | bool mWeekStartsMonday; |
97 | bool mHourF24Format; | 99 | bool mHourF24Format; |
98 | int mIntDateFormat; | 100 | IntDateFormat mIntDateFormat; |
99 | int mLanguage; | 101 | int mLanguage; |
100 | QString mDateFormat; | 102 | QString mDateFormat; |
101 | QString mDateFormatShort; | 103 | QString mDateFormatShort; |
102 | QStringList mTimeZoneList; | 104 | QStringList mTimeZoneList; |
103 | bool daylightEnabled; | 105 | bool daylightEnabled; |
104 | int mDaylightTZoffset; | 106 | int mDaylightTZoffset; |