summaryrefslogtreecommitdiffabout
path: root/microkde/kdecore
authorzautrix <zautrix>2004-11-07 17:35:51 (UTC)
committer zautrix <zautrix>2004-11-07 17:35:51 (UTC)
commitd90d17044d7daf6677074b0964d59f94407157d5 (patch) (side-by-side diff)
tree82bf4f2001465637572534650769a864c15a6f7c /microkde/kdecore
parentb6ef669713ee1d52adcfc9754dd039a4ff6675da (diff)
downloadkdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.zip
kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.gz
kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.bz2
some mail fixes and warnings removed
Diffstat (limited to 'microkde/kdecore') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdecore/klocale.cpp27
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
@@ -868,23 +868,24 @@ QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const
const IntDateFormat tformat = (intIntTimeFormat == Undefined)?mIntTimeFormat:intIntTimeFormat;
if ( tformat == Default )
- if ( mHourF24Format)
- return "%H:%M:%S";
- else
- return "%I:%M:%S%p";
+ if ( mHourF24Format)
+ return "%H:%M:%S";
+ else
+ return "%I:%M:%S%p";
else if ( tformat == Format1 )
- if ( mHourF24Format)
- return "%H:%M:%S";
- else
- return "%I:%M:%S%p";
+ if ( mHourF24Format)
+ return "%H:%M:%S";
+ else
+ return "%I:%M:%S%p";
else if ( tformat == ISODate ) // = Qt::ISODate
- if ( mHourF24Format)
- return "%H:%M:%S";
- else
- return "%I:%M:%S%p";
-
+ if ( mHourF24Format)
+ return "%H:%M:%S";
+ else
+ return "%I:%M:%S%p";
+ // to satisfy the compiler
+ return "%H:%M:%S";
}
void KLocale::insertCatalogue ( const QString & )