FCL/sf/app/contacts: comparison phonebookui/cnthistorymodel/src/cnthistorymodel

equal deleted inserted replaced

-:ae724a111993
+:7cc7d74059f9
 m_isMyCard(false),
 m_isMarkedAsSeen(false),
 m_initLogs(false),
 m_extendedLocale(HbExtendedLocale::system())
 {
+CNT_ENTRY
 // Create the model structure and cache history data from the databases
 initializeModel();
+CNT_EXIT
 }
 CntHistoryModelPrivate::~CntHistoryModelPrivate()
 {
+CNT_ENTRY
 if (m_logsModel) {
 delete m_logsModel;
 m_logsModel = NULL;
 }
 if (m_logsFilter) {
 }
 if (m_msgHistory) {
 delete m_msgHistory;
 m_msgHistory = NULL;
 }
+CNT_EXIT
 }
 /*!
 * Return the data to be used by the view or delegates for a particular
 * item and role.
 * \param role The data should be relevant to this particular purpose.
 * \return QVariant The data for the specified index and role.
 */
 QVariant CntHistoryModelPrivate::data(const QModelIndex& index, int role) const
 {
+CNT_ENTRY_ARGS(index << role)
 // Invalid index
 int row = index.row();
 if ( !validateRowIndex(row) )
 return QVariant();
 HItemPointer p = m_List.at(row);
 if ( p.isNull() )
 return QVariant();
 switch( role )
 {
 case Qt::DisplayRole:
 return displayRoleData(*p);
 case Qt::DecorationRole:
 *  index 1 Body text
 *  index 2 Time stamp
 */
 QVariant CntHistoryModelPrivate::displayRoleData(const HistoryItem& item) const
 {
+CNT_ENTRY
 QStringList list;
 HbExtendedLocale locale = m_extendedLocale;
 if (item.timeStamp.date() == QDateTime::currentDateTime().date())
 {
 else
 {
 list << item.title << item.message << locale.format(item.timeStamp.date(), r_qtn_date_usual);
 }
+CNT_EXIT_ARGS(list)
 return QVariant(list);
 }
 /*!
 * Return the data to be used by the view for a decoration role.
 * \param item The History item to return data about.
 *  return QVariant String of the icon path.
 */
 QVariant CntHistoryModelPrivate::decorationRoleData(const HistoryItem& item) const
 {
+CNT_ENTRY
 // Messages
 if (item.flags & CntMessage)
 return QVariant(HbIcon(MESSAGE_ICON));
 // Call logs
 HItemPointer p = m_List.at(row);
 int id(-1);
 if ( p.data()->flags & CntMessage )
 id = m_msgMap.key(p, -1);
 if (id != -1)
 return QVariant(id);
 else
 return QVariant();
 }
 * \param column Column to be sorted. It is not used.
 * \param order Order to sort the list items.
 */
 void CntHistoryModelPrivate::sort(int /*column*/, Qt::SortOrder order)
 {
+CNT_ENTRY_ARGS(order)
 if ( order == Qt::AscendingOrder )
 qStableSort(m_List.begin(), m_List.end(), lessThan);
 else
 qStableSort(m_List.begin(), m_List.end(), greaterThan);
+CNT_EXIT
 }
 /*!
 * Clear history from the database. If the history cached
 * is specific to one contact, only that history is cleared.
 *
 */
 void CntHistoryModelPrivate::clearHistory()
 {
+CNT_ENTRY
 Q_Q(CntHistoryModel);
 if ( m_List.isEmpty() )
 return;
+// Clear all data from the history model.
+int count = rowCount();
+q->doBeginRemoveRows( QModelIndex(), 0, count );
 // Call logs
 if ( !m_isMyCard && m_logsFilter )
 m_logsFilter->clearEvents();
 else if ( m_logsModel )
 // Messages
 if (m_msgHistory)
 m_msgHistory->clearMessages( (int)m_contactId );
-// Clear all data from the history model.
-int count = rowCount();
 m_List.clear();
 m_msgMap.clear();
 m_logsMap.clear();
-q->doBeginRemoveRows( QModelIndex(), 0, count );
 q->doEndRemoveRows();
+CNT_EXIT
 }
 /*!
 * Mark all the conversations in the view as seen.
 *
 */
 void CntHistoryModelPrivate::markAllAsSeen()
 {
+CNT_ENTRY
 if ( m_isMarkedAsSeen )
 return;
 // Messages
 if (m_msgHistory->markRead( m_contactId ))
 m_isMarkedAsSeen = true;
+CNT_EXIT
 }
 /*!
 * Create the model structure and cache history data from
 * conversations and call logs databases.
 *
 */
 void CntHistoryModelPrivate::initializeModel()
 {
+CNT_ENTRY
 initializeLogsModel();
 initializeMsgModel();
+CNT_EXIT
 }
 void CntHistoryModelPrivate::initializeMsgModel()
 {
+CNT_ENTRY
 if( m_isMyCard )
 return;
 // Contact centric
 MsgHistory* m = new MsgHistory();
 // received from this contact
 m->subscribe(m_contactId);
 // Initial fetch of all messages
 m->getMessages(m_contactId);
+CNT_EXIT
 }
 void CntHistoryModelPrivate::initializeLogsModel()
 {
+CNT_ENTRY
 //populate model with call events
 m_logsModel = new LogsModel(LogsModel::LogsFullModel);
 if (!m_isMyCard) {
 //do the filtering to get call events for the target contact
 m_logsFilter = new LogsCustomFilter;
 this, SLOT(logsRowsRemoved(const QModelIndex &, int, int)));
 connect(m_AbstractLogsModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
 this, SLOT(logsDataChanged(const QModelIndex &, const QModelIndex &)));
 connect(m_AbstractLogsModel, SIGNAL(modelReset()), this, SLOT(handleLogsReset()));
+CNT_EXIT
 }
 /*!
 * Read call event into a history item
 *
 * \param event Call log event
 * \param item Conversation history item
 */
 void CntHistoryModelPrivate::readLogEvent(LogsEvent* event, HistoryItem& item)
 {
 QString bodyText;
 QString title;
 if ( m_isMyCard ) {
 if ( event->remoteParty().length() > 0 ) {
 * \param first The first row item to be received from the model.
 * \param last The last row item to be received from the model.
 */
 void CntHistoryModelPrivate::logsRowsInserted(const QModelIndex& /*parent*/, int first, int last)
 {
+CNT_ENTRY_ARGS(first << last)
 Q_Q(CntHistoryModel);
-int oldRowCount = rowCount();
+// Check if this is the first time to receive events
+if ( !m_initLogs ) {
+q->doBeginResetModel();
+}
+else {
+q->doBeginInsertRows( QModelIndex(), rowCount(), rowCount() + (last - first) );
+}
 QList<HItemPointer> l;
 for ( int i = first; i < m_AbstractLogsModel->rowCount() && i <= last; ++i ) {
 LogsEvent* event = qVariantValue<LogsEvent*>(
 m_AbstractLogsModel->data(m_AbstractLogsModel->index(i, 0), LogsModel::RoleFullEvent) );
 // Check if this is the first time to receive events
 // and sort the entire list.
 if ( !m_initLogs ) {
 sort();
-oldRowCount = 0;
 m_initLogs = true;
-}
+q->doEndResetModel();
+}
-q->doBeginInsertRows(QModelIndex(), oldRowCount, rowCount());
+else {
 q->doEndInsertRows();
+}
+CNT_EXIT
 }
 /*!
 * Slot used for receiving new rows from the LogsModel.
 *
 * \param first The first row item to be received from the model.
 * \param last The last row item to be received from the model.
 */
 void CntHistoryModelPrivate::logsRowsRemoved(const QModelIndex& /*parent*/, int first, int last)
 {
+CNT_ENTRY_ARGS(first << last)
 Q_Q(CntHistoryModel);
 QList< int > indices;
 for ( int i = first; i <= last; ++i ) {
 foreach( QList<int> l, batches ) {
 q->doBeginRemoveRows(QModelIndex(), l.first(), l.last());
 q->doEndRemoveRows();
 }
 }
+CNT_EXIT
 }
 /*!
 * Update events from logs model. Events are
 * received as a batch
 * \param first First updated model index
 * \param last Last updated model index
 */
 void CntHistoryModelPrivate::logsDataChanged(const QModelIndex& first, const QModelIndex& last)
 {
+CNT_ENTRY_ARGS(first << last)
 Q_Q(CntHistoryModel);
 int f = first.row();
 int l = last.row();
 QList< int > indices;
 if ( !indices.isEmpty() ) {
 QList< QList<int> > batches = findIndices( indices );
 foreach( QList<int> l, batches )
 q->doDataChanged( q->index(l.first(), 0), q->index(l.last(), 0) );
 }
+CNT_EXIT
 }
 /*
-* Clear all call logs after receiving a reset model
+* Clear all call logs and refetches new call events after
-* signal from logs model
+* receiving a reset model signal from logs model
 */
 void CntHistoryModelPrivate::handleLogsReset()
 {
+CNT_ENTRY
 Q_Q(CntHistoryModel);
+q->doBeginResetModel();
 // Remove all call logs
 QList<HItemPointer> values = m_logsMap.values();
 foreach(HItemPointer p, values) {
 m_List.removeOne( p );
 m_List.append( item );
 }
 }
 sort();
-q->doBeginInsertRows(QModelIndex(), 0, rowCount());
-q->doEndInsertRows();
+q->doEndResetModel();
+CNT_EXIT
 }
 /*!
 * Check whether an idex is out of bound of our list
 *
 * \param indices List of indices
 * \return sequences of indices
 */
 QList< QList<int> > CntHistoryModelPrivate::findIndices( const QList< int >& indices )
 {
+CNT_ENTRY_ARGS(indices)
 QList< QList<int> > sequences;
 QList<int> currSequence;
 int prevIndex = indices.at(0) - 1;
 foreach( int currIndex, indices )
 {
 // Add last sequence if such exist
 sequences.append( currSequence );
 }
+CNT_EXIT_ARGS(sequences)
 return sequences;
 }
 /*!
 * Read message event into a history item
 * \param event Message event
 * \param item Conversation history item
 */
 void CntHistoryModelPrivate::readMsgEvent(MsgItem& event, HistoryItem& item)
 {
+CNT_ENTRY
 // Msg direction
 if ( event.direction() == MsgItem::MsgDirectionIncoming ) {
 item.flags |= CntIncoming;
 // Read status
 if ( event.isAttributeSet(MsgItem::MsgAttributeUnread) )
 }
 item.timeStamp = event.timeStamp().toLocalTime();
 LOG_ITEM(item);
+CNT_EXIT
 }
 /*!
 * Slot to receive new messages for the first time
 * from the messages model
 * \param event Message event
 * \param item Conversation history item
 */
 void CntHistoryModelPrivate::messagesReady(QList<MsgItem>& msgs)
 {
+CNT_ENTRY
 Q_Q(CntHistoryModel);
+q->doBeginResetModel();
 foreach( MsgItem m, msgs ) {
 // Create a new hst item
 HItemPointer item(new HistoryItem());
 m_List.append( item );
 }
 sort();
-q->doBeginInsertRows(QModelIndex(), 0, rowCount());
+q->doEndResetModel();
-q->doEndInsertRows();
+CNT_EXIT
 }
 /*!
 * Slot to receive new messages from the messages model
 *
 * \param event Message event
 * \param item Conversation history item
 */
 void CntHistoryModelPrivate::messageAdded(MsgItem& msg)
 {
+CNT_ENTRY
 Q_Q(CntHistoryModel);
-int oldRowCount = rowCount();
+q->doBeginInsertRows( QModelIndex(), rowCount(), rowCount() );
 // Create a new hst item
 HItemPointer item(new HistoryItem());
 // Parse the MsgItem and add data into hst item
 m_msgMap.insert( msg.id(), item );
 // Append the hst item to our list
 m_List.append( item );
-q->doBeginInsertRows( QModelIndex(), oldRowCount, rowCount() );
 q->doEndInsertRows();
+CNT_EXIT
 }
 /*!
 * Slot to update a message from the messages model
 *
 * \param event Message event
 * \param item Conversation history item
 */
 void CntHistoryModelPrivate::messageChanged(MsgItem& msg)
 {
+CNT_ENTRY
 Q_Q(CntHistoryModel);
 // Fetch the hst item that maps to this MsgItem
 HItemPointer p = m_msgMap.value( msg.id() );
 // Get the index of the the hst item in the list
 int pIndex = m_List.indexOf( p );
 q->doDataChanged(q->index(pIndex, 0), q->index(pIndex, 0));
+CNT_EXIT
 }
 /*!
 * Slot to delete a message from the messages model
 *
 * \param event Message event
 * \param item Conversation history item
 */
 void CntHistoryModelPrivate::messageDeleted(MsgItem& msg)
 {
+CNT_ENTRY
 Q_Q(CntHistoryModel);
 // Fetch the hst item that maps to this MsgItem
 HItemPointer p = m_msgMap.value( msg.id() );
 // Remove the item in stored containers
 m_msgMap.remove( msg.id() );
 int index = m_List.indexOf( p );
 if ( index > -1 ) {
+q->doBeginRemoveRows(QModelIndex(), index, index);
 m_List.removeAt( index );
-q->doBeginRemoveRows(QModelIndex(), index, index);
 q->doEndRemoveRows();
 }
-}
+CNT_EXIT
+}

changeset 71	7cc7d74059f9
parent 65	ae724a111993
child 72	6abfb1094884