| author | zautrix <zautrix> | 2004-11-07 17:35:51 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-11-07 17:35:51 (UTC) |
| commit | d90d17044d7daf6677074b0964d59f94407157d5 (patch) (unidiff) | |
| tree | 82bf4f2001465637572534650769a864c15a6f7c /microkde/kdecore/klocale.cpp | |
| parent | b6ef669713ee1d52adcfc9754dd039a4ff6675da (diff) | |
| download | kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.zip kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.gz kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.bz2 | |
some mail fixes and warnings removed
Diffstat (limited to 'microkde/kdecore/klocale.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | microkde/kdecore/klocale.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index 1da1e99..d7e384c 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp | |||
| @@ -870,19 +870,20 @@ QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const | |||
| 870 | if ( tformat == Default ) | 870 | if ( tformat == Default ) |
| 871 | if ( mHourF24Format) | 871 | if ( mHourF24Format) |
| 872 | return "%H:%M:%S"; | 872 | return "%H:%M:%S"; |
| 873 | else | 873 | else |
| 874 | return "%I:%M:%S%p"; | 874 | return "%I:%M:%S%p"; |
| 875 | 875 | ||
| 876 | else if ( tformat == Format1 ) | 876 | else if ( tformat == Format1 ) |
| 877 | if ( mHourF24Format) | 877 | if ( mHourF24Format) |
| 878 | return "%H:%M:%S"; | 878 | return "%H:%M:%S"; |
| 879 | else | 879 | else |
| 880 | return "%I:%M:%S%p"; | 880 | return "%I:%M:%S%p"; |
| 881 | 881 | ||
| 882 | else if ( tformat == ISODate ) // = Qt::ISODate | 882 | else if ( tformat == ISODate ) // = Qt::ISODate |
| 883 | if ( mHourF24Format) | 883 | if ( mHourF24Format) |
| 884 | return "%H:%M:%S"; | 884 | return "%H:%M:%S"; |
| 885 | else | 885 | else |
| 886 | return "%I:%M:%S%p"; | 886 | return "%I:%M:%S%p"; |
| 887 | 887 | // to satisfy the compiler | |
| 888 | return "%H:%M:%S"; | ||
| 888 | } | 889 | } |