diff -r 5aadd1120515 -r b57382753122 pimappservices/calendar/inc/calentry.h
--- a/pimappservices/calendar/inc/calentry.h	Fri Oct 15 12:10:36 2010 +0530
+++ b/pimappservices/calendar/inc/calentry.h	Wed Nov 03 17:12:22 2010 +0530
@@ -67,7 +67,7 @@
 class CCalEntryIdImpl;
 
 /** Class representing a calendar entry. This can be an appointment, to-do
-item, reminder, event, anniversary, note.
+item, reminder, event or anniversary.
 
 CCalEntry contains information about a calendar entry, including
 a repeat definition, synchronisation information, and group scheduling data.
@@ -99,9 +99,7 @@
 		/** A reminder, which has a start time only. */
 		EReminder,
 		/** An anniversary, which has a start time and end time. */
-		EAnniv,
-		/** A text note which has description */
-		ENote
+		EAnniv
 		};
 
 	/** Defines the possible status values of the entry.
@@ -276,6 +274,7 @@
 	IMPORT_C CCalUser* OrganizerL() const;
 	IMPORT_C void SetPhoneOwnerL(const CCalUser* aOwner);
 	IMPORT_C CCalUser* PhoneOwnerL() const;
+	IMPORT_C void CCalEntry::ClearMRSpecificDataL();
 
 	// Attachments
 	IMPORT_C void AddAttachmentL(CCalAttachment& aAttachment);
@@ -319,10 +318,10 @@
 	IMPORT_C TCalTime PreviousInstanceForLocalUIDL(const TCalTime& aTime) const;
 
 	IMPORT_C TCalTime FindRptUntilTimeL(TInt aCount);
+    
+    IMPORT_C void SetUserInt32L( TUint32 aUserInt );
+    IMPORT_C TUint32 UserInt32L();
 
-	IMPORT_C void SetFavouriteL(TUint32 aFavourite);
-	IMPORT_C TUint32 FavouriteL();
-	
 public:
 	// Internal APIs
 	static CCalEntry* NewL(CCalEntryImpl* aImpl);