diff -r e6e3e87d58b4 -r 4df3a095718c creator/src/creator_contactsetcache.cpp --- a/creator/src/creator_contactsetcache.cpp Fri Mar 19 09:29:26 2010 +0200 +++ b/creator/src/creator_contactsetcache.cpp Fri Apr 16 14:59:17 2010 +0300 @@ -31,7 +31,7 @@ return iLinkId; } -#if(!defined __SERIES60_30__ && !defined __SERIES60_31__) +#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4) void CCreatorContactSet::AppendL(MVPbkContactLink* aContactLink) { iContactLinks.AppendL(aContactLink); @@ -78,7 +78,7 @@ static CContactLinkCacheImp* NewL(); virtual ~CContactLinkCacheImp(); virtual void AppendL(CCreatorContactSet* aContactSet); -#if(!defined __SERIES60_30__ && !defined __SERIES60_31__) +#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4) virtual RPointerArray& ContactLinks(TInt aLinkId); virtual const RPointerArray& ContactLinks(TInt aLinkId) const; #endif @@ -90,7 +90,7 @@ private: void ConstructL(); CContactLinkCacheImp(); -#if(!defined __SERIES60_30__ && !defined __SERIES60_31__) +#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4) RPointerArray iEmptyLinks; #endif RPointerArray iContactSets; @@ -118,7 +118,7 @@ CContactLinkCacheImp::~CContactLinkCacheImp() { -#if(!defined __SERIES60_30__ && !defined __SERIES60_31__) +#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4) iEmptyLinks.ResetAndDestroy(); // just in case... iEmptyLinks.Close(); #endif @@ -131,7 +131,7 @@ iContactSets.AppendL(aContactSet); } -#if(!defined __SERIES60_30__ && !defined __SERIES60_31__) +#if(!defined __SERIES60_30__ && !defined __SERIES60_31__ && SYMBIAN_VERSION_SUPPORT < SYMBIAN_4) RPointerArray& CContactLinkCacheImp::ContactLinks(TInt aLinkId) {