some mail fixes and warnings removed

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
@@ -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 & )
diff --git a/microkde/kidmanager.cpp b/microkde/kidmanager.cpp
index 8cf486a..e687e5d 100644
--- a/microkde/kidmanager.cpp
+++ b/microkde/kidmanager.cpp
@@ -121,7 +121,7 @@ bool KIdManager::getNumbers (const QString& idString,const QString& prof, int &s
                 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 {
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
@@ -157,7 +157,7 @@ void ManagerImpl::writeConfig( KConfig *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 );
 
@@ -169,7 +169,7 @@ qDebug("ManagerImpl::add begin this= %ul resource=%ul", this, resource);
 
   writeResourceConfig( resource, true );
 
-  qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
+  //qDebug("ManagerImpl::add end this= %ul resource=%ul", this, resource);
 
 }