diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
| commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
| tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /knotes/resourcelocal.cpp | |
| parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
| download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip | |
* 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
Diffstat (limited to 'knotes/resourcelocal.cpp')
| -rw-r--r-- | knotes/resourcelocal.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
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() ) { |