1.1 --- a/epoc32/include/app/cntfield.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/app/cntfield.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,9 +1,9 @@
1.4 // Copyright (c) 1997-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 @@ -24,41 +24,74 @@
1.16
1.17
1.18
1.19 +/** Null field ID.
1.20 +@publishedAll
1.21 +@released
1.22 +*/
1.23 const TInt KNullFieldId=-1;
1.24
1.25 -//const TInt KIntContactFieldHint???=0x01;
1.26 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.27 +/** @internalComponent */
1.28 const TInt KIntContactHintIsPhone=0x02;
1.29 +/** @internalComponent */
1.30 const TInt KIntContactHintIsMsg=0x04;
1.31 +/** @internalComponent */
1.32 const TInt KIntContactHintIsCompanyName=0x08;
1.33 +/** @internalComponent */
1.34 const TInt KIntContactHintIsFamilyName=0x10;
1.35 +/** @internalComponent */
1.36 const TInt KIntContactHintIsGivenName=0x20;
1.37 +/** @internalComponent */
1.38 const TInt KIntContactHintIsAddress=0x40;
1.39 +/** @internalComponent */
1.40 const TInt KIntContactHintIsAdditionalName=0x80;
1.41 +/** @internalComponent */
1.42 const TInt KIntContactHintIsSuffixName=0x100;
1.43 +/** @internalComponent */
1.44 const TInt KIntContactHintIsPrefixName=0x200;
1.45 +/** @internalComponent */
1.46 const TInt KIntContactHintStorageInline=0x400;
1.47 +/** @internalComponent */
1.48 const TInt KIntContactHintIsEmail=0x4000;
1.49 +/** @internalComponent */
1.50 const TInt KIntContactHintIsPronunciation=0x800;
1.51 +/** @internalComponent */
1.52 const TInt KIntContactHintIsCompanyNamePronunciation=KIntContactHintIsPronunciation|KIntContactHintIsCompanyName;
1.53 +/** @internalComponent */
1.54 const TInt KIntContactHintIsGivenNamePronunciation=KIntContactHintIsPronunciation|KIntContactHintIsGivenName;
1.55 +/** @internalComponent */
1.56 const TInt KIntContactHintIsFamilyNamePronunciation=KIntContactHintIsPronunciation|KIntContactHintIsFamilyName;
1.57
1.58 +/** @internalComponent */
1.59 const TInt KHintTypeMask = 0x1FFFFF;
1.60
1.61 #ifdef __SYMBIAN_CNTMODEL_USE_SQLITE__
1.62 -const TInt KHintAdditionalMask = 0x7F000000; //Number of additional type ids.
1.63 -const TInt KHintVCardMappingMask = 0x80000000; //bit flag to show if there is a vCard mapping uid.
1.64 -const TInt KHintTemplateFieldMask = 0x7FFFFFFF; //Template field mask in low hint value.
1.65
1.66 +/** Number of additional type ids.
1.67 +@internalComponent
1.68 +*/
1.69 +const TInt KHintAdditionalMask = 0x7F000000;
1.70 +/** Bit flag to show if there is a vCard mapping uid.
1.71 +@internalComponent
1.72 +*/
1.73 +const TInt KHintVCardMappingMask = 0x80000000;
1.74 +/** Template field mask in low hint value.
1.75 +@internalComponent
1.76 +*/
1.77 +const TInt KHintTemplateFieldMask = 0x7FFFFFFF;
1.78 +
1.79 +/** @internalComponent */
1.80 const TInt KHintAdditionalMaskShift = 24;
1.81
1.82 #else //_SYMBIAN_USE_SQLITE__
1.83
1.84 +/** @internalComponent */
1.85 const TInt KHintAdditionalMask = 0x200000;
1.86 +/** @internalComponent */
1.87 const TInt KHintIdMask = 0xFFC00000;
1.88
1.89 #endif //_SYMBIAN_USE_SQLITE__
1.90 -
1.91 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
1.92
1.93 class RWriteStream;
1.94 class RReadStream;
1.95 @@ -173,6 +206,9 @@
1.96 friend class CContactTables;
1.97 friend class RPplContactTable;
1.98 friend class CPackagerTests;
1.99 +#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
1.100 + class THint;
1.101 +#else
1.102 class THint
1.103 /**
1.104 @internalComponent
1.105 @@ -239,6 +275,7 @@
1.106 TInt iHintValue;
1.107
1.108 };
1.109 +#endif
1.110
1.111 public:
1.112 IMPORT_C static CContactItemField* NewLC();
1.113 @@ -401,7 +438,7 @@
1.114 /** Constructs the CContactItemFieldDef object, with an array granularity of 8. */
1.115 {};
1.116 };
1.117 -
1.118 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.119 class TContactFieldAtts
1.120 /**
1.121 @internalComponent
1.122 @@ -479,6 +516,7 @@
1.123 inline TFieldHeader::TFieldHeader(TStreamId aId,TContactFieldAtts aAtts)
1.124 { iStreamId=aId; iAtts=aAtts; }
1.125 #endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.126 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
1.127
1.128 inline TBool CContactItemField::IsHidden() const
1.129 /** Gets the value of the field's hidden attribute.
1.130 @@ -527,7 +565,7 @@
1.131
1.132 @return ETrue if the field is deleted, otherwise EFalse. */
1.133 { return iAttributes&EDeleted; }
1.134 -
1.135 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
1.136 inline void CContactItemField::THint::SetIsPhone()
1.137 {iHintValue|=KIntContactHintIsPhone;}
1.138 inline void CContactItemField::THint::SetIsMsg()
1.139 @@ -592,7 +630,7 @@
1.140 #endif //__SYMBIAN_CNTMODEL_USE_SQLITE__
1.141 inline TBool CContactItemField::THint::Contains(const THint& aHint) const
1.142 {return (iHintValue&aHint.iHintValue);}
1.143 -
1.144 +#endif
1.145 inline TBool CContactItemField::OverRidesLabel() const
1.146 /** Tests whether the field's label (as set by SetLabel()) overrides the label
1.147 specified in the field's template.