1 files changed, 63 insertions, 124 deletions
diff --git a/Swift/QtUI/UserSearch/ContactListModel.cpp b/Swift/QtUI/UserSearch/ContactListModel.cpp
index 6523a4d..5d8aa6c 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.cpp
+++ b/Swift/QtUI/UserSearch/ContactListModel.cpp
@@ -4,170 +4,109 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include <Swift/QtUI/UserSearch/ContactListModel.h>
 
-#include <Swift/QtUI/QtSwiftUtil.h>
+#include <QMimeData>
+
 #include <Swiften/Base/Path.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/StatusShow.h>
 
-#include <QMimeData>
+#include <Swift/QtUI/QtResourceHelper.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
-QDataStream& operator >>(QDataStream& in, StatusShow::Type& e){
-	quint32 buffer;
-	in >> buffer;
-	switch(buffer) {
-		case StatusShow::Online:
-			e = StatusShow::Online;
-			break;
-		case StatusShow::Away:
-			e = StatusShow::Away;
-			break;
-		case StatusShow::FFC:
-			e = StatusShow::FFC;
-			break;
-		case StatusShow::XA:
-			e = StatusShow::XA;
-			break;
-		case StatusShow::DND:
-			e = StatusShow::DND;
-			break;
-		default:
-			e = StatusShow::None;
-			break;
-	}
-	return in;
+ContactListModel::ContactListModel(bool editable) : QAbstractItemModel(), editable_(editable) {
 }
 
-ContactListModel::ContactListModel(bool editable) : QAbstractItemModel(), editable_(editable) {
+void ContactListModel::setList(const std::vector<Contact::ref>& list) {
+    emit layoutAboutToBeChanged();
+    contacts_ = list;
+    emit layoutChanged();
 }
 
-void ContactListModel::setList(const std::vector<Contact>& list) {
-	emit layoutAboutToBeChanged();
-	contacts_ = list;
-	emit layoutChanged();
+const std::vector<Contact::ref>& ContactListModel::getList() const {
+    return contacts_;
 }
 
-const std::vector<Contact>& ContactListModel::getList() const {
-	return contacts_;
+Contact::ref ContactListModel::getContact(const size_t i) const {
+    return contacts_[i];
 }
 
 Qt::ItemFlags ContactListModel::flags(const QModelIndex& index) const {
-	Qt::ItemFlags flags = QAbstractItemModel::flags(index);
-	if (index.isValid()) {
-		flags = flags & ~Qt::ItemIsDropEnabled;
-	} else {
-		flags = Qt::ItemIsDropEnabled | flags;
-	}
-	return flags;
+    Qt::ItemFlags flags = QAbstractItemModel::flags(index);
+    if (index.isValid()) {
+        flags = flags & ~Qt::ItemIsDropEnabled;
+    } else {
+        flags = Qt::ItemIsDropEnabled | flags;
+    }
+    return flags;
 }
 
 int ContactListModel::columnCount(const QModelIndex&) const {
-	return editable_ ? 2 : 1;
+    return editable_ ? 2 : 1;
 }
 
 QVariant ContactListModel::data(const QModelIndex& index, int role) const {
-	if (boost::numeric_cast<size_t>(index.row()) < contacts_.size()) {
-		const Contact& contact = contacts_[index.row()];
-		if (role == Qt::EditRole) {
-			return P2QSTRING(contact.jid.toString());
-		}
-		return dataForContact(contact, role);
-	} else {
-		return QVariant();
-	}
-}
-
-bool ContactListModel::dropMimeData(const QMimeData* data, Qt::DropAction /*action*/, int /*row*/, int /*column*/, const QModelIndex& /*parent*/) {
-	if (!data->hasFormat("application/vnd.swift.contact-jid")) {
-		return false;
-	}
-
-	QByteArray dataBytes = data->data("application/vnd.swift.contact-jid");
-	QDataStream dataStream(&dataBytes, QIODevice::ReadOnly);
-	QString jidString;
-	QString displayName;
-	QString statusText;
-	StatusShow::Type statusType;
-	QString avatarPath;
-
-	dataStream >> jidString;
-	dataStream >> displayName;
-	dataStream >> statusText;
-	dataStream >> statusType;
-	dataStream >> avatarPath;
-
-	JID jid = JID(Q2PSTRING(jidString));
-
-	foreach(const Contact& contact, contacts_) {
-		if (contact.jid == jid) {
-			return false;
-		}
-	}
-
-	emit layoutAboutToBeChanged();
-	contacts_.push_back(Contact(Q2PSTRING(displayName), jid, statusType, Q2PSTRING(avatarPath)));
-	emit layoutChanged();
-
-	onJIDsDropped(std::vector<JID>(1, jid));
-	onListChanged(getList());
-
-	return true;
+    if ((boost::numeric_cast<size_t>(index.row()) < contacts_.size()) && (index.column() == 0)) {
+        const Contact::ref& contact = contacts_[index.row()];
+        if (role == Qt::EditRole) {
+            return P2QSTRING(contact->jid.toString());
+        }
+        return dataForContact(contact, role);
+    } else {
+        return QVariant();
+    }
 }
 
 QModelIndex ContactListModel::index(int row, int column, const QModelIndex& parent) const {
-	if (!hasIndex(row, column, parent)) {
-		return QModelIndex();
-	}
+    if (!hasIndex(row, column, parent)) {
+        return QModelIndex();
+    }
 
-	return boost::numeric_cast<size_t>(row) < contacts_.size() ? createIndex(row, column, (void*)&(contacts_[row])) : QModelIndex();
+    return boost::numeric_cast<size_t>(row) < contacts_.size() ? createIndex(row, column, contacts_[row].get()) : QModelIndex();
 }
 
 QModelIndex ContactListModel::parent(const QModelIndex& index) const {
-	if (!index.isValid()) {
-		return QModelIndex();
-	}
-	return QModelIndex();
+    if (!index.isValid()) {
+        return QModelIndex();
+    }
+    return QModelIndex();
 }
 
 int ContactListModel::rowCount(const QModelIndex& /*parent*/) const {
-	return contacts_.size();
+    return contacts_.size();
 }
 
 bool ContactListModel::removeRows(int row, int /*count*/, const QModelIndex& /*parent*/) {
-	if (boost::numeric_cast<size_t>(row) < contacts_.size()) {
-		emit layoutAboutToBeChanged();
-		contacts_.erase(contacts_.begin() + row);
-		emit layoutChanged();
-		onListChanged(getList());
-		return true;
-	}
-	return false;
+    if (boost::numeric_cast<size_t>(row) < contacts_.size()) {
+        emit layoutAboutToBeChanged();
+        contacts_.erase(contacts_.begin() + row);
+        emit layoutChanged();
+        onListChanged(getList());
+        return true;
+    }
+    return false;
 }
 
-QVariant ContactListModel::dataForContact(const Contact& contact, int role) const {
-	switch (role) {
-		case Qt::DisplayRole: return P2QSTRING(contact.name);
-		case DetailTextRole: return P2QSTRING(contact.jid.toString());
-		case AvatarRole: return QVariant(P2QSTRING(pathToString(contact.avatarPath)));
-		case PresenceIconRole: return getPresenceIconForContact(contact);
-		default: return QVariant();
-	}
+QVariant ContactListModel::dataForContact(const Contact::ref& contact, int role) const {
+    switch (role) {
+        case Qt::DisplayRole: return P2QSTRING(contact->name);
+        case DetailTextRole: return P2QSTRING(contact->jid.toString());
+        case AvatarRole: return QVariant(P2QSTRING(pathToString(contact->avatarPath)));
+        case PresenceIconRole: return getPresenceIconForContact(contact);
+        default: return QVariant();
+    }
 }
 
-QIcon ContactListModel::getPresenceIconForContact(const Contact& contact) const {
-	QString iconString;
-	switch (contact.statusType) {
-		case StatusShow::Online: iconString = "online";break;
-		case StatusShow::Away: iconString = "away";break;
-		case StatusShow::XA: iconString = "away";break;
-		case StatusShow::FFC: iconString = "online";break;
-		case StatusShow::DND: iconString = "dnd";break;
-		case StatusShow::None: iconString = "offline";break;
-	}
-	return QIcon(":/icons/" + iconString + ".png");
+QIcon ContactListModel::getPresenceIconForContact(const Contact::ref& contact) const {
+    return QIcon(statusShowTypeToIconPath(contact->statusType));
 }
 
 }