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

equal deleted inserted replaced

-:e492551a0d54
+:9d806967057c
 #include "caitemmodel.h"
 #include "caitemmodel_p.h"
 #include "canotifier.h"
 #include "canotifierfilter.h"
+#include "caclienttest_global.h"
 // Constants
 const QSize defaultIconSize(30, 30);
 // ======== MEMBER FUNCTIONS ========
 /*!
 Constructor.
 \param query query describing entries that should be present in a model.
 \param parent parent of a model
 */
-CaItemModel::CaItemModel(const CaQuery& query, QObject * parent) :
+CaItemModel::CaItemModel(const CaQuery &query, QObject *parent) :
 QAbstractItemModel(parent), m_d(new CaItemModelPrivate(query, this))
 {
 }
 ...
 \endcode
 */
 QModelIndex CaItemModel::index(int row, int column,
 const QModelIndex &parent) const
 {
 Q_UNUSED(column);
 Q_UNUSED(parent);
 return m_d->index(row);
 }
 ...
 \endcode
 */
 void CaItemModel::setSort(SortAttribute sortAttribute,
 Qt::SortOrder sortOrder)
 {
 m_d->setSort(sortAttribute, sortOrder);
 }
 /*!
 {
 m_d->setParentId(parentId);
 }
 /*!
+Sets flags to mQuery which should be enabled.
+This method does not update current model - only mQuery member.
+Now to do this setParentId have to be invoke.
+\param onFlags flags.
+\code
+...
+// to set a flags enabled
+model->setFlagsOn(RemovableEntryFlag);
+...
+\endcode
+*/
+void CaItemModel::setFlagsOn(const EntryFlags &onFlags)
+{
+m_d->setFlagsOn(onFlags);
+}
+/*!
+Sets flags to mQuery which should be disabled.
+This method does not update current model - only mQuery member.
+Now to do this setParentId have to be invoke.
+\param offFlags flags.
+\code
+...
+// to set a flags disabled
+model->setFlagsOff(RemovableEntryFlag);
+...
+\endcode
+*/
+void CaItemModel::setFlagsOff(const EntryFlags &offFlags)
+{
+m_d->setFlagsOff(offFlags);
+}
+/*!
 Returns an entry from model
 \param index of entry in model
 \retval pointer to an entry
 \code
 ...
 delete entry;
 \endcode
 */
-CaEntry* CaItemModel::entry(const QModelIndex &index) const
+CaEntry *CaItemModel::entry(const QModelIndex &index) const
 {
 return m_d->entry(index);
 }
 /*!
 Constructor
 \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),
 mService(CaService::instance()), mEntries(mService), mNotifier(NULL),
 mSize(defaultIconSize), mSecondLineVisibility(true)
 {
 updateModel();
 \param modelIndex model index
 \param role which data role to return
 \retval models data as QVariant
 */
 QVariant CaItemModelPrivate::data(const QModelIndex &modelIndex,
 int role) const
 {
-if (!modelIndex.isValid())
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::data");
-return QVariant();
+QVariant variant;
+if (modelIndex.isValid()) {
 switch (role) {
 case Qt::DisplayRole:
-return displayRole(modelIndex);
+variant = displayRole(modelIndex);
-case Qt::DecorationRole:
+break;
-return QVariant(HbIcon(entry(modelIndex)->makeIcon(mSize)));
+case Qt::DecorationRole:
-case CaItemModel::IdRole:
+variant = QVariant(HbIcon(entry(modelIndex)->makeIcon(mSize)));
-return QVariant(entry(modelIndex)->id());
+break;
-case CaItemModel::TypeRole:
+case CaItemModel::IdRole:
-return QVariant(entry(modelIndex)->entryTypeName());
+variant = QVariant(entry(modelIndex)->id());
-case CaItemModel::FlagsRole:
+break;
-return qVariantFromValue(entry(modelIndex)->flags());
+case CaItemModel::TypeRole:
-case CaItemModel::TextRole:
+variant = QVariant(entry(modelIndex)->entryTypeName());
-return QVariant(entry(modelIndex)->text());
+break;
-default:
+case CaItemModel::FlagsRole:
-return QVariant(QVariant::Invalid);
+variant = qVariantFromValue(entry(modelIndex)->flags());
-}
+break;
+case CaItemModel::TextRole:
+variant = QVariant(entry(modelIndex)->text());
+break;
+default:
+variant = QVariant(QVariant::Invalid);
+}
+}
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::data");
+return variant;
 }
 /*!
 Disables or enables auto-update feature of the model
 \param autoUpdate (HsMenuAutoUpdate)
 */
 void CaItemModelPrivate::setAutoUpdate(bool autoUpdate)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::setAutoUpdate");
 if (autoUpdate) {
 if (!mNotifier) {
 CaNotifierFilter filter(mQuery);
 mNotifier = mService->createNotifier(filter);
 connectSlots();
 } else {
 disconnectSlots();
 delete mNotifier;
 mNotifier = NULL;
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::setAutoUpdate");
 }
 /*!
 Method for setting sorting order on model
 (probably will be moved to MenuService)
 \param  sortOrder sorting order (SortAttribute)
 */
 void CaItemModelPrivate::setSort(SortAttribute sortAttribute,
 Qt::SortOrder sortOrder)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::setSort");
 mQuery.setSort(sortAttribute, sortOrder);
 updateLayout();
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::setSort");
 }
 /*!
 Method for setting icon size
 \param size icon size to display
 /*!
 Returns an entry from model
 \param modelIndex index of entry in model
 \retval pointer to an entry
 */
-CaEntry* CaItemModelPrivate::entry(const QModelIndex &modelIndex) const
+CaEntry *CaItemModelPrivate::entry(const QModelIndex &modelIndex) const
 {
 if (modelIndex.column() == 1) {
 return mParentEntry;
 } else {
 return mEntries.at(modelIndex.row());
 \param modelIndex item index
 \retval QVariant containing display role
 */
 QVariant CaItemModelPrivate::displayRole(const QModelIndex &modelIndex) const
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::displayRole")
 QVariant result;
 if (mSecondLineVisibility) {
 if (entry(modelIndex)->description().isEmpty()) {
 result = entry(modelIndex)->text();
 } else {
 result = QVariant(text);
 }
 } else {
 result = entry(modelIndex)->text();
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::displayRole")
 return result;
 }
 /*!
 Sets parent
 \param parentId
 */
 void CaItemModelPrivate::setParentId(int parentId)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::setParentId");
 mQuery.setParentId(parentId);
 if (mNotifier) {
 delete mNotifier;
 mNotifier = mService->createNotifier(CaNotifierFilter(mQuery));
 reconnectSlots();
 }
 updateModel();
-}
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::setParentId");
+}
+/*!
+Sets flags to mQuery which should be enabled.
+\param onFlags flags.
+*/
+void CaItemModelPrivate::setFlagsOn(const EntryFlags &onFlags)
+{
+mQuery.setFlagsOn(onFlags);
+}
+/*!
+Sets flags to mQuery which should be disabled.
+\param offFlags flags.
+\code
+...
+// to set a new parent id
+model->setFlagsOff(RemovableEntryFlag);
+...
+\endcode
+*/
+void CaItemModelPrivate::setFlagsOff(const EntryFlags &offFlags)
+{
+mQuery.setFlagsOff(offFlags);
+}
 /*!
 Checks if notifier exists
 \retval true if notifier exists otherwise false
 */
 /*!
 Updates model with fresh entries and resets model
 */
 void CaItemModelPrivate::updateModel()
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::updateModel");
 mEntries.reloadEntries(mQuery);
 updateParentEntry();
 m_q->reset();
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateModel");
 }
 /*!
 Updates parent entry
 */
 void CaItemModelPrivate::updateParentEntry()
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::updateParentEntry");
 if (mQuery.parentId()) {
 delete mParentEntry;
 mParentEntry = mService->getEntry(mQuery.parentId());
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateParentEntry");
 }
 /*!
 Updates model item with fresh data
 \param id id of item to update
 */
 void CaItemModelPrivate::updateItemData(int id)
 {
+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 (mParentEntry && id == mParentEntry->id()) {
 updateParentEntry();
 m_q->reset();
 } else {
 updateLayout();
 }
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateItemData");
 }
 /*!
 Adds new item to model
 \param id id of item to add
 */
 void CaItemModelPrivate::addItem(int id)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::addItem");
 int row = itemRow(id);
 //we use beginInsertRows and endInsertRows to emit proper signal
 //(see Qt documentation of QAbstractItemModel)
 if (mEntries.indexOf(id) < 0 && row >= 0) {
 m_q->beginInsertRows(QModelIndex(), row, row);
 mEntries.insert(row, id);
 m_q->endInsertRows();
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::addItem");
 }
 /*!
 Adds new items to model
 \param itemsList current items list
 */
 void CaItemModelPrivate::handleAddItems(QList<int> &itemsList)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::handleAddItems");
 int entriesCount = mEntries.count();
 if (entriesCount) {
 int lastRow = itemsList.indexOf(mEntries[entriesCount - 1]);
 if (itemsList.count() == entriesCount && lastRow == (entriesCount
 - 1)) {
 //count is same and last item is in same position
 //so we update whole model
 updateModel();
 } else if ((itemsList.count() - entriesCount) == 1 && lastRow
 == entriesCount) {
 //just one item added - collection
 int i = 0;
 for (i = 0; i < entriesCount; i++) {
 if (itemsList[i] != mEntries[i]) {
 addItem(itemsList[i]);
+updateLayout();
+emit m_q->scrollTo(i,
+QAbstractItemView::PositionAtTop);
 }
 }
 while (i < itemsList.count()) {
 addItem(itemsList[i]);
 i++;
 //of first moved/added item
 //signal is needed to scroll a view to proper position after
 //some items were added
 updateLayout();
 emit m_q->scrollTo(lastRow + 1,
 QAbstractItemView::PositionAtTop);
 }
 } else {
 updateModel();
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::handleAddItems");
 }
 /*!
 Gets index/row for new item
 \param id of item to add
 \retval row in model list for new item to insert
 */
 int CaItemModelPrivate::itemRow(int id)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::itemRow");
 QList<int> ids = mService->getEntryIds(mQuery);
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::itemRow");
 return ids.indexOf(id);
 }
 /*!
 Removes item from model
 \param id of item to remove
 */
 void CaItemModelPrivate::removeItem(int id)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::removeItem");
 int row = mEntries.indexOf(id);
 if (row >= 0) {
 m_q->beginRemoveRows(QModelIndex(), mEntries.indexOf(id),
 mEntries.indexOf(id));
 mEntries.remove(id);
 m_q->endRemoveRows();
-}
+} else {
+updateLayout();
+}
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::removeItem");
 }
 /*!
 Removes missing items from model
 \param itemsList current items list
 */
 void CaItemModelPrivate::removeItems(const QList<int> &itemsList)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::removeItems");
 int i = 0;
 for (i = 0; i < itemsList.count(); i++) {
 if (itemsList[i] != mEntries[i]) {
 removeItem(mEntries[i]);
 }
 }
 while (i < mEntries.count()) {
 removeItem(mEntries[i]);
 i++;
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::removeItems");
 }
 /*!
 Layout update
 */
 void CaItemModelPrivate::updateLayout()
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::updateLayout");
 m_q->layoutAboutToBeChanged();
 mEntries.updateEntries(mQuery);
 updateParentEntry();
 m_q->layoutChanged();
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateLayout");
 }
 /*!
 Connects slots
 */
 void CaItemModelPrivate::connectSlots()
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::connectSlots");
 connect(mNotifier, SIGNAL(entryChanged(int,ChangeType)),
-this, SLOT(updateModelItem(int,ChangeType)) );
+this, SLOT(updateModelItem(int,ChangeType)));
 if (mQuery.parentId() > 0) {
 connect(mNotifier, SIGNAL(groupContentChanged(int)),
-this, SLOT(updateModelContent(int)) );
+this, SLOT(updateModelContent(int)));
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::connectSlots");
 }
 /*!
 Disconnects slots
 */
 void CaItemModelPrivate::disconnectSlots()
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::disconnectSlots");
 disconnect(mNotifier, SIGNAL(entryChanged(int,ChangeType)),
-this, SLOT(updateModelItem(int,ChangeType)) );
+this, SLOT(updateModelItem(int,ChangeType)));
 if (mQuery.parentId() > 0) {
 disconnect(mNotifier, SIGNAL(groupContentChanged(int)),
-this, SLOT(updateModelContent(int)) );
+this, SLOT(updateModelContent(int)));
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::disconnectSlots");
 }
 /*!
 Reconnects slots
 */
 void CaItemModelPrivate::reconnectSlots()
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::reconnectSlots");
 disconnectSlots();
 connectSlots();
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::reconnectSlots");
 }
 /*!
 Updates model with fresh entries
 \param id of item to handle
 \param changeType change type
 */
 void CaItemModelPrivate::updateModelItem(int id, ChangeType changeType)
 {
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::updateModelItem");
 switch (changeType) {
 case AddChangeType:
 addItem(id);
 break;
 case RemoveChangeType:
 break;
 default:
 updateItemData(id);
 break;
 }
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateModelItem");
 }
 /*!
 Updates model with fresh entries
 \param id of parent
 */
 void CaItemModelPrivate::updateModelContent(int id)
 {
 Q_UNUSED(id);
+CACLIENTTEST_FUNC_ENTRY("CaItemModelPrivate::updateModelContent");
 QList<int> ids = mService->getEntryIds(mQuery);
 if (ids.count() >= mEntries.count()) {
 handleAddItems(ids);
 } else {
 removeItems(ids);
 }
-}
+CACLIENTTEST_FUNC_EXIT("CaItemModelPrivate::updateModelContent");
+}

changeset 87	9d806967057c
parent 86	e492551a0d54
child 89	1e87eb3b400f