diff -r 8e5041d13c84 -r 32469d7d46ff contentstorage/caclient/src/caitemmodellist.cpp --- a/contentstorage/caclient/src/caitemmodellist.cpp Fri Apr 16 15:16:09 2010 +0300 +++ b/contentstorage/caclient/src/caitemmodellist.cpp Mon May 03 12:48:45 2010 +0300 @@ -49,7 +49,6 @@ { CACLIENTTEST_FUNC_ENTRY("CaItemModelList::clear"); mOrderedList.clear(); - qDeleteAll(mEntriesHash); mEntriesHash.clear(); CACLIENTTEST_FUNC_EXIT("CaItemModelList::clear"); } @@ -68,7 +67,7 @@ \param row of model list \retval entry at row */ -CaEntry *CaItemModelList::at(int row) const +QSharedPointer CaItemModelList::at(int row) const { int id = mOrderedList[row]; return mEntriesHash.value(id); @@ -83,7 +82,7 @@ CACLIENTTEST_FUNC_ENTRY("CaItemModelList::reloadEntries"); clear(); int id=0; - QList eList = mService->getEntries(query); + QList< QSharedPointer > eList = mService->getEntries(query); for (int i = 0; i < eList.count(); i++) { id = eList[i]->id(); mOrderedList << id; @@ -100,7 +99,6 @@ { CACLIENTTEST_FUNC_ENTRY("CaItemModelList::updateEntry"); if (mEntriesHash.contains(id)) { - delete mEntriesHash.take(id); mEntriesHash.insert(id, mService->getEntry(id)); } CACLIENTTEST_FUNC_EXIT("CaItemModelList::updateEntry"); @@ -155,7 +153,7 @@ { CACLIENTTEST_FUNC_ENTRY("CaItemModelList::remove"); if (mEntriesHash.contains(id)) { - delete mEntriesHash.take(id); + mEntriesHash.remove(id); } mOrderedList.removeOne(id); CACLIENTTEST_FUNC_EXIT("CaItemModelList::remove");