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/knoteslegacy.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'knotes/knoteslegacy.cpp') diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 8cb57d4c..6dd80368 100644 --- a/knotes/knoteslegacy.cpp +++ b/knotes/knoteslegacy.cpp @@ -72,8 +72,8 @@ bool KNotesLegacy::convert( CalendarLocal *calendar ) bool converted = false; TQDir noteDir( KGlobal::dirs()->saveLocation( "appdata", "notes/" ) ); - TQStringList notes = noteDir.entryList( TQDir::Files, TQDir::Name ); - for ( TQStringList::Iterator note = notes.begin(); note != notes.end(); note++ ) + const TQStringList notes = noteDir.entryList( TQDir::Files, TQDir::Name ); + for ( TQStringList::ConstIterator note = notes.constBegin(); note != notes.constEnd(); ++note ) { TQString file = noteDir.absFilePath( *note ); KSimpleConfig* test = new KSimpleConfig( file ); @@ -82,7 +82,6 @@ bool KNotesLegacy::convert( CalendarLocal *calendar ) if ( version < 3.0 ) { - delete test; // create the new note Journal *journal = new Journal(); @@ -109,8 +108,8 @@ bool KNotesLegacy::convert( CalendarLocal *calendar ) test->writeEntry( "ShowInTaskbar", (state & NET::SkipTaskbar) ? false : true ); test->writeEntry( "KeepAbove", (state & NET::KeepAbove) ? true : false ); test->deleteEntry( "state" ); - delete test; } + delete test; } return converted; -- cgit v1.2.3