From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knotes/resourcelocal.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'knotes/resourcelocal.cpp') diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp index a6e4b9a3..91e6d2d9 100644 --- a/knotes/resourcelocal.cpp +++ b/knotes/resourcelocal.cpp @@ -75,7 +75,7 @@ bool ResourceLocal::load() KCal::Journal::List notes = mCalendar.journals(); KCal::Journal::List::ConstIterator it; - for ( it = notes.begin(); it != notes.end(); ++it ) + for ( it = notes.constBegin(); it != notes.constEnd(); ++it ) manager()->registerNote( this, *it ); return true; @@ -98,14 +98,12 @@ bool ResourceLocal::save() bool ResourceLocal::addNote( KCal::Journal *journal ) { - mCalendar.addJournal( journal ); - return true; + return mCalendar.addJournal( journal ); } bool ResourceLocal::deleteNote( KCal::Journal *journal ) { - mCalendar.deleteJournal( journal ); - return true; + return mCalendar.deleteJournal( journal ); } KCal::Alarm::List ResourceLocal::alarms( const TQDateTime& from, const TQDateTime& to ) @@ -113,11 +111,11 @@ KCal::Alarm::List ResourceLocal::alarms( const TQDateTime& from, const TQDateTim KCal::Alarm::List alarms; KCal::Journal::List notes = mCalendar.journals(); KCal::Journal::List::ConstIterator note; - for ( note = notes.begin(); note != notes.end(); ++note ) + for ( note = notes.constBegin(); note != notes.constEnd(); ++note ) { TQDateTime preTime = from.addSecs( -1 ); KCal::Alarm::List::ConstIterator it; - for( it = (*note)->alarms().begin(); it != (*note)->alarms().end(); ++it ) + for( it = (*note)->alarms().constBegin(); it != (*note)->alarms().constEnd(); ++it ) { if ( (*it)->enabled() ) { -- cgit v1.2.3