From 9850ee57acacfaf0546fc5bb6ae62cccf638feac Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 14 Aug 2010 22:09:59 +0000 Subject: [PATCH] Fixed resource loading problem from kcontrol git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1163706 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kresources/caldav/resource.cpp | 5 ----- kresources/caldav/resource.h | 5 ----- 2 files changed, 10 deletions(-) diff --git a/kresources/caldav/resource.cpp b/kresources/caldav/resource.cpp index 1e52b3ec..4e154202 100644 --- a/kresources/caldav/resource.cpp +++ b/kresources/caldav/resource.cpp @@ -207,11 +207,6 @@ bool ResourceCalDav::doSave() { } -bool ResourceCalDav::doSave( bool syncCache, Incidence *incidence ) { - // To suppress warning about doSave(bool) method hides ResourceCached::doSave(bool, Incidence) - return ResourceCached::doSave(); -} - KABC::Lock* ResourceCalDav::lock() { log("lock()"); return &mLock; diff --git a/kresources/caldav/resource.h b/kresources/caldav/resource.h index deba22b7..ba1f3e9a 100644 --- a/kresources/caldav/resource.h +++ b/kresources/caldav/resource.h @@ -95,14 +95,9 @@ protected: }; -// virtual bool doLoad( bool syncCache ); -// virtual bool doSave( bool syncCache ); - virtual bool doLoad(); // virtual bool doSave(); - virtual bool doSave( bool syncCache, Incidence *incidence ); - virtual KABC::Lock* lock(); /**