equal
deleted
inserted
replaced
109 |
109 |
110 // --------------------------------------------------------------------------- |
110 // --------------------------------------------------------------------------- |
111 // |
111 // |
112 // --------------------------------------------------------------------------- |
112 // --------------------------------------------------------------------------- |
113 // |
113 // |
114 TDesC& CMCSData::Name() |
114 const TDesC* CMCSData::Name() |
115 { |
115 { |
116 return *iName; |
116 return iName; |
117 } |
117 } |
118 |
118 |
119 // --------------------------------------------------------------------------- |
119 // --------------------------------------------------------------------------- |
120 // |
120 // |
121 // --------------------------------------------------------------------------- |
121 // --------------------------------------------------------------------------- |
129 |
129 |
130 // --------------------------------------------------------------------------- |
130 // --------------------------------------------------------------------------- |
131 // |
131 // |
132 // --------------------------------------------------------------------------- |
132 // --------------------------------------------------------------------------- |
133 // |
133 // |
134 TDesC& CMCSData::Value() |
134 const TDesC* CMCSData::Value() |
135 { |
135 { |
136 return *iValue; |
136 return iValue; |
137 } |
137 } |
138 |
138 |
139 // --------------------------------------------------------------------------- |
139 // --------------------------------------------------------------------------- |
140 // |
140 // |
141 // --------------------------------------------------------------------------- |
141 // --------------------------------------------------------------------------- |
263 // set as dirty |
263 // set as dirty |
264 TInt id( iData[ i ]->MenuItem().Id() ); |
264 TInt id( iData[ i ]->MenuItem().Id() ); |
265 |
265 |
266 // id of all bookmarks is zero so name has to be check |
266 // id of all bookmarks is zero so name has to be check |
267 // in case of bookmark has changed |
267 // in case of bookmark has changed |
268 if ( id >= 0 && ( data->MenuItem().Id() != id || |
268 if( data->MenuItem().Id() != id || |
269 ( id == 0 && data->Name().CompareF( |
269 ( id == 0 && data->Name() != NULL && iData[i]->Name() != NULL && |
270 iData[ i ]->Name() ) != 0 ) ) ) |
270 data->Name()->CompareF( *iData[i]->Name() ) != 0 ) ) |
271 { |
271 { |
272 data->SetDirty( ETrue ); |
272 data->SetDirty( ETrue ); |
273 CMCSData* oldData = iData[i]; |
273 CMCSData* oldData = iData[i]; |
274 iData.Remove( i ); |
274 iData.Remove( i ); |
275 delete oldData; |
275 delete oldData; |
276 |
|
277 iData.InsertL( data, i ); |
276 iData.InsertL( data, i ); |
278 CleanupStack::Pop( data ); |
277 CleanupStack::Pop( data ); |
279 } |
278 } |
280 else |
279 else |
281 { |
280 { |
|
281 // keep old data |
282 CleanupStack::PopAndDestroy( data ); |
282 CleanupStack::PopAndDestroy( data ); |
283 } |
283 } |
284 } |
284 } |
285 } |
285 } |
286 |
286 |
570 { |
570 { |
571 properties[i]->SetValueL( KNullDesC8 ); |
571 properties[i]->SetValueL( KNullDesC8 ); |
572 } |
572 } |
573 } |
573 } |
574 } |
574 } |
575 // ETrue tells that modified settings are stored also to plugin reference |
575 // EFalse tells that modified settings are not stored to plugin reference |
576 iPluginSettings->SetSettingsL( iInstanceUid, settingItems, ETrue ); |
576 iPluginSettings->SetSettingsL( iInstanceUid, settingItems, EFalse ); |
577 CleanupStack::PopAndDestroy(); // settingItems |
577 CleanupStack::PopAndDestroy(); // settingItems |
578 } |
578 } |
579 |
579 |
580 // End of file |
580 // End of file |