1 files changed, 12 insertions, 0 deletions
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index fa8c393..2bd0d09 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -70,70 +70,72 @@ void RosterModel::handleDataChanged(RosterItem* item) {
 		emit dataChanged(modelIndex, modelIndex);
 		view_->refreshTooltip();
 	}
 }
 
 Qt::ItemFlags RosterModel::flags(const QModelIndex& index) const {
 	Qt::ItemFlags flags = QAbstractItemModel::flags(index);
 	if (dynamic_cast<GroupRosterItem*>(getItem(index)) == NULL) {
 		flags |= Qt::ItemIsDragEnabled;
 	}
 	return flags;
 }
 
 int RosterModel::columnCount(const QModelIndex& /*parent*/) const {
 	return 1;
 }
 
 RosterItem* RosterModel::getItem(const QModelIndex& index) const {
 	return index.isValid() ? static_cast<RosterItem*>(index.internalPointer()) : NULL;
 }
 
 QVariant RosterModel::data(const QModelIndex& index, int role) const {
 	RosterItem* item = getItem(index);
 	if (!item) return QVariant();
 
 	switch (role) {
 		case Qt::DisplayRole: return getScreenReaderTextOr(item, P2QSTRING(item->getDisplayName()));
 		case Qt::TextColorRole: return getTextColor(item);
 		case Qt::BackgroundColorRole: return getBackgroundColor(item);
 		case Qt::ToolTipRole: return getToolTip(item);
 		case StatusTextRole: return getStatusText(item);
 		case AvatarRole: return getAvatar(item);
 		case PresenceIconRole: return getPresenceIcon(item);
 		case ChildCountRole: return getChildCount(item);
 		case IdleRole: return getIsIdle(item);
+		case JIDRole: return getJID(item);
+		case DisplayJIDRole: return getDisplayJID(item);
 		default: return QVariant();
 	}
 }
 
 QString RosterModel::getScreenReaderTextOr(RosterItem* item, const QString& alternative) const {
 	QString name = P2QSTRING(item->getDisplayName());
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (contact && screenReader_) {
 		name += ": " + P2QSTRING(statusShowTypeToFriendlyName(contact->getStatusShow()));
 		if (!contact->getStatusText().empty()) {
 			name += " (" + P2QSTRING(contact->getStatusText()) + ")";
 		}
 		return name;
 	}
 	else {
 		return alternative;
 	}
 }
 
 int RosterModel::getChildCount(RosterItem* item) const {
 	GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item);
 	return group ? group->getDisplayedChildren().size() : 0; 
 }
 
 bool RosterModel::getIsIdle(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	return contact ? !contact->getIdleText().empty() : false;
 }
 
 QColor RosterModel::intToColor(int color) const {
 	return QColor(
 		((color & 0xFF0000)>>16),
 		((color & 0xFF00)>>8), 
 		(color & 0xFF));
 }
@@ -149,70 +151,80 @@ QColor RosterModel::getTextColor(RosterItem* item) const {
 			case StatusShow::FFC: color = 0x000000; break;
 			case StatusShow::DND: color = 0x990000; break;
 			case StatusShow::None: color = 0x7F7F7F;break;
 		}
 	}
 	return intToColor(color);
 }
 
 QColor RosterModel::getBackgroundColor(RosterItem* item) const {
 	return dynamic_cast<ContactRosterItem*>(item) ? intToColor(0xFFFFFF) : intToColor(0x969696);
 }
 
 QString RosterModel::getToolTip(RosterItem* item) const {
 	QString tip(P2QSTRING(item->getDisplayName()));
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (contact) {
 		return RosterTooltip::buildDetailedTooltip(contact, cachedImageScaler_);
 	}
 	return tip;
 }
 
 QString RosterModel::getAvatar(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) {
 		return "";
 	}
 	return P2QSTRING(pathToString(contact->getAvatarPath()));
 }
 
 QString RosterModel::getStatusText(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) return "";
 	return P2QSTRING(contact->getStatusText());
 }
 
+QString RosterModel::getJID(RosterItem* item) const {
+	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
+	return contact ? P2QSTRING(contact->getJID().toString()) : QString();
+}
+
+QString RosterModel::getDisplayJID(RosterItem* item) const {
+	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
+	return contact ? P2QSTRING(contact->getDisplayJID().toString()) : QString();
+}
+
 QIcon RosterModel::getPresenceIcon(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) return QIcon();
 	if (contact->blockState() == ContactRosterItem::IsBlocked ||
 		contact->blockState() == ContactRosterItem::IsDomainBlocked) {
 		return QIcon(":/icons/stop.png");
 	}
 
 	return QIcon(statusShowTypeToIconPath(contact->getStatusShow()));
 }
 
 
 QModelIndex RosterModel::index(int row, int column, const QModelIndex& parent) const {
 	if (!roster_) {
 		return QModelIndex();
 	}
 	GroupRosterItem* parentItem;
 	if (!parent.isValid()) {
 		//top level
 		parentItem = roster_->getRoot();
 	} else {
 		parentItem = dynamic_cast<GroupRosterItem*>(getItem(parent));
 		if (!parentItem) return QModelIndex();
 	}
 	return static_cast<size_t>(row) < parentItem->getDisplayedChildren().size() ? createIndex(row, column, parentItem->getDisplayedChildren()[row]) : QModelIndex();
 }
 
 QModelIndex RosterModel::index(RosterItem* item) const {
 	GroupRosterItem* parent = item->getParent();
 	/* Recursive check that it's ok to create such an item 
 		Assuming there are more contacts in a group than groups in a 
 		group, this could save a decent chunk of search time at startup.*/
 	if (parent == NULL || roster_ == NULL || (parent != roster_->getRoot() && !index(parent).isValid())) {
 		return QModelIndex();
 	}