equal
deleted
inserted
replaced
34 #include <CVPbkContactDuplicatePolicy.h> |
34 #include <CVPbkContactDuplicatePolicy.h> |
35 #include <VPbkUtil.h> |
35 #include <VPbkUtil.h> |
36 |
36 |
37 #include <barsread.h> |
37 #include <barsread.h> |
38 #include <vcard.h> |
38 #include <vcard.h> |
|
39 #include <versittls.h> |
39 |
40 |
40 namespace |
41 namespace |
41 { |
42 { |
42 /// VCard engine default resource file |
43 /// VCard engine default resource file |
43 _LIT(KVCardEngDefResFileName, "VPbkVCardEng.rsc"); |
44 _LIT(KVCardEngDefResFileName, "VPbkVCardEng.rsc"); |
124 TRAPD( res, iDuplicatePolicy = CVPbkContactDuplicatePolicy::NewL( param )); |
125 TRAPD( res, iDuplicatePolicy = CVPbkContactDuplicatePolicy::NewL( param )); |
125 if ( res != KErrNone && res != KErrNotFound ) |
126 if ( res != KErrNone && res != KErrNotFound ) |
126 { |
127 { |
127 User::LeaveIfError( res ); |
128 User::LeaveIfError( res ); |
128 } |
129 } |
|
130 iVersitTlsData = &CVersitTlsData::VersitTlsDataL(); |
129 } |
131 } |
130 |
132 |
131 CVPbkVCardData* CVPbkVCardData::NewL(CVPbkContactManager& aContactManager) |
133 CVPbkVCardData* CVPbkVCardData::NewL(CVPbkContactManager& aContactManager) |
132 { |
134 { |
133 CVPbkVCardData* self = new(ELeave) CVPbkVCardData(aContactManager); |
135 CVPbkVCardData* self = new(ELeave) CVPbkVCardData(aContactManager); |
137 return self; |
139 return self; |
138 } |
140 } |
139 |
141 |
140 CVPbkVCardData::~CVPbkVCardData() |
142 CVPbkVCardData::~CVPbkVCardData() |
141 { |
143 { |
|
144 if (iVersitTlsData) |
|
145 { |
|
146 iVersitTlsData->VersitTlsDataClose(); |
|
147 } |
142 delete iCopyPolicyManager; |
148 delete iCopyPolicyManager; |
143 iParamIdNameMappings.ResetAndDestroy(); |
149 iParamIdNameMappings.ResetAndDestroy(); |
144 iVNameIdNameMappings.ResetAndDestroy(); |
150 iVNameIdNameMappings.ResetAndDestroy(); |
145 iProperties.ResetAndDestroy(); |
151 iProperties.ResetAndDestroy(); |
146 delete iSupportedFieldTypes; |
152 delete iSupportedFieldTypes; |