53 * @param aFieldSecond Second field. |
58 * @param aFieldSecond Second field. |
54 */ |
59 */ |
55 void AddFields( |
60 void AddFields( |
56 const MVPbkStoreContactField& aFieldFirst, |
61 const MVPbkStoreContactField& aFieldFirst, |
57 const MVPbkStoreContactField& aFieldSecond ); |
62 const MVPbkStoreContactField& aFieldSecond ); |
|
63 |
|
64 /** |
|
65 * Adds display fields into conflict. For special fields, normally not needed. |
|
66 * If not provided normal field values used for display. Takes ownership. |
|
67 * |
|
68 * @param aDisplayFieldFirst First display field. |
|
69 * @param aDisplayFieldSecond Second display field. |
|
70 */ |
|
71 void AddDisplayFields( |
|
72 HBufC* aDisplayFieldFirst, |
|
73 HBufC* aDisplayFieldSecond ); |
58 |
74 |
59 /** |
75 /** |
60 * Gets fields from conflict. |
76 * Gets fields from conflict. |
61 * |
77 * |
62 * @param aFieldFirst First field. |
78 * @param aFieldFirst First field. |
73 void ResolveConflict( EPbk2ConflictedNumber aNumber ); |
89 void ResolveConflict( EPbk2ConflictedNumber aNumber ); |
74 void GetChosenFieldsL( RPointerArray<MVPbkStoreContactField>& aAddressFields ); |
90 void GetChosenFieldsL( RPointerArray<MVPbkStoreContactField>& aAddressFields ); |
75 |
91 |
76 private: // methods |
92 private: // methods |
77 void CustomizeTextValueL( const MVPbkStoreContactField& aField, TDes& aBuf ); |
93 void CustomizeTextValueL( const MVPbkStoreContactField& aField, TDes& aBuf ); |
|
94 HBufC* GetContentTextLC( |
|
95 EPbk2ConflictedNumber aNumber, |
|
96 const MVPbkStoreContactField* aField ); |
78 |
97 |
79 private: //Data |
98 private: //Data |
80 // Not own: First field |
99 // Not own: First field |
81 const MVPbkStoreContactField* iFieldFirst; |
100 const MVPbkStoreContactField* iFieldFirst; |
82 // Not own: Second field |
101 // Not own: Second field |
83 const MVPbkStoreContactField* iFieldSecond; |
102 const MVPbkStoreContactField* iFieldSecond; |
|
103 //own: optional display value |
|
104 HBufC* iDisplayFieldFirst; |
|
105 //own: optional display value |
|
106 HBufC* iDisplayFieldSecond; |
84 // Not own: Chosen field |
107 // Not own: Chosen field |
85 const MVPbkStoreContactField* iChosenField; |
108 const MVPbkStoreContactField* iChosenField; |
86 // Own: Conflict type |
109 // Own: Conflict type |
87 EPbk2ConflictType iConflictType; |
110 EPbk2ConflictType iConflictType; |
88 }; |
111 }; |