| -rw-r--r-- | microkde/kdecore/klocale.cpp | 3 | ||||
| -rw-r--r-- | microkde/kidmanager.cpp | 2 | ||||
| -rw-r--r-- | microkde/kresources/managerimpl.cpp | 4 |
3 files changed, 5 insertions, 4 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 @@ -871,33 +871,34 @@ QString KLocale::timeFormat(IntDateFormat intIntTimeFormat) const 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"; else if ( tformat == ISODate ) // = Qt::ISODate 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 & ) { } KCalendarSystem *KLocale::calendar() { if ( !mCalendarSystem ) { mCalendarSystem = new KCalendarSystemGregorian; } return mCalendarSystem; } int KLocale::timezoneOffset( QString timeZone ) diff --git a/microkde/kidmanager.cpp b/microkde/kidmanager.cpp index 8cf486a..e687e5d 100644 --- a/microkde/kidmanager.cpp +++ b/microkde/kidmanager.cpp @@ -108,29 +108,29 @@ bool KIdManager::getNumbers (const QString& idString,const QString& prof, int &s startIDnum = prof.length()+2+startProf; startID = idString.find( ";", startIDnum ) +1; startIDnumlen = startID - startIDnum - 1; if ( startIDnum > 0 ) { bool ok; lenID = idString.mid ( startIDnum,startIDnumlen).toInt( &ok ); if (ok) { startCsum = startID+lenID+1; endall = idString.find( ":", startCsum )-1; if ( endall < 0 ) { 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; } } else { //qDebug("getnumbers: profile not found *%s* ",prof.latin1() ); return false; } return true; } 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 @@ -144,45 +144,45 @@ void ManagerImpl::writeConfig( KConfig *cfg ) mConfig->writeEntry( "ResourceKeys", activeKeys ); mConfig->writeEntry( "PassiveResourceKeys", passiveKeys ); if ( mStandard ) mConfig->writeEntry( "Standard", mStandard->identifier() ); else mConfig->writeEntry( "Standard", "" ); mConfig->sync(); kdDebug(5650) << "ManagerImpl::save() finished" << endl; //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; removeResource( resource ); mResources.remove( resource ); delete resource; kdDebug(5650) << "Finished ManagerImpl::remove()" << endl; } void ManagerImpl::setActive( Resource *resource, bool active ) |