From 73e6962503fad5bfe57c178ed91476a0fcf2ba4d Mon Sep 17 00:00:00 2001 From: Emanoil Kotsev Date: Tue, 3 Nov 2026 16:18:25 +0000 Subject: Fix missing endl in kdDebug(), kdWarning() and kdError() calls - replace \n with endl in kdDebug(), kdWarning() and kdError() calls - style: format debug URLs using prettyUrl() Signed-off-by: Emanoil Kotsev --- akregator/src/mainwindow.cpp | 2 +- akregator/src/pluginmanager.cpp | 10 +- certmanager/certificatewizardimpl.cpp | 2 +- certmanager/lib/ui/keyselectiondialog.cpp | 2 +- kaddressbook/features/resourceselection.cpp | 4 +- kaddressbook/thumbnailcreator/ldifvcardcreator.cpp | 2 +- kaddressbook/viewmanager.cpp | 2 +- kaddressbook/xxport/gnokii_xxport.cpp | 4 +- kalarm/alarmcalendar.cpp | 16 +-- kalarm/alarmevent.cpp | 128 ++++++++++----------- kalarm/alarmlistview.cpp | 2 +- kalarm/calendarcompat.cpp | 2 +- kalarm/daemon.cpp | 22 ++-- kalarm/dcophandler.cpp | 4 +- kalarm/functions.cpp | 14 +-- kalarm/kalarmapp.cpp | 48 ++++---- kalarm/kalarmd/adcalendar.cpp | 8 +- kalarm/kalarmd/adconfigdata.cpp | 8 +- kalarm/kalarmd/alarmdaemon.cpp | 8 +- kalarm/kamail.cpp | 10 +- kalarm/lib/shellprocess.cpp | 6 +- kalarm/main.cpp | 2 +- kalarm/mainwindow.cpp | 14 +-- kalarm/messagewin.cpp | 18 +-- kalarm/sounddlg.cpp | 4 +- kalarm/traywindow.cpp | 8 +- kalarm/undo.cpp | 10 +- karm/karmstorage.cpp | 6 +- kmail/configuredialog.cpp | 6 +- kmail/folderstorage.cpp | 2 +- kmail/imapaccountbase.cpp | 2 +- kmail/kmailicalifaceimpl.cpp | 20 ++-- kmail/kmcommands.cpp | 4 +- kmail/kmcomposewin.cpp | 2 +- kmail/kmdebug.h | 2 +- kmail/kmedit.cpp | 2 +- kmail/kmfoldercachedimap.cpp | 8 +- kmail/kmfoldermaildir.cpp | 4 +- kmail/kmkernel.cpp | 6 +- kmail/kmmainwidget.cpp | 3 +- kmail/kmmessage.cpp | 11 +- kmail/kmreaderwin.cpp | 58 +++++----- kmail/objecttreeparser.cpp | 38 +++--- kmail/snippetwidget.cpp | 2 +- kmobile/kmobile.cpp | 8 +- kmobile/kmobileclient.cpp | 10 +- kmobile/kmobiledevice.cpp | 10 +- kmobile/kmobileitem.cpp | 10 +- kmobile/kmobileview.cpp | 6 +- kmobile/tdeioslave/tdeio_mobile.cpp | 44 +++---- kmobile/testlibkmobile.cpp | 6 +- knotes/knoteprinter.cpp | 6 +- korganizer/actionmanager.cpp | 2 +- korganizer/calendarview.cpp | 2 +- korganizer/eventarchiver.cpp | 2 +- korganizer/freebusymanager.cpp | 6 +- korganizer/incidencechanger.cpp | 9 +- korganizer/koagenda.cpp | 4 +- korganizer/koagendaview.cpp | 2 +- korganizer/kodaymatrix.cpp | 2 +- korganizer/koprefs.cpp | 8 +- korganizer/kotodoeditor.cpp | 4 +- korganizer/plugins/exchange/exchange.cpp | 4 +- korn/tdeio_subjects.cpp | 2 +- ktnef/gui/qwmf.cpp | 2 +- ktnef/lib/ktnefparser.cpp | 30 ++--- libemailfunctions/email.cpp | 12 +- libkcal/assignmentvisitor.cpp | 8 +- libkcal/calendar.cpp | 2 +- libkcal/calendarlocal.cpp | 2 +- libkcal/freebusy.cpp | 2 +- libkcal/icalformat.cpp | 6 +- libkcal/icalformatimpl.cpp | 4 +- libkcal/recurrencerule.cpp | 6 +- libkcal/resourcecached.cpp | 2 +- libkcal/resourcelocal.cpp | 2 +- libkcal/scheduler.cpp | 2 +- libkholidays/kholidays.cpp | 4 +- libkmime/tests/test_dates.cpp | 80 ++++++------- libkpgp/kpgp.cpp | 16 +-- libkpgp/kpgpbase2.cpp | 12 +- libkpgp/kpgpbase5.cpp | 10 +- libkpgp/kpgpbase6.cpp | 34 +++--- libkpgp/kpgpbaseG.cpp | 12 +- libkpgp/kpgpui.cpp | 26 ++--- libkpimexchange/core/exchangeclient.cpp | 2 +- libtdepim/komposer/core/core.cpp | 18 +-- libtdepim/komposer/core/pluginmanager.cpp | 2 +- libtdepim/komposer/core/tests/testmanager.cpp | 10 +- tdeioslave/sieve/sieve.cpp | 2 +- tderesources/birthdays/resourcetdeabc.cpp | 2 +- tderesources/blogging/API_Blog.cpp | 8 +- tderesources/blogging/API_Blogger.cpp | 20 ++-- tderesources/caldav/config.cpp | 4 +- tderesources/caldav/job.cpp | 2 +- tderesources/caldav/preferences.cpp | 20 ++-- tderesources/caldav/preferences.h | 2 +- tderesources/caldav/reader.cpp | 35 +++--- tderesources/caldav/resource.cpp | 2 +- tderesources/caldav/writer.cpp | 38 +++--- tderesources/carddav/config.cpp | 4 +- tderesources/carddav/job.cpp | 2 +- tderesources/carddav/preferences.cpp | 20 ++-- tderesources/carddav/preferences.h | 2 +- tderesources/carddav/reader.cpp | 9 +- tderesources/carddav/resource.cpp | 2 +- tderesources/carddav/writer.cpp | 14 +-- tderesources/exchange/resourceexchange.cpp | 2 +- tderesources/groupwise/soap/gwjobs.cpp | 8 +- tderesources/groupwise/soap/incidenceconverter.cpp | 3 +- tderesources/groupwise/soap/ksslsocket.cpp | 5 +- tderesources/kolab/kcal/event.cpp | 4 +- tderesources/kolab/kcal/incidence.cpp | 4 +- tderesources/kolab/kcal/resourcekolab.cpp | 10 +- tderesources/kolab/knotes/resourcekolab.cpp | 10 +- tderesources/kolab/shared/kmailconnection.cpp | 10 +- tderesources/kolab/shared/kolabbase.cpp | 6 +- tderesources/kolab/tdeabc/resourcekolab.cpp | 12 +- tderesources/lib/folderlister.cpp | 16 +-- tderesources/lib/groupwaredataadaptor.cpp | 22 ++-- .../newexchange/exchangeconvertercalendar.cpp | 6 +- tderesources/newexchange/exchangeglobals.cpp | 30 ++--- tderesources/scalix/kcal/resourcescalix.cpp | 8 +- tderesources/scalix/knotes/resourcescalix.cpp | 10 +- tderesources/scalix/shared/kmailconnection.cpp | 10 +- tderesources/scalix/shared/scalixbase.cpp | 6 +- tderesources/scalix/tdeabc/resourcescalix.cpp | 12 +- tderesources/slox/kcalresourceslox.cpp | 10 +- tderesources/slox/tdeabcresourceslox.cpp | 2 +- 129 files changed, 695 insertions(+), 688 deletions(-) diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index b236d0017..6b2dea29f 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -241,7 +241,7 @@ bool MainWindow::queryExit() m_part = 0; } else - kdDebug("MainWindow::queryExit(): saving session"); + kdDebug() << "MainWindow::queryExit(): saving session" << endl; return TDEMainWindow::queryExit(); } diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp index 8efe9c71f..e29c5011d 100644 --- a/akregator/src/pluginmanager.cpp +++ b/akregator/src/pluginmanager.cpp @@ -63,7 +63,7 @@ PluginManager::createFromQuery( const TQString &constraint ) TDETrader::OfferList offers = query( constraint ); if ( offers.isEmpty() ) { - kdWarning() << k_funcinfo << "No matching plugin found.\n"; + kdWarning() << k_funcinfo << "No matching plugin found." << endl; return 0; } @@ -100,7 +100,7 @@ PluginManager::createFromService( const KService::Ptr service ) Plugin* (*create_plugin)() = ( Plugin* (*)() ) lib->symbol( "create_plugin" ); if ( !create_plugin ) { - kdWarning() << k_funcinfo << "create_plugin == NULL\n"; + kdWarning() << k_funcinfo << "create_plugin == NULL" << endl; return 0; } //create plugin on the heap @@ -131,7 +131,7 @@ PluginManager::unload( Plugin* plugin ) m_store.erase( iter ); } else - kdWarning() << k_funcinfo << "Could not unload plugin (not found in store).\n"; + kdWarning() << k_funcinfo << "Could not unload plugin (not found in store)." << endl; } @@ -139,7 +139,7 @@ KService::Ptr PluginManager::getService( const Plugin* plugin ) { if ( !plugin ) { - kdWarning() << k_funcinfo << "pointer == NULL\n"; + kdWarning() << k_funcinfo << "pointer == NULL" << endl; return 0; } @@ -147,7 +147,7 @@ PluginManager::getService( const Plugin* plugin ) vector::const_iterator iter = lookupPlugin( plugin ); if ( iter == m_store.end() ) - kdWarning() << k_funcinfo << "Plugin not found in store.\n"; + kdWarning() << k_funcinfo << "Plugin not found in store." << endl; return (*iter).service; } diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 8cfd4bf7a..fbe670d32 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -424,7 +424,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte findServiceFor( "DCOP/Mailer", TQString(), TQString(), &error, &dcopService ); if ( result != 0 ) { - kdDebug() << "Couldn't connect to KMail\n"; + kdDebug() << "Couldn't connect to KMail" << endl; KMessageBox::error( this, i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) ); return; diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 78bb441d8..969ba1496 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -680,7 +680,7 @@ namespace { } void Kleo::KeySelectionDialog::slotCheckSelection( KeyListViewItem * item ) { - kdDebug(5150) << "KeySelectionDialog::slotCheckSelection()\n"; + kdDebug(5150) << "KeySelectionDialog::slotCheckSelection()" << endl; mCheckSelectionTimer->stop(); diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 4a16c5988..4e1d6b67f 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -441,11 +441,11 @@ void ResourceSelection::slotSubresourceChanged( KPIM::ResourceABC* resource, const TQString& type, const TQString& subResource ) { - kdDebug(5720) << resource->resourceName() << subResource; + kdDebug(5720) << resource->resourceName() << subResource << endl; ResourceItem *item = findSubResourceItem( resource, subResource ); if ( item == 0 ) { - kdWarning(5720) << "Changed before it was added?"; + kdWarning(5720) << "Changed before it was added?" << endl; slotSubresourceAdded( resource, type, subResource ); return; } diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 35c05a214..7acdd9d30 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -166,7 +166,7 @@ bool VCard_LDIFCreator::createImageSmall() if ( pixmap.isEmpty() ) { delete mSplitter; mSplitter=0; - kdWarning() << "VCard_LDIFCreator: Font image \"thumbnailfont_7x4.png\" not found!\n"; + kdWarning() << "VCard_LDIFCreator: Font image \"thumbnailfont_7x4.png\" not found!" << endl; return false; } mSplitter->setPixmap( TQPixmap( pixmap ) ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index eaeb0ae1b..39cd1b306 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -250,7 +250,7 @@ void ViewManager::setActiveView( const TQString &name ) mActiveView->refresh(); } else - kdDebug(5720) << "ViewManager::setActiveView: unable to find view\n"; + kdDebug(5720) << "ViewManager::setActiveView: unable to find view" << endl; } void ViewManager::refreshView( const TQString &uid ) diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index e1be330a4..6559aaecf 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -56,14 +56,14 @@ extern "C" { #define APP "GNOKII_XXPORT" #if 1 // !defined(NDEBUG) - #define GNOKII_DEBUG(x) do { kdWarning() << (x); } while (0) + #define GNOKII_DEBUG(x) do { kdWarning() << (x) << endl; } while (0) #else #define GNOKII_DEBUG(x) do { } while (0) #endif #define GNOKII_CHECK_ERROR(error) \ do { \ if (error) \ - kdError() << TQString("ERROR %1: %2\n").arg(error).arg(gn_error_print(error));\ + kdError() << TQString("ERROR %1: %2").arg(error).arg(gn_error_print(error)) << endl;\ } while (0) // Locale conversion routines: diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 1e08590e1..31d8898d7 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -110,7 +110,7 @@ bool AlarmCalendar::initialiseCalendars() errorKey1 = templateKey; if (!errorKey1.isNull()) { - kdError(5950) << "AlarmCalendar::initialiseCalendars(): '" << errorKey1 << "' calendar name = display calendar name\n"; + kdError(5950) << "AlarmCalendar::initialiseCalendars(): '" << errorKey1 << "' calendar name = display calendar name" << endl; TQString file = config->readPathEntry(errorKey1); KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").arg(errorKey1).arg(file)); return false; @@ -193,7 +193,7 @@ AlarmCalendar* AlarmCalendar::calendarOpen(CalID id) return 0; // all events are automatically purged from the calendar if (cal->open()) return cal; - kdError(5950) << "AlarmCalendar::calendarOpen(" << calendarNames[id] << "): open error\n"; + kdError(5950) << "AlarmCalendar::calendarOpen(" << calendarNames[id] << "): open error" << endl; return 0; } @@ -259,7 +259,7 @@ bool AlarmCalendar::open() if (!mUrl.isValid()) return false; - kdDebug(5950) << "AlarmCalendar::open(" << mUrl.prettyURL() << ")\n"; + kdDebug(5950) << "AlarmCalendar::open(" << mUrl.prettyURL() << ")" << endl; if (!mCalendar) mCalendar = new CalendarLocal(TQString::fromLatin1("UTC")); mCalendar->setLocalTime(); // write out using local time (i.e. no time zone) @@ -376,13 +376,13 @@ bool AlarmCalendar::saveCal(const TQString& newFile) if (!mCalendar || (!mOpen && newFile.isNull())) return false; - kdDebug(5950) << "AlarmCalendar::saveCal(\"" << newFile << "\", " << mType << ")\n"; + kdDebug(5950) << "AlarmCalendar::saveCal(\"" << newFile << "\", " << mType << ")" << endl; TQString saveFilename = newFile.isNull() ? mLocalFile : newFile; if (mVCal && newFile.isNull() && mUrl.isLocalFile()) saveFilename = mICalUrl.path(); if (!mCalendar->save(saveFilename, new ICalFormat)) { - kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): failed.\n"; + kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): failed." << endl; KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } @@ -391,7 +391,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile) { if (!TDEIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow())) { - kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n"; + kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed." << endl; KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL())); return false; } @@ -686,7 +686,7 @@ void AlarmCalendar::purgeIfQueued() { if (open()) { - kdDebug(5950) << "AlarmCalendar::purgeIfQueued(" << mPurgeDaysQueued << ")\n"; + kdDebug(5950) << "AlarmCalendar::purgeIfQueued(" << mPurgeDaysQueued << ")" << endl; bool changed = false; TQDate cutoff = TQDate::currentDate().addDays(-mPurgeDaysQueued); Event::List events = mCalendar->rawEvents(); @@ -845,7 +845,7 @@ KCal::Event::List AlarmCalendar::events() */ Event::List AlarmCalendar::eventsWithAlarms(const TQDateTime& from, const TQDateTime& to) { - kdDebug(5950) << "AlarmCalendar::eventsWithAlarms(" << from.toString() << " - " << to.toString() << ")\n"; + kdDebug(5950) << "AlarmCalendar::eventsWithAlarms(" << from.toString() << " - " << to.toString() << ")" << endl; Event::List evnts; TQDateTime dt; Event::List allEvents = events(); // ignore events without usable alarms diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp index b5c4fb030..db345243f 100644 --- a/kalarm/alarmevent.cpp +++ b/kalarm/alarmevent.cpp @@ -3115,56 +3115,56 @@ bool KAEvent::convertRepetition(KCal::Event* event) #ifndef NDEBUG void KAEvent::dumpDebug() const { - kdDebug(5950) << "KAEvent dump:\n"; + kdDebug(5950) << "KAEvent dump:" << endl; KAAlarmEventBase::dumpDebug(); if (!mTemplateName.isEmpty()) { - kdDebug(5950) << "-- mTemplateName:" << mTemplateName << ":\n"; - kdDebug(5950) << "-- mTemplateAfterTime:" << mTemplateAfterTime << ":\n"; + kdDebug(5950) << "-- mTemplateName:" << mTemplateName << ":" << endl; + kdDebug(5950) << "-- mTemplateAfterTime:" << mTemplateAfterTime << ":" << endl; } if (mActionType == T_MESSAGE || mActionType == T_FILE) { - kdDebug(5950) << "-- mAudioFile:" << mAudioFile << ":\n"; - kdDebug(5950) << "-- mPreAction:" << mPreAction << ":\n"; - kdDebug(5950) << "-- mPostAction:" << mPostAction << ":\n"; + kdDebug(5950) << "-- mAudioFile:" << mAudioFile << ":" << endl; + kdDebug(5950) << "-- mPreAction:" << mPreAction << ":" << endl; + kdDebug(5950) << "-- mPostAction:" << mPostAction << ":" << endl; } else if (mActionType == T_COMMAND) { - kdDebug(5950) << "-- mCommandXterm:" << (mCommandXterm ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mLogFile:" << mLogFile << ":\n"; + kdDebug(5950) << "-- mCommandXterm:" << (mCommandXterm ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mLogFile:" << mLogFile << ":" << endl; } - kdDebug(5950) << "-- mKMailSerialNumber:" << mKMailSerialNumber << ":\n"; - kdDebug(5950) << "-- mCopyToKOrganizer:" << (mCopyToKOrganizer ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mStartDateTime:" << mStartDateTime.toString() << ":\n"; - kdDebug(5950) << "-- mSaveDateTime:" << mSaveDateTime.toString() << ":\n"; + kdDebug(5950) << "-- mKMailSerialNumber:" << mKMailSerialNumber << ":" << endl; + kdDebug(5950) << "-- mCopyToKOrganizer:" << (mCopyToKOrganizer ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mStartDateTime:" << mStartDateTime.toString() << ":" << endl; + kdDebug(5950) << "-- mSaveDateTime:" << mSaveDateTime.toString() << ":" << endl; if (mRepeatAtLogin) - kdDebug(5950) << "-- mAtLoginDateTime:" << mAtLoginDateTime.toString() << ":\n"; - kdDebug(5950) << "-- mArchiveRepeatAtLogin:" << (mArchiveRepeatAtLogin ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mEnabled:" << (mEnabled ? "true" : "false") << ":\n"; + kdDebug(5950) << "-- mAtLoginDateTime:" << mAtLoginDateTime.toString() << ":" << endl; + kdDebug(5950) << "-- mArchiveRepeatAtLogin:" << (mArchiveRepeatAtLogin ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mEnabled:" << (mEnabled ? "true" : "false") << ":" << endl; if (mReminderMinutes) - kdDebug(5950) << "-- mReminderMinutes:" << mReminderMinutes << ":\n"; + kdDebug(5950) << "-- mReminderMinutes:" << mReminderMinutes << ":" << endl; if (mArchiveReminderMinutes) - kdDebug(5950) << "-- mArchiveReminderMinutes:" << mArchiveReminderMinutes << ":\n"; + kdDebug(5950) << "-- mArchiveReminderMinutes:" << mArchiveReminderMinutes << ":" << endl; if (mReminderMinutes || mArchiveReminderMinutes) - kdDebug(5950) << "-- mReminderOnceOnly:" << mReminderOnceOnly << ":\n"; + kdDebug(5950) << "-- mReminderOnceOnly:" << mReminderOnceOnly << ":" << endl; else if (mDeferral > 0) { - kdDebug(5950) << "-- mDeferral:" << (mDeferral == NORMAL_DEFERRAL ? "normal" : "reminder") << ":\n"; - kdDebug(5950) << "-- mDeferralTime:" << mDeferralTime.toString() << ":\n"; + kdDebug(5950) << "-- mDeferral:" << (mDeferral == NORMAL_DEFERRAL ? "normal" : "reminder") << ":" << endl; + kdDebug(5950) << "-- mDeferralTime:" << mDeferralTime.toString() << ":" << endl; } else if (mDeferral == CANCEL_DEFERRAL) kdDebug(5950) << "-- mDeferral:cancel:\n"; - kdDebug(5950) << "-- mDeferDefaultMinutes:" << mDeferDefaultMinutes << ":\n"; + kdDebug(5950) << "-- mDeferDefaultMinutes:" << mDeferDefaultMinutes << ":" << endl; if (mDisplaying) { - kdDebug(5950) << "-- mDisplayingTime:" << mDisplayingTime.toString() << ":\n"; - kdDebug(5950) << "-- mDisplayingFlags:" << mDisplayingFlags << ":\n"; + kdDebug(5950) << "-- mDisplayingTime:" << mDisplayingTime.toString() << ":" << endl; + kdDebug(5950) << "-- mDisplayingFlags:" << mDisplayingFlags << ":" << endl; } - kdDebug(5950) << "-- mRevision:" << mRevision << ":\n"; - kdDebug(5950) << "-- mRecurrence:" << (mRecurrence ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mAlarmCount:" << mAlarmCount << ":\n"; - kdDebug(5950) << "-- mMainExpired:" << (mMainExpired ? "true" : "false") << ":\n"; - kdDebug(5950) << "KAEvent dump end\n"; + kdDebug(5950) << "-- mRevision:" << mRevision << ":" << endl; + kdDebug(5950) << "-- mRecurrence:" << (mRecurrence ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mAlarmCount:" << mAlarmCount << ":" << endl; + kdDebug(5950) << "-- mMainExpired:" << (mMainExpired ? "true" : "false") << ":" << endl; + kdDebug(5950) << "KAEvent dump end" << endl; } #endif @@ -3192,7 +3192,7 @@ int KAAlarm::flags() const #ifndef NDEBUG void KAAlarm::dumpDebug() const { - kdDebug(5950) << "KAAlarm dump:\n"; + kdDebug(5950) << "KAAlarm dump:" << endl; KAAlarmEventBase::dumpDebug(); const char* altype = 0; switch (mType) @@ -3210,10 +3210,10 @@ void KAAlarm::dumpDebug() const case POST_ACTION__ALARM: altype = "POST_ACTION"; break; default: altype = "INVALID"; break; } - kdDebug(5950) << "-- mType:" << altype << ":\n"; - kdDebug(5950) << "-- mRecurs:" << (mRecurs ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mDeferred:" << (mDeferred ? "true" : "false") << ":\n"; - kdDebug(5950) << "KAAlarm dump end\n"; + kdDebug(5950) << "-- mType:" << altype << ":" << endl; + kdDebug(5950) << "-- mRecurs:" << (mRecurs ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mDeferred:" << (mDeferred ? "true" : "false") << ":" << endl; + kdDebug(5950) << "KAAlarm dump end" << endl; } const char* KAAlarm::debugType(Type type) @@ -3307,52 +3307,52 @@ const TQFont& KAAlarmEventBase::font() const #ifndef NDEBUG void KAAlarmEventBase::dumpDebug() const { - kdDebug(5950) << "-- mEventID:" << mEventID << ":\n"; - kdDebug(5950) << "-- mActionType:" << (mActionType == T_MESSAGE ? "MESSAGE" : mActionType == T_FILE ? "FILE" : mActionType == T_COMMAND ? "COMMAND" : mActionType == T_EMAIL ? "EMAIL" : mActionType == T_AUDIO ? "AUDIO" : "??") << ":\n"; - kdDebug(5950) << "-- mText:" << mText << ":\n"; + kdDebug(5950) << "-- mEventID:" << mEventID << ":" << endl; + kdDebug(5950) << "-- mActionType:" << (mActionType == T_MESSAGE ? "MESSAGE" : mActionType == T_FILE ? "FILE" : mActionType == T_COMMAND ? "COMMAND" : mActionType == T_EMAIL ? "EMAIL" : mActionType == T_AUDIO ? "AUDIO" : "??") << ":" << endl; + kdDebug(5950) << "-- mText:" << mText << ":" << endl; if (mActionType == T_COMMAND) - kdDebug(5950) << "-- mCommandScript:" << (mCommandScript ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mNextMainDateTime:" << mNextMainDateTime.toString() << ":\n"; + kdDebug(5950) << "-- mCommandScript:" << (mCommandScript ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mNextMainDateTime:" << mNextMainDateTime.toString() << ":" << endl; if (mActionType == T_EMAIL) { - kdDebug(5950) << "-- mEmail: FromKMail:" << mEmailFromIdentity << ":\n"; - kdDebug(5950) << "-- Addresses:" << mEmailAddresses.join(", ") << ":\n"; - kdDebug(5950) << "-- Subject:" << mEmailSubject << ":\n"; - kdDebug(5950) << "-- Attachments:" << mEmailAttachments.join(", ") << ":\n"; - kdDebug(5950) << "-- Bcc:" << (mEmailBcc ? "true" : "false") << ":\n"; + kdDebug(5950) << "-- mEmail: FromKMail:" << mEmailFromIdentity << ":" << endl; + kdDebug(5950) << "-- Addresses:" << mEmailAddresses.join(", ") << ":" << endl; + kdDebug(5950) << "-- Subject:" << mEmailSubject << ":" << endl; + kdDebug(5950) << "-- Attachments:" << mEmailAttachments.join(", ") << ":" << endl; + kdDebug(5950) << "-- Bcc:" << (mEmailBcc ? "true" : "false") << ":" << endl; } - kdDebug(5950) << "-- mBgColour:" << TQString(mBgColour.name()) << ":\n"; - kdDebug(5950) << "-- mFgColour:" << TQString(mFgColour.name()) << ":\n"; - kdDebug(5950) << "-- mDefaultFont:" << (mDefaultFont ? "true" : "false") << ":\n"; + kdDebug(5950) << "-- mBgColour:" << TQString(mBgColour.name()) << ":" << endl; + kdDebug(5950) << "-- mFgColour:" << TQString(mFgColour.name()) << ":" << endl; + kdDebug(5950) << "-- mDefaultFont:" << (mDefaultFont ? "true" : "false") << ":" << endl; if (!mDefaultFont) - kdDebug(5950) << "-- mFont:" << TQString(mFont.toString()) << ":\n"; - kdDebug(5950) << "-- mBeep:" << (mBeep ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mSpeak:" << (mSpeak ? "true" : "false") << ":\n"; + kdDebug(5950) << "-- mFont:" << TQString(mFont.toString()) << ":" << endl; + kdDebug(5950) << "-- mBeep:" << (mBeep ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mSpeak:" << (mSpeak ? "true" : "false") << ":" << endl; if (mActionType == T_AUDIO) { if (mSoundVolume >= 0) { - kdDebug(5950) << "-- mSoundVolume:" << mSoundVolume << ":\n"; + kdDebug(5950) << "-- mSoundVolume:" << mSoundVolume << ":" << endl; if (mFadeVolume >= 0) { - kdDebug(5950) << "-- mFadeVolume:" << mFadeVolume << ":\n"; - kdDebug(5950) << "-- mFadeSeconds:" << mFadeSeconds << ":\n"; + kdDebug(5950) << "-- mFadeVolume:" << mFadeVolume << ":" << endl; + kdDebug(5950) << "-- mFadeSeconds:" << mFadeSeconds << ":" << endl; } else - kdDebug(5950) << "-- mFadeVolume:-:\n"; + kdDebug(5950) << "-- mFadeVolume:-:" << endl; } else - kdDebug(5950) << "-- mSoundVolume:-:\n"; - kdDebug(5950) << "-- mRepeatSound:" << (mRepeatSound ? "true" : "false") << ":\n"; - } - kdDebug(5950) << "-- mConfirmAck:" << (mConfirmAck ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mRepeatAtLogin:" << (mRepeatAtLogin ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mRepeatCount:" << mRepeatCount << ":\n"; - kdDebug(5950) << "-- mRepeatInterval:" << mRepeatInterval << ":\n"; - kdDebug(5950) << "-- mNextRepeat:" << mNextRepeat << ":\n"; - kdDebug(5950) << "-- mDisplaying:" << (mDisplaying ? "true" : "false") << ":\n"; - kdDebug(5950) << "-- mLateCancel:" << mLateCancel << ":\n"; - kdDebug(5950) << "-- mAutoClose:" << (mAutoClose ? "true" : "false") << ":\n"; + kdDebug(5950) << "-- mSoundVolume:-:" << endl; + kdDebug(5950) << "-- mRepeatSound:" << (mRepeatSound ? "true" : "false") << ":" << endl; + } + kdDebug(5950) << "-- mConfirmAck:" << (mConfirmAck ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mRepeatAtLogin:" << (mRepeatAtLogin ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mRepeatCount:" << mRepeatCount << ":" << endl; + kdDebug(5950) << "-- mRepeatInterval:" << mRepeatInterval << ":" << endl; + kdDebug(5950) << "-- mNextRepeat:" << mNextRepeat << ":" << endl; + kdDebug(5950) << "-- mDisplaying:" << (mDisplaying ? "true" : "false") << ":" << endl; + kdDebug(5950) << "-- mLateCancel:" << mLateCancel << ":" << endl; + kdDebug(5950) << "-- mAutoClose:" << (mAutoClose ? "true" : "false") << ":" << endl; } #endif diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index a436e3d08..d0e5ab0f5 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -703,7 +703,7 @@ void AlarmListTooltip::maybeTip(const TQPoint& pt) TQRect rect = listView->itemRect(item); rect.setLeft(columnX); rect.setWidth(columnWidth); - kdDebug(5950) << "AlarmListTooltip::maybeTip(): display\n"; + kdDebug(5950) << "AlarmListTooltip::maybeTip(): display" << endl; tip(rect, AlarmText::summary(item->event(), 10)); // display up to 10 lines of text } } diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp index cc7431f99..c6138a3cd 100644 --- a/kalarm/calendarcompat.cpp +++ b/kalarm/calendarcompat.cpp @@ -59,7 +59,7 @@ void CalendarCompat::fix(KCal::Calendar& calendar, const TQString& localFile) // KAlarm version 0.5.7 - check whether times are stored in UTC, in which // case it is the KDE 3.0.0 version, which needs adjustment of summer times. version057_UTC = isUTC(localFile); - kdDebug(5950) << "CalendarCompat::fix(): KAlarm version 0.5.7 (" << (version057_UTC ? "" : "non-") << "UTC)\n"; + kdDebug(5950) << "CalendarCompat::fix(): KAlarm version 0.5.7 (" << (version057_UTC ? "" : "non-") << "UTC)" << endl; } else kdDebug(5950) << "CalendarCompat::fix(): KAlarm version " << version << endl; diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 264e0a5bd..cecb15a79 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -124,7 +124,7 @@ void Daemon::createDcopHandler() */ bool Daemon::start() { - kdDebug(5950) << "Daemon::start()\n"; + kdDebug(5950) << "Daemon::start()" << endl; updateRegisteredStatus(); switch (mStatus) { @@ -233,7 +233,7 @@ void Daemon::registrationResult(bool reregister, int result, int version) // We've successfully registered with the daemon, but the daemon can't // find the KAlarm executable so won't be able to restart KAlarm if // KAlarm exits. - kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found\n"; + kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << tdeApp->aboutData()->appName() << " not found" << endl; KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n" "(Installation or configuration error: %1 cannot locate %2 executable.)") .arg(TQString::fromLatin1(DAEMON_APP_NAME)) @@ -385,7 +385,7 @@ bool Daemon::reset() */ void Daemon::reload() { - kdDebug(5950) << "Daemon::reload()\n"; + kdDebug(5950) << "Daemon::reload()" << endl; AlarmDaemonIface_stub s(DAEMON_APP_NAME, DAEMON_DCOP_OBJECT); s.reloadCalendar(TQCString(tdeApp->aboutData()->appName()), AlarmCalendar::activeCalendar()->urlString()); if (!s.ok()) @@ -457,7 +457,7 @@ void Daemon::calendarIsEnabled(bool enabled) */ void Daemon::setAlarmsEnabled(bool enable) { - kdDebug(5950) << "Daemon::setAlarmsEnabled(" << enable << ")\n"; + kdDebug(5950) << "Daemon::setAlarmsEnabled(" << enable << ")" << endl; if (enable && !checkIfRunning()) { // The daemon is not running, so start it @@ -658,7 +658,7 @@ NotificationHandler::NotificationHandler() : DCOPObject(NOTIFY_DCOP_OBJECT), TQObject() { - kdDebug(5950) << "NotificationHandler::NotificationHandler()\n"; + kdDebug(5950) << "NotificationHandler::NotificationHandler()" << endl; } /****************************************************************************** @@ -668,7 +668,7 @@ NotificationHandler::NotificationHandler() */ void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString& calendarURL) { - kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendarStatus << ")\n"; + kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendarStatus << ")" << endl; KAlarmd::CalendarStatus status = KAlarmd::CalendarStatus(calendarStatus); if (expandURL(calendarURL) != AlarmCalendar::activeCalendar()->urlString()) return; // it's not a notification about KAlarm's calendar @@ -677,15 +677,15 @@ void NotificationHandler::alarmDaemonUpdate(int calendarStatus, const TQString& { case KAlarmd::CALENDAR_UNAVAILABLE: // Calendar is not available for monitoring - kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(CALENDAR_UNAVAILABLE)\n"; + kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(CALENDAR_UNAVAILABLE)" << endl; break; case KAlarmd::CALENDAR_DISABLED: // Calendar is available for monitoring but is not currently being monitored - kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(DISABLE_CALENDAR)\n"; + kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(DISABLE_CALENDAR)" << endl; break; case KAlarmd::CALENDAR_ENABLED: // Calendar is currently being monitored - kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(ENABLE_CALENDAR)\n"; + kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(ENABLE_CALENDAR)" << endl; enabled = true; break; default: @@ -737,7 +737,7 @@ AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* na */ void AlarmEnableAction::setCheckedActual(bool running) { - kdDebug(5950) << "AlarmEnableAction::setCheckedActual(" << running << ")\n"; + kdDebug(5950) << "AlarmEnableAction::setCheckedActual(" << running << ")" << endl; if (running != isChecked() || !mInitialised) { TDEToggleAction::setChecked(running); @@ -751,7 +751,7 @@ void AlarmEnableAction::setCheckedActual(bool running) */ void AlarmEnableAction::setChecked(bool check) { - kdDebug(5950) << "AlarmEnableAction::setChecked(" << check << ")\n"; + kdDebug(5950) << "AlarmEnableAction::setChecked(" << check << ")" << endl; if (check != isChecked()) { if (check) diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp index 45eddac6c..04949589d 100644 --- a/kalarm/dcophandler.cpp +++ b/kalarm/dcophandler.cpp @@ -46,7 +46,7 @@ DcopHandler::DcopHandler() : DCOPObject(DCOP_OBJECT_NAME), TQWidget() { - kdDebug(5950) << "DcopHandler::DcopHandler()\n"; + kdDebug(5950) << "DcopHandler::DcopHandler()" << endl; } @@ -298,7 +298,7 @@ bool DcopHandler::scheduleEmail(const TQString& fromID, const TQString& addresse } if (addrs.isEmpty()) { - kdError(5950) << "DCOP call scheduleEmail(): no email address\n"; + kdError(5950) << "DCOP call scheduleEmail(): no email address" << endl; return false; } TQStringList atts; diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index d3e85a623..11c576ed0 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -168,7 +168,7 @@ UpdateStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* er */ bool addExpiredEvent(KAEvent& event) { - kdDebug(5950) << "KAlarm::addExpiredEvent(" << event.id() << ")\n"; + kdDebug(5950) << "KAlarm::addExpiredEvent(" << event.id() << ")" << endl; AlarmCalendar* cal = AlarmCalendar::expiredCalendarOpen(); if (!cal) return false; @@ -405,7 +405,7 @@ UpdateStatus deleteTemplate(const KAEvent& event) */ void deleteDisplayEvent(const TQString& eventID) { - kdDebug(5950) << "KAlarm::deleteDisplayEvent(" << eventID << ")\n"; + kdDebug(5950) << "KAlarm::deleteDisplayEvent(" << eventID << ")" << endl; if (KAEvent::uidStatus(eventID) == KAEvent::DISPLAYING) { @@ -723,7 +723,7 @@ bool runProgram(const TQCString& program, const TQCString& windowName, TQCString // KOrganizer is not already running, so start it if (TDEApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString(), &errorMessage, &dcopName)) { - kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n"; + kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")" << endl; return false; } // Minimise its window - don't use hide() since this would remove all @@ -989,11 +989,11 @@ kdDebug(5950)<<"Korg->"<> result; if (result) { - kdDebug(5950) << "sendToKOrganizer(" << uid << "): success\n"; + kdDebug(5950) << "sendToKOrganizer(" << uid << "): success" << endl; return true; } } - kdError(5950) << "sendToKOrganizer(): KOrganizer addEvent(" << uid << ") dcop call failed\n"; + kdError(5950) << "sendToKOrganizer(): KOrganizer addEvent(" << uid << ") dcop call failed" << endl; return false; } @@ -1017,11 +1017,11 @@ bool deleteFromKOrganizer(const TQString& eventID) reply >> result; if (result) { - kdDebug(5950) << "deleteFromKOrganizer(" << newID << "): success\n"; + kdDebug(5950) << "deleteFromKOrganizer(" << newID << "): success" << endl; return true; } } - kdError(5950) << "sendToKOrganizer(): KOrganizer deleteEvent(" << newID << ") dcop call failed\n"; + kdError(5950) << "sendToKOrganizer(): KOrganizer deleteEvent(" << newID << ") dcop call failed" << endl; return false; } diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index c0eb6b557..4c98477c6 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -193,7 +193,7 @@ bool KAlarmApp::restoreSession() } // Process is being restored by session management. - kdDebug(5950) << "KAlarmApp::restoreSession(): Restoring\n"; + kdDebug(5950) << "KAlarmApp::restoreSession(): Restoring" << endl; ++mActiveCount; if (!initCheck(true)) // open the calendar file (needed for main windows) { @@ -249,7 +249,7 @@ bool KAlarmApp::restoreSession() */ int KAlarmApp::newInstance() { - kdDebug(5950)<<"KAlarmApp::newInstance()\n"; + kdDebug(5950)<<"KAlarmApp::newInstance()" << endl; if (mFatalError) { quitFatal(); @@ -276,7 +276,7 @@ int KAlarmApp::newInstance() if (args->isSet("stop")) { // Stop the alarm daemon - kdDebug(5950)<<"KAlarmApp::newInstance(): stop\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): stop" << endl; args->clear(); // free up memory if (!Daemon::stop()) { @@ -290,7 +290,7 @@ int KAlarmApp::newInstance() { // Reset the alarm daemon, if it's running. // (If it's not running, it will reset automatically when it eventually starts.) - kdDebug(5950)<<"KAlarmApp::newInstance(): reset\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): reset" << endl; args->clear(); // free up memory Daemon::reset(); dontRedisplay = true; // exit program if no other instances running @@ -299,7 +299,7 @@ int KAlarmApp::newInstance() if (args->isSet("tray")) { // Display only the system tray icon - kdDebug(5950)<<"KAlarmApp::newInstance(): tray\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): tray" << endl; args->clear(); // free up memory if (!mHaveSystemTray) { @@ -321,7 +321,7 @@ int KAlarmApp::newInstance() if (args->isSet("handleEvent") || args->isSet("triggerEvent") || args->isSet("cancelEvent") || args->isSet("calendarURL")) { // Display or delete the event with the specified event ID - kdDebug(5950)<<"KAlarmApp::newInstance(): handle event\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): handle event" << endl; EventFunc function = EVENT_HANDLE; int count = 0; const char* option = 0; @@ -399,7 +399,7 @@ int KAlarmApp::newInstance() TQCString alSubject; if (args->isSet("file")) { - kdDebug(5950)<<"KAlarmApp::newInstance(): file\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): file" << endl; if (args->isSet("exec")) USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--exec")).arg(TQString::fromLatin1("--file"))) if (args->isSet("mail")) @@ -411,7 +411,7 @@ int KAlarmApp::newInstance() } else if (args->isSet("exec")) { - kdDebug(5950)<<"KAlarmApp::newInstance(): exec\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): exec" << endl; if (args->isSet("mail")) USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--exec"))) alMessage = args->getOption("exec"); @@ -425,7 +425,7 @@ int KAlarmApp::newInstance() } else if (args->isSet("mail")) { - kdDebug(5950)<<"KAlarmApp::newInstance(): mail\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): mail" << endl; if (args->isSet("subject")) alSubject = args->getOption("subject"); if (args->isSet("from-id")) @@ -446,7 +446,7 @@ int KAlarmApp::newInstance() } else { - kdDebug(5950)<<"KAlarmApp::newInstance(): message\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): message" << endl; alMessage = args->arg(0); } @@ -681,7 +681,7 @@ int KAlarmApp::newInstance() else { // No arguments - run interactively & display the main window - kdDebug(5950)<<"KAlarmApp::newInstance(): interactive\n"; + kdDebug(5950)<<"KAlarmApp::newInstance(): interactive" << endl; if (args->isSet("ack-confirm")) usage += TQString::fromLatin1("--ack-confirm "); if (args->isSet("attach")) @@ -818,7 +818,7 @@ void KAlarmApp::quitIf(int exitCode, bool force) */ void KAlarmApp::doQuit(TQWidget* parent) { - kdDebug(5950) << "KAlarmApp::doQuit()\n"; + kdDebug(5950) << "KAlarmApp::doQuit()" << endl; if (mDisableAlarmsIfStopped && MessageBox::warningContinueCancel(parent, KMessageBox::Cancel, i18n("Quitting will disable alarms\n(once any alarm message windows are closed)."), @@ -892,7 +892,7 @@ void KAlarmApp::processQueue() { if (mInitialised && !mProcessingQueue) { - kdDebug(5950) << "KAlarmApp::processQueue()\n"; + kdDebug(5950) << "KAlarmApp::processQueue()" << endl; mProcessingQueue = true; // Reset the alarm daemon if it's been queued @@ -1279,7 +1279,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) if (secs < 0) { // This alarm is definitely not due yet - kdDebug(5950) << "KAlarmApp::handleEvent(): alarm " << alarm.type() << ": not due\n"; + kdDebug(5950) << "KAlarmApp::handleEvent(): alarm " << alarm.type() << ": not due" << endl; continue; } if (alarm.repeatAtLogin()) @@ -1288,7 +1288,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) // Check if the alarm has only just been set up. // (The alarm daemon will immediately notify that it is due // since it is set up with a time in the past.) - kdDebug(5950) << "KAlarmApp::handleEvent(): REPEAT_AT_LOGIN\n"; + kdDebug(5950) << "KAlarmApp::handleEvent(): REPEAT_AT_LOGIN" << endl; if (secs < maxLateness(1)) continue; @@ -1303,7 +1303,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) if (alarm.lateCancel()) { // Alarm is due, and it is to be cancelled if too late. - kdDebug(5950) << "KAlarmApp::handleEvent(): LATE_CANCEL\n"; + kdDebug(5950) << "KAlarmApp::handleEvent(): LATE_CANCEL" << endl; bool late = false; bool cancel = false; if (alarm.dateTime().isDateOnly()) @@ -1392,12 +1392,12 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) } if (!alarmToExecuteValid) { - kdDebug(5950) << "KAlarmApp::handleEvent(): alarm " << alarm.type() << ": execute\n"; + kdDebug(5950) << "KAlarmApp::handleEvent(): alarm " << alarm.type() << ": execute" << endl; alarmToExecute = alarm; // note the alarm to be executed alarmToExecuteValid = true; // only trigger one alarm for the event } else - kdDebug(5950) << "KAlarmApp::handleEvent(): alarm " << alarm.type() << ": skip\n"; + kdDebug(5950) << "KAlarmApp::handleEvent(): alarm " << alarm.type() << ": skip" << endl; } // If there is an alarm to execute, do this last after rescheduling/cancelling @@ -1419,7 +1419,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) KAlarm::updateEvent(event, 0); // update the window lists and calendar file else if (function != EVENT_TRIGGER) { - kdDebug(5950) << "KAlarmApp::handleEvent(): no action\n"; + kdDebug(5950) << "KAlarmApp::handleEvent(): no action" << endl; Daemon::eventHandled(eventID, false); } } @@ -1436,7 +1436,7 @@ bool KAlarmApp::handleEvent(const TQString& eventID, EventFunc function) */ void KAlarmApp::alarmShowing(KAEvent& event, KAAlarm::Type alarmType, const DateTime& alarmTime) { - kdDebug(5950) << "KAlarmApp::alarmShowing(" << event.id() << ", " << KAAlarm::debugType(alarmType) << ")\n"; + kdDebug(5950) << "KAlarmApp::alarmShowing(" << event.id() << ", " << KAAlarm::debugType(alarmType) << ")" << endl; KCal::Event* kcalEvent = AlarmCalendar::activeCalendar()->event(event.id()); if (!kcalEvent) kdError(5950) << "KAlarmApp::alarmShowing(): event ID not found: " << event.id() << endl; @@ -1784,7 +1784,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& return proc; // Error executing command - report it - kdError(5950) << "KAlarmApp::doShellCommand(): command failed to start\n"; + kdError(5950) << "KAlarmApp::doShellCommand(): command failed to start" << endl; commandErrorMsg(proc, event, alarm, flags); mCommandProcesses.remove(pd); delete pd; @@ -1824,7 +1824,7 @@ TQString KAlarmApp::createTempScriptFile(const TQString& command, bool insertShe */ void KAlarmApp::slotCommandOutput(TDEProcess* proc, char* buffer, int bufflen) { -//kdDebug(5950) << "KAlarmApp::slotCommandOutput(): '" << TQCString(buffer, bufflen+1) << "'\n"; +//kdDebug(5950) << "KAlarmApp::slotCommandOutput(): '" << TQCString(buffer, bufflen+1) << "'" << endl; // Find this command in the command list for (TQValueList::Iterator it = mCommandProcesses.begin(); it != mCommandProcesses.end(); ++it) { @@ -1852,7 +1852,7 @@ void KAlarmApp::slotLogProcExited(ShellProcess* proc) */ void KAlarmApp::slotCommandExited(ShellProcess* proc) { - kdDebug(5950) << "KAlarmApp::slotCommandExited()\n"; + kdDebug(5950) << "KAlarmApp::slotCommandExited()" << endl; // Find this command in the command list for (TQValueList::Iterator it = mCommandProcesses.begin(); it != mCommandProcesses.end(); ++it) { @@ -1954,7 +1954,7 @@ bool KAlarmApp::initCheck(bool calendarOnly) AlarmCalendar* cal = AlarmCalendar::activeCalendar(); if (!cal->isOpen()) { - kdDebug(5950) << "KAlarmApp::initCheck(): opening active calendar\n"; + kdDebug(5950) << "KAlarmApp::initCheck(): opening active calendar" << endl; // First time through. Open the calendar file. if (!cal->open()) diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index 699e9684e..839f64167 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -77,7 +77,7 @@ bool ADCalendar::loadFile(bool reset) if (!mTempFileName.isNull()) { // Don't try to load the file if already downloading it - kdError(5900) << "ADCalendar::loadFile(): already downloading another file\n"; + kdError(5900) << "ADCalendar::loadFile(): already downloading another file" << endl; return false; } mLoaded = false; @@ -123,7 +123,7 @@ void ADCalendar::loadLocalFile(const TQString& filename) { mLoaded = load(filename); if (!mLoaded) - kdDebug(5900) << "ADCalendar::loadLocalFile(): Error loading calendar file '" << filename << "'\n"; + kdDebug(5900) << "ADCalendar::loadLocalFile(): Error loading calendar file '" << filename << "'" << endl; else clearEventsHandled(true); // remove all events which no longer exist from handled list } @@ -166,7 +166,7 @@ bool ADCalendar::eventHandled(const KCal::Event* event, const TQValueListuid() << ")\n"; + kdDebug(5900) << "ADCalendar::setEventPending(" << event->uid() << ")" << endl; EventKey key(event->uid(), mUrlIndex); setEventInMap(mEventsPending, key, alarmtimes, event->revision()); } diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp index 75179185c..25f46e9c7 100644 --- a/kalarm/kalarmd/adconfigdata.cpp +++ b/kalarm/kalarmd/adconfigdata.cpp @@ -64,11 +64,11 @@ void ADConfigData::readConfig() // Verify the configuration bool ok = false; if (client.isEmpty() || TDEStandardDirs::findExe(client).isNull()) - kdError(5900) << "ADConfigData::readConfig(): group '" << *cl << "' deleted (client app not found)\n"; + kdError(5900) << "ADConfigData::readConfig(): group '" << *cl << "' deleted (client app not found)" << endl; else if (calendar.isEmpty()) - kdError(5900) << "ADConfigData::readConfig(): no calendar specified for '" << client << "'\n"; + kdError(5900) << "ADConfigData::readConfig(): no calendar specified for '" << client << "'" << endl; else if (dcopObject.isEmpty()) - kdError(5900) << "ADConfigData::readConfig(): no DCOP object specified for '" << client << "'\n"; + kdError(5900) << "ADConfigData::readConfig(): no DCOP object specified for '" << client << "'" << endl; else { ADCalendar* cal = ADCalendar::getCalendar(calendar); @@ -136,7 +136,7 @@ void ADConfigData::setCalendar(const TQCString& appName, ADCalendar* cal) */ void ADConfigData::enableAutoStart(bool on) { - kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")\n"; + kdDebug(5900) << "ADConfigData::enableAutoStart(" << on << ")" << endl; TDEConfig* config = TDEGlobal::config(); config->reparseConfiguration(); config->setGroup(TQString::fromLatin1(DAEMON_AUTOSTART_SECTION)); diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 8759c171b..5de17379f 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -145,10 +145,10 @@ void AlarmDaemon::autostartKAlarm() #ifdef AUTOSTART_KALARM if (mAlarmTimer) { - kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): KAlarm already registered\n"; + kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): KAlarm already registered" << endl; return; // KAlarm has already registered with us } - kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm\n"; + kdDebug(5900) << "AlarmDaemon::autostartKAlarm(): starting KAlarm" << endl; TQStringList args; args << TQString::fromLatin1("--tray"); int ret = TDEApplication::tdeinitExec(TQString::fromLatin1("kalarm"), args); @@ -527,9 +527,9 @@ bool AlarmDaemon::notifyEvent(ADCalendar* calendar, const TQString& eventID) if (!client->startClient()) { if (registered) - kdDebug(5900) << "AlarmDaemon::notifyEvent(): client not ready\n"; + kdDebug(5900) << "AlarmDaemon::notifyEvent(): client not ready" << endl; else - kdDebug(5900) << "AlarmDaemon::notifyEvent(): don't start client\n"; + kdDebug(5900) << "AlarmDaemon::notifyEvent(): don't start client" << endl; return false; } diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index b86b8262d..349727496 100644 --- a/kalarm/kamail.cpp +++ b/kalarm/kamail.cpp @@ -146,8 +146,8 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify) KAMailData data(event, from, (event.emailBcc() ? Preferences::emailBccAddress() : TQString()), allowNotify); - kdDebug(5950) << "KAlarmApp::sendEmail(): To: " << event.emailAddresses(", ") - << "\nSubject: " << event.emailSubject() << endl; + kdDebug(5950) << "KAlarmApp::sendEmail(): To: " << event.emailAddresses(", ") << endl + << "Subject: " << event.emailSubject() << endl; if (Preferences::emailClient() == Preferences::SENDMAIL) { @@ -342,7 +342,7 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons { TQCString funcname = function; funcname.replace(TQRegExp("(.+$"), "()"); - kdError(5950) << "KAMail::callKMail(): kmail " << funcname << " call failed\n";; + kdError(5950) << "KAMail::callKMail(): kmail " << funcname << " call failed" << endl; return false; } TQDataStream replyStream(replyData, IO_ReadOnly); @@ -364,7 +364,7 @@ bool KAMail::callKMail(const TQByteArray& callData, const TQCString& iface, cons replyStream >> result; if (!result) { - kdError(5950) << "KAMail::callKMail(): kmail " << funcname << " call returned error\n"; + kdError(5950) << "KAMail::callKMail(): kmail " << funcname << " call returned error" << endl; return false; } } @@ -950,7 +950,7 @@ TQString KAMail::getMailBody(TQ_UINT32 serialNumber) reply_stream >> body; } else - kdDebug(5950) << "KAMail::getMailBody(): kmail getDecodedBodyPart() call failed\n"; + kdDebug(5950) << "KAMail::getMailBody(): kmail getDecodedBodyPart() call failed" << endl; return body; } diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 97d89fee8..87e5e6840 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -74,12 +74,12 @@ bool ShellProcess::start(Communication comm) */ void ShellProcess::slotExited(TDEProcess* proc) { - kdDebug(5950) << "ShellProcess::slotExited()\n"; + kdDebug(5950) << "ShellProcess::slotExited()" << endl; mStdinQueue.clear(); mStatus = SUCCESS; if (!proc->normalExit()) { - kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": died/killed\n"; + kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": died/killed" << endl; mStatus = DIED; } else @@ -89,7 +89,7 @@ void ShellProcess::slotExited(TDEProcess* proc) if ((mShellName == "bash" && (status == 126 || status == 127)) || (mShellName == "ksh" && status == 127)) { - kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": not found or not executable\n"; + kdWarning(5950) << "ShellProcess::slotExited(" << mCommand << ") " << mShellName << ": not found or not executable" << endl; mStatus = NOT_FOUND; } } diff --git a/kalarm/main.cpp b/kalarm/main.cpp index 62904a17c..dee6051af 100644 --- a/kalarm/main.cpp +++ b/kalarm/main.cpp @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) } // This is the first time through - //kdDebug(5950) << "[KAlarm] Initializing.\n"; + //kdDebug(5950) << "[KAlarm] Initializing." << endl; KAlarmApp* app = KAlarmApp::getInstance(); app->restoreSession(); return app->exec(); diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 77d86e09b..02de1cec5 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -122,7 +122,7 @@ MainWindow::MainWindow(bool restored) mMinuteTimerActive(false), mHiddenTrayParent(false) { - kdDebug(5950) << "MainWindow::MainWindow()\n"; + kdDebug(5950) << "MainWindow::MainWindow()" << endl; setAutoSaveSettings(TQString::fromLatin1(WINDOW_NAME)); // save window sizes etc. setPlainCaption(tdeApp->aboutData()->programName()); TDEConfig* config = TDEGlobal::config(); @@ -173,7 +173,7 @@ MainWindow::MainWindow(bool restored) MainWindow::~MainWindow() { - kdDebug(5950) << "MainWindow::~MainWindow()\n"; + kdDebug(5950) << "MainWindow::~MainWindow()" << endl; mWindowList.remove(this); if (theApp()->trayWindow()) { @@ -433,7 +433,7 @@ void MainWindow::enableTemplateMenuItem(bool enable) */ void MainWindow::refresh() { - kdDebug(5950) << "MainWindow::refresh()\n"; + kdDebug(5950) << "MainWindow::refresh()" << endl; for (WindowList::Iterator it = mWindowList.begin(); it != mWindowList.end(); ++it) (*it)->mListView->refresh(); } @@ -445,7 +445,7 @@ void MainWindow::refresh() */ void MainWindow::updateExpired() { - kdDebug(5950) << "MainWindow::updateExpired()\n"; + kdDebug(5950) << "MainWindow::updateExpired()" << endl; bool enableShowExpired = Preferences::expiredKeepDays(); for (WindowList::Iterator it = mWindowList.begin(); it != mWindowList.end(); ++it) { @@ -1136,7 +1136,7 @@ void MainWindow::slotDeletion() { if (!mListView->selectedCount()) { - kdDebug(5950) << "MainWindow::slotDeletion(true)\n"; + kdDebug(5950) << "MainWindow::slotDeletion(true)" << endl; mActionCreateTemplate->setEnabled(false); mActionCopy->setEnabled(false); mActionModify->setEnabled(false); @@ -1320,7 +1320,7 @@ void MainWindow::slotSelection() } } - kdDebug(5950) << "MainWindow::slotSelection(true)\n"; + kdDebug(5950) << "MainWindow::slotSelection(true)" << endl; mActionCreateTemplate->setEnabled(count == 1); mActionCopy->setEnabled(count == 1); mActionModify->setEnabled(item && !mListView->expired(item)); @@ -1370,7 +1370,7 @@ void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoin */ void MainWindow::slotDoubleClicked(TQListViewItem* item) { - kdDebug(5950) << "MainWindow::slotDoubleClicked()\n"; + kdDebug(5950) << "MainWindow::slotDoubleClicked()" << endl; if (item) { if (mListView->expired((AlarmListViewItem*)item)) diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 9c2e0a031..1fefa7d1f 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -258,7 +258,7 @@ MessageWin::MessageWin() mNoCloseConfirm(false), mDisableDeferral(false) { - kdDebug(5950) << "MessageWin::MessageWin(restore)\n"; + kdDebug(5950) << "MessageWin::MessageWin(restore)" << endl; mWindowList.append(this); } @@ -879,7 +879,7 @@ void MessageWin::slotPlayAudio() { // Output error message now that everything else has been done. // (Outputting it earlier would delay things until it is acknowledged.) - kdWarning(5950) << "Unable to set master volume (KMix: " << mKMixError << ")\n"; + kdWarning(5950) << "Unable to set master volume (KMix: " << mKMixError << ")" << endl; if (!haveErrorMessage(ErrMsg_Volume)) { KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError), @@ -963,7 +963,7 @@ void MessageWin::checkAudioPlay() } // Start playing the file, either for the first time or again - kdDebug(5950) << "MessageWin::checkAudioPlay(): start\n"; + kdDebug(5950) << "MessageWin::checkAudioPlay(): start" << endl; if (!mPlayedOnce) { // Start playing the file for the first time @@ -1017,7 +1017,7 @@ void MessageWin::checkAudioPlay() int time = 1000*(overall.seconds - current.seconds) + overall.ms - current.ms; if (time < 0) time = 0; - kdDebug(5950) << "MessageWin::checkAudioPlay(): wait for " << (time+100) << "ms\n"; + kdDebug(5950) << "MessageWin::checkAudioPlay(): wait for " << (time+100) << "ms" << endl; mPlayTimer->start(time + 100, true); #endif } @@ -1084,14 +1084,14 @@ void MessageWin::slotFade() mFadeTimer = 0; if (!mVolume) { - kdDebug(5950) << "MessageWin::slotFade(0)\n"; + kdDebug(5950) << "MessageWin::slotFade(0)" << endl; stopPlay(); return; } } else volume = mFadeVolume + ((mVolume - mFadeVolume) * elapsed) / mFadeSeconds; - kdDebug(5950) << "MessageWin::slotFade(" << volume << ")\n"; + kdDebug(5950) << "MessageWin::slotFade(" << volume << ")" << endl; if (mArtsDispatcher) { if (mUsingKMix) @@ -1139,7 +1139,7 @@ void MessageWin::setKMixVolume(int percent) TQDataStream arg(data, IO_WriteOnly); arg << percent; if (!tdeApp->dcopClient()->send(mKMixName, KMIX_DCOP_OBJECT, "setMasterVolume(int)", data)) - kdError(5950) << "MessageWin::setKMixVolume(): kmix dcop call failed\n"; + kdError(5950) << "MessageWin::setKMixVolume(): kmix dcop call failed" << endl; } #endif @@ -1425,7 +1425,7 @@ void MessageWin::closeEvent(TQCloseEvent* ce) */ void MessageWin::slotShowKMailMessage() { - kdDebug(5950) << "MessageWin::slotShowKMailMessage()\n"; + kdDebug(5950) << "MessageWin::slotShowKMailMessage()" << endl; if (!mKMailSerialNumber) return; TQString err = KAlarm::runKMail(false); @@ -1447,7 +1447,7 @@ void MessageWin::slotShowKMailMessage() if (result) return; // success } - kdError(5950) << "MessageWin::slotShowKMailMessage(): kmail dcop call failed\n"; + kdError(5950) << "MessageWin::slotShowKMailMessage(): kmail dcop call failed" << endl; KMessageBox::sorry(this, i18n("Unable to locate this email in KMail")); } diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index 1ca5db6a3..d90b4ea8b 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -341,7 +341,7 @@ void SoundDlg::checkAudioPlay() } // Start playing the file - kdDebug(5950) << "SoundDlg::checkAudioPlay(): start\n"; + kdDebug(5950) << "SoundDlg::checkAudioPlay(): start" << endl; mPlayStarted = true; mPlayObject->play(); } @@ -352,7 +352,7 @@ void SoundDlg::checkAudioPlay() int time = 1000*(overall.seconds - current.seconds) + overall.ms - current.ms; if (time < 0) time = 0; - kdDebug(5950) << "SoundDlg::checkAudioPlay(): wait for " << (time+100) << "ms\n"; + kdDebug(5950) << "SoundDlg::checkAudioPlay(): wait for " << (time+100) << "ms" << endl; mPlayTimer->start(time + 100, true); #endif } diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 5c36bb1b2..55e7a8628 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -75,7 +75,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) : KSystemTray((theApp()->wantRunInSystemTray() ? parent : 0), name), mAssocMainWindow(parent) { - kdDebug(5950) << "TrayWindow::TrayWindow()\n"; + kdDebug(5950) << "TrayWindow::TrayWindow()" << endl; // Set up GUI icons mPixmapEnabled = loadIcon("kalarm"); mPixmapDisabled = loadIcon("kalarm_disabled"); @@ -107,7 +107,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) TrayWindow::~TrayWindow() { - kdDebug(5950) << "TrayWindow::~TrayWindow()\n"; + kdDebug(5950) << "TrayWindow::~TrayWindow()" << endl; delete mTooltip; mTooltip = 0; theApp()->removeWindow(this); @@ -162,7 +162,7 @@ void TrayWindow::slotQuit() */ void TrayWindow::setEnabledStatus(bool status) { - kdDebug(5950) << "TrayWindow::setEnabledStatus(" << (int)status << ")\n"; + kdDebug(5950) << "TrayWindow::setEnabledStatus(" << (int)status << ")" << endl; setPixmap(status ? mPixmapEnabled : mPixmapDisabled); } @@ -285,7 +285,7 @@ void TrayWindow::tooltipAlarmText(TQString& text) const items.insert(iit, item); } } - kdDebug(5950) << "TrayWindow::tooltipAlarmText():\n"; + kdDebug(5950) << "TrayWindow::tooltipAlarmText():" << endl; int count = 0; for (iit = items.begin(); iit != items.end(); ++iit) { diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp index 1e6d3b0f1..0d48a637a 100644 --- a/kalarm/undo.cpp +++ b/kalarm/undo.cpp @@ -715,7 +715,7 @@ UndoAdd::UndoAdd(Undo::Type type, const KAEvent& event, KAEvent::Status cal) UndoItem* UndoAdd::doRestore(bool setArchive) { // Retrieve the current state of the alarm - kdDebug(5950) << "UndoAdd::doRestore(" << mEventID << ")\n"; + kdDebug(5950) << "UndoAdd::doRestore(" << mEventID << ")" << endl; const KCal::Event* kcalEvent = AlarmCalendar::getEvent(mEventID); if (!kcalEvent) { @@ -808,7 +808,7 @@ UndoEdit::~UndoEdit() */ UndoItem* UndoEdit::restore() { - kdDebug(5950) << "UndoEdit::restore(" << mNewEventID << ")\n"; + kdDebug(5950) << "UndoEdit::restore(" << mNewEventID << ")" << endl; // Retrieve the current state of the alarm const KCal::Event* kcalEvent = AlarmCalendar::getEvent(mNewEventID); if (!kcalEvent) @@ -895,7 +895,7 @@ UndoDelete::~UndoDelete() */ UndoItem* UndoDelete::restore() { - kdDebug(5950) << "UndoDelete::restore(" << mEvent->id() << ")\n"; + kdDebug(5950) << "UndoDelete::restore(" << mEvent->id() << ")" << endl; // Restore the original event switch (calendar()) { @@ -1029,7 +1029,7 @@ TQString UndoDeletes::actionText() const */ UndoItem* UndoReactivate::restore() { - kdDebug(5950) << "UndoReactivate::restore()\n"; + kdDebug(5950) << "UndoReactivate::restore()" << endl; // Validate the alarm's calendar switch (calendar()) { @@ -1072,7 +1072,7 @@ TQString UndoReactivate::actionText() const */ UndoItem* UndoDeactivate::restore() { - kdDebug(5950) << "UndoDeactivate::restore()\n"; + kdDebug(5950) << "UndoDeactivate::restore()" << endl; // Validate the alarm's calendar switch (calendar()) { diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 84ac89302..7c992e0e4 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -415,7 +415,7 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview, // break; line = stream.readLine(); - kdDebug(5970) << "DEBUG: line: " << line << "\n"; + kdDebug(5970) << "DEBUG: line: " << line << endl; if (line.isNull()) break; @@ -434,14 +434,14 @@ TQString KarmStorage::loadFromFlatFile(TaskView* taskview, if (level == 1) { kdDebug(5970) << "KarmStorage::loadFromFlatFile - toplevel task: " - << name << " min: " << minutes << "\n"; + << name << " min: " << minutes << endl; task = new Task(name, minutes, 0, desktopList, taskview); task->setUid(addTask(task, 0)); } else { Task *parent = stack.top(); kdDebug(5970) << "KarmStorage::loadFromFlatFile - task: " << name - << " min: " << minutes << " parent" << parent->name() << "\n"; + << " min: " << minutes << " parent" << parent->name() << endl; task = new Task(name, minutes, 0, desktopList, parent); task->setUid(addTask(task, parent)); diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index f778cf9f1..2442490c3 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -3492,9 +3492,9 @@ void ComposerPage::HeadersTab::slotRemoveMimeHeader() // calling this w/o selection is a programming error: TQListViewItem * item = mTagList->selectedItem(); if ( !item ) { - kdDebug(5006) << "==================================================\n" - << "Error: Remove button was pressed although no custom header was selected\n" - << "==================================================\n"; + kdDebug(5006) << "==================================================" << endl + << "Error: Remove button was pressed although no custom header was selected" << endl + << "==================================================" << endl; return; } diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index f9605df32..eafac543a 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -382,7 +382,7 @@ void FolderStorage::removeMsg(int idx, bool) //assert(idx>=0); if(idx < 0) { - kdDebug(5006) << "FolderStorage::removeMsg() : idx < 0\n" << endl; + kdDebug(5006) << "FolderStorage::removeMsg() : idx < 0" << endl; return; } diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index 527ad334b..231b88fdb 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -1373,7 +1373,7 @@ namespace KMail { TQString ImapAccountBase::createImapPath( const TQString& parent, const TQString& folderName ) { - kdDebug(5006) << "createImapPath parent="<location() ) ) return f; - kdError(5006) << "No folder ( " << type << ", " << folder << " )\n"; + kdError(5006) << "No folder ( " << type << ", " << folder << " )" << endl; } return 0; @@ -1407,7 +1407,7 @@ void KMailICalIfaceImpl::folderContentsTypeChanged( KMFolder* folder, if ( !mUseResourceIMAP ) return; // kdDebug(5006) << "folderContentsTypeChanged( " << folder->name() -// << ", " << contentsType << ")\n"; +// << ", " << contentsType << ")" << endl; // The builtins can't change type if ( isStandardResourceFolder( folder ) ) diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 7f509078d..704783f6d 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -331,7 +331,7 @@ void KMCommand::transferSelectedMsgs() if ( thisMsg->parent() && !thisMsg->isComplete() && ( !mProgressDialog || !mProgressDialog->wasCancelled() ) ) { - kdDebug(5006)<<"### INCOMPLETE\n"; + kdDebug(5006) << "### INCOMPLETE" << endl; // the message needs to be transferred first complete = false; KMCommand::mCountJobs++; @@ -2997,7 +2997,7 @@ KMIMChatCommand::KMIMChatCommand( const KURL &url, KMMessage *msg ) KMCommand::Result KMIMChatCommand::execute() { - kdDebug( 5006 ) << k_funcinfo << " URL is: " << mUrl << endl; + kdDebug( 5006 ) << k_funcinfo << " URL is: " << mUrl.prettyURL() << endl; TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() ); // find UID for mail address TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 2202deec2..16f94d2e9 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -2351,7 +2351,7 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable ) kdDebug(5006) << "entering KMComposeWin::applyChanges" << endl; if(!mMsg || mComposer) { - kdDebug(5006) << "KMComposeWin::applyChanges() : mMsg == 0!\n" << endl; + kdDebug(5006) << "KMComposeWin::applyChanges() : mMsg == 0!" << endl; emit applyChangesDone( false ); return; } diff --git a/kmail/kmdebug.h b/kmail/kmdebug.h index 142d0b9e2..b95168a46 100644 --- a/kmail/kmdebug.h +++ b/kmail/kmdebug.h @@ -35,7 +35,7 @@ static inline kdbgstream kmFatal( bool cond ) { return kdFatal( cond, kmail_debu #define START_TIMER(x) x ## _tmp2 = TQTime::currentTime() #define GRAB_TIMER(x) x ## _tmp2.msecsTo(TQTime::currentTime()) #define END_TIMER(x) x += GRAB_TIMER(x); x ## _tmp++ -#define SHOW_TIMER(x) kdDebug(5006) << #x " == " << x << "(" << x ## _tmp << ")\n" +#define SHOW_TIMER(x) kdDebug(5006) << #x " == " << x << "(" << x ## _tmp << ")" << endl #else #define CREATE_TIMER(x) #define START_TIMER(x) diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index e19b0f46b..9ef513cd9 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -868,7 +868,7 @@ void KMEdit::slotSpellResult(const TQString &s) void KMEdit::slotSpellDone() { - kdDebug(5006)<<" void KMEdit::slotSpellDone()\n"; + kdDebug(5006)<<" void KMEdit::slotSpellDone()" << endl; KSpell::spellStatus status = mKSpellForDialog->status(); delete mKSpellForDialog; mKSpellForDialog = 0; diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index f7acebf61..ecceb4630 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -1663,7 +1663,7 @@ TQValueList KMFolderCachedImap::findNewFolders() if( !node->isDir() ) { if( static_cast(node)->folderType() != KMFolderTypeCachedImap ) { kdError(5006) << "KMFolderCachedImap::findNewFolders(): ARGH!!! " - << node->name() << " is not an IMAP folder\n"; + << node->name() << " is not an IMAP folder" << endl; node = folder()->child()->next(); assert(0); } @@ -2362,7 +2362,7 @@ void KMFolderCachedImap::createFoldersNewOnServerAndFinishListing( const TQValue KMFolder* newFolder = folder()->child()->createFolder( mSubfolderNames[idx], false, KMFolderTypeCachedImap); if (newFolder) { KMFolderCachedImap *f = dynamic_cast(newFolder->storage()); - kdDebug(5006) << " ####### Locally creating folder " << mSubfolderNames[idx] <close("cachedimap"); f->setAccount(mAccount); f->mAnnotationFolderType = "FROMSERVER"; @@ -2371,11 +2371,11 @@ void KMFolderCachedImap::createFoldersNewOnServerAndFinishListing( const TQValue f->setImapPath(mSubfolderPaths[idx]); f->mFolderAttributes = mSubfolderAttributes[idx]; mNewlyCreatedSubfolders.append( TQGuardedPtr( f ) ); - kdDebug(5006) << " ####### Attributes: " << f->mFolderAttributes <mFolderAttributes << endl; //kdDebug(5006) << subfolderPath << ": mAnnotationFolderType set to FROMSERVER" << endl; kmkernel->dimapFolderMgr()->contentsChanged(); } else { - kdDebug(5006) << "can't create folder " << mSubfolderNames[idx] <folderMgr()->getFolderByURL( folderPath ); if ( !folder && folderPath.startsWith( localPrefix ) ) diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index b1b1a5bbb..33d6685a3 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -1770,7 +1770,8 @@ void KMMainWidget::slotStartCertManager() "please check your installation." ), i18n( "KMail Error" ) ); else - kdDebug(5006) << "\nslotStartCertManager(): certificate manager started.\n" << endl; + kdDebug(5006) << endl + << "slotStartCertManager(): certificate manager started." << endl; // process continues to run even after the TDEProcess object goes // out of scope here, since it is started in DontCare run mode. diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index b12ae65cd..d5f35ec47 100644 --- a/kmail/kmmessage.cpp +++ b/kmail/kmmessage.cpp @@ -723,8 +723,10 @@ void KMMessage::parseTextStringFromDwPart( partNode * root, DwMime::kSubtypeUnknown, true, false ); - kdDebug(5006) << "\n\n======= KMMessage::parseTextStringFromDwPart() - " - << ( curNode ? "text part found!\n" : "sorry, no text node!\n" ) << endl; + kdDebug(5006) << endl + << endl + << "======= KMMessage::parseTextStringFromDwPart() - " + << ( curNode ? "text part found!" : "sorry, no text node!" ) << endl; if( curNode ) { isHTML = DwMime::kSubtypeHtml == curNode->subType(); // now parse the TEXT message part we want to quote @@ -1588,7 +1590,8 @@ KMMessage* KMMessage::createMDN( MDN::ActionMode a, receipt->cleanupHeader(); - kdDebug(5006) << "final message:\n" + receipt->asString() << endl; + kdDebug(5006) << "final message:" << endl + << receipt->asString() << endl; // // Set "MDN sent" status: @@ -1803,7 +1806,7 @@ TQString KMMessage::dateStr() const if (!header.HasDate()) return ""; unixTime = header.Date().AsUnixTime(); - //kdDebug(5006)<<"#### Date = "<parentNode()) ? &rootHeaders : 0 ) ); - if( dataNode == curNode ) { -kdDebug(5006) << "dataNode == curNode: Save curNode without replacing it." << endl; + if ( dataNode == curNode ) { + kdDebug(5006) << "dataNode == curNode: Save curNode without replacing it." << endl; // A) Store the headers of this part IF curNode is not the root node // AND we are not replacing a node that already *has* replaced // the root node in previous recursion steps of this function... - if( headers ) { - if( dataNode->parentNode() && !weAreReplacingTheRootNode ) { -kdDebug(5006) << "dataNode is NOT replacing the root node: Store the headers." << endl; + if ( headers ) { + if ( dataNode->parentNode() && !weAreReplacingTheRootNode ) { + kdDebug(5006) << "dataNode is NOT replacing the root node: Store the headers." << endl; resultingData += headers->AsString().c_str(); - } else if( weAreReplacingTheRootNode && part && part->hasHeaders() ){ -kdDebug(5006) << "dataNode replace the root node: Do NOT store the headers but change" << endl; -kdDebug(5006) << " the Message's headers accordingly." << endl; -kdDebug(5006) << " old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl; -kdDebug(5006) << " new Content-Type = " << headers->ContentType( ).AsString().c_str() << endl; + } else if ( weAreReplacingTheRootNode && part && part->hasHeaders() ) { + kdDebug(5006) << "dataNode replace the root node: Do NOT store the headers but change" << endl; + kdDebug(5006) << " the Message's headers accordingly." << endl; + kdDebug(5006) << " old Content-Type = " << rootHeaders.ContentType().AsString().c_str() << endl; + kdDebug(5006) << " new Content-Type = " << headers->ContentType( ).AsString().c_str() << endl; rootHeaders.ContentType() = headers->ContentType(); theMessage.setContentTransferEncodingStr( headers->HasContentTransferEncoding() @@ -307,12 +307,12 @@ kdDebug(5006) << " new Content-Type = " << headers->ContentType( // B) Store the body of this part. if( headers && bIsMultipart && dataNode->firstChild() ) { -kdDebug(5006) << "is valid Multipart, processing children:" << endl; + kdDebug(5006) << "is valid Multipart, processing children:" << endl; TQCString boundary = headers->ContentType().Boundary().c_str(); curNode = dataNode->firstChild(); // store children of multipart while( curNode ) { -kdDebug(5006) << "--boundary" << endl; + kdDebug(5006) << "--boundary" << endl; if( resultingData.size() && ( '\n' != resultingData.at( resultingData.size()-1 ) ) ) resultingData += TQCString( "\n" ); @@ -330,24 +330,24 @@ kdDebug(5006) << "--boundary" << endl; recCount + 1 ); curNode = curNode->nextSibling(); } -kdDebug(5006) << "--boundary--" << endl; + kdDebug(5006) << "--boundary--" << endl; resultingData += "\n--"; resultingData += boundary; resultingData += "--\n\n"; -kdDebug(5006) << "Multipart processing children - DONE" << endl; + kdDebug(5006) << "Multipart processing children - DONE" << endl; } else if( part ){ // store simple part -kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl; + kdDebug(5006) << "is Simple part or invalid Multipart, storing body data .. DONE" << endl; resultingData += part->Body().AsString().c_str(); } } } else { -kdDebug(5006) << "dataNode != curNode: Replace curNode by dataNode." << endl; + kdDebug(5006) << "dataNode != curNode: Replace curNode by dataNode." << endl; bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode(); - if( rootNodeReplaceFlag ) { -kdDebug(5006) << " Root node will be replaced." << endl; + if ( rootNodeReplaceFlag ) { + kdDebug(5006) << " Root node will be replaced." << endl; } else { -kdDebug(5006) << " Root node will NOT be replaced." << endl; + kdDebug(5006) << " Root node will NOT be replaced." << endl; } // store special data to replace the current part // (e.g. decrypted data or embedded RfC 822 data) @@ -1519,7 +1519,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) if ( mRootNode && !mRootNode->processed() ) { - kdWarning() << "The root node is not yet processed! Danger!\n"; + kdWarning() << "The root node is not yet processed! Danger!" << endl; return; } else delete mRootNode; @@ -1607,9 +1607,11 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) // something different than 'curNode'. -kdDebug(5006) << "\n\n\nKMReaderWin::parseMsg() - special post-encryption handling:\n1." << endl; -kdDebug(5006) << "(aMsg == msg) = " << (aMsg == message()) << endl; -kdDebug(5006) << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " << (aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder()) << endl; +kdDebug(5006) << endl << endl << endl + << "KMReaderWin::parseMsg() - special post-encryption handling:\n1." << endl; +kdDebug(5006) << "(aMsg == msg) = " << (aMsg == message()) << endl; +kdDebug(5006) << "aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder() = " + << (aMsg->parent() && aMsg->parent() != kmkernel->outboxFolder()) << endl; kdDebug(5006) << "message_was_saved_decrypted_before( aMsg ) = " << message_was_saved_decrypted_before( aMsg ) << endl; kdDebug(5006) << "this->decryptMessage() = " << decryptMessage() << endl; kdDebug(5006) << "otp.hasPendingAsyncJobs() = " << otp.hasPendingAsyncJobs() << endl; @@ -1630,7 +1632,7 @@ kdDebug(5006) << "|| (KMMsgPartiallyEncrypted == encryptionState) = " << (KMMsgP && ( (KMMsgFullyEncrypted == encryptionState) || (KMMsgPartiallyEncrypted == encryptionState) ) ) { -kdDebug(5006) << "KMReaderWin - calling objectTreeToDecryptedMsg()" << endl; + kdDebug(5006) << "KMReaderWin - calling objectTreeToDecryptedMsg()" << endl; NewByteArray decryptedData; // note: The following call may change the message's headers. @@ -1638,10 +1640,10 @@ kdDebug(5006) << "KMReaderWin - calling objectTreeToDecryptedMsg()" << endl; // add a \0 to the data decryptedData.appendNULL(); TQCString resultString( decryptedData.data() ); -kdDebug(5006) << "KMReaderWin - resulting data:" << resultString << endl; + kdDebug(5006) << "KMReaderWin - resulting data:" << resultString << endl; - if( !resultString.isEmpty() ) { -kdDebug(5006) << "KMReaderWin - composing unencrypted message" << endl; + if ( !resultString.isEmpty() ) { + kdDebug(5006) << "KMReaderWin - composing unencrypted message" << endl; // try this: aMsg->setBody( resultString ); KMMessage* unencryptedMessage = new KMMessage( *aMsg ); @@ -2569,7 +2571,7 @@ KMMessage* KMReaderWin::message( KMFolder** aFolder ) const if (folder ) message = folder->getMsg( index ); if (!message) - kdWarning(5006) << "Attempt to reference invalid serial number " << mLastSerNum << "\n" << endl; + kdWarning(5006) << "Attempt to reference invalid serial number " << mLastSerNum << endl; return message; } return 0; diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 9613a64b4..0ef90d5c9 100644 --- a/kmail/objecttreeparser.cpp +++ b/kmail/objecttreeparser.cpp @@ -581,12 +581,12 @@ namespace KMail { } if ( doCheck ) { - //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: returned from CRYPTPLUG" << endl; + //kdDebug(5006) << endl << "ObjectTreeParser::writeOpaqueOrMultipartSignedData: returned from CRYPTPLUG" << endl; } // ### only one signature supported if ( signatures.size() > 0 ) { - //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: found signature" << endl; + //kdDebug(5006) << endl << "ObjectTreeParser::writeOpaqueOrMultipartSignedData: found signature" << endl; GpgME::Signature signature = signatures[0]; messagePart.status_code = signatureToStatus( signature ); @@ -640,9 +640,9 @@ namespace KMail { } } - //kdDebug(5006) << "\n key id: " << messagePart.keyId - // << "\n key trust: " << messagePart.keyTrust - // << "\n signer: " << messagePart.signer << endl; + //kdDebug(5006) << endl << " key id: " << messagePart.keyId + // << endl << " key trust: " << messagePart.keyTrust + // << endl << " signer: " << messagePart.signer << endl; } else { messagePart.creationTime = TQDateTime(); @@ -728,7 +728,7 @@ namespace KMail { htmlWriter()->queue( writeSigstatFooter( messagePart ) ); } - //kdDebug(5006) << "\nObjectTreeParser::writeOpaqueOrMultipartSignedData: done, returning " + //kdDebug(5006) << endl << "ObjectTreeParser::writeOpaqueOrMultipartSignedData: done, returning " // << ( bIsOpaqueSigned ? "TRUE" : "FALSE" ) << endl; return bIsOpaqueSigned; } @@ -1388,9 +1388,9 @@ namespace KMail { CryptoProtocolSaver cpws( this, useThisCryptProto ); if ( partNode * dataChild = data->firstChild() ) { - //kdDebug(5006) << "\n-----> Calling parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "-----> Calling parseObjectTree( curNode->mChild )" << endl; stdChildHandling( dataChild ); - //kdDebug(5006) << "\n-----> Returning from parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "-----> Returning from parseObjectTree( curNode->mChild )" << endl; return true; } @@ -1402,7 +1402,7 @@ namespace KMail { return true; } - //kdDebug(5006) << "\n-----> Initially processing encrypted data\n" << endl; + //kdDebug(5006) << endl << "-----> Initially processing encrypted data" << endl; PartMetaData messagePart; TQCString decryptedData; bool signatureFound; @@ -1490,17 +1490,17 @@ namespace KMail { return false; if ( partNode * child = node->firstChild() ) { - //kdDebug(5006) << "\n-----> Calling parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "-----> Calling parseObjectTree( curNode->mChild )" << endl; ObjectTreeParser otp( mReader, cryptoProtocol() ); otp.parseObjectTree( child ); mRawReplyString += otp.rawReplyString(); mTextualContent += otp.textualContent(); if ( !otp.textualContentCharset().isEmpty() ) mTextualContentCharset = otp.textualContentCharset(); - //kdDebug(5006) << "\n<----- Returning from parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "<----- Returning from parseObjectTree( curNode->mChild )" << endl; return true; } - //kdDebug(5006) << "\n-----> Initially processing data of embedded RfC 822 message\n" << endl; + //kdDebug(5006) << endl << "-----> Initially processing data of embedded RfC 822 message" << endl; // paint the frame PartMetaData messagePart; if ( mReader ) { @@ -1522,7 +1522,7 @@ namespace KMail { rfc822DwMessage->Parse(); KMMessage rfc822message( rfc822DwMessage ); node->setFromAddress( rfc822message.from() ); - //kdDebug(5006) << "\n-----> Store RfC 822 message header \"From: " << rfc822message.from() << "\"\n" << endl; + //kdDebug(5006) << endl << "-----> Store RfC 822 message header \"From: " << rfc822message.from() << "\"" << endl; if ( mReader ) htmlWriter()->queue( mReader->writeMsgHeader( &rfc822message ) ); //mReader->parseMsgHeader( &rfc822message ); @@ -1540,14 +1540,14 @@ namespace KMail { bool ObjectTreeParser::processApplicationOctetStreamSubtype( partNode * node, ProcessResult & result ) { if ( partNode * child = node->firstChild() ) { - //kdDebug(5006) << "\n-----> Calling parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "-----> Calling parseObjectTree( curNode->mChild )" << endl; ObjectTreeParser otp( mReader, cryptoProtocol() ); otp.parseObjectTree( child ); mRawReplyString += otp.rawReplyString(); mTextualContent += otp.textualContent(); if ( !otp.textualContentCharset().isEmpty() ) mTextualContentCharset = otp.textualContentCharset(); - //kdDebug(5006) << "\n<----- Returning from parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "<----- Returning from parseObjectTree( curNode->mChild )" << endl; return true; } @@ -1555,7 +1555,7 @@ namespace KMail { if ( node->parentNode() && DwMime::kTypeMultipart == node->parentNode()->type() && DwMime::kSubtypeEncrypted == node->parentNode()->subType() ) { - //kdDebug(5006) << "\n-----> Initially processing encrypted data\n" << endl; + //kdDebug(5006) << endl << "-----> Initially processing encrypted data" << endl; node->setEncryptionState( KMMsgFullyEncrypted ); if ( keepEncryptions() ) { const TQCString cstr = node->msgPart().bodyDecoded(); @@ -1632,18 +1632,18 @@ namespace KMail { bool ObjectTreeParser::processApplicationPkcs7MimeSubtype( partNode * node, ProcessResult & result ) { if ( partNode * child = node->firstChild() ) { - //kdDebug(5006) << "\n-----> Calling parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "-----> Calling parseObjectTree( curNode->mChild )" << endl; ObjectTreeParser otp( mReader, cryptoProtocol() ); otp.parseObjectTree( child ); mRawReplyString += otp.rawReplyString(); mTextualContent += otp.textualContent(); if ( !otp.textualContentCharset().isEmpty() ) mTextualContentCharset = otp.textualContentCharset(); - //kdDebug(5006) << "\n<----- Returning from parseObjectTree( curNode->mChild )\n" << endl; + //kdDebug(5006) << endl << "<----- Returning from parseObjectTree( curNode->mChild )" << endl; return true; } - //kdDebug(5006) << "\n-----> Initially processing signed and/or encrypted data\n" << endl; + //kdDebug(5006) << endl << "-----> Initially processing signed and/or encrypted data" << endl; if ( !node->dwPart() || !node->dwPart()->hasHeaders() ) return false; diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 406632b67..9612b9462 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -481,7 +481,7 @@ void SnippetWidget::initConfig() } } } else { - //kdDebug() << "iCount is not -1"; + //kdDebug() << "iCount is not -1" << endl; } iCount = _cfg->readNumEntry("snippetSavedCount", 0); diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 3e41e6dd6..e2ace6a86 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -272,8 +272,8 @@ void KMobile::addDevice() KService::Ptr ptr; for ( it = list.begin(); it != list.end(); ++it ) { ptr = *it; - kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n") - .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()); + kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'") + .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()) << endl; TQString iconName = ptr->icon(); if (iconName.isEmpty()) @@ -356,8 +356,8 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, if (!ptr) continue; - // kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4' #%5\n") - // .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()).arg(i); + // kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4' #%5") + // .arg(ptr->library()).arg(ptr->name()).arg(ptr->icon()).arg(ptr->comment()).arg(i) << endl; TQString iconName = ptr->icon(); if (iconName.isEmpty()) diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index 8a0b967ad..2fd11d5e3 100644 --- a/kmobile/kmobileclient.cpp +++ b/kmobile/kmobileclient.cpp @@ -36,7 +36,7 @@ KMobileClient::KMobileClient() m_kmobileObj = "kmobileIface"; bool ok = attach(); - PRINT_DEBUG << TQString("attached to DCOP server %1\n").arg(ok?"sucessful.":"failed."); + PRINT_DEBUG << TQString("attached to DCOP server %1").arg(ok?"sucessful.":"failed.") << endl; // m_clientAppId = registerAs("kmobileclient"); // PRINT_DEBUG << TQString("registered as DCOP client %1\n").arg(m_clientAppId); @@ -47,14 +47,14 @@ KMobileClient::KMobileClient() KMobileClient::~KMobileClient() { detach(); - PRINT_DEBUG << TQString("detached from server\n"); + PRINT_DEBUG << TQString("detached from server") << endl; } bool KMobileClient::isKMobileAvailable() { bool available = isApplicationRegistered(m_kmobileApp); - PRINT_DEBUG << TQString("KMobile DCOP server: %1\n").arg(available?"available.":"not available"); + PRINT_DEBUG << TQString("KMobile DCOP server: %1").arg(available?"available.":"not available") << endl; if (!available) { startKMobileApplication(); // check again... @@ -73,7 +73,7 @@ bool KMobileClient::startKMobileApplication() TQCString replyType; TQByteArray replyData; bool ok = call("tdelauncher", "tdelauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData); - PRINT_DEBUG << TQString("DCOP-CALL to tdelauncher: %1\n").arg(ok?"ok.":"failed."); + PRINT_DEBUG << TQString("DCOP-CALL to tdelauncher: %1").arg(ok?"ok.":"failed.") << endl; return ok; } @@ -93,7 +93,7 @@ bool KMobileClient::startKMobileApplication() TQCString replyType; \ TQByteArray replyData; \ bool ok = call(m_kmobileApp, m_kmobileObj, FUNC, data, replyType, replyData, KMOBILECLIENT_USE_EVENTLOOP, KMOBILECLIENT_TIMEOUT); \ - PRINT_DEBUG << TQString("DCOP-CALL to %1: %2\n").arg(FUNC).arg(ok?"ok.":"FAILED.") + PRINT_DEBUG << TQString("DCOP-CALL to %1: %2").arg(FUNC).arg(ok?"ok.":"FAILED.") << endl; #define RETURN_TYPE( FUNC, PARAMS, RETURN_TYPE ) \ PREPARE( FUNC, PARAMS ); \ diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index 4fb07c865..160e0f9cc 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -62,7 +62,7 @@ KMobileDevice::KMobileDevice(TQObject *obj, const char *name, const TQStringList m_config = new TDEConfig(); else m_config = new TDEConfig(m_configFileName); - PRINT_DEBUG << TQString("name of config file is %1\n").arg(m_configFileName); + PRINT_DEBUG << TQString("name of config file is %1").arg(m_configFileName) << endl; } KMobileDevice::~KMobileDevice() @@ -259,7 +259,7 @@ void KMobileDevice::createDirEntry(TDEIO::UDSEntry& entry, const TQString& name, addAtom(entry, TDEIO::UDS_ACCESS, 0500); addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime); addAtom(entry, TDEIO::UDS_URL, 0, url); - PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").arg(name).arg(mime).arg(url); + PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3").arg(name).arg(mime).arg(url) << endl; // addAtom(entry, TDEIO::UDS_SIZE, 0); addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime); } @@ -275,7 +275,7 @@ void KMobileDevice::createFileEntry(TDEIO::UDSEntry& entry, const TQString& name addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime); if (size) addAtom(entry, TDEIO::UDS_SIZE, size); addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime); - PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").arg(name).arg(size).arg(mime); + PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3").arg(name).arg(size).arg(mime) << endl; } @@ -364,13 +364,13 @@ bool KMobileDevice::lockDevice(const TQString &device, TQString &err_reason) if ((m_fd = open(fdev, O_RDWR)) == -1) { PRINT_DEBUG << i18n("Unable to open device '%1'. " - "Please check that you have sufficient permissions.").arg(fdev); + "Please check that you have sufficient permissions.").arg(fdev) << endl; return false; } if (flock(m_fd, LOCK_EX)) { // Locking failed - PRINT_DEBUG << i18n("Unable to lock device '%1'.").arg(fdev); + PRINT_DEBUG << i18n("Unable to lock device '%1'.").arg(fdev) << endl; return false; } return true; diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index 8165eadd5..08458307b 100644 --- a/kmobile/kmobileitem.cpp +++ b/kmobile/kmobileitem.cpp @@ -161,8 +161,8 @@ KService::Ptr KMobileItem::getServicePtr() const if (ptr->desktopEntryName() == m_deviceDesktopFile) return ptr; } - PRINT_DEBUG << TQString("Service for library '%1' not found in KService list\n") - .arg(m_deviceDesktopFile); + PRINT_DEBUG << TQString("Service for library '%1' not found in KService list") + .arg(m_deviceDesktopFile) << endl; return 0L; } @@ -178,15 +178,15 @@ bool KMobileItem::driverAvailable() if (!ptr) return false; - PRINT_DEBUG << TQString("Loading library %1\n").arg(ptr->library()); + PRINT_DEBUG << TQString("Loading library %1").arg(ptr->library()) << endl; KLibFactory *factory = KLibLoader::self()->factory( ptr->library().utf8() ); if (!factory) return false; m_dev = static_cast(factory->create(this, ptr->name().utf8(), "KMobileDevice", TQStringList(m_deviceConfigFile))); - PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2\n") - .arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile); + PRINT_DEBUG << TQString("Got KMobileDevice object at 0x%1, configfile=%2") + .arg((unsigned long)m_dev, 0, 16).arg(m_deviceConfigFile) << endl; return (m_dev != 0); } diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 6bd5b8832..58941dc6b 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -49,10 +49,10 @@ KMobileView::~KMobileView() bool KMobileView::addNewDevice(TDEConfig *config, KService::Ptr service) { - kdDebug() << "New mobile device item:\n"; - kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'\n") + kdDebug() << "New mobile device item:" << endl; + kdDebug() << TQString("LIBRARY: '%1', NAME: '%2', ICON: '%3', COMMENT: '%4'") .arg(service->library()).arg(service->name()).arg(service->icon()) - .arg(service->comment()); + .arg(service->comment()) << endl; KMobileItem *it; it = new KMobileItem(this, config, service); diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp index de946d4cd..1a5579988 100644 --- a/kmobile/tdeioslave/tdeio_mobile.cpp +++ b/kmobile/tdeioslave/tdeio_mobile.cpp @@ -84,7 +84,7 @@ int KMobileProtocol::getDeviceAndRessource(const TQString &_path, TQString &devName, TQString &resource, TQString &devPath, KMobileDevice::Capabilities &devCaps) { -// PRINT_DEBUG << TQString("###getDeviceAndRessource### %1\n").arg(_path); +// PRINT_DEBUG << TQString("###getDeviceAndRessource### %1").arg(_path) << endl; TQStringList path = TQStringList::split('/', _path, false); devName = resource = devPath = TQString(); @@ -140,7 +140,7 @@ void createDirEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQString addAtom(entry, TDEIO::UDS_URL, 0, url); addAtom(entry, TDEIO::UDS_USER, 0, getenv("USER")); addAtom(entry, TDEIO::UDS_GROUP, 0, getenv("USER")); - PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3\n").arg(name).arg(mime).arg(url); + PRINT_DEBUG << TQString("createDirEntry: File: %1 MIME: %2 URL: %3").arg(name).arg(mime).arg(url) << endl; // addAtom(entry, TDEIO::UDS_SIZE, 0); addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime); } @@ -159,7 +159,7 @@ void createFileEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQStrin addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, mime); if (size) addAtom(entry, TDEIO::UDS_SIZE, size); addAtom(entry, TDEIO::UDS_GUESSED_MIME_TYPE, 0, mime); - PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3\n").arg(name).arg(size).arg(mime); + PRINT_DEBUG << TQString("createFileEntry: File: %1, Size: %2, MIME: %3").arg(name).arg(size).arg(mime) << endl; } @@ -168,8 +168,8 @@ void createFileEntry(TDEIO::UDSEntry& entry, const TQString& name, const TQStrin */ void KMobileProtocol::get(const KURL &url) { - PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("get(%1)\n").arg(url.path()); + PRINT_DEBUG << "###############################" << endl; + PRINT_DEBUG << TQString("get(%1)").arg(url.path()) << endl; KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -231,7 +231,7 @@ void KMobileProtocol::get(const KURL &url) */ void KMobileProtocol::listRoot(const KURL& url) { - PRINT_DEBUG << TQString("########## listRoot(%1) for %2:/\n").arg(url.path()).arg(url.protocol()); + PRINT_DEBUG << TQString("########## listRoot(%1) for %2:/").arg(url.path()).arg(url.protocol()) << endl; TDEIO::UDSEntry entry; @@ -312,7 +312,7 @@ TQString KMobileProtocol::entryMimeType(int cap) void KMobileProtocol::listTopDeviceDir(const TQString &devName) { - PRINT_DEBUG << TQString("listTopDeviceDir(%1)\n").arg(devName); + PRINT_DEBUG << TQString("listTopDeviceDir(%1)").arg(devName) << endl; TDEIO::UDSEntry entry; unsigned int caps = m_dev.capabilities(devName); @@ -340,7 +340,7 @@ void KMobileProtocol::listEntries(const TQString &devName, const TQString &resource, const TQString &devPath, const KMobileDevice::Capabilities devCaps) { - PRINT_DEBUG << TQString("listEntries(%1,%2,%3)\n").arg(devName).arg(resource).arg(devPath); + PRINT_DEBUG << TQString("listEntries(%1,%2,%3)").arg(devName).arg(resource).arg(devPath) << endl; switch (devCaps) { case KMobileDevice::hasAddressBook: listAddressBook(devName, resource); break; @@ -360,7 +360,7 @@ void KMobileProtocol::listEntries(const TQString &devName, */ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listAddressBook(%1)\n").arg(devName); + PRINT_DEBUG << TQString("listAddressBook(%1)").arg(devName) << endl; TDEIO::UDSEntry entry; @@ -403,7 +403,7 @@ void KMobileProtocol::listAddressBook(const TQString &devName, const TQString &r */ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQString &mime, const TQString &path ) { - PRINT_DEBUG << TQString("getVCard(%1)\n").arg(path); + PRINT_DEBUG << TQString("getVCard(%1)").arg(path) << endl; int index = path.find('.'); if (index>0) @@ -425,7 +425,7 @@ int KMobileProtocol::getVCard( const TQString &devName, TQCString &result, TQStr */ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listCalendar(%1)\n").arg(devName); + PRINT_DEBUG << TQString("listCalendar(%1)").arg(devName) << endl; TDEIO::UDSEntry entry; @@ -450,7 +450,7 @@ void KMobileProtocol::listCalendar( const TQString &devName, const TQString &res */ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQString &mime, const TQString &path) { - PRINT_DEBUG << TQString("getCalendar(%1, #%2)\n").arg(devName).arg(path); + PRINT_DEBUG << TQString("getCalendar(%1, #%2)").arg(devName).arg(path) << endl; /* TODO */ Q_UNUSED(result); @@ -464,7 +464,7 @@ int KMobileProtocol::getCalendar( const TQString &devName, TQCString &result, TQ */ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resource) { - PRINT_DEBUG << TQString("listNotes(%1)\n").arg(devName); + PRINT_DEBUG << TQString("listNotes(%1)").arg(devName) << endl; TDEIO::UDSEntry entry; @@ -492,7 +492,7 @@ void KMobileProtocol::listNotes( const TQString &devName, const TQString &resour */ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQString &mime, const TQString &path ) { - PRINT_DEBUG << TQString("getNote(%1)\n").arg(path); + PRINT_DEBUG << TQString("getNote(%1)").arg(path) << endl; int index = path.find('_'); if (index>0) @@ -514,7 +514,7 @@ int KMobileProtocol::getNote( const TQString &devName, TQCString &result, TQStri */ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &resource, const TQString &devPath) { - PRINT_DEBUG << TQString("listFileStorage(%1,%2)\n").arg(devName).arg(devPath); + PRINT_DEBUG << TQString("listFileStorage(%1,%2)").arg(devName).arg(devPath) << endl; /* TODO */ error( TDEIO::ERR_DOES_NOT_EXIST, TQString("/%1/%2/%3").arg(devName).arg(resource).arg(devPath) ); @@ -525,7 +525,7 @@ void KMobileProtocol::listFileStorage(const TQString &devName, const TQString &r */ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, TQString &mime, const TQString &path) { - PRINT_DEBUG << TQString("getFileStorage(%1)\n").arg(path); + PRINT_DEBUG << TQString("getFileStorage(%1)").arg(path) << endl; /* TODO */ Q_UNUSED(devName); @@ -540,8 +540,8 @@ int KMobileProtocol::getFileStorage(const TQString &devName, TQCString &result, */ void KMobileProtocol::stat( const KURL &url ) { - PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("stat(%1)\n").arg(url.path()); + PRINT_DEBUG << "###############################" << endl; + PRINT_DEBUG << TQString("stat(%1)").arg(url.path()) << endl; KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -576,8 +576,8 @@ void KMobileProtocol::stat( const KURL &url ) */ void KMobileProtocol::mimetype(const KURL &url) { - PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("mimetype(%1)\n").arg(url.path()); + PRINT_DEBUG << "###############################" << endl; + PRINT_DEBUG << TQString("mimetype(%1)").arg(url.path()) << endl; KMobileDevice::Capabilities devCaps; TQString devName, resource, devPath; @@ -598,8 +598,8 @@ void KMobileProtocol::mimetype(const KURL &url) */ void KMobileProtocol::listDir(const KURL &url) { - PRINT_DEBUG << "###############################\n"; - PRINT_DEBUG << TQString("listDir(%1)\n").arg(url.path()); + PRINT_DEBUG << "###############################" << endl; + PRINT_DEBUG << TQString("listDir(%1)").arg(url.path()) << endl; if (!m_dev.isKMobileAvailable()) { error( TDEIO::ERR_CONNECTION_BROKEN, i18n("TDE Mobile Device Manager") ); diff --git a/kmobile/testlibkmobile.cpp b/kmobile/testlibkmobile.cpp index 4a883dede..37a6566a0 100644 --- a/kmobile/testlibkmobile.cpp +++ b/kmobile/testlibkmobile.cpp @@ -31,10 +31,10 @@ int main(int argc, char **argv) TQStringList deviceNames; reply >> deviceNames; - kdDebug() << TQString("%1\n").arg(ok?"Ok":"Failure"); - kdDebug() << TQString("Number of currently registered drivers: %1\n").arg(deviceNames.count()); + kdDebug() << TQString("%1").arg(ok?"Ok":"Failure") << endl; + kdDebug() << TQString("Number of currently registered drivers: %1").arg(deviceNames.count()) << endl; for (int i=0; ioutputFile().isEmpty() ) return; - kdDebug()<<" settings->outputFile() :"<outputFile()<outputFile() :" << settings->outputFile() << endl; if ( TQFileInfo( settings->outputFile() ).exists() ) { if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").arg( settings->outputFile()) ) == KMessageBox::No) return; diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 239f8522d..5401501a8 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1325,7 +1325,7 @@ void CalendarView::newSubTodo(Todo *parentEvent) bool CalendarView::addIncidence( const TQString &ical ) { - kdDebug(5850) << "CalendarView::addIncidence:\n" << ical << endl; + kdDebug(5850) << "CalendarView::addIncidence:" << endl << ical << endl; ICalFormat format; format.setTimeZone( mCalendar->timeZoneId(), true ); Incidence *incidence = format.fromString( ical ); diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index 5655debfd..5edcf9930 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -249,7 +249,7 @@ bool EventArchiver::isSubTreeComplete( const Todo *todo, const TQDate &limitDate // This TQPtrList is only to prevent infinit recursion if ( checkedUids.contains( todo->uid() ) ) { // Probably will never happen, calendar.cpp checks for this - kdWarning() << "To-do hierarchy loop detected!"; + kdWarning() << "To-do hierarchy loop detected!" << endl; return false; } diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 4d9c027b0..b9338bc30 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -197,7 +197,7 @@ void FreeBusyManager::slotPerhapsUploadFB() } else { // We are currently uploading the FB list. Start the timer if( eta <= 0 ) { - DEBUG_5850 << "This shouldn't happen! eta <= 0\n"; + DEBUG_5850 << "This shouldn't happen! eta <= 0" << endl; eta = 10; // whatever } } @@ -399,7 +399,7 @@ bool FreeBusyManager::processRetrieveQueue() kdDebug(5850) << "FreeBusyManager::processRetrieveQueue(): url: " << sourceURL << endl; if ( !sourceURL.isValid() ) { - kdDebug(5850) << "Invalid FB URL\n"; + kdDebug(5850) << "Invalid FB URL" << endl; slotFreeBusyDownloadError( email ); return false; } @@ -508,7 +508,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) url = cfg.readEntry ( "url" ); if ( !url.isEmpty() ) { kdDebug(5850) << "FreeBusyManager::freeBusyUrl():" - << "Taken url from preferred email:" << url << endl; + << "Taken url from preferred email:" << KURL( url ).prettyURL() << endl; return replaceVariablesURL( KURL( url ), email ); } } diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index e03eba318..51c0504d3 100644 --- a/korganizer/incidencechanger.cpp +++ b/korganizer/incidencechanger.cpp @@ -114,7 +114,7 @@ bool IncidenceChanger::endChange( Incidence *incidence, bool IncidenceChanger::deleteIncidence( Incidence *incidence, TQWidget *parent ) { if ( !incidence ) return true; -kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<summary()<<"\""<summary() << "\"" << endl; bool doDelete = sendGroupwareMessage( incidence, KCal::Scheduler::Cancel, KOGlobals::INCIDENCEDELETED, parent ); if( doDelete ) { @@ -337,12 +337,13 @@ bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc, TQWidget *parent, int dontAskForGroupware ) { -kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<summary()<<"\" ( old one was \""<summary()<<"\")"<summary() << "\" (old one was \"" << oldinc->summary() << "\")" << endl; if ( incidencesEqual( newinc, oldinc ) ) { // Don't do anything - kdDebug(5850) << "Incidence not changed\n"; + kdDebug(5850) << "Incidence not changed" << endl; } else { - kdDebug(5850) << "Incidence changed\n"; + kdDebug(5850) << "Incidence changed" << endl; bool attendeeStatusChanged = myAttendeeStatusChanged( oldinc, newinc ); int revision = newinc->revision(); newinc->setRevision( revision + 1 ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index b7a0e1de5..38c1c78b3 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -901,7 +901,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos) // kdDebug(5850) << "clipper: " << point.x() << "," << point.y() << endl; // kdDebug(5850) << "visible height: " << visibleHeight() << endl; TQPoint pos = viewportToContents( viewportPos ); -// kdDebug(5850) << "contents: " << x << "," << y << "\n" << endl; +// kdDebug(5850) << "contents: " << x << "," << y << endl; TQPoint gpos = contentsToGrid( pos ); TQPoint clipperPos = clipper()-> mapFromGlobal(viewport()->mapToGlobal(viewportPos)); @@ -1521,7 +1521,7 @@ int KOAgenda::timeToY(const TQTime &time) // kdDebug(5850) << "timeMinutes: " << timeMinutes << endl; int Y = (timeMinutes + (minutesPerCell / 2)) / minutesPerCell; // kdDebug(5850) << "y: " << Y << endl; -// kdDebug(5850) << "\n" << endl; +// kdDebug(5850) << endl; return Y; } diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 90cd4099c..e90f068bc 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -550,7 +550,7 @@ void KOAgendaView::zoomOutHorizontally( const TQDate &date ) } if ( abs( count ) >= 31 ) - kdDebug(5850) << "change to the mounth view?"<readColorEntry( it3.key(), &mDefaultResourceColor ) ); } @@ -283,8 +283,8 @@ bool KOPrefs::hasCategoryColor( const TQString& cat ) const void KOPrefs::setResourceColor ( const TQString &cal, const TQColor &color ) { - // kdDebug(5850)<<"KOPrefs::setResourceColor: " << cal << " color: "<< - // color.name()<insertCatalogue("libkpimexchange"); return new Exchange(parent,name); } @@ -61,7 +61,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : { setInstance( new TDEInstance( "korganizer" ) ); - kdDebug(5850) << "Creating Exchange Plugin...\n"; + kdDebug(5850) << "Creating Exchange Plugin..." << endl; mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" ); mClient = new KPIM::ExchangeClient( mAccount ); diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp index 47b51458f..3a946bb39 100644 --- a/korn/tdeio_subjects.cpp +++ b/korn/tdeio_subjects.cpp @@ -101,7 +101,7 @@ void TDEIO_Subjects::getConnection( ) if( ! ( _slave = TDEIO::Scheduler::getConnectedSlave( kurl, metadata ) ) ) { - kdWarning() << i18n( "Not able to open a tdeio-slave for %1." ).arg( _protocol->configName() ); + kdWarning() << i18n( "Not able to open a tdeio-slave for %1." ).arg( _protocol->configName() ) << endl; _tdeio->emitShowPassivePopup( i18n( "Not able to open a tdeio-slave for %1." ).arg( _protocol->configName() ) ); _valid = false; _tdeio->emitValidChanged(); diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp index 325cccc71..64b64045c 100644 --- a/ktnef/gui/qwmf.cpp +++ b/ktnef/gui/qwmf.cpp @@ -255,7 +255,7 @@ bool TQWinMetaFile::load( TQBuffer &buffer ) kdDebug() << " rclFrame=( " << eheader.rclFrame.left << "; " << eheader.rclFrame.top << "; " << eheader.rclFrame.right << "; " << eheader.rclFrame.bottom << ")" << endl; kdDebug() << " nBytes=" << eheader.nBytes << endl; - kdDebug() << "\nNOT YET IMPLEMENTED, SORRY." << endl; + kdDebug() << "NOT YET IMPLEMENTED, SORRY." << endl; } } else // no, not enhanced diff --git a/ktnef/lib/ktnefparser.cpp b/ktnef/lib/ktnefparser.cpp index 26bc157f6..cbd5ebef9 100644 --- a/ktnef/lib/ktnefparser.cpp +++ b/ktnef/lib/ktnefparser.cpp @@ -238,7 +238,7 @@ bool KTNEFParser::decodeMessage() break; default: value = readTNEFAttribute( d->stream_, type, i2 ); - kdDebug().form( "Message: type=%x, length=%d, check=%x\n", i1, i2, u ); + kdDebug().form( "Message: type=%x, length=%d, check=%x", i1, i2, u ) << endl; break; } // skip data @@ -310,7 +310,7 @@ bool KTNEFParser::decodeAttachment() break; default: value = readTNEFAttribute( d->stream_, type, i ); - kdDebug().form( "Attachment unknown field: tag=%x, length=%d\n", tag, i); + kdDebug().form( "Attachment unknown field: tag=%x, length=%d", tag, i) << endl; break; } d->stream_ >> u; // u <- checksum @@ -340,7 +340,7 @@ bool KTNEFParser::parseDevice() } if ( !d->device_->open( IO_ReadOnly ) ) { - kdDebug() << "Couldn't open device" << endl; + kdDebug() << "Couldn't open device" << endl; return false; } @@ -350,7 +350,7 @@ bool KTNEFParser::parseDevice() if (i == TNEF_SIGNATURE) { d->stream_ >> u; - kdDebug().form( "Attachment cross reference key: 0x%04x\n",u ); + kdDebug().form( "Attachment cross reference key: 0x%04x",u ) << endl; //kdDebug() << "stream: " << d->device_->at() << endl; while (!d->stream_.eof()) { @@ -751,7 +751,7 @@ TQ_UINT16 readMAPIValue(TQDataStream& stream, MAPI_value& mapi) } break; default: - kdDebug().form( "unsupported type=%x\n", mapi.type ); + kdDebug().form( "unsupported type=%x", mapi.type ) << endl; mapi.type = MAPI_TYPE_NONE; break; } @@ -788,7 +788,7 @@ bool KTNEFParser::readMAPIProperties( TQMap& props, KTNEFAtt readMAPIValue(d->stream_, mapi); if (mapi.type == MAPI_TYPE_NONE) { - kdDebug().form( "MAPI unsupported: tag=%x, type=%x\n", mapi.tag, mapi.type ); + kdDebug().form( "MAPI unsupported: tag=%x, type=%x", mapi.tag, mapi.type ) << endl; clearMAPIValue(mapi); return false; } @@ -828,7 +828,7 @@ bool KTNEFParser::readMAPIProperties( TQMap& props, KTNEFAtt attach->addAttribute( attATTACHDATA, atpBYTE, TQString( "< size=%1 >" ).arg( len ), false ); } } - kdDebug().form( "MAPI data: size=%d\n", mapi.value.toByteArray().size() ); + kdDebug().form( "MAPI data: size=%d", mapi.value.toByteArray().size() ) << endl; break; default: { @@ -843,29 +843,29 @@ bool KTNEFParser::readMAPIProperties( TQMap& props, KTNEFAtt switch ( mapi.type & 0x0FFF ) { case MAPI_TYPE_UINT16: - kdDebug().form( "(tag=%04x) MAPI short%s: 0x%x\n", mapi.tag, mapiname.ascii(), mapi.value.toUInt() ); + kdDebug().form( "(tag=%04x) MAPI short%s: 0x%x", mapi.tag, mapiname.ascii(), mapi.value.toUInt() ) << endl; break; case MAPI_TYPE_ULONG: - kdDebug().form( "(tag=%04x) MAPI long%s: 0x%x\n", mapi.tag, mapiname.ascii(), mapi.value.toUInt() ); + kdDebug().form( "(tag=%04x) MAPI long%s: 0x%x", mapi.tag, mapiname.ascii(), mapi.value.toUInt() ) << endl; break; case MAPI_TYPE_BOOLEAN: - kdDebug().form( "(tag=%04x) MAPI boolean%s: %s\n", mapi.tag, mapiname.ascii(), ( mapi.value.toBool() ? "true" : "false" ) ); + kdDebug().form( "(tag=%04x) MAPI boolean%s: %s", mapi.tag, mapiname.ascii(), ( mapi.value.toBool() ? "true" : "false" ) ) << endl; break; case MAPI_TYPE_TIME: - kdDebug().form( "(tag=%04x) MAPI time%s: %s\n", mapi.tag, mapiname.ascii(), mapi.value.toString().ascii() ); + kdDebug().form( "(tag=%04x) MAPI time%s: %s", mapi.tag, mapiname.ascii(), mapi.value.toString().ascii() ) << endl; break; case MAPI_TYPE_USTRING: - kdDebug() << TQString( "(tag=%1) MAPI unicode string%2: size=%3 \"%4\"\n" ) + kdDebug() << TQString( "(tag=%1) MAPI unicode string%2: size=%3 \"%4\"" ) .arg( TQString( "%1" ).arg(mapi.tag, 4, 16).replace(" ","0") ) .arg( mapiname ) .arg( mapi.value.toByteArray().size() ) - .arg( mapi.value.toString() ); + .arg( mapi.value.toString() ) << endl; break; case MAPI_TYPE_STRING8: - kdDebug().form( "(tag=%04x) MAPI string%s: size=%d \"%s\"\n", mapi.tag, mapiname.ascii(), mapi.value.toByteArray().size(), mapi.value.toString().ascii() ); + kdDebug().form( "(tag=%04x) MAPI string%s: size=%d \"%s\"", mapi.tag, mapiname.ascii(), mapi.value.toByteArray().size(), mapi.value.toString().ascii() ) << endl; break; case MAPI_TYPE_BINARY: - kdDebug().form( "(tag=%04x) MAPI binary%s: size=%d\n", mapi.tag, mapiname.ascii(), mapi.value.toByteArray().size() ); + kdDebug().form( "(tag=%04x) MAPI binary%s: size=%d", mapi.tag, mapiname.ascii(), mapi.value.toByteArray().size() ) << endl; break; } } diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp index d44897bec..61d4a5b62 100644 --- a/libemailfunctions/email.cpp +++ b/libemailfunctions/email.cpp @@ -575,9 +575,9 @@ TQCString KPIM::getEmailAddress( const TQCString & address ) false /* don't allow multiple addresses */ ); if ( result != AddressOk ) { addrSpec = TQCString(); - kdDebug() // << k_funcinfo << "\n" - << "Input: aStr\nError:" - << emailParseResultToString( result ) << endl; + kdDebug() // << k_funcinfo << endl + << "Input: aStr" << endl + << "Error:" << emailParseResultToString( result ) << endl; } return addrSpec; @@ -600,9 +600,9 @@ TQCString KPIM::getFirstEmailAddress( const TQCString & addresses ) true /* allow multiple addresses */ ); if ( result != AddressOk ) { addrSpec = TQCString(); - kdDebug() // << k_funcinfo << "\n" - << "Input: aStr\nError:" - << emailParseResultToString( result ) << endl; + kdDebug() // << k_funcinfo << endl + << "Input: aStr" << endl + << "Error:" << emailParseResultToString( result ) << endl; } return addrSpec; diff --git a/libkcal/assignmentvisitor.cpp b/libkcal/assignmentvisitor.cpp index c5599e930..4ba41bfe7 100644 --- a/libkcal/assignmentvisitor.cpp +++ b/libkcal/assignmentvisitor.cpp @@ -67,7 +67,7 @@ bool AssignmentVisitor::visit( Event *event ) const Event *source = dynamic_cast( d->mSource ); if ( source == 0 ) { kdError(5800) << "Type mismatch: source is" << d->mSource->type() - << "target is" << event->type(); + << "target is" << event->type() << endl; return false; } @@ -82,7 +82,7 @@ bool AssignmentVisitor::visit( Todo *todo ) const Todo *source = dynamic_cast( d->mSource ); if ( source == 0 ) { kdError(5800) << "Type mismatch: source is" << d->mSource->type() - << "target is" << todo->type(); + << "target is" << todo->type() << endl; return false; } @@ -97,7 +97,7 @@ bool AssignmentVisitor::visit( Journal *journal ) const Journal *source = dynamic_cast( d->mSource ); if ( source == 0 ) { kdError(5800) << "Type mismatch: source is" << d->mSource->type() - << "target is" << journal->type(); + << "target is" << journal->type() << endl; return false; } @@ -112,7 +112,7 @@ bool AssignmentVisitor::visit( FreeBusy *freebusy ) const FreeBusy *source = dynamic_cast( d->mSource ); if ( source == 0 ) { kdError(5800) << "Type mismatch: source is" << d->mSource->type() - << "target is" << freebusy->type(); + << "target is" << freebusy->type() << endl; return false; } diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp index f7988077a..a87472b0c 100644 --- a/libkcal/calendar.cpp +++ b/libkcal/calendar.cpp @@ -874,7 +874,7 @@ void Calendar::setupRelations( Incidence *forincidence ) void Calendar::removeRelations( Incidence *incidence ) { if( !incidence ) { - kdDebug(5800) << "Warning: Calendar::removeRelations( 0 )!\n"; + kdDebug(5800) << "Warning: Calendar::removeRelations( 0 )!" << endl; return; } diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 297c5104b..9fa5de8c6 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -264,7 +264,7 @@ bool CalendarLocal::deleteChildTodos( Todo *todo ) void CalendarLocal::deleteAllTodos() { - // kdDebug(5800) << "CalendarLocal::deleteAllTodos()\n"; + // kdDebug(5800) << "CalendarLocal::deleteAllTodos()" << endl; Todo::List::ConstIterator it; for( it = mTodoList.begin(); it != mTodoList.end(); ++it ) { notifyIncidenceDeleted( *it ); diff --git a/libkcal/freebusy.cpp b/libkcal/freebusy.cpp index 2935f4baf..2e67e2837 100644 --- a/libkcal/freebusy.cpp +++ b/libkcal/freebusy.cpp @@ -64,7 +64,7 @@ FreeBusy::FreeBusy( Calendar *calendar, const TQDateTime &start, const TQDateTim Event *floatingEvent = 0; if ( event->doesFloat() ) { // Floating event. Do the hack - kdDebug(5800) << "Floating event\n"; + kdDebug(5800) << "Floating event" << endl; floatingEvent = new Event( *event ); // Set the start and end times to be on midnight diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp index 6c024774c..707291977 100644 --- a/libkcal/icalformat.cpp +++ b/libkcal/icalformat.cpp @@ -413,9 +413,9 @@ TQString ICalFormat::createScheduleMessage(IncidenceBase *incidence, TQString messageText = TQString::fromUtf8( icalcomponent_as_ical_string(message) ); #if 0 - kdDebug(5800) << "ICalFormat::createScheduleMessage: message START\n" - << messageText - << "ICalFormat::createScheduleMessage: message END" << endl; + kdDebug(5800) << "ICalFormat::createScheduleMessage: message START" << endl + << messageText << endl + << "ICalFormat::createScheduleMessage: message END" << endl; #endif return messageText; diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp index 2254c06c0..3f6feb246 100644 --- a/libkcal/icalformatimpl.cpp +++ b/libkcal/icalformatimpl.cpp @@ -86,8 +86,8 @@ static void _dumpIcaltime( const icaltimetype& t) << endl; kdDebug(5800) << "--- H: " << t.hour << " M: " << t.minute << " S: " << t.second << endl; - kdDebug(5800) << "--- isUtc: " << icaltime_is_utc( t )<< endl; - kdDebug(5800) << "--- zoneId: " << icaltimezone_get_tzid( const_cast( t.zone ) )<< endl; + kdDebug(5800) << "--- isUtc: " << icaltime_is_utc( t ) << endl; + kdDebug(5800) << "--- zoneId: " << icaltimezone_get_tzid( const_cast( t.zone ) ) << endl; } */ diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp index 9805784f3..ee161d4c3 100644 --- a/libkcal/recurrencerule.cpp +++ b/libkcal/recurrencerule.cpp @@ -118,7 +118,7 @@ TQDate DateHelper::getNthWeek( int year, int weeknumber, short weekstart ) int DateHelper::getWeekNumber( const TQDate &date, short weekstart, int *year ) { -// kdDebug(5800) << "Getting week number for " << date << " with weekstart="< Y="< Y=" << year << ", M=" << month << ", D=" << day + << ", H=" << hour << ", m=" << minute << ", S=" << second + << ", wd=" << weekday << ",#wd=" << weekdaynr << ", #w=" << weeknumber << ", yd=" << yearday << endl; } diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index aeb7e44e5..88aae9820 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -277,7 +277,7 @@ Alarm::List ResourceCached::alarmsTo( const TQDateTime &to ) Alarm::List ResourceCached::alarms( const TQDateTime &from, const TQDateTime &to ) { - // kdDebug(5800) << "ResourceCached::alarms(" << from.toString() << " - " << to.toString() << ")\n"; + // kdDebug(5800) << "ResourceCached::alarms(" << from.toString() << " - " << to.toString() << ")" << endl; return mCalendar.alarms( from, to ); } diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index f6ba2b8fe..617446d9e 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -179,7 +179,7 @@ bool ResourceLocal::doReload() if ( d->mLastModified == readLastModified() ) { kdDebug(5800) << "ResourceLocal::reload(): file not modified since last read." - << endl; + << endl; return false; } diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp index 3481f9cb2..45c9e49b0 100644 --- a/libkcal/scheduler.cpp +++ b/libkcal/scheduler.cpp @@ -663,7 +663,7 @@ bool Scheduler::acceptReply(IncidenceBase *incidence,ScheduleMessage::Status /* } } } else - kdError(5800) << "No incidence for scheduling\n"; + kdError(5800) << "No incidence for scheduling" << endl; if (ret) deleteTransaction(incidence); return ret; } diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp index 201cc8d80..6fd0ea18b 100644 --- a/libkholidays/kholidays.cpp +++ b/libkholidays/kholidays.cpp @@ -96,14 +96,14 @@ TQString KHolidays::shortText( const TQDate &date ) bool KHolidays::parseFile( const TQDate &date ) { -// kdDebug()<<"KHolidays::parseFile( date=" << date << ")"< don't ask for passphrase\n"; + kdDebug(5100) << "user uses gpg-agent -> don't ask for passphrase" << endl; // set dummy passphrase (because else signing doesn't work -> FIXME) setPassPhrase( "dummy" ); } @@ -513,13 +513,13 @@ Module::getEncryptionKeys( KeyIDList& encryptionKeyIds, recipientKeyIds[i] = keyIds; } - kdDebug(5100) << "recipientKeyIds = (\n"; + kdDebug(5100) << "recipientKeyIds = (" << endl; TQValueVector::const_iterator kit; for( kit = recipientKeyIds.begin(); kit != recipientKeyIds.end(); ++kit ) { kdDebug(5100) << "( 0x" << (*kit).toStringList().join( ", 0x" ) - << " ),\n"; + << " )," << endl; } - kdDebug(5100) << ")\n"; + kdDebug(5100) << ")" << endl; if( showKeysForApproval || mShowKeyApprovalDlg ) { // #### FIXME: Until we support encryption with untrusted keys only @@ -809,12 +809,12 @@ Module::rereadKey( const KeyID& keyID, const bool readTrust /* = true */ ) { mPublicKeys.inSort( newKey ); kdDebug(5100) << "New public key 0x" << newKey->primaryKeyID() << " (" - << newKey->primaryUserID() << ").\n"; + << newKey->primaryUserID() << ")." << endl; } else if( ( 0 != oldKey ) && ( 0 == newKey ) ) { // the key has been deleted in the meantime kdDebug(5100) << "Public key 0x" << oldKey->primaryKeyID() << " (" - << oldKey->primaryUserID() << ") will be removed.\n"; + << oldKey->primaryUserID() << ") will be removed." << endl; mPublicKeys.removeRef( oldKey ); } @@ -1213,7 +1213,7 @@ Module::getEncryptionKeys( const TQString& person ) KeyList matchingKeys; // search all keys which match the complete address - kdDebug(5100) << "Looking for keys matching " << person << " ...\n"; + kdDebug(5100) << "Looking for keys matching " << person << " ..." << endl; for( it.toFirst(); (*it); ++it ) { // search case insensitively in the list of userIDs of this key if( (*it)->matchesUserID( person, false ) ) { @@ -1230,7 +1230,7 @@ Module::getEncryptionKeys( const TQString& person ) // if no keys match the complete address look for keys which match // the canonical mail address - kdDebug(5100) << "Looking for keys matching " << address << " ...\n"; + kdDebug(5100) << "Looking for keys matching " << address << " ..." << endl; if( matchingKeys.isEmpty() ) { for ( it.toFirst(); (*it); ++it ) { // search case insensitively in the list of userIDs of this key diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp index 7299762e5..0ff728256 100644 --- a/libkpgp/kpgpbase2.cpp +++ b/libkpgp/kpgpbase2.cpp @@ -292,7 +292,7 @@ Base2::decrypt( Block& block, const TQString &passphrase ) index += 17; index2 = error.find('\n', index); block.setRequiredUserId( error.mid(index, index2 - index) ); - //kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!\n"; + //kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!" << endl; if ((!passphrase.isEmpty()) && (error.find("Bad pass phrase") != -1)) { @@ -403,10 +403,10 @@ Base2::decrypt( Block& block, const TQString &passphrase ) index2 += 15; int index3 = error.find("using", index2); block.setSignatureDate( error.mid(index2, index3-index2-1) ); - kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'\n"; + kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'" << endl; index3 = error.find("key ID ", index3) + 7; block.setSignatureKeyId( error.mid(index3,8) ); - kdDebug(5100) << "Message was signed with key '" << block.signatureKeyId() << "'\n"; + kdDebug(5100) << "Message was signed with key '" << block.signatureKeyId() << "'" << endl; } else { // if pgp can't find the keyring it unfortunately doesn't print @@ -692,7 +692,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ ) key->setExpired( true ); break; default: - kdDebug(5100) << "Unknown key flag.\n"; + kdDebug(5100) << "Unknown key flag." << endl; } // Key Length @@ -811,7 +811,7 @@ Base2::parsePublicKeyData( const TQCString& output, Key* key /* = 0 */ ) index = index2 + 1; } - //kdDebug(5100) << "finished parsing key data\n"; + //kdDebug(5100) << "finished parsing key data" << endl; return key; } @@ -972,7 +972,7 @@ Base2::parseKeyList( const TQCString& output, bool secretKeys ) key->setExpired( true ); break; default: - kdDebug(5100) << "Unknown key flag.\n"; + kdDebug(5100) << "Unknown key flag." << endl; } // Key Length diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp index f73ea4a46..fd8f4c2ab 100644 --- a/libkpgp/kpgpbase5.cpp +++ b/libkpgp/kpgpbase5.cpp @@ -466,7 +466,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) if( ( strncmp( output.data() + offset, "pub", 3 ) != 0 ) && ( strncmp( output.data() + offset, "sec", 3 ) != 0 ) ) { - kdDebug(5100) << "Unknown key type or corrupt key data.\n"; + kdDebug(5100) << "Unknown key type or corrupt key data." << endl; return 0; } @@ -493,7 +493,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) !strncmp( output.data() + offset, "sec", 3 ) || !strncmp( output.data() + offset, "sub", 3 ) ) { // line contains key data - //kdDebug(5100)<<"Key data:\n"; + //kdDebug(5100)<<"Key data:" << endl; int pos, pos2; subkey = new Subkey( "", false ); @@ -517,7 +517,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) key->setDisabled( true ); break; default: // all other flags are ignored - //kdDebug(5100) << "Unknown key flag.\n"; + //kdDebug(5100) << "Unknown key flag." << endl; ; } @@ -606,7 +606,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) else if( !strncmp( output.data() + pos, "Diffie-Hellman", 14 ) ) encr = true; else - kdDebug(5100)<<"Unknown key algorithm\n"; + kdDebug(5100)<<"Unknown key algorithm" << endl; // set key capabilities of the subkey subkey->setCanEncrypt( encr ); @@ -632,7 +632,7 @@ Base5::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) else if( !strncmp( output.data() + pos, "Encrypt only", 12 ) ) canEncr = true; else - kdDebug(5100)<<"Unknown key capability\n"; + kdDebug(5100)<<"Unknown key capability" << endl; // set the global key capabilities if( !key->expired() && !key->revoked() ) diff --git a/libkpgp/kpgpbase6.cpp b/libkpgp/kpgpbase6.cpp index eb1fdb186..59c85a2cd 100644 --- a/libkpgp/kpgpbase6.cpp +++ b/libkpgp/kpgpbase6.cpp @@ -76,7 +76,7 @@ Base6::decrypt( Block& block, const TQString &passphrase ) index = error.find(':', index) + 2; index2 = error.find('\n', index); block.setRequiredUserId( error.mid(index, index2 - index) ); - //kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!\n"; + //kdDebug(5100) << "Base: key needed is \"" << block.requiredUserId() << "\"!" << endl; // Test output length to find out, if the passphrase is // bad. If someone knows a better way, please fix this. @@ -134,7 +134,7 @@ Base6::decrypt( Block& block, const TQString &passphrase ) index2 += 15; int eol = error.find( '\n', index2 ); block.setSignatureDate( error.mid( index2, eol-index2 ) ); - kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'\n"; + kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'" << endl; } else block.setSignatureDate( TQCString() ); @@ -384,7 +384,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) if( ( strncmp( output.data() + offset, "DSS", 3 ) != 0 ) && ( strncmp( output.data() + offset, "RSA", 3 ) != 0 ) ) { - kdDebug(5100) << "Unknown key type or corrupt key data.\n"; + kdDebug(5100) << "Unknown key type or corrupt key data." << endl; return 0; } @@ -423,7 +423,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) // DSS 1024 0x80E104A7 2000/06/05 expires 2002/05/31 // DSS 1024 0x80E104A7 2001/06/27 *** KEY REVOKED ***expires 2002/06/27 // DH 1024 0x80E104A7 2000/06/05 *** KEY REVOKED ****** KEY EXPIRED *** - //kdDebug(5100)<<"Primary key data:\n"; + //kdDebug(5100)<<"Primary key data:" << endl; bool sign = false; bool encr = false; @@ -458,7 +458,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) key->setDisabled( true ); break; default: - kdDebug(5100) << "Unknown key flag.\n"; + kdDebug(5100) << "Unknown key flag." << endl; } // Key Length @@ -507,7 +507,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) subkey->setRevoked( true ); key->setRevoked( true ); pos += 19; - //kdDebug(5100) << "Key was revoked.\n"; + //kdDebug(5100) << "Key was revoked." << endl; } else if( !strncmp( output.data() + pos, "*** KEY EXPIRED ***", 19 ) ) { @@ -516,7 +516,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) subkey->setExpired( true ); key->setExpired( true ); pos += 19; - //kdDebug(5100) << "Key has expired.\n"; + //kdDebug(5100) << "Key has expired." << endl; } else if( !strncmp( output.data() + pos, "expires ", 8 ) ) { @@ -528,12 +528,12 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) // Here the same comments as for the creation date are valid. subkey->setExpirationDate( epoch.secsTo( dt ) ); pos += 10; - //kdDebug(5100) << "Key expires...\n"; + //kdDebug(5100) << "Key expires..." << endl; } else if( !strncmp( output.data() + pos, "*** DEFAULT SIGNING KEY ***", 27 ) ) { pos += 27; - //kdDebug(5100) << "Key is default signing key.\n"; + //kdDebug(5100) << "Key is default signing key." << endl; } else { @@ -557,7 +557,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) { // line contains secondary key data (or data for the next key) if( fpr ) break; // here begins the next key's data - //kdDebug(5100)<<"Secondary key data:\n"; + //kdDebug(5100)<<"Secondary key data:" << endl; if( key == 0 ) break; @@ -607,24 +607,24 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) sign = false; encr = false; pos += 19; - //kdDebug(5100) << "Key was revoked.\n"; + //kdDebug(5100) << "Key was revoked." << endl; } else if( !strncmp( output.data() + pos, "*** KEY EXPIRED ***", 19 ) ) { sign = false; encr = false; pos += 19; - //kdDebug(5100) << "Key has expired.\n"; + //kdDebug(5100) << "Key has expired." << endl; } else if( !strncmp( output.data() + pos, "expires ", 8 ) ) { pos += 18; // skip the expiration date - //kdDebug(5100) << "Key expires...\n"; + //kdDebug(5100) << "Key expires..." << endl; } else if( !strncmp( output.data() + pos, "*** DEFAULT SIGNING KEY ***", 27 ) ) { pos += 27; - //kdDebug(5100) << "Key is default signing key.\n"; + //kdDebug(5100) << "Key is default signing key." << endl; } else { @@ -640,13 +640,13 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) } else if( !strncmp( output.data() + offset, "Unknown type", 12 ) ) { // line contains key data of unknown type (ignored) - kdDebug(5100)<<"Unknown key type.\n"; + kdDebug(5100)<<"Unknown key type." << endl; } else if( output[offset] == ' ' ) { // line contains additional key data if( key == 0 ) break; - //kdDebug(5100)<<"Additional key data:\n"; + //kdDebug(5100)<<"Additional key data:" << endl; int pos = offset + 1; while( output[pos] == ' ' ) @@ -680,7 +680,7 @@ Base6::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) } else if( !strncmp( output.data() + offset, "sig", 3 ) ) { // line contains signature data (ignored) - //kdDebug(5100)<<"Signature.\n"; + //kdDebug(5100)<<"Signature." << endl; } else // end of key data break; diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp index c4aa0ac12..71a6f1716 100644 --- a/libkpgp/kpgpbaseG.cpp +++ b/libkpgp/kpgpbaseG.cpp @@ -312,7 +312,7 @@ BaseG::decrypt( Block& block, const TQString &passphrase ) // Example: Signature made Sun 06 May 2001 03:49:27 PM CEST using DSA key ID 12345678 index2 = error.find("using", index+15); block.setSignatureDate( error.mid(index+15, index2-(index+15)-1) ); - kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'\n"; + kdDebug(5100) << "Message was signed on '" << block.signatureDate() << "'" << endl; // To handle gnupg > 2.1 // gpg: Signature made Thu 05 Apr 2018 10:02:50 PM CEST // gpg: using DSA key A0CF1DC09533E5E87F54DB40F1EEB8CD9FB16A50 @@ -331,7 +331,7 @@ BaseG::decrypt( Block& block, const TQString &passphrase ) int end = error.find("\n", index2); block.setSignatureKeyId( error.mid(index2,end-index2) ); } - kdDebug(5100) << "Message was signed with key '" << block.signatureKeyId() << "'\n"; + kdDebug(5100) << "Message was signed with key '" << block.signatureKeyId() << "'" << endl; // move index to start of next line index = error.find('\n', index2)+1; @@ -609,7 +609,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) // from the trust values of the user ids. break; default: - kdDebug(5100) << "Unknown trust value\n"; + kdDebug(5100) << "Unknown trust value" << endl; } } break; @@ -663,7 +663,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) key->setCanCertify( true ); break; default: - kdDebug(5100) << "Unknown key capability\n"; + kdDebug(5100) << "Unknown key capability" << endl; } break; } @@ -712,7 +712,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) userID->setValidity( KPGP_VALIDITY_ULTIMATE ); break; default: - kdDebug(5100) << "Unknown trust value\n"; + kdDebug(5100) << "Unknown trust value" << endl; } } break; @@ -825,7 +825,7 @@ BaseG::parseKeyData( const TQCString& output, int& offset, Key* key /* = 0 */ ) index = eol + 1; } - //kdDebug(5100) << "finished parsing key data\n"; + //kdDebug(5100) << "finished parsing key data" << endl; offset = index; diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index be9f552e5..bea5aced3 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -675,11 +675,11 @@ void KeySelectionDialog::updateKeyInfo( const Kpgp::Key* key, if( 0 == key ) { // the key doesn't exist anymore -> delete it from the list view while( lvi->firstChild() ) { - kdDebug(5100) << "Deleting '" << lvi->firstChild()->text( 1 ) << "'\n"; + kdDebug(5100) << "Deleting '" << lvi->firstChild()->text( 1 ) << "'" << endl; delete lvi->firstChild(); } kdDebug(5100) << "Deleting key 0x" << lvi->text( 0 ) << " (" - << lvi->text( 1 ) << ")\n"; + << lvi->text( 1 ) << ")" << endl; delete lvi; lvi = 0; return; @@ -773,7 +773,7 @@ KeySelectionDialog::keyAdmissibility( TQListViewItem* lvi, return 1; break; default: - kdDebug( 5100 ) << "Error: Invalid key status value.\n"; + kdDebug( 5100 ) << "Error: Invalid key status value." << endl; } return 0; @@ -855,7 +855,7 @@ void KeySelectionDialog::slotSelectionChanged( TQListViewItem * lvi ) void KeySelectionDialog::slotSelectionChanged() { - kdDebug(5100) << "KeySelectionDialog::slotSelectionChanged()\n"; + kdDebug(5100) << "KeySelectionDialog::slotSelectionChanged()" << endl; // (re)start the check selection timer. Checking the selection is delayed // because else drag-selection doesn't work very good (checking key trust @@ -866,7 +866,7 @@ void KeySelectionDialog::slotSelectionChanged() void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) { - kdDebug(5100) << "KeySelectionDialog::slotCheckSelection()\n"; + kdDebug(5100) << "KeySelectionDialog::slotCheckSelection()" << endl; if( !mListView->isMultiSelection() ) { mKeyIds.clear(); @@ -921,16 +921,16 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) if( -1 == mKeyIds.findIndex( lvi->text(0).local8Bit() ) ) { // some items of this key are selected and the key wasn't selected // before => the user selected something - kdDebug(5100) << "selectedCount: "<text(0)<text(0) << endl; userAction = SELECTED; } else if( ( itemCount > selectedCount ) && ( -1 != mKeyIds.findIndex( lvi->text(0).local8Bit() ) ) ) { // some items of this key are unselected and the key was selected // before => the user deselected something - kdDebug(5100) << "selectedCount: "<text(0)<text(0) << endl; userAction = DESELECTED; } } @@ -997,7 +997,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList& keys ) c { KProgressDialog* pProgressDlg = 0; bool keysAllowed = true; - kdDebug(5100) << "Checking keys...\n"; + kdDebug(5100) << "Checking keys..." << endl; pProgressDlg = new KProgressDialog( 0, 0, i18n("Checking Keys"), i18n("Checking key 0xMMMMMMMM..."), @@ -1010,7 +1010,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList& keys ) c for( TQValueList::ConstIterator it = keys.begin(); it != keys.end(); ++it ) { - kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n"; + kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "..." << endl; pProgressDlg->setLabel( i18n("Checking key 0x%1...") .arg( TQString( getKeyId( *it ) ) ) ); tdeApp->processEvents(); @@ -1512,8 +1512,8 @@ KeyApprovalDialog::slotChangeEncryptionKey( int nr ) { Kpgp::Module *pgp = Kpgp::Module::getKpgp(); - kdDebug(5100)<<"Key approval dialog size is " - <( plugin ); if ( editor ) { @@ -118,11 +118,11 @@ void Core::slotAllPluginsLoaded() { TQValueList plugins = m_pluginManager->availablePlugins(); - kdDebug()<<"Number of available plugins is "<< plugins.count() <::iterator it = plugins.begin(); it != plugins.end(); ++it ) { KPluginInfo *i = ( *it ); - kdDebug()<<"\tAvailable plugin "<< i->pluginName() - <<", comment = "<< i->comment() <pluginName() + <<", comment = " << i->comment() << endl; } if ( !m_stack->visibleWidget() ) { @@ -140,7 +140,7 @@ Core::slotActivePartChanged( KParts::Part *part ) } kdDebug() << "Part activated: " << part << " with stack id. " - << m_stack->id( part->widget() )<< endl; + << m_stack->id( part->widget() ) << endl; createGUI( part ); } @@ -164,7 +164,7 @@ Core::selectEditor( Komposer::Editor *editor ) TQWidget *view = part->widget(); Q_ASSERT( view ); - kdDebug()<<"Raising view "<raiseWidget( view ); @@ -184,7 +184,7 @@ Core::selectEditor( const TQString &editorName ) void Core::loadSettings() { - //kdDebug()<<"Trying to select "<< Prefs::self()->m_activeEditor <m_activeEditor << endl; //selectEditor( Prefs::self()->m_activeEditor ); //m_activeEditors = Prefs::self()->m_activeEditors; @@ -200,7 +200,7 @@ Core::saveSettings() void Core::slotQuit() { - kdDebug()<<"exit"<shutdown(); } @@ -232,7 +232,7 @@ Core::initCore() m_pluginManager->loadAllPlugins(); - kdDebug()<<"Loading"<deleteLater(); } diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp index 40fe5181e..ca0978002 100644 --- a/libtdepim/komposer/core/tests/testmanager.cpp +++ b/libtdepim/komposer/core/tests/testmanager.cpp @@ -22,24 +22,24 @@ TestManager::TestManager( TQObject *parent ) m_manager->loadAllPlugins(); TQValueList plugins = m_manager->availablePlugins(); - kdDebug()<<"Number of available plugins is "<< plugins.count() <::iterator it = plugins.begin(); it != plugins.end(); ++it ) { KPluginInfo *i = ( *it ); - kdDebug()<<"\tAvailable plugin "<< i->name() - <<", comment = "<< i->comment() <name() + << ", comment = " << i->comment() << endl; } } void TestManager::slotAllPluginsLoaded() { - kdDebug()<<"Done"<shutdown(); tqApp->exit(); } void TestManager::slotPluginLoaded( Plugin *plugin ) { - kdDebug()<<"A plugin "<< m_manager->pluginName( plugin ) << " has been loaded"<pluginName( plugin ) << " has been loaded" << endl; } int main( int argc, char **argv ) diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp index 7bae12441..4a590d1d9 100644 --- a/tdeioslave/sieve/sieve.cpp +++ b/tdeioslave/sieve/sieve.cpp @@ -1080,7 +1080,7 @@ bool tdeio_sieveProtocol::authenticate() return false; } - ksDebug() << "Preferred authentication method is " << mechusing << "." << endl; + ksDebug() << "Preferred authentication method is " << mechusing << "." << endl; TQString firstCommand = "AUTHENTICATE \"" + TQString::fromLatin1( mechusing ) + "\""; tmp.setRawData( out, outlen ); diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp index 0917f6adc..f7d6d7a32 100644 --- a/tderesources/birthdays/resourcetdeabc.cpp +++ b/tderesources/birthdays/resourcetdeabc.cpp @@ -504,7 +504,7 @@ Alarm::List ResourceTDEABC::alarmsTo( const TQDateTime &to ) Alarm::List ResourceTDEABC::alarms( const TQDateTime &from, const TQDateTime &to ) { -// kdDebug(5800) << "ResourceTDEABC::alarms(" << from.toString() << " - " << to.toString() << ")\n"; +// kdDebug(5800) << "ResourceTDEABC::alarms(" << from.toString() << " - " << to.toString() << ")" << endl; return mCalendar.alarms( from, to ); } diff --git a/tderesources/blogging/API_Blog.cpp b/tderesources/blogging/API_Blog.cpp index 981390fa1..abba7fcd2 100644 --- a/tderesources/blogging/API_Blog.cpp +++ b/tderesources/blogging/API_Blog.cpp @@ -70,9 +70,9 @@ KCal::Journal *APIBlog::journalFromPosting( KBlog::BlogPosting *blog ) TQDateTime dt = blog->dateTime(); TQDateTime creationDt = blog->creationDateTime(); TQDateTime modificationDt = blog->modificationDateTime(); -kdDebug() << "dt ="<title() << " is " - << blog->dateTime().toString()<dateTime().toString() << endl; j->setSummary( blog->title() ); j->setDescription( blog->content() ); j->setCategories( TQStringList( blog->category() ) ); diff --git a/tderesources/blogging/API_Blogger.cpp b/tderesources/blogging/API_Blogger.cpp index ead54dcd2..fcbf17aeb 100644 --- a/tderesources/blogging/API_Blogger.cpp +++ b/tderesources/blogging/API_Blogger.cpp @@ -128,7 +128,7 @@ TDEIO::TransferJob *APIBlogger::createUploadNewJob( KBlog::BlogPosting *posting TDEIO::Job *APIBlogger::createRemoveJob( const KURL &/*url*/, const TQString &postid ) { -kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl; + kdDebug() << "APIBlogger::createRemoveJob: postid=" << postid << endl; // if ( isValid() ){ TQValueList args( defaultArgs( postid ) ); args << TQVariant( /*publish=*/true ); @@ -174,12 +174,12 @@ bool APIBlogger::interpretUserInfoJob( TDEIO::Job *job ) void APIBlogger::interpretListFoldersJob( TDEIO::Job *job ) { -kdDebug() << "APIBlogger::interpretListFoldersJob" << endl; - TDEIO::XmlrpcJob *trfjob = dynamic_cast(job); - if ( job->error() || !trfjob ) { - // TODO: Error handling - } else { -kdDebug() << "APIBlogger::interpretListFoldersJob, no error!" << endl; + kdDebug() << "APIBlogger::interpretListFoldersJob" << endl; + TDEIO::XmlrpcJob *trfjob = dynamic_cast(job); + if ( job->error() || !trfjob ) { + // TODO: Error handling + } else { + kdDebug() << "APIBlogger::interpretListFoldersJob, no error!" << endl; TQValueList message( trfjob->response() ); kdDebug () << "TOP: " << message[ 0 ].typeName() << endl; @@ -198,7 +198,7 @@ kdDebug() << "APIBlogger::interpretListFoldersJob, no error!" << endl; // URL for all calls will be the XML-RPC interface, anyway. if ( !id.isEmpty() && !name.isEmpty() ) { emit folderInfoRetrieved( id, name ); -kdDebug()<< "Emitting folderInfoRetrieved( id=" << id << ", name=" << name << "); " << endl; + kdDebug()<< "Emitting folderInfoRetrieved( id=" << id << ", name=" << name << "); " << endl; } } } @@ -301,7 +301,7 @@ bool APIBlogger::readPostingFromMap( BlogPosting *post, const TQStringVariantMap int catStart = contents.find( catTagOpen, 0, false ) + catTagOpen.length(); int catEnd = contents.find( catTagClose, 0, false ); -kdDebug() << " catTagOpen = " << catTagOpen << ", catTagClose = " << catTagClose << ", start - end : " << catStart <<" - " << catEnd << endl; + kdDebug() << " catTagOpen = " << catTagOpen << ", catTagClose = " << catTagClose << ", start - end : " << catStart <<" - " << catEnd << endl; if ( catEnd > catStart ) { category = contents.mid( catStart, catEnd - catStart ); kdDebug() << "Found a category \"" << category << "\"" << endl; @@ -310,7 +310,7 @@ kdDebug() << " catTagOpen = " << catTagOpen << ", catTagClose = " << catTagClos } int titleStart = contents.find( titleTagOpen, 0, false ) + titleTagOpen.length(); int titleEnd = contents.find( titleTagClose, 0, false ); -kdDebug() << " titleTagOpen = " << titleTagOpen << ", titleTagClose = " << titleTagClose << ", start - end : " << titleStart <<" - " << titleEnd << endl; + kdDebug() << " titleTagOpen = " << titleTagOpen << ", titleTagClose = " << titleTagClose << ", start - end : " << titleStart <<" - " << titleEnd << endl; kdDebug() << "Title start and end: " << titleStart << ", " << titleEnd << endl; if ( titleEnd > titleStart ) { title = contents.mid( titleStart, titleEnd - titleStart ); diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index 4a9888ea1..1de9c988c 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -47,7 +47,7 @@ using namespace KCal; ResourceCalDav* ResourceCalDavConfig::getCalDavResource(KRES::Resource* resource) { ResourceCalDav *res = dynamic_cast( resource ); if (!res) { - kdDebug() << "invalid resource type" << '\n'; + kdDebug() << "invalid resource type" << endl; } return res; @@ -59,7 +59,7 @@ CalDavPrefs* ResourceCalDavConfig::getPrefs(ResourceCalDav* res) { if (res) { p = res->prefs(); if (!p) { - kdDebug() << "CalDAV: res->prefs() returned NULL" << '\n'; + kdDebug() << "CalDAV: res->prefs() returned NULL" << endl; } } diff --git a/tderesources/caldav/job.cpp b/tderesources/caldav/job.cpp index d44f61050..3e4cc3d22 100644 --- a/tderesources/caldav/job.cpp +++ b/tderesources/caldav/job.cpp @@ -20,7 +20,7 @@ #include -#define log(s) kdDebug() << s << '\n'; +#define log(s) kdDebug() << s << endl; /*========================================================================= | NAMESPACE diff --git a/tderesources/caldav/preferences.cpp b/tderesources/caldav/preferences.cpp index a9ba68785..e1894162a 100644 --- a/tderesources/caldav/preferences.cpp +++ b/tderesources/caldav/preferences.cpp @@ -47,12 +47,12 @@ bool CalDavPrefs::setWalletFolder(const TQString& folder) { if (!mWallet->hasFolder(folder)) { if (!mWallet->createFolder(folder)) { ret = false; - kdWarning() << "can't create the wallet folder for CalDAV passwords\n"; + kdWarning() << "can't create the wallet folder for CalDAV passwords" << endl; } } if (!mWallet->setFolder(folder)) { ret = false; - kdWarning() << "can't set the wallet folder for CalDAV passwords\n"; + kdWarning() << "can't set the wallet folder for CalDAV passwords" << endl; } } else { // the wallet is inaccessible or not configured @@ -69,18 +69,18 @@ Wallet* CalDavPrefs::getWallet() { // the wallet is not marked as inaccessible if (NULL == mWallet) { - kdDebug() << "creating wallet for " << mPrefix << '\n'; + kdDebug() << "creating wallet for " << mPrefix << endl; mWallet = Wallet::openWallet(Wallet::NetworkWallet(), 0); if (NULL == mWallet) { mNoWallet = true; // can't open the wallet, mark it inaccessible - kdWarning() << "can't create a wallet for CalDAV passwords\n"; + kdWarning() << "can't create a wallet for CalDAV passwords" << endl; } else { if (setWalletFolder(WALLET_FOLDER)) { // reserved } else { // can't set the wallet folder, remove the wallet and mark it inaccessible - kdWarning() << "can't set the walet folder for CalDAV passwords\n"; + kdWarning() << "can't set the walet folder for CalDAV passwords" << endl; removeWallet(true); } } @@ -115,7 +115,7 @@ bool CalDavPrefs::writePasswordToWallet(const TQString& password) { if (NULL != w) { int rc = w->writePassword(mPrefix + WALLET_PWD_SUFFIX, password); if (0 != rc) { - kdWarning() << "CalDAV: can't write password to the wallet\n"; + kdWarning() << "CalDAV: can't write password to the wallet" << endl; } else { ret = true; } @@ -136,7 +136,7 @@ bool CalDavPrefs::readPasswordFromWallet(TQString& password) { password = p; ret = true; } else { - kdWarning() << "CalDAV: can't read password from the wallet\n"; + kdWarning() << "CalDAV: can't read password from the wallet" << endl; password = NO_PASSWORD; } } @@ -154,7 +154,7 @@ bool CalDavPrefs::removePasswordFromWallet() { if (0 == rc) { ret = true; } else { - kdWarning() << "CalDAV: can't remove password from the wallet\n"; + kdWarning() << "CalDAV: can't remove password from the wallet" << endl; } } @@ -182,13 +182,13 @@ TQString CalDavPrefs::getusername() { } void CalDavPrefs::setRememberPassword(bool v) { - kdDebug() << "remember: " << v << '\n'; + kdDebug() << "remember: " << v << endl; CalDavPrefsSkel::setRememberPassword(v); if (!v) { // we should not remember password. If there is one already stored, it must be removed. - kdDebug() << "removing password from wallet" << '\n'; + kdDebug() << "removing password from wallet" << endl; removePasswordFromWallet(); } } diff --git a/tderesources/caldav/preferences.h b/tderesources/caldav/preferences.h index d54d7d4e3..888c640bd 100644 --- a/tderesources/caldav/preferences.h +++ b/tderesources/caldav/preferences.h @@ -54,7 +54,7 @@ public: } virtual ~CalDavPrefs() { - kdDebug() << "removing wallet" << '\n'; + kdDebug() << "removing wallet" << endl; removeWallet(); } diff --git a/tderesources/caldav/reader.cpp b/tderesources/caldav/reader.cpp index 6d7400340..0db181d42 100644 --- a/tderesources/caldav/reader.cpp +++ b/tderesources/caldav/reader.cpp @@ -17,6 +17,7 @@ #include "reader.h" #include #include +#include #include /*========================================================================= @@ -45,26 +46,26 @@ void CalDavReader::cleanJournalsJob() { } int CalDavReader::runJob(runtime_info* RT) { - kdDebug() << "reader::run, url: " << url() << '\n'; + kdDebug() << "reader::run, url: " << KURL(url()).prettyURL() << endl; response* result = caldav_get_response(); CALDAV_RESPONSE res = OK; if ((OK == res) && (url() != "")) { if (mGetAll) { - kdDebug() << "getting all objects" << '\n'; + kdDebug() << "getting all objects" << endl; res = caldav_getall_object(result, std::string(url().ascii()).c_str(), RT); } else { - kdDebug() << "getting object from the specified time range" << '\n'; + kdDebug() << "getting object from the specified time range" << endl; res = caldav_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(url().ascii()).c_str(), RT); } if (OK == res) { - kdDebug() << "success" << '\n'; + kdDebug() << "success" << endl; if (result->msg) { mData = KCharsets::resolveEntities(TQString::fromUtf8(result->msg)); } else { - kdDebug() << "empty collection" << '\n'; + kdDebug() << "empty collection" << endl; // empty collection mData = ""; } @@ -77,28 +78,28 @@ int CalDavReader::runJob(runtime_info* RT) { } int CalDavReader::runTasksJob(runtime_info* RT) { - kdDebug() << "reader::run, tasksUrl: " << tasksUrl() << '\n'; + kdDebug() << "reader::run, tasksUrl: " << KURL(tasksUrl()).prettyURL() << endl; response* result = caldav_get_response(); CALDAV_RESPONSE tasksres = OK; if ((OK == tasksres) && (tasksUrl() != "")) { - kdDebug() << "reader::run, url: " << tasksUrl() << '\n'; + kdDebug() << "reader::run, url: " << KURL(tasksUrl()).prettyURL() << endl; if (mGetAll) { - kdDebug() << "getting all objects" << '\n'; + kdDebug() << "getting all objects" << endl; tasksres = caldav_tasks_getall_object(result, std::string(tasksUrl().ascii()).c_str(), RT); } else { - kdDebug() << "getting object from the specified time range" << '\n'; + kdDebug() << "getting object from the specified time range" << endl; tasksres = caldav_tasks_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(tasksUrl().ascii()).c_str(), RT); } if (OK == tasksres) { - kdDebug() << "success" << '\n'; + kdDebug() << "success" << endl; if (result->msg) { mTasksData = KCharsets::resolveEntities(TQString::fromUtf8(result->msg)); } else { - kdDebug() << "empty collection" << '\n'; + kdDebug() << "empty collection" << endl; // empty collection mTasksData = ""; } @@ -111,28 +112,28 @@ int CalDavReader::runTasksJob(runtime_info* RT) { } int CalDavReader::runJournalsJob(runtime_info* RT) { - kdDebug() << "reader::run, journalsUrl: " << journalsUrl() << '\n'; + kdDebug() << "reader::run, journalsUrl: " << KURL(journalsUrl()).prettyURL() << endl; response* result = caldav_get_response(); CALDAV_RESPONSE journalsres = OK; if ((OK == journalsres) && (journalsUrl() != "")) { - kdDebug() << "reader::run, url: " << journalsUrl() << '\n'; + kdDebug() << "reader::run, url: " << KURL(journalsUrl()).prettyURL() << endl; if (mGetAll) { - kdDebug() << "getting all objects" << '\n'; + kdDebug() << "getting all objects" << endl; journalsres = caldav_tasks_getall_object(result, std::string(journalsUrl().ascii()).c_str(), RT); } else { - kdDebug() << "getting object from the specified time range" << '\n'; + kdDebug() << "getting object from the specified time range" << endl; journalsres = caldav_tasks_get_object(result, mTimeStart.toTime_t(), mTimeEnd.toTime_t(), std::string(journalsUrl().ascii()).c_str(), RT); } if (OK == journalsres) { - kdDebug() << "success" << '\n'; + kdDebug() << "success" << endl; if (result->msg) { mJournalsData = KCharsets::resolveEntities(TQString::fromUtf8(result->msg)); } else { - kdDebug() << "empty collection" << '\n'; + kdDebug() << "empty collection" << endl; // empty collection mJournalsData = ""; } diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index 9ab685c86..41e76f797 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -62,7 +62,7 @@ const int ResourceCalDav::DEFAULT_SAVE_POLICY = ResourceCached::SaveDelaye | UTILITY ========================================================================*/ -#define log(s) kdDebug() << identifier() << ": " << (s) << '\n'; +#define log(s) kdDebug() << identifier() << ": " << (s) << endl; /*========================================================================= | CONSTRUCTOR / DESTRUCTOR diff --git a/tderesources/caldav/writer.cpp b/tderesources/caldav/writer.cpp index d9a6b2f0e..c046c4458 100644 --- a/tderesources/caldav/writer.cpp +++ b/tderesources/caldav/writer.cpp @@ -45,29 +45,29 @@ void CalDavWriter::cleanJob() { } int CalDavWriter::runJob(runtime_info* RT) { - kdDebug() << "writer::run, url: " << url() << "\n"; + kdDebug() << "writer::run, url: " << url() << endl; int res = OK; if ((OK == res) && (url() != "")) { - kdDebug() << "pushing added objects" << '\n'; + kdDebug() << "pushing added objects" << endl; res = pushObjects(mAdded, caldav_add_object, OK, RT); if (OK == res) { #ifdef USE_CALDAV_MODIFY - kdDebug() << "pushing changed objects" << '\n'; + kdDebug() << "pushing changed objects" << endl; res = pushObjects(mChanged, caldav_modify_object, OK, RT); if (OK == res) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; res = pushObjects(mDeleted, caldav_delete_object, OK, RT); } #else // if USE_CALDAV_MODIFY - kdDebug() << "pushing changed objects (delete)" << '\n'; + kdDebug() << "pushing changed objects (delete)" << endl; res = pushObjects(mChanged, caldav_delete_object, OK, RT); if (OK == res) { - kdDebug() << "pushing changed objects (add)" << '\n'; + kdDebug() << "pushing changed objects (add)" << endl; res = pushObjects(mChanged, caldav_add_object, OK, RT); if (OK == res) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; res = pushObjects(mDeleted, caldav_delete_object, OK, RT); } } @@ -78,24 +78,24 @@ int CalDavWriter::runJob(runtime_info* RT) { int tasksres = OK; if ((OK == tasksres) && (tasksUrl() != "")) { - kdDebug() << "pushing added tasks objects" << '\n'; + kdDebug() << "pushing added tasks objects" << endl; tasksres = pushTasksObjects(mTasksAdded, caldav_add_object, OK, RT); if (OK == tasksres) { #ifdef USE_CALDAV_TASKS_MODIFY - kdDebug() << "pushing changed objects" << '\n'; + kdDebug() << "pushing changed objects" << endl; tasksres = pushTasksObjects(mTasksChanged, caldav_tasks_modify_object, OK, RT); if (OK == tasksres) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; tasksres = pushTasksObjects(mTasksDeleted, caldav_tasks_delete_object, OK, RT); } #else // if USE_CALDAV_TASKS_MODIFY - kdDebug() << "pushing changed objects (delete)" << '\n'; + kdDebug() << "pushing changed objects (delete)" << endl; tasksres = pushTasksObjects(mTasksChanged, caldav_tasks_delete_object, OK, RT); if (OK == tasksres) { - kdDebug() << "pushing changed objects (add)" << '\n'; + kdDebug() << "pushing changed objects (add)" << endl; tasksres = pushTasksObjects(mTasksChanged, caldav_add_object, OK, RT); if (OK == tasksres) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; tasksres = pushTasksObjects(mTasksDeleted, caldav_tasks_delete_object, OK, RT); } } @@ -106,24 +106,24 @@ int CalDavWriter::runJob(runtime_info* RT) { int journalsres = OK; if ((OK == journalsres) && (tasksUrl() != "")) { - kdDebug() << "pushing added tasks objects" << '\n'; + kdDebug() << "pushing added tasks objects" << endl; journalsres = pushJournalsObjects(mJournalsAdded, caldav_add_object, OK, RT); if (OK == journalsres) { #ifdef USE_CALDAV_TASKS_MODIFY - kdDebug() << "pushing changed objects" << '\n'; + kdDebug() << "pushing changed objects" << endl; journalsres = pushJournalsObjects(mJournalsChanged, caldav_tasks_modify_object, OK, RT); if (OK == journalsres) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; journalsres = pushJournalsObjects(mJournalsDeleted, caldav_tasks_delete_object, OK, RT); } #else // if USE_CALDAV_TASKS_MODIFY - kdDebug() << "pushing changed objects (delete)" << '\n'; + kdDebug() << "pushing changed objects (delete)" << endl; journalsres = pushJournalsObjects(mJournalsChanged, caldav_tasks_delete_object, OK, RT); if (OK == journalsres) { - kdDebug() << "pushing changed objects (add)" << '\n'; + kdDebug() << "pushing changed objects (add)" << endl; journalsres = pushJournalsObjects(mJournalsChanged, caldav_add_object, OK, RT); if (OK == journalsres) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; journalsres = pushJournalsObjects(mJournalsDeleted, caldav_tasks_delete_object, OK, RT); } } diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp index b476fb249..663d19d40 100644 --- a/tderesources/carddav/config.cpp +++ b/tderesources/carddav/config.cpp @@ -46,7 +46,7 @@ using namespace TDEABC; ResourceCardDav* ResourceCardDavConfig::getCardDavResource(KRES::Resource* resource) { ResourceCardDav *res = dynamic_cast( resource ); if (!res) { - kdDebug() << "invalid resource type" << '\n'; + kdDebug() << "invalid resource type" << endl; } return res; @@ -58,7 +58,7 @@ CardDavPrefs* ResourceCardDavConfig::getPrefs(ResourceCardDav* res) { if (res) { p = res->prefs(); if (!p) { - kdDebug() << "CardDAV: res->prefs() returned NULL" << '\n'; + kdDebug() << "CardDAV: res->prefs() returned NULL" << endl; } } diff --git a/tderesources/carddav/job.cpp b/tderesources/carddav/job.cpp index 51e090d9b..4eb3f30b4 100644 --- a/tderesources/carddav/job.cpp +++ b/tderesources/carddav/job.cpp @@ -19,7 +19,7 @@ #include -#define log(s) kdDebug() << s << '\n'; +#define log(s) kdDebug() << s << endl; /*========================================================================= | NAMESPACE diff --git a/tderesources/carddav/preferences.cpp b/tderesources/carddav/preferences.cpp index 3be1f21a8..2bde1ff44 100644 --- a/tderesources/carddav/preferences.cpp +++ b/tderesources/carddav/preferences.cpp @@ -46,12 +46,12 @@ bool CardDavPrefs::setWalletFolder(const TQString& folder) { if (!mWallet->hasFolder(folder)) { if (!mWallet->createFolder(folder)) { ret = false; - kdWarning() << "can't create the wallet folder for CardDAV passwords\n"; + kdWarning() << "can't create the wallet folder for CardDAV passwords" << endl; } } if (!mWallet->setFolder(folder)) { ret = false; - kdWarning() << "can't set the wallet folder for CardDAV passwords\n"; + kdWarning() << "can't set the wallet folder for CardDAV passwords" << endl; } } else { // the wallet is inaccessible or not configured @@ -68,18 +68,18 @@ Wallet* CardDavPrefs::getWallet() { // the wallet is not marked as inaccessible if (NULL == mWallet) { - kdDebug() << "creating wallet for " << mPrefix << '\n'; + kdDebug() << "creating wallet for " << mPrefix << endl; mWallet = Wallet::openWallet(Wallet::NetworkWallet(), 0); if (NULL == mWallet) { mNoWallet = true; // can't open the wallet, mark it inaccessible - kdWarning() << "can't create a wallet for CardDAV passwords\n"; + kdWarning() << "can't create a wallet for CardDAV passwords" << endl; } else { if (setWalletFolder(WALLET_FOLDER)) { // reserved } else { // can't set the wallet folder, remove the wallet and mark it inaccessible - kdWarning() << "can't set the walet folder for CardDAV passwords\n"; + kdWarning() << "can't set the walet folder for CardDAV passwords" << endl; removeWallet(true); } } @@ -114,7 +114,7 @@ bool CardDavPrefs::writePasswordToWallet(const TQString& password) { if (NULL != w) { int rc = w->writePassword(mPrefix + WALLET_PWD_SUFFIX, password); if (0 != rc) { - kdWarning() << "CardDAV: can't write password to the wallet\n"; + kdWarning() << "CardDAV: can't write password to the wallet" << endl; } else { ret = true; } @@ -135,7 +135,7 @@ bool CardDavPrefs::readPasswordFromWallet(TQString& password) { password = p; ret = true; } else { - kdWarning() << "CardDAV: can't read password from the wallet\n"; + kdWarning() << "CardDAV: can't read password from the wallet" << endl; password = NO_PASSWORD; } } @@ -153,7 +153,7 @@ bool CardDavPrefs::removePasswordFromWallet() { if (0 == rc) { ret = true; } else { - kdWarning() << "CardDAV: can't remove password from the wallet\n"; + kdWarning() << "CardDAV: can't remove password from the wallet" << endl; } } @@ -181,13 +181,13 @@ TQString CardDavPrefs::getusername() { } void CardDavPrefs::setRememberPassword(bool v) { - kdDebug() << "remember: " << v << '\n'; + kdDebug() << "remember: " << v << endl; CardDavPrefsSkel::setRememberPassword(v); if (!v) { // we should not remember password. If there is one already stored, it must be removed. - kdDebug() << "removing password from wallet" << '\n'; + kdDebug() << "removing password from wallet" << endl; removePasswordFromWallet(); } } diff --git a/tderesources/carddav/preferences.h b/tderesources/carddav/preferences.h index 6ff80ef3d..1d205d031 100644 --- a/tderesources/carddav/preferences.h +++ b/tderesources/carddav/preferences.h @@ -53,7 +53,7 @@ public: } virtual ~CardDavPrefs() { - kdDebug() << "removing wallet" << '\n'; + kdDebug() << "removing wallet" << endl; removeWallet(); } diff --git a/tderesources/carddav/reader.cpp b/tderesources/carddav/reader.cpp index eb5625060..157ff32d5 100644 --- a/tderesources/carddav/reader.cpp +++ b/tderesources/carddav/reader.cpp @@ -16,6 +16,7 @@ #include "reader.h" #include #include +#include #include /*========================================================================= @@ -34,23 +35,23 @@ void CardDavReader::cleanJob() { } int CardDavReader::runJob(runtime_info* RT) { - kdDebug() << "reader::run, url: " << url() << '\n'; + kdDebug() << "reader::run, url: " << KURL(url()).prettyURL() << endl; response* result = carddav_get_response(); CARDDAV_RESPONSE res = OK; - kdDebug() << "getting all objects" << '\n'; + kdDebug() << "getting all objects" << endl; if (getUseURI() == false) res = carddav_getall_object(result, std::string(url().ascii()).c_str(), RT); else res = carddav_getall_object_by_uri(result, std::string(url().ascii()).c_str(), RT); if (OK == res) { - kdDebug() << "success" << '\n'; + kdDebug() << "success" << endl; if (result->msg) { mData = KCharsets::resolveEntities(TQString::fromUtf8(result->msg)); } else { - kdDebug() << "empty collection" << '\n'; + kdDebug() << "empty collection" << endl; // empty collection mData = ""; } diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index 4bc11df08..840d96be8 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -62,7 +62,7 @@ const int ResourceCardDav::DEFAULT_SAVE_POLICY = ResourceCached::SaveDelay | UTILITY ========================================================================*/ -#define log(s) kdDebug() << identifier() << ": " << (s) << '\n'; +#define log(s) kdDebug() << identifier() << ": " << (s) << endl; /*========================================================================= | CONSTRUCTOR / DESTRUCTOR diff --git a/tderesources/carddav/writer.cpp b/tderesources/carddav/writer.cpp index 345d3f665..130be060b 100644 --- a/tderesources/carddav/writer.cpp +++ b/tderesources/carddav/writer.cpp @@ -43,21 +43,21 @@ void CardDavWriter::cleanJob() { } int CardDavWriter::runJob(runtime_info* RT) { - kdDebug() << "writer::run, url: " << url() << "\n"; + kdDebug() << "writer::run, url: " << url() << endl; int res = OK; - kdDebug() << "pushing added objects" << '\n'; + kdDebug() << "pushing added objects" << endl; res = pushObjects(mAdded, carddav_add_object, OK, RT); if (OK == res) { #ifdef USE_CARDDAV_MODIFY - kdDebug() << "pushing changed objects" << '\n'; + kdDebug() << "pushing changed objects" << endl; if (getUseURI() == false) res = pushObjects(mChanged, carddav_modify_object, OK, RT); else res = pushObjects(mChanged, carddav_modify_object_by_uri, OK, RT); if (OK == res) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; while (mDeleted.contains("BEGIN:VCARD", true) > 0) { int endLocation = mDeleted.find("END:VCARD", 0, true); TQString deletedCurSeq = mDeleted.mid(0, endLocation+9); @@ -69,19 +69,19 @@ int CardDavWriter::runJob(runtime_info* RT) { } } #else // if USE_CARDDAV_MODIFY - kdDebug() << "pushing changed objects (delete)" << '\n'; + kdDebug() << "pushing changed objects (delete)" << endl; if (getUseURI() == false) res = pushObjects(mChanged, carddav_delete_object, OK, RT); else res = pushObjects(mChanged, carddav_delete_object_by_uri, OK, RT); if (OK == res) { - kdDebug() << "pushing changed objects (add)" << '\n'; + kdDebug() << "pushing changed objects (add)" << endl; if (getUseURI() == false) res = pushObjects(mChanged, carddav_add_object, OK, RT); else res = pushObjects(mChanged, carddav_add_object, OK, RT); if (OK == res) { - kdDebug() << "pushing deleted objects" << '\n'; + kdDebug() << "pushing deleted objects" << endl; while (mDeleted.contains("BEGIN:VCARD", true) > 0) { int endLocation = mDeleted.find("END:VCARD", 0, true); TQString deletedCurSeq = mDeleted.mid(0, endLocation+9); diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index a2cbbed04..c5ceaa445 100644 --- a/tderesources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -421,7 +421,7 @@ Alarm::List ResourceExchange::alarmsTo( const TQDateTime &to ) /* Invoked by korgac when checking alarms. Always updates the cache. */ Alarm::List ResourceExchange::alarms( const TQDateTime &from, const TQDateTime &to ) { - kdDebug(5800) << "ResourceExchange::alarms(" << from.toString() << " - " << to.toString() << ")\n"; + kdDebug(5800) << "ResourceExchange::alarms(" << from.toString() << " - " << to.toString() << ")" << endl; Alarm::List list; TQDate start = from.date(); diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp index 4bbf728a3..a3bc50ba5 100644 --- a/tderesources/groupwise/soap/gwjobs.cpp +++ b/tderesources/groupwise/soap/gwjobs.cpp @@ -259,7 +259,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) if ( readCursorResponse.items ) { ContactConverter converter( mSoap ); - kdDebug() << "ReadAddressBooksJob::readAddressBook() - got " << readCursorResponse.items->item.size() << " contacts in cursor read of folder " << id.c_str() << endl; + kdDebug() << "ReadAddressBooksJob::readAddressBook() - got " << readCursorResponse.items->item.size() << " contacts in cursor read of folder " << id.c_str() << endl; std::vector::const_iterator it; for( it = readCursorResponse.items->item.begin(); it != readCursorResponse.items->item.end(); ++it ) { @@ -270,8 +270,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id ) if ( item->name ) kdDebug() << "ITEM: " << item->name->c_str() << endl; if ( item->id ) - kdDebug() << "ITEM: (" << item->id->c_str() - << ")" << endl; + kdDebug() << "ITEM: (" << item->id->c_str() << ")" << endl; else kdDebug() << "ITEM is null" << endl; #endif @@ -701,8 +700,7 @@ void UpdateAddressBooksJob::run() if ( item->name ) kdDebug() << "ITEM: " << item->name->c_str() << endl; if ( item->id ) - kdDebug() << "ITEM: ID (" << item->id->c_str() - << ")" << endl; + kdDebug() << "ITEM: ID (" << item->id->c_str() << ")" << endl; else kdDebug() << "ITEM is null" << endl; #endif diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 5491f3db0..31eeae896 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -471,8 +471,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence, for( it = attendees.begin(); it != attendees.end(); ++it ) { if ( !to.isEmpty() ) to += TQString::fromLatin1( "; %1" ).arg( (*it)->name() ); - kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName() - << endl; + kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName() << endl; TQString uuid; TQValueList addList = TDEABC::StdAddressBook::self()->findByEmail( (*it)->email() ); if ( !addList.first().isEmpty() ) diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index b753249d0..6a3b84608 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -89,7 +89,7 @@ TQ_LONG KSSLSocket::readBlock( char* data, TQ_ULONG maxLen ) TQ_LONG KSSLSocket::writeBlock( const char* data, TQ_ULONG len ) { -// kdDebug() << "KSSLSocket::writeBlock() " << (void*)this << endl; +// kdDebug() << "KSSLSocket::writeBlock() " << (void*)this << endl; // kdDebug() << " d->kssl: " << (void*)d->kssl << endl; return d->kssl->write( data, len ); } @@ -369,8 +369,7 @@ int KSSLSocket::verifyCertificate() break; } default: - kdDebug(0) << "SSL error in cert code." - << endl; + kdDebug(0) << "SSL error in cert code." << endl; break; } } diff --git a/tderesources/kolab/kcal/event.cpp b/tderesources/kolab/kcal/event.cpp index c15c567d8..38b80a27c 100644 --- a/tderesources/kolab/kcal/event.cpp +++ b/tderesources/kolab/kcal/event.cpp @@ -83,7 +83,7 @@ void Event::setEndDate( const TQDateTime& date ) mEndDate = date; mHasEndDate = true; if ( mFloatingStatus == AllDay ) - kdDebug() << "ERROR: Time on end date but no time on the event\n"; + kdDebug() << "ERROR: Time on end date but no time on the event" << endl; mFloatingStatus = HasTime; } @@ -92,7 +92,7 @@ void Event::setEndDate( const TQDate& date ) mEndDate = date; mHasEndDate = true; if ( mFloatingStatus == HasTime ) - kdDebug() << "ERROR: No time on end date but time on the event\n"; + kdDebug() << "ERROR: No time on end date but time on the event" << endl; mFloatingStatus = AllDay; } diff --git a/tderesources/kolab/kcal/incidence.cpp b/tderesources/kolab/kcal/incidence.cpp index f7e40dcb6..68199ae47 100644 --- a/tderesources/kolab/kcal/incidence.cpp +++ b/tderesources/kolab/kcal/incidence.cpp @@ -96,7 +96,7 @@ void Incidence::setStartDate( const TQDateTime& startDate ) { mStartDate = startDate; if ( mFloatingStatus == AllDay ) - kdDebug() << "ERROR: Time on start date but no time on the event\n"; + kdDebug() << "ERROR: Time on start date but no time on the event" << endl; mFloatingStatus = HasTime; } @@ -104,7 +104,7 @@ void Incidence::setStartDate( const TQDate& startDate ) { mStartDate = startDate; if ( mFloatingStatus == HasTime ) - kdDebug() << "ERROR: No time on start date but time on the event\n"; + kdDebug() << "ERROR: No time on start date but time on the event" << endl; mFloatingStatus = AllDay; } diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index d19a25765..223bb98e1 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -158,7 +158,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, { int count = 0; if ( !kmailIncidencesCount( count, mimetype, subResource ) ) { - kdError(5650) << "Communication problem in ResourceKolab::load()\n"; + kdError(5650) << "Communication problem in ResourceKolab::load()" << endl; return false; } @@ -185,7 +185,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) { TQMap lst; if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) { - kdError(5650) << "Communication problem in ResourceKolab::load()\n"; + kdError(5650) << "Communication problem in ResourceKolab::load()" << endl; if ( progressId ) uiserver.jobFinished( progressId ); return false; @@ -523,7 +523,7 @@ bool ResourceKolab::sendKMailUpdate( KCal::IncidenceBase* incidencebase, const T tempFile->close(); tmpFiles.append( tempFile ); } else { - kdWarning(5006) << "Cannot open temporary file for attachment"; + kdWarning(5006) << "Cannot open temporary file for attachment" << endl; } } TQStringList deletedAtts; @@ -659,7 +659,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s mNewIncidencesMap.insert( uid, subResource ); if ( !sendKMailUpdate( incidence, subResource, sernum ) ) { - kdError(5650) << "Communication problem in ResourceKolab::addIncidence()\n"; + kdError(5650) << "Communication problem in ResourceKolab::addIncidence()" << endl; endAddingIncidences(); // cleanup return false; } else { @@ -1154,7 +1154,7 @@ bool ResourceKolab::subresourceActive( const TQString& subresource ) const return mJournalSubResources[ subresource ].active(); // Safe default bet: - kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet\n"; + kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet" << endl; return true; } diff --git a/tderesources/kolab/knotes/resourcekolab.cpp b/tderesources/kolab/knotes/resourcekolab.cpp index 242281598..53f83c637 100644 --- a/tderesources/kolab/knotes/resourcekolab.cpp +++ b/tderesources/kolab/knotes/resourcekolab.cpp @@ -101,14 +101,14 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, // Get the list of journals int count = 0; if ( !kmailIncidencesCount( count, mimetype, subResource ) ) { - kdError() << "Communication problem in ResourceKolab::load()\n"; + kdError() << "Communication problem in ResourceKolab::load()" << endl; return false; } TQMap lst; if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) { kdError(5500) << "Communication problem in " - << "ResourceKolab::getIncidenceList()\n"; + << "ResourceKolab::getIncidenceList()" << endl; return false; } @@ -196,7 +196,7 @@ KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& sub bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource, TQ_UINT32 sernum ) { - kdDebug(5500) << "ResourceKolab::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n"; + kdDebug(5500) << "ResourceKolab::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )" << endl; journal->registerObserver( this ); @@ -217,7 +217,7 @@ bool ResourceKolab::addNote( KCal::Journal *journal, const TQString &subresource kdDebug(5500) << k_funcinfo << "XML string:\n" << xml << endl; if( !kmailUpdate( resource, sernum, xml, attachmentMimeType, journal->uid() ) ) { - kdError(5500) << "Communication problem in ResourceKolab::addNote()\n"; + kdError(5500) << "Communication problem in ResourceKolab::addNote()" << endl; return false; } } @@ -445,7 +445,7 @@ bool ResourceKolab::subresourceActive( const TQString& res ) const } // Safe default bet: - kdDebug(5650) << "subresourceActive( " << res << " ): Safe bet\n"; + kdDebug(5650) << "subresourceActive( " << res << " ): Safe bet" << endl; return true; } diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index 24d9c25e0..6b3a0a7de 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -100,7 +100,7 @@ bool KMailConnection::connectToKMail() findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(), TQString(), &error, &dcopService ); if ( result != 0 ) { - kdError(5650) << "Couldn't connect to the IMAP resource backend\n"; + kdError(5650) << "Couldn't connect to the IMAP resource backend" << endl; // TODO: You might want to show "error" (if not empty) here, // using e.g. KMessageBox return false; @@ -153,14 +153,14 @@ void KMailConnection::fromKMailDelIncidence( const TQString& type, const TQString& xml ) { // kdDebug(5650) << "KMailConnection::fromKMailDelIncidence( " << type << ", " -// << folder << ", " << uid << " )\n"; +// << folder << ", " << uid << " )" << endl; mResource->fromKMailDelIncidence( type, folder, xml ); } void KMailConnection::fromKMailRefresh( const TQString& type, const TQString& folder ) { // kdDebug(5650) << "KMailConnection::fromKMailRefresh( " << type << ", " -// << folder << " )\n"; +// << folder << " )" << endl; mResource->fromKMailRefresh( type, folder ); } @@ -171,7 +171,7 @@ void KMailConnection::fromKMailAddSubresource( const TQString& type, bool alarmRelevant ) { // kdDebug(5650) << "KMailConnection::fromKMailAddSubresource( " << type << ", " -// << resource << " )\n"; +// << resource << " )" << endl; mResource->fromKMailAddSubresource( type, resource, label, writable, alarmRelevant ); } @@ -180,7 +180,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type, const TQString& resource ) { // kdDebug(5650) << "KMailConnection::fromKMailDelSubresource( " << type << ", " -// << resource << " )\n"; +// << resource << " )" << endl; mResource->fromKMailDelSubresource( type, resource ); } diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp index 5834fd1fc..0b85041e4 100644 --- a/tderesources/kolab/shared/kolabbase.cpp +++ b/tderesources/kolab/shared/kolabbase.cpp @@ -95,11 +95,11 @@ void KolabBase::setFields( const TDEABC::Addressee* addressee ) TQDateTime creationDate; if ( creationString.isEmpty() ) { creationDate = TQDateTime::currentDateTime(); - kdDebug(5006) << "Creation date set to current time\n"; + kdDebug(5006) << "Creation date set to current time" << endl; } else { creationDate = stringToDateTime( creationString ); - kdDebug(5006) << "Creation date loaded\n"; + kdDebug(5006) << "Creation date loaded" << endl; } TQDateTime modified = addressee->revision(); if ( !modified.isValid() ) @@ -108,7 +108,7 @@ void KolabBase::setFields( const TDEABC::Addressee* addressee ) if ( modified < creationDate ) { // It's not possible that the modification date is earlier than creation creationDate = modified; - kdDebug(5006) << "Creation date set to modification date\n"; + kdDebug(5006) << "Creation date set to modification date" << endl; } setCreationDate( creationDate ); const TQString newCreationDate = dateTimeToString( creationDate ); diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp index 4415ce2ef..85fc65652 100644 --- a/tderesources/kolab/tdeabc/resourcekolab.cpp +++ b/tderesources/kolab/tdeabc/resourcekolab.cpp @@ -186,7 +186,7 @@ bool TDEABC::ResourceKolab::loadSubResource( const TQString& subResource ) { int count = 0; if ( !kmailIncidencesCount( count, TQString(), subResource ) ) { - kdError() << "Communication problem in TDEABC::ResourceKolab::loadSubResource()\n"; + kdError() << "Communication problem in TDEABC::ResourceKolab::loadSubResource()" << endl; return false; } if ( !count ) @@ -217,7 +217,7 @@ bool TDEABC::ResourceKolab::loadSubResource( const TQString& subResource ) KMailICalIface::StorageFormat format = s_formats[indexFormat].format; TQMap lst; if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) { - kdError() << "Communication problem in TDEABC::ResourceKolab::loadSubResource()\n"; + kdError() << "Communication problem in TDEABC::ResourceKolab::loadSubResource()" << endl; if ( progressId ) uiserver.jobFinished( progressId ); return false; @@ -585,7 +585,7 @@ void TDEABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMapemitAddressBookChanged(); } @@ -602,7 +602,7 @@ bool TDEABC::ResourceKolab::subresourceActive( const TQString& subresource ) con } // Safe default bet: - kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet\n"; + kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet" << endl; return true; } @@ -621,7 +621,7 @@ int TDEABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresou return mSubResources[ subresource ].completionWeight(); } - kdDebug(5650) << "subresourceCompletionWeight( " << subresource << " ): not found, using default\n"; + kdDebug(5650) << "subresourceCompletionWeight( " << subresource << " ): not found, using default" << endl; return 80; } @@ -632,7 +632,7 @@ TQString TDEABC::ResourceKolab::subresourceLabel( const TQString& subresource ) return mSubResources[ subresource ].label(); } - kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n"; + kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!" << endl; return TQString(); } diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp index ec40e8cc4..a455774cb 100644 --- a/tderesources/lib/folderlister.cpp +++ b/tderesources/lib/folderlister.cpp @@ -85,7 +85,7 @@ bool FolderLister::isActive( const TQString &id ) const TQStringList FolderLister::contentTypeToStrings( ContentType type ) { -kdDebug() << "FolderLister::contentTypeToStrings( type=" << type << ")" << endl; + kdDebug() << "FolderLister::contentTypeToStrings( type=" << type << ")" << endl; TQStringList cont; if ( type == All ) { cont << "All"; @@ -238,7 +238,7 @@ void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder ) void FolderLister::retrieveFolders( const KURL &u ) { -kdDebug()<<"FolderLister::retrieveFolders( "<adaptDownloadUrl( url ); if ( mUrls.contains( url ) || mProcessedPathes.contains( url.path(-1) ) ) { - kdDebug()<<"Item "<idMapper()->fingerprint( uid() ) << endl; + kdDebug() << "Adding If-Match header: " << adaptor->idMapper()->fingerprint( uid() ) << endl; TQString header; if ( job->outgoingMetaData().contains("customHTTPHeader") ) { header = job->outgoingMetaData()["customHTTPHeader"]; header += "\r\n"; } -kdDebug()<<"old HEADER: " << header << endl; + kdDebug() << "old HEADER: " << header << endl; header += "If-Match: " + adaptor->idMapper()->fingerprint( uid() ); -kdDebug()<<"new HEADER: " << header << endl; + kdDebug() << "new HEADER: " << header << endl; job->addMetaData( "customHTTPHeader", header ); } return job; @@ -144,7 +144,7 @@ TDEIO::TransferJob *GroupwareDataAdaptor::createUploadJob( const KURL &url, TDEIO::TransferJob *GroupwareDataAdaptor::createUploadNewJob( const KURL &url, GroupwareUploadItem *item ) { -kdDebug()<<"GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl; + kdDebug() << "GroupwareDataAdaptor::createUploadNewJob, url=" << url.url() << endl; if ( item ) { TDEIO::TransferJob *job = item->createUploadNewJob( this, url ); setUidForJob( job, item->uid() ); @@ -261,9 +261,9 @@ bool GroupwareDataAdaptor::interpretUploadNewJob( TDEIO::Job *job, const TQStrin TQString GroupwareDataAdaptor::uidFromJob( TDEIO::Job *job ) const { -kdDebug()<<"GroupwareDataAdaptor::uidFromJob( "<setDuration( tmplng ); - // kdDebug() << "DURATION " << tmplng << "\n"; + // kdDebug() << "DURATION " << tmplng << endl; } else if ( WebdavHandler::extractDateTime( node, "dtend", tmpdt ) ) { event->setDtEnd( WebdavHandler::utcAsZone( tmpdt, mFormat.timeZoneId() ) ); } @@ -705,7 +705,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis if ((*it)->hasStartOffset()) { domCalendarProperty( "reminderoffset", TQString::number( (*it)->startOffset().asSeconds() * -1 ) ); } else { - kdDebug() << "ExchangeConverterCalendar::createWebDAVVisitor: Alarm type not supported\n"; + kdDebug() << "ExchangeConverterCalendar::createWebDAVVisitor: Alarm type not supported" << endl; } } @@ -809,7 +809,7 @@ TQDomDocument ExchangeConverterCalendar::createWebDAV( Incidence *incidence ) ExchangeConverterCalendar::createWebDAVVisitor v; v.act( doc, prop, incidence, mFormat.timeZoneId() ); - kdDebug() << "ExchangeConverterCalendar::createWebDAVVisitor=" << doc.toString() << "\n"; + kdDebug() << "ExchangeConverterCalendar::createWebDAVVisitor=" << doc.toString() << endl; return doc; } diff --git a/tderesources/newexchange/exchangeglobals.cpp b/tderesources/newexchange/exchangeglobals.cpp index 313b04f57..947747cfb 100644 --- a/tderesources/newexchange/exchangeglobals.cpp +++ b/tderesources/newexchange/exchangeglobals.cpp @@ -36,7 +36,7 @@ KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const TQDomElement &prop ) { const TQString &contentclass = prop.namedItem("contentclass").toElement().text(); -kdDebug()<<"contentclass: "<url().url() << endl; @@ -194,7 +194,7 @@ TDEIO::Job *ExchangeGlobals::createRemoveJob( const KURL &uploadurl, bool ExchangeGlobals::interpretListItemsJob( KPIM::GroupwareDataAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ ) { -kdDebug()<<"ExchangeGlobals::interpretListItemsJob"<(job); if ( !davjob ) { @@ -242,8 +242,8 @@ bool ExchangeGlobals::interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor * TDEIO::DavJob *davjob = dynamic_cast(job); if ( !davjob || !adaptor ) return false; -kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocument=" - << endl << davjob->response().toString() << endl; + kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocument=" + << endl << davjob->response().toString() << endl; KCal::ExchangeConverterCalendar conv; conv.setTimeZone( adaptor->resource()->timeZoneId() ); KCal::Incidence::List incidences = conv.parseWebDAV( davjob->response() ); @@ -266,8 +266,8 @@ bool ExchangeGlobals::interpretAddressBookDownloadItemsJob( TDEIO::DavJob *davjob = dynamic_cast(job); if ( !davjob || !adaptor ) return false; -kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument=" - << endl << davjob->response().toString() << endl; + kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument=" + << endl << davjob->response().toString() << endl; TDEABC::ExchangeConverterContact conv; TDEABC::Addressee::List addressees = conv.parseWebDAV( davjob->response() ); diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index cd341e2d3..a716d28d7 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -147,7 +147,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, { int count = 0; if ( !kmailIncidencesCount( count, mimetype, subResource ) ) { - kdError(5650) << "Communication problem in ResourceScalix::load()\n"; + kdError(5650) << "Communication problem in ResourceScalix::load()" << endl; return false; } @@ -174,7 +174,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, for ( int startIndex = 0; startIndex < count; startIndex += nbMessages ) { TQMap lst; if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) { - kdError(5650) << "Communication problem in ResourceScalix::load()\n"; + kdError(5650) << "Communication problem in ResourceScalix::load()" << endl; if ( progressId ) uiserver.jobFinished( progressId ); return false; @@ -429,7 +429,7 @@ bool ResourceScalix::addIncidence( KCal::Incidence* incidence, const TQString& _ mNewIncidencesMap.insert( uid, subResource ); if ( !sendKMailUpdate( incidence, subResource, sernum ) ) { - kdError(5650) << "Communication problem in ResourceScalix::addIncidence()\n"; + kdError(5650) << "Communication problem in ResourceScalix::addIncidence()" << endl; return false; } else { // KMail is doing it's best to add the event now, put a sticker on it, @@ -851,7 +851,7 @@ bool ResourceScalix::subresourceActive( const TQString& subresource ) const return mJournalSubResources[ subresource ].active(); // Safe default bet: - kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet\n"; + kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet" << endl; return true; } diff --git a/tderesources/scalix/knotes/resourcescalix.cpp b/tderesources/scalix/knotes/resourcescalix.cpp index c227d6546..ccec87b50 100644 --- a/tderesources/scalix/knotes/resourcescalix.cpp +++ b/tderesources/scalix/knotes/resourcescalix.cpp @@ -95,14 +95,14 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, // Get the list of journals int count = 0; if ( !kmailIncidencesCount( count, mimetype, subResource ) ) { - kdError() << "Communication problem in ResourceScalix::load()\n"; + kdError() << "Communication problem in ResourceScalix::load()" << endl; return false; } TQMap lst; if( !kmailIncidences( lst, mimetype, subResource, 0, count ) ) { kdError(5500) << "Communication problem in " - << "ResourceScalix::getIncidenceList()\n"; + << "ResourceScalix::getIncidenceList()" << endl; return false; } @@ -177,7 +177,7 @@ KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& su bool ResourceScalix::addNote( KCal::Journal* journal, const TQString& subresource, TQ_UINT32 sernum ) { - kdDebug(5500) << "ResourceScalix::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )\n"; + kdDebug(5500) << "ResourceScalix::addNote( KCal::Journal*, '" << subresource << "', " << sernum << " )" << endl; journal->registerObserver( this ); @@ -196,7 +196,7 @@ bool ResourceScalix::addNote( KCal::Journal* journal, kdDebug(5500) << k_funcinfo << "XML string:\n" << xml << endl; if( !kmailUpdate( resource, sernum, xml, attachmentMimeType, journal->uid() ) ) { - kdError(5500) << "Communication problem in ResourceScalix::addNote()\n"; + kdError(5500) << "Communication problem in ResourceScalix::addNote()" << endl; return false; } } @@ -416,7 +416,7 @@ bool ResourceScalix::subresourceActive( const TQString& res ) const } // Safe default bet: - kdDebug(5650) << "subresourceActive( " << res << " ): Safe bet\n"; + kdDebug(5650) << "subresourceActive( " << res << " ): Safe bet" << endl; return true; } diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index dec929ce7..ce51bdaba 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -78,7 +78,7 @@ bool KMailConnection::connectToKMail() findServiceFor( "DCOP/ResourceBackend/IMAP", TQString(), TQString(), &error, &dcopService ); if ( result != 0 ) { - kdError(5650) << "Couldn't connect to the IMAP resource backend\n"; + kdError(5650) << "Couldn't connect to the IMAP resource backend" << endl; // TODO: You might want to show "error" (if not empty) here, // using e.g. KMessageBox return false; @@ -130,14 +130,14 @@ void KMailConnection::fromKMailDelIncidence( const TQString& type, const TQString& xml ) { // kdDebug(5650) << "KMailConnection::fromKMailDelIncidence( " << type << ", " -// << folder << ", " << uid << " )\n"; +// << folder << ", " << uid << " )" << endl; mResource->fromKMailDelIncidence( type, folder, xml ); } void KMailConnection::fromKMailRefresh( const TQString& type, const TQString& folder ) { // kdDebug(5650) << "KMailConnection::fromKMailRefresh( " << type << ", " -// << folder << " )\n"; +// << folder << " )" << endl; mResource->fromKMailRefresh( type, folder ); } @@ -146,7 +146,7 @@ void KMailConnection::fromKMailAddSubresource( const TQString& type, const TQString& label ) { // kdDebug(5650) << "KMailConnection::fromKMailAddSubresource( " << type << ", " -// << resource << " )\n"; +// << resource << " )" << endl; bool writable = true; // TODO: This should be told by KMail right away @@ -160,7 +160,7 @@ void KMailConnection::fromKMailDelSubresource( const TQString& type, const TQString& resource ) { // kdDebug(5650) << "KMailConnection::fromKMailDelSubresource( " << type << ", " -// << resource << " )\n"; +// << resource << " ) << endl"; mResource->fromKMailDelSubresource( type, resource ); } diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index 51ef87986..c1f3577a4 100644 --- a/tderesources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp @@ -93,11 +93,11 @@ void ScalixBase::setFields( const TDEABC::Addressee* addressee ) TQDateTime creationDate; if ( creationString.isEmpty() ) { creationDate = TQDateTime::currentDateTime(); - kdDebug(5006) << "Creation date set to current time\n"; + kdDebug(5006) << "Creation date set to current time" << endl; } else { creationDate = stringToDateTime( creationString ); - kdDebug(5006) << "Creation date loaded\n"; + kdDebug(5006) << "Creation date loaded" << endl; } TQDateTime modified = addressee->revision(); if ( !modified.isValid() ) @@ -106,7 +106,7 @@ void ScalixBase::setFields( const TDEABC::Addressee* addressee ) if ( modified < creationDate ) { // It's not possible that the modification date is earlier than creation creationDate = modified; - kdDebug(5006) << "Creation date set to modification date\n"; + kdDebug(5006) << "Creation date set to modification date" << endl; } setCreationDate( creationDate ); const TQString newCreationDate = dateTimeToString( creationDate ); diff --git a/tderesources/scalix/tdeabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp index 91fe99dd9..8a9fd5316 100644 --- a/tderesources/scalix/tdeabc/resourcescalix.cpp +++ b/tderesources/scalix/tdeabc/resourcescalix.cpp @@ -182,7 +182,7 @@ bool TDEABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource, { int count = 0; if ( !kmailIncidencesCount( count, mimetype, subResource ) ) { - kdError() << "Communication problem in TDEABC::ResourceScalix::loadSubResourceHelper()\n"; + kdError() << "Communication problem in TDEABC::ResourceScalix::loadSubResourceHelper()" << endl; return false; } if ( !count ) @@ -207,7 +207,7 @@ bool TDEABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource, TQMap lst; if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) { - kdError() << "Communication problem in ResourceScalix::load()\n"; + kdError() << "Communication problem in ResourceScalix::load()" << endl; if ( progressId ) uiserver.jobFinished( progressId ); return false; @@ -545,7 +545,7 @@ void TDEABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMapemitAddressBookChanged(); } @@ -562,7 +562,7 @@ bool TDEABC::ResourceScalix::subresourceActive( const TQString& subresource ) co } // Safe default bet: - kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet\n"; + kdDebug(5650) << "subresourceActive( " << subresource << " ): Safe bet" << endl; return true; } @@ -581,7 +581,7 @@ int TDEABC::ResourceScalix::subresourceCompletionWeight( const TQString& subreso return mSubResources[ subresource ].completionWeight(); } - kdDebug(5650) << "subresourceCompletionWeight( " << subresource << " ): not found, using default\n"; + kdDebug(5650) << "subresourceCompletionWeight( " << subresource << " ): not found, using default" << endl; return 80; } @@ -592,7 +592,7 @@ TQString TDEABC::ResourceScalix::subresourceLabel( const TQString& subresource ) return mSubResources[ subresource ].label(); } - kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!\n"; + kdDebug(5650) << "subresourceLabel( " << subresource << " ): not found!" << endl; return TQString(); } diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 530c2907e..19462bc4f 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -155,7 +155,7 @@ bool KCalResourceSlox::doLoad() if ( mLoadEventsJob || mLoadTodosJob ) { kdDebug() << "KCalResourceSlox::load(): download still in progress." - << endl; + << endl; return true; } if ( mUploadJob ) { @@ -202,7 +202,7 @@ void KCalResourceSlox::requestEvents() url.setUser( mPrefs->user() ); url.setPass( mPrefs->password() ); - kdDebug() << "KCalResourceSlox::requestEvents(): " << url << endl; + kdDebug() << "KCalResourceSlox::requestEvents(): " << url.prettyURL() << endl; TQString lastsync = "0"; if ( mPrefs->useLastSync() ) { @@ -223,7 +223,7 @@ void KCalResourceSlox::requestEvents() } else WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectType ), "all" ); - kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl; + kdDebug() << "REQUEST CALENDAR: " << endl << doc.toString( 2 ) << endl; mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false ); connect( mLoadEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), @@ -268,7 +268,7 @@ void KCalResourceSlox::requestTodos() } else WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectType ), "all" ); - kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl; + kdDebug() << "REQUEST TASKS: " << endl << doc.toString( 2 ) << endl; mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false ); connect( mLoadTodosJob, TQ_SIGNAL( result( TDEIO::Job * ) ), @@ -377,7 +377,7 @@ void KCalResourceSlox::uploadIncidences() kdDebug() << "KCalResourceSlox::uploadIncidences(): " << url << endl; - kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl; + kdDebug() << "UPLOAD: " << endl << doc.toString( 2 ) << endl; mUploadJob = TDEIO::davPropPatch( url, doc, false ); connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index a32bed50d..2d44d0f39 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -204,7 +204,7 @@ bool ResourceSlox::asyncLoad() } else WebdavHandler::addSloxElement( this, doc, prop, fieldName( ObjectType ), "all" ); - kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl; + kdDebug() << "REQUEST CONTACTS: " << endl << doc.toString( 2 ) << endl; mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), -- cgit v1.2.3