equal
deleted
inserted
replaced
190 } |
190 } |
191 } |
191 } |
192 } else { |
192 } else { |
193 for (int a(0); a < messageIds.count(); a++) { |
193 for (int a(0); a < messageIds.count(); a++) { |
194 removeMessageFromModel(messageIds[a]); |
194 removeMessageFromModel(messageIds[a]); |
195 emit removeMessage(messageIds[a]); |
|
196 } |
195 } |
197 } |
196 } |
198 } |
197 } |
199 } |
198 } |
200 |
199 |
411 int i(0); |
410 int i(0); |
412 while (!found && i < count) { |
411 while (!found && i < count) { |
413 QModelIndex index = items[i]->index(); |
412 QModelIndex index = items[i]->index(); |
414 NmMessageListModelItem *item = static_cast<NmMessageListModelItem*>(itemFromIndex(index)); |
413 NmMessageListModelItem *item = static_cast<NmMessageListModelItem*>(itemFromIndex(index)); |
415 if (NmMessageListModelItem::NmMessageItemMessage == item->itemType() |
414 if (NmMessageListModelItem::NmMessageItemMessage == item->itemType() |
416 && msgId == item->envelope().id()) { |
415 && msgId == item->envelope().messageId()) { |
417 found = true; |
416 found = true; |
418 // dividers are not active, just remove message |
417 // dividers are not active, just remove message |
419 if (!mDividersActive) { |
418 if (!mDividersActive) { |
420 removeItem(index.row(), *item); |
419 removeItem(index.row(), *item); |
421 } else { |
420 } else { |
473 NmMessageListModelItem *ret(NULL); |
472 NmMessageListModelItem *ret(NULL); |
474 while (i < count && !found) { |
473 while (i < count && !found) { |
475 NmMessageListModelItem *item = |
474 NmMessageListModelItem *item = |
476 static_cast<NmMessageListModelItem*>(itemFromIndex(items[i]->index())); |
475 static_cast<NmMessageListModelItem*>(itemFromIndex(items[i]->index())); |
477 if (NmMessageListModelItem::NmMessageItemMessage == item->itemType() |
476 if (NmMessageListModelItem::NmMessageItemMessage == item->itemType() |
478 && messageId == item->envelope().id()) { |
477 && messageId == item->envelope().messageId()) { |
479 found = true; |
478 found = true; |
480 ret = item; |
479 ret = item; |
481 } |
480 } |
482 i++; |
481 i++; |
483 } |
482 } |