1.1 --- a/epoc32/include/app/calsession.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/app/calsession.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -23,6 +23,9 @@
    1.16  
    1.17  class CCalSessionImpl;
    1.18  class MCalChangeCallBack2;
    1.19 +class CCalSession;
    1.20 +class CCalCalendarInfo;
    1.21 +class MCalFileChangeObserver;
    1.22  
    1.23  /** A handle to the calendar file.
    1.24  
    1.25 @@ -51,17 +54,23 @@
    1.26      {
    1.27  public:
    1.28  	IMPORT_C static CCalSession* NewL();
    1.29 +	IMPORT_C static CCalSession* NewL(CCalSession& aCalSession);
    1.30  	IMPORT_C ~CCalSession();
    1.31  
    1.32 -	IMPORT_C void CreateCalFileL(const TDesC&  aFileName) const;
    1.33 +	IMPORT_C void CreateCalFileL(const TDesC& aFileName) const;
    1.34 +	IMPORT_C void CreateCalFileL(const TDesC& aFileName, const CCalCalendarInfo& aCalendarInfo) const;
    1.35 +	IMPORT_C void SetCalendarInfoL(const CCalCalendarInfo& aCalendarInfo) const;
    1.36 +	IMPORT_C CCalCalendarInfo* CalendarInfoL() const;
    1.37 +
    1.38  	IMPORT_C void OpenL(const TDesC& aFileName) const;
    1.39  	IMPORT_C void OpenL(const TDesC& aFileName, CalCommon::TCalFileVersionSupport& aFileSupportStatus) const;
    1.40  	IMPORT_C const TDesC& DefaultFileNameL() const; 
    1.41  	IMPORT_C void DeleteCalFileL(const TDesC& aFileName) const;
    1.42  	IMPORT_C CDesCArray* ListCalFilesL() const;
    1.43 -
    1.44  	IMPORT_C void StartChangeNotification(MCalChangeCallBack2& aCallBack, const CCalChangeNotificationFilter& aFilter);
    1.45 +	IMPORT_C void StartFileChangeNotificationL(MCalFileChangeObserver& aCallBack);
    1.46  	IMPORT_C void StopChangeNotification();
    1.47 +	IMPORT_C void StopFileChangeNotification();
    1.48  	IMPORT_C void DisableChangeBroadcast();
    1.49  	IMPORT_C void EnableChangeBroadcast();
    1.50  	
    1.51 @@ -72,7 +81,8 @@
    1.52  	IMPORT_C void GetFileNameL(TCalPubSubData aPubSubData, TDes& aFileName) const;
    1.53  	IMPORT_C TBool IsFileNameL(TCalPubSubData aPubSubData, const TDesC& aFileName) const;
    1.54  	IMPORT_C TBool IsOpenedFileL(TCalPubSubData aPubSubData) const;
    1.55 -
    1.56 +	IMPORT_C TCalCollectionId CollectionIdL() const;
    1.57 +	
    1.58  	// debug only
    1.59  /**
    1.60  @publishedPartner
    1.61 @@ -99,6 +109,7 @@
    1.62  private:
    1.63  	CCalSession();
    1.64  	void ConstructL();
    1.65 +	void ConstructL(CCalSession& aCalSession);
    1.66  private:
    1.67  	CCalSessionImpl* iImpl;
    1.68  	};