equal
deleted
inserted
replaced
69 } |
69 } |
70 |
70 |
71 CMdSIdentifierGenerator::~CMdSIdentifierGenerator() |
71 CMdSIdentifierGenerator::~CMdSIdentifierGenerator() |
72 { |
72 { |
73 delete iDigest; |
73 delete iDigest; |
|
74 iDigest = NULL; |
74 } |
75 } |
75 |
76 |
76 void CMdSIdentifierGenerator::ConstructL( ) |
77 void CMdSIdentifierGenerator::ConstructL( ) |
77 { |
78 { |
78 CMdsGetImeiAO * imeigetter = CMdsGetImeiAO::NewLC(); |
79 CMdsGetImeiAO * imeigetter = CMdsGetImeiAO::NewLC(); |
176 const TInt count = iBuffers.Count(); |
177 const TInt count = iBuffers.Count(); |
177 |
178 |
178 for (TInt i = 0; i < count; ++i) |
179 for (TInt i = 0; i < count; ++i) |
179 { |
180 { |
180 delete iBuffers[i].iBuffer; |
181 delete iBuffers[i].iBuffer; |
|
182 iBuffers[i].iBuffer = NULL; |
181 } |
183 } |
182 iBuffers.Close(); |
184 iBuffers.Close(); |
183 |
185 |
184 delete iGenerator; |
186 delete iGenerator; |
|
187 iGenerator = NULL; |
185 delete iUri; |
188 delete iUri; |
|
189 iUri = NULL; |
186 } |
190 } |
187 |
191 |
188 CMdSSqlObjectManipulate::CMdSSqlObjectManipulate( const CMdsSchema& aSchema, |
192 CMdSSqlObjectManipulate::CMdSSqlObjectManipulate( const CMdsSchema& aSchema, |
189 CMdSObjectLockList& aLockList ) |
193 CMdSObjectLockList& aLockList ) |
190 : iSchema( aSchema ), iGenerator(NULL), iLockList( aLockList ) |
194 : iSchema( aSchema ), iGenerator(NULL), iLockList( aLockList ) |
2265 for (TUint32 i = 0; i < aCount; ++i) |
2269 for (TUint32 i = 0; i < aCount; ++i) |
2266 { |
2270 { |
2267 TPtrC16 uri = aBuffer.ReceivePtr16L(); |
2271 TPtrC16 uri = aBuffer.ReceivePtr16L(); |
2268 objectId = SearchObjectByUriL( uri, flags ); |
2272 objectId = SearchObjectByUriL( uri, flags ); |
2269 if ( objectId != KNoId && |
2273 if ( objectId != KNoId && |
2270 objectId != KSystemFavouritesAlbumId && |
2274 uri != KSystemFavouritesAlbumUri && |
2271 objectId != KSystemCapturedAlbumId ) |
2275 uri != KSystemCapturedAlbumUri ) |
2272 { |
2276 { |
2273 // unlock object, so update is no possible anymore |
2277 // unlock object, so update is no possible anymore |
2274 if ( iLockList.IsLocked( *iNamespaceDef, objectId ) ) |
2278 if ( iLockList.IsLocked( *iNamespaceDef, objectId ) ) |
2275 { |
2279 { |
2276 iLockList.UnlockById( *iNamespaceDef, objectId ); |
2280 iLockList.UnlockById( *iNamespaceDef, objectId ); |