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 --- kmail/kmacctcachedimap.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'kmail/kmacctcachedimap.h') diff --git a/kmail/kmacctcachedimap.h b/kmail/kmacctcachedimap.h index e8e428204..72ed5c7db 100644 --- a/kmail/kmacctcachedimap.h +++ b/kmail/kmacctcachedimap.h @@ -75,11 +75,6 @@ public: virtual TQString type() const; virtual void processNewMail( bool interactive ); - /** - * Kill all jobs related the the specified folder - */ - void killJobsForItem(KMFolderTreeItem * fti); - /** * Kill the slave if any jobs are active */ @@ -179,7 +174,7 @@ public: /** * Returns the root folder of this account */ - virtual FolderStorage* const rootFolder() const; + virtual FolderStorage* rootFolder() const; /** return if the account passed the annotation test */ bool annotationCheckPassed(){ return mAnnotationCheckPassed;}; -- cgit v1.2.1