summaryrefslogtreecommitdiffabout
path: root/microkde
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
parentb6ef669713ee1d52adcfc9754dd039a4ff6675da (diff)
downloadkdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.zip
kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.gz
kdepimpi-d90d17044d7daf6677074b0964d59f94407157d5.tar.bz2
some mail fixes and warnings removed
Diffstat (limited to 'microkde') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdecore/klocale.cpp27
-rw-r--r--microkde/kidmanager.cpp2
-rw-r--r--microkde/kresources/managerimpl.cpp4
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
@@ -865,29 +865,30 @@ QString KLocale::dateFormatShort(IntDateFormat intIntDateFormat) const
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 & )
{
}
diff --git a/microkde/kidmanager.cpp b/microkde/kidmanager.cpp
index 8cf486a..e687e5d 100644
--- a/microkde/kidmanager.cpp
+++ b/microkde/kidmanager.cpp
@@ -118,13 +118,13 @@ bool KIdManager::getNumbers (const QString& idString,const QString& prof, int &s
qDebug("Error getNumbers: andall not found ");
return false;
}
lenCsum = endall-startCsum+1;
}
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;
}
} else {
qDebug("Error in KIdManager::getNumbers.startIDnum <= 0");
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
@@ -154,25 +154,25 @@ void ManagerImpl::writeConfig( KConfig *cfg )
//US qDebug("ManagerImpl::writeConfig end this= %ul cfg=%ul", this, cfg);
}
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);
resource->setActive( true );
if ( mResources.isEmpty() ) {
mStandard = resource;
}
mResources.append( resource );
writeResourceConfig( resource, true );
- qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
+ //qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
}
void ManagerImpl::remove( Resource *resource, bool useDCOP )
{
if ( mStandard == resource ) mStandard = 0;