--- a/pimappservices/calendar/inc/calcommon.h	Tue Feb 02 10:12:19 2010 +0200
+++ b/pimappservices/calendar/inc/calcommon.h	Fri Apr 16 14:57:40 2010 +0300
@@ -110,6 +110,9 @@
 		*/
 		EInstanceEndTimeWithinRange=0x200,
 		
+		/** Include text notes **/
+		EIncludeNotes=0x300,
+		
 		/** By default all instances which adjoin the search range are found. Use the EExcludeInstanceAdjoiningRange
 		flag to exclude instances that are outside, but adjoin the search range.
 		
@@ -121,7 +124,7 @@
 		
 		/** Include all entries (appointments, day events, reminders, anniversaries and todos). */
 		EIncludeAll=EIncludeAppts|EIncludeReminder|EIncludeEvents|EIncludeAnnivs|
-		EIncludeCompletedTodos|EIncludeIncompletedTodos,
+		EIncludeCompletedTodos|EIncludeIncompletedTodos|EIncludeNotes,
 		};
 		
 	/** The range of instances referred to in a recurrence ID or instance view. 
@@ -263,6 +266,26 @@
 		TUint iLowestPriority;
 		};
 	
+	/** Class to implement the filter on favourite entries.
+	This is used to filter entries according the value of the favourite property
+	when using CCalFindInstanceSettings.
+	@publishedAll
+	@released
+	*/
+	class TCalFavouriteFilter
+		{
+	public:
+		IMPORT_C TCalFavouriteFilter();
+		IMPORT_C TCalFavouriteFilter(TUint32 aValue, TUint32 aMask);
+		
+		IMPORT_C TUint32 Value() const;
+		IMPORT_C TUint32 Mask() const;
+		
+	private:
+		TUint32 iValue;
+		TUint32 iMask;
+		};
+
 	/** Enumeration to define the sort-able attributes that can be sorted on in the
 	 * instance view 
 	@publishedAll