| author | zautrix <zautrix> | 2004-11-07 17:35:51 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-11-07 17:35:51 (UTC) |
| commit | d90d17044d7daf6677074b0964d59f94407157d5 (patch) (side-by-side diff) | |
| tree | 82bf4f2001465637572534650769a864c15a6f7c /microkde | |
| parent | b6ef669713ee1d52adcfc9754dd039a4ff6675da (diff) | |
| download | kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.zip kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.gz kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.bz2 | |
some mail fixes and warnings removed
| -rw-r--r-- | microkde/kdecore/klocale.cpp | 27 | ||||
| -rw-r--r-- | microkde/kidmanager.cpp | 2 | ||||
| -rw-r--r-- | microkde/kresources/managerimpl.cpp | 4 |
3 files changed, 17 insertions, 16 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 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"; } diff --git a/microkde/kidmanager.cpp b/microkde/kidmanager.cpp index 8cf486a..e687e5d 100644 --- a/microkde/kidmanager.cpp +++ b/microkde/kidmanager.cpp @@ -123,3 +123,3 @@ bool KIdManager::getNumbers (const QString& idString,const QString& prof, int &s else { - qDebug("Error getNumbers:length is no number:*%s* ", idString.mid ( startIDnum,startIDnumlen).toInt( &ok )); + qDebug("Error getNumbers:length is no number:*%s* ", idString.mid ( startIDnum,startIDnumlen).latin1()); return false; diff --git a/microkde/kresources/managerimpl.cpp b/microkde/kresources/managerimpl.cpp index 5bd9eb7..566b8f4 100644 --- a/microkde/kresources/managerimpl.cpp +++ b/microkde/kresources/managerimpl.cpp @@ -159,3 +159,3 @@ void ManagerImpl::add( Resource *resource, bool useDCOP ) { -qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); + //qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); @@ -171,3 +171,3 @@ qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource); - qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource); + //qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource); |