--- a/phonebookengines/contactsmodel/inc/CNTDEF.HRH	Tue Feb 02 10:12:17 2010 +0200
+++ b/phonebookengines/contactsmodel/inc/CNTDEF.HRH	Fri Mar 19 09:27:18 2010 +0200
@@ -1,17 +1,20 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
+/*
+* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #if !defined(__CNTDEF_HRH__)
 #define __CNTDEF_HRH__
@@ -46,9 +49,11 @@
 // UID's 0x1000401C				Note value
 // UID's 0x1000401D-0x10004033	UID values
 // UID's 0x10004034-6			Birthday/URL/inline
-// UID's 0x10274DA4-B7      Assistant/Assistant Tel/Anniversary/Spouse/Children/Class
-//			    Currently uids 0x10274DA4-B2 are being used and 
-//			    uids 0x10274DB3-B7 are free and can be used in future
+// UID's 0x10274DA4-B7          Assistant/Assistant Tel/Anniversary/Spouse/Children/Class
+//			                    Currently uids 0x10274DA4-B2 are being used and 
+//			                    uids 0x10274DB3-B7 are free and can be used in future
+// UID's 0x10274DB5-B7          Online Account Informaiton
+
 
 #define KUidContactFieldAddressValue        0x1000130C
 #define KUidContactFieldPostOfficeValue		0x10004DF4
@@ -100,6 +105,9 @@
 #define KUidContactFieldClassValue		0x10274DA8
 #define KUidContactFieldDepartmentNameValue	0x10274DA9
 #define KUidContactFieldGEOValue            0x10274DB2
+#define KUidContactFieldServiceProviderValue    0x10274DB5    
+#define KUidContactFieldPresenceValue           0x10274DB6
+#define KUidContactFieldStatusMsgValue          0x10274DB7
 
 
 #define KIntContactFieldVCardMapWORK    0x100039DA
@@ -187,22 +195,21 @@
 #define KIntContactFieldVCardMapDepartment		0x10274DB0
 #define KIntContactFieldVCardMapINTERNET		0x10274DB1
 
-/**
-@publishedAll
-@released
-*/
+#define KUidContactFieldFavouriteValue      	0x10274DB3
+#define KIntContactFieldVCardMapFavourite   	0x10274DB4
 
+
+/** @internalComponent */
 #define KStorageTypeText			0
-
+/** @internalComponent */
 #define KStorageTypeStore			1
-
+/** @internalComponent */
 #define KStorageTypeContactItemId	2
-
+/** @internalComponent */
 #define KStorageTypeDateTime		3
 
-
 /**
-@publishedAll
+@internalComponent
 @released
 */
 enum EContactFieldCategory
@@ -212,33 +219,28 @@
 	EContactCategoryWork=2,
 	EContactCategoryOther=3
 	};
-	
-/** These values should not be used directly. The EContactFieldFlags enum should be used instead.
-@publishedAll
-@released
-*/
 
+/** @internalComponent */
 #define KIntFieldFlagHidden			0x001
-
+/** @internalComponent */
 #define KIntFieldFlagReadOnly		0x002
-
+/** @internalComponent */
 #define KIntFieldFlagSynchronize	0x004
-
+/** @internalComponent */
 #define KIntFieldFlagDisabled		0x008
-
+/** @internalComponent */
 #define KIntFieldFlagFilterable		0x010
-
+/** @internalComponent */
 #define KIntFieldFlagFilterable1	0x020
-
+/** @internalComponent */
 #define KIntFieldFlagFilterable2	0x040
-
+/** @internalComponent */
 #define KIntFieldFlagFilterable3	0x080
-
+/** @internalComponent */
 #define KIntFieldFlagFilterable4	0x100
 
-
 /**
-@publishedAll
+@internalComponent
 @released
 */	
 enum EContactFieldFlags
@@ -253,7 +255,5 @@
 	EContactFieldFlagFilterable3	=KIntFieldFlagFilterable3,
 	EContactFieldFlagFilterable4	=KIntFieldFlagFilterable4
 	};
-	
-
 
 #endif // __CNTDEF_HRH__