FCL/sf/mw/homescreensrv: comparison contentstorage/caclient/src/caitemmodel.cpp

equal deleted inserted replaced

-:a6d55a2e75be
+:782e3408c2ab
 ...
 delete entry;
 \endcode
 */
-CaEntry *CaItemModel::entry(const QModelIndex &index) const
+QSharedPointer<CaEntry> CaItemModel::entry(const QModelIndex &index) const
 {
 return m_d->entry(index);
 }
 /*!
 \param query needed to create model
 \param pointer to public implementation object connected
 */
 CaItemModelPrivate::CaItemModelPrivate(const CaQuery &query,
 CaItemModel *itemModelPublic) :
-QObject(), m_q(itemModelPublic), mParentEntry(0), mQuery(query),
+QObject(), m_q(itemModelPublic), mParentEntry(), mQuery(query),
 mService(CaService::instance()), mEntries(mService), mNotifier(NULL),
 mSize(defaultIconSize), mSecondLineVisibility(true)
 {
 updateModel();
 setAutoUpdate(true);
 Destructor
 */
 CaItemModelPrivate::~CaItemModelPrivate()
 {
 mEntries.clear();
-delete mParentEntry;
 delete mNotifier;
 }
 /*!
 Returns count of rows in model
 variant = qVariantFromValue(entry(modelIndex)->flags());
 break;
 case CaItemModel::TextRole:
 variant = QVariant(entry(modelIndex)->text());
 break;
+case CaItemModel::FullTextRole:
+variant = QVariant(entry(modelIndex)->text() + QString(" ")
++ entry(modelIndex)->description());
+break;
 default:
 variant = QVariant(QVariant::Invalid);
 }
 }
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::data");
 /*!
 Returns an entry from model
 \param modelIndex index of entry in model
 \retval pointer to an entry
 */
-CaEntry *CaItemModelPrivate::entry(const QModelIndex &modelIndex) const
+QSharedPointer<CaEntry> CaItemModelPrivate::entry(const QModelIndex &modelIndex) const
 {
 if (modelIndex.column() == 1) {
 return mParentEntry;
 } else {
 return mEntries.at(modelIndex.row());
 void CaItemModelPrivate::updateParentEntry()
 {
 CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::updateParentEntry");
 if (mQuery.parentId()) {
-delete mParentEntry;
 mParentEntry = mService->getEntry(mQuery.parentId());
 }
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateParentEntry");
 CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::updateItemData");
 mEntries.updateEntry(id);
 QList<int> ids = mService->getEntryIds(mQuery);
 if (mEntries.indexOf(id) >= 0
 && ids.indexOf(id) == mEntries.indexOf(id)) {
 emit m_q->dataChanged(index(mEntries.indexOf(id)), index(
 mEntries.indexOf(id)));
 } else if (ids.indexOf(id) < 0){
 removeItem(id);
 } else if (mEntries.indexOf(id) < 0){
 addItem(id);
 } else if (mParentEntry && id == mParentEntry->id()) {
 updateParentEntry();
 m_q->reset();
 } else {
 updateModel();
 }
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::addItem");
 }
 /*!
+Adds new item block to model
+Use in cases when inserting / appending an adjacent block of items
+\param itemsList list of adjacent items
+*/
+void CaItemModelPrivate::addItemBlock(const QList<int> &itemsList)
+{
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::addItemBlock");
+if (!itemsList.isEmpty()) {
+int firstRow = itemRow(itemsList.first());
+int lastRow = itemRow(itemsList.last());
+m_q->beginInsertRows(QModelIndex(), firstRow, lastRow);
+for (int i = 0; i < itemsList.count(); ++i) {
+mEntries.insert(firstRow + i, itemsList.at(i));
+}
+m_q->endInsertRows();
+emit m_q->scrollTo(firstRow, QAbstractItemView::PositionAtTop);
+}
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::addItemBlock");
+}
+/*!
 Adds new items to model
 \param itemsList current items list
 */
-void CaItemModelPrivate::handleAddItems(QList<int> &itemsList)
+void CaItemModelPrivate::handleAddItems(const QList<int> &itemsList)
 {
 CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::handleAddItems");
+const int oldItemCount(mEntries.count());
-int entriesCount = mEntries.count();
+if (oldItemCount) {
-if (entriesCount) {
+const int newItemCount(itemsList.count());
-int lastRow = itemsList.indexOf(mEntries[entriesCount - 1]);
+if (newItemCount == oldItemCount) {
-if (itemsList.count() == entriesCount) {
+// count is the same - check if item order changed
-//count is same and last item is in same position
+if (itemsList == mEntries.orderedIdList()) {
-//so we update whole model
+// assume that if the order has not changed
-bool orderChanged(false);
+// it had to be the secondary lines
-while (entriesCount) {
+updateModel();
-if (itemsList.indexOf(mEntries[entriesCount - 1])
+} else {
-!= (entriesCount - 1)) {
-orderChanged = true;
-break;
-}
-entriesCount--;
-}
-if (orderChanged) {
 updateLayout();
 }
-else {
+} else {
-updateModel();
-}
-} else if ((itemsList.count() - entriesCount) == 1 && lastRow
-== entriesCount) {
-//just one item added - collection
 int i = 0;
-for (i = 0; i < entriesCount; i++) {
+QList<int> oldList = mEntries.orderedIdList();
-if (itemsList[i] != mEntries[i]) {
+//we loop through items to find first added
-addItem(itemsList[i]);
+while (i < oldList.count()) {
-updateLayout();
+if (oldList[i] != itemsList[i]) {
-emit m_q->scrollTo(i,
+oldList.takeAt(i);
-QAbstractItemView::PositionAtTop);
+} else {
+++i;
 }
 }
-while (i < itemsList.count()) {
-addItem(itemsList[i]);
-i++;
-}
-} else {
-//some items were inserted
-//so we update model and emit signal with row number
-//of first moved/added item
-//signal is needed to scroll a view to proper position after
-//some items were added
 updateModel();
-emit m_q->scrollTo(lastRow + 1,
+//i is the index of first added item
-QAbstractItemView::PositionAtTop);
+emit m_q->scrollTo(i, QAbstractItemView::PositionAtTop);
 }
 } else {
-updateModel();
+// items added to an empty list - add all as a single block
+addItemBlock(itemsList);
 }
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::handleAddItems");
 }
 /*!
 QModelIndexList newPersistentIndexList;
 QModelIndex index;
 foreach (index, oldPersistentIndexList) {
 newPersistentIndexList <<
 m_q->createIndex(
-newPositionsList.at(index.row()),
+newPositionsList.at(index.row()), 0, index.internalPointer());
-0,
+}
-index.internalPointer());
+m_q->changePersistentIndexList(
-}
+oldPersistentIndexList, newPersistentIndexList);
-m_q->changePersistentIndexList(oldPersistentIndexList, newPersistentIndexList);
 m_q->layoutChanged();
 CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateLayout");
 }

changeset 92	782e3408c2ab
parent 89	1e87eb3b400f
child 94	dbb8300717f7