10 files changed, 102 insertions, 75 deletions
diff --git a/Swift/QtUI/UserSearch/ContactListDelegate.cpp b/Swift/QtUI/UserSearch/ContactListDelegate.cpp
index 29cab83..56c479b 100644
--- a/Swift/QtUI/UserSearch/ContactListDelegate.cpp
+++ b/Swift/QtUI/UserSearch/ContactListDelegate.cpp
@@ -1,33 +1,39 @@
 /*
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #include <Swift/QtUI/UserSearch/ContactListDelegate.h>
 #include <Swift/QtUI/UserSearch/ContactListModel.h>
 #include <Swift/Controllers/Contact.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 
 ContactListDelegate::ContactListDelegate(bool compact) : compact_(compact) {
 }
 
 ContactListDelegate::~ContactListDelegate() {
 }
 
 void ContactListDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
 	if (!index.isValid()) {
 		return;
 	}
-	const Contact* contact = static_cast<Contact*>(index.internalPointer());
+	const Contact::ref contact = static_cast<Contact*>(index.internalPointer())->shared_from_this();
 	QColor nameColor = index.data(Qt::TextColorRole).value<QColor>();
 	QString avatarPath = index.data(ContactListModel::AvatarRole).value<QString>();
 	QIcon presenceIcon =index.data(ChatListRecentItem::PresenceIconRole).isValid() && !index.data(ChatListRecentItem::PresenceIconRole).value<QIcon>().isNull()
 			? index.data(ChatListRecentItem::PresenceIconRole).value<QIcon>()
 			: QIcon(":/icons/offline.png");
 	QString name = P2QSTRING(contact->name);
 	QString statusText = P2QSTRING(contact->jid.toString());
 	common_.paintContact(painter, option, nameColor, avatarPath, presenceIcon, name, statusText, false, 0, compact_);
 }
diff --git a/Swift/QtUI/UserSearch/ContactListModel.cpp b/Swift/QtUI/UserSearch/ContactListModel.cpp
index 907142f..ef6383c 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.cpp
+++ b/Swift/QtUI/UserSearch/ContactListModel.cpp
@@ -46,60 +46,64 @@ QDataStream& operator >>(QDataStream& in, StatusShow::Type& e){
 			e = StatusShow::None;
 			break;
 	}
 	return in;
 }
 
 ContactListModel::ContactListModel(bool editable) : QAbstractItemModel(), editable_(editable) {
 }
 
-void ContactListModel::setList(const std::vector<Contact>& list) {
+void ContactListModel::setList(const std::vector<Contact::ref>& list) {
 	emit layoutAboutToBeChanged();
 	contacts_ = list;
 	emit layoutChanged();
 }
 
-const std::vector<Contact>& ContactListModel::getList() const {
+const std::vector<Contact::ref>& 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;
 }
 
 int ContactListModel::columnCount(const QModelIndex&) const {
 	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()];
+		const Contact::ref& contact = contacts_[index.row()];
 		if (role == Qt::EditRole) {
-			return P2QSTRING(contact.jid.toString());
+			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();
 	}
 
-	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();
 }
 
@@ -112,24 +116,24 @@ bool ContactListModel::removeRows(int row, int /*count*/, const QModelIndex& /*p
 		emit layoutAboutToBeChanged();
 		contacts_.erase(contacts_.begin() + row);
 		emit layoutChanged();
 		onListChanged(getList());
 		return true;
 	}
 	return false;
 }
 
-QVariant ContactListModel::dataForContact(const Contact& contact, int role) const {
+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 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 {
-	return QIcon(statusShowTypeToIconPath(contact.statusType));
+QIcon ContactListModel::getPresenceIconForContact(const Contact::ref& contact) const {
+	return QIcon(statusShowTypeToIconPath(contact->statusType));
 }
 
 }
diff --git a/Swift/QtUI/UserSearch/ContactListModel.h b/Swift/QtUI/UserSearch/ContactListModel.h
index 6ca505e..e582ac4 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.h
+++ b/Swift/QtUI/UserSearch/ContactListModel.h
@@ -30,34 +30,35 @@ namespace Swift {
 			enum ContactRoles {
 				DetailTextRole = Qt::UserRole,
 				AvatarRole = Qt::UserRole + 1,
 				PresenceIconRole = Qt::UserRole + 2
 			};
 
 		public:
 			ContactListModel(bool editable);
 
-			void setList(const std::vector<Contact>& list);
-			const std::vector<Contact>& getList() const;
+			void setList(const std::vector<Contact::ref>& list);
+			const std::vector<Contact::ref>& getList() const;
+			Contact::ref getContact(const size_t i) const;
 
 			Qt::ItemFlags flags(const QModelIndex& index) const;
 			int columnCount(const QModelIndex& parent = QModelIndex()) const;
 			QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
 			QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const;
 			QModelIndex parent(const QModelIndex& index) const;
 			int rowCount(const QModelIndex& parent = QModelIndex()) const;
 			bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex());
 
 		private:
-			QVariant dataForContact(const Contact& contact, int role) const;
-			QIcon getPresenceIconForContact(const Contact& contact) const;
+			QVariant dataForContact(const Contact::ref& contact, int role) const;
+			QIcon getPresenceIconForContact(const Contact::ref& contact) const;
 
 		signals:
-			void onListChanged(std::vector<Contact> list);
+			void onListChanged(std::vector<Contact::ref> list);
 			void onJIDsDropped(const std::vector<JID>& contact);
 
 		private:
 			bool editable_;
-			std::vector<Contact> contacts_;
+			std::vector<Contact::ref> contacts_;
 	};
 
 }
diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.cpp b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
index 6ad1169..4adc929 100644
--- a/Swift/QtUI/UserSearch/QtContactListWidget.cpp
+++ b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
@@ -20,19 +20,19 @@
 
 #include <QHeaderView>
 
 namespace Swift {
 
 QtContactListWidget::QtContactListWidget(QWidget* parent, SettingsProvider* settings) : QTreeView(parent), settings_(settings), limited_(false) {
 	contactListModel_ = new ContactListModel(true);
 	setModel(contactListModel_);
 
-	connect(contactListModel_, SIGNAL(onListChanged(std::vector<Contact>)), this, SIGNAL(onListChanged(std::vector<Contact>)));
+	connect(contactListModel_, SIGNAL(onListChanged(std::vector<Contact::ref>)), this, SIGNAL(onListChanged(std::vector<Contact::ref>)));
 	connect(contactListModel_, SIGNAL(onJIDsDropped(std::vector<JID>)), this, SIGNAL(onJIDsAdded(std::vector<JID>)));
 
 	setSelectionMode(QAbstractItemView::SingleSelection);
 	setSelectionBehavior(QAbstractItemView::SelectRows);
 	setUniformRowHeights(true);
 
 	setAlternatingRowColors(true);
 	setIndentation(0);
 	setHeaderHidden(true);
@@ -55,35 +55,39 @@ QtContactListWidget::QtContactListWidget(QWidget* parent, SettingsProvider* sett
 	header()->setResizeMode(0, QHeaderView::Stretch);
 #endif
 }
 
 QtContactListWidget::~QtContactListWidget() {
 	delete contactListDelegate_;
 	delete removableItemDelegate_;
 }
 
-void QtContactListWidget::setList(const std::vector<Contact>& list) {
+void QtContactListWidget::setList(const std::vector<Contact::ref>& list) {
 	contactListModel_->setList(list);
 }
 
-std::vector<Contact> QtContactListWidget::getList() const {
+std::vector<Contact::ref> QtContactListWidget::getList() const {
 	return contactListModel_->getList();
 }
 
+Contact::ref QtContactListWidget::getContact(const size_t i) {
+	return contactListModel_->getContact(i);
+}
+
 void QtContactListWidget::setMaximumNoOfContactsToOne(bool limited) {
 	limited_ = limited;
 }
 
-void QtContactListWidget::updateContacts(const std::vector<Contact>& contactUpdates) {
-	std::vector<Contact> contacts = contactListModel_->getList();
-	foreach(const Contact& contactUpdate, contactUpdates) {
+void QtContactListWidget::updateContacts(const std::vector<Contact::ref>& contactUpdates) {
+	std::vector<Contact::ref> contacts = contactListModel_->getList();
+	foreach(const Contact::ref& contactUpdate, contactUpdates) {
 		for(size_t n = 0; n < contacts.size(); n++) {
-			if (contactUpdate.jid == contacts[n].jid) {
+			if (contactUpdate->jid == contacts[n]->jid) {
 				contacts[n] = contactUpdate;
 				break;
 			}
 		}
 	}
 	contactListModel_->setList(contacts);
 }
 
 void QtContactListWidget::handleSettingsChanged(const std::string&) {
diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.h b/Swift/QtUI/UserSearch/QtContactListWidget.h
index a83b47a..601d320 100644
--- a/Swift/QtUI/UserSearch/QtContactListWidget.h
+++ b/Swift/QtUI/UserSearch/QtContactListWidget.h
@@ -30,27 +30,28 @@ class ContactListModel;
 class SettingsProvider;
 class QtRemovableItemDelegate;
 
 class QtContactListWidget : public QTreeView {
 	Q_OBJECT
 public:
 	QtContactListWidget(QWidget* parent, SettingsProvider* settings);
 	virtual ~QtContactListWidget();
 
-	void setList(const std::vector<Contact>& list);
-	std::vector<Contact> getList() const;
+	void setList(const std::vector<Contact::ref>& list);
+	std::vector<Contact::ref> getList() const;
+	Contact::ref getContact(const size_t i);
 	void setMaximumNoOfContactsToOne(bool limited);
 
 public slots:
-	void updateContacts(const std::vector<Contact>& contactUpdates);
+	void updateContacts(const std::vector<Contact::ref>& contactUpdates);
 
 signals:
-	void onListChanged(std::vector<Contact> list);
+	void onListChanged(std::vector<Contact::ref> list);
 	void onJIDsAdded(const std::vector<JID>& jids);
 
 private:
 	void handleSettingsChanged(const std::string&);
 
 private:
 	SettingsProvider* settings_;
 	ContactListModel* contactListModel_;
 	ContactListDelegate* contactListDelegate_;
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index de935d9..a4a4610 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -1,15 +1,21 @@
 /*
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h>
 #include <Swift/QtUI/UserSearch/ContactListDelegate.h>
 #include <Swift/Controllers/Settings/SettingsProvider.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/UserSearch/ContactListModel.h>
 
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/bind.hpp>
 
@@ -17,19 +23,19 @@
 
 #include <QAbstractItemView>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QKeyEvent>
 
 
 namespace Swift {
 
-QtSuggestingJIDInput::QtSuggestingJIDInput(QWidget* parent, SettingsProvider* settings) : QLineEdit(parent), settings_(settings), currentContact_(NULL) {
+QtSuggestingJIDInput::QtSuggestingJIDInput(QWidget* parent, SettingsProvider* settings) : QLineEdit(parent), settings_(settings) {
 	treeViewPopup_ = new QTreeView();
 	treeViewPopup_->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
 	//treeViewPopup_->setAttribute(Qt::WA_ShowWithoutActivating);
 	treeViewPopup_->setAlternatingRowColors(true);
 	treeViewPopup_->setIndentation(0);
 	treeViewPopup_->setHeaderHidden(true);
 	treeViewPopup_->setExpandsOnDoubleClick(false);
 	treeViewPopup_->setItemsExpandable(false);
 	treeViewPopup_->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -51,42 +57,43 @@ QtSuggestingJIDInput::QtSuggestingJIDInput(QWidget* parent, SettingsProvider* se
 
 	settings_->onSettingChanged.connect(boost::bind(&QtSuggestingJIDInput::handleSettingsChanged, this, _1));
 }
 
 QtSuggestingJIDInput::~QtSuggestingJIDInput() {
 	settings_->onSettingChanged.disconnect(boost::bind(&QtSuggestingJIDInput::handleSettingsChanged, this, _1));
 	delete treeViewPopup_;
 }
 
-const Contact* QtSuggestingJIDInput::getContact() {
-	if (currentContact_ != NULL) {
+Contact::ref QtSuggestingJIDInput::getContact() {
+	if (!!currentContact_) {
 		return currentContact_;
-	} else {
-		if (!text().isEmpty()) {
-			JID jid(Q2PSTRING(text()));
-			if (jid.isValid()) {
-				manualContact_.name = jid.toString();
-				manualContact_.jid = jid;
-				return &manualContact_;
-			}
+	}
+
+	if (!text().isEmpty()) {
+		JID jid(Q2PSTRING(text()));
+		if (jid.isValid()) {
+			Contact::ref manualContact = boost::make_shared<Contact>();
+			manualContact->name = jid.toString();
+			manualContact->jid = jid;
+			return manualContact;
 		}
-		return NULL;
 	}
+	return boost::shared_ptr<Contact>();
 }
 
-void QtSuggestingJIDInput::setSuggestions(const std::vector<Contact>& suggestions) {
+void QtSuggestingJIDInput::setSuggestions(const std::vector<Contact::ref>& suggestions) {
 	contactListModel_->setList(suggestions);
 	positionPopup();
 	if (!suggestions.empty()) {
 		treeViewPopup_->setCurrentIndex(contactListModel_->index(0, 0));
 		showPopup();
 	} else {
-		currentContact_ = NULL;
+		currentContact_.reset();
 	}
 }
 
 void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) {
 	if (event->key() == Qt::Key_Up) {
 		if (contactListModel_->rowCount() > 0) {
 			int row = treeViewPopup_->currentIndex().row();
 			row = (row + contactListModel_->rowCount() - 1) % contactListModel_->rowCount();
 			treeViewPopup_->setCurrentIndex(contactListModel_->index(row, 0));
@@ -94,24 +101,24 @@ void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) {
 	} else if (event->key() == Qt::Key_Down) {
 		if (contactListModel_->rowCount() > 0) {
 			int row = treeViewPopup_->currentIndex().row();
 			row = (row + contactListModel_->rowCount() + 1) % contactListModel_->rowCount();
 			treeViewPopup_->setCurrentIndex(contactListModel_->index(row, 0));
 		}
 	} else if (event->key() == Qt::Key_Return && treeViewPopup_->isVisible()) {
 		QModelIndex index = treeViewPopup_->currentIndex();
 		if (!contactListModel_->getList().empty() && index.isValid()) {
-			currentContact_ = &contactListModel_->getList()[index.row()];
+			currentContact_ = contactListModel_->getContact(index.row());
 			setText(P2QSTRING(currentContact_->jid.toString()));
 			hidePopup();
 			clearFocus();
 		} else {
-			currentContact_ = NULL;
+			currentContact_.reset();
 		}
 		editingDone();
 	} else {
 		QLineEdit::keyPressEvent(event);
 	}
 }
 
 void QtSuggestingJIDInput::handleApplicationFocusChanged(QWidget* /*old*/, QWidget* /*now*/) {
 	/* Using the now argument gives use the wrong widget. This is part of the code needed
@@ -124,19 +131,19 @@ void QtSuggestingJIDInput::handleApplicationFocusChanged(QWidget* /*old*/, QWidg
 
 void QtSuggestingJIDInput::handleSettingsChanged(const std::string& setting) {
 	if (setting == QtUISettingConstants::COMPACT_ROSTER.getKey()) {
 		contactListDelegate_->setCompact(settings_->getSetting(QtUISettingConstants::COMPACT_ROSTER));
 	}
 }
 
 void QtSuggestingJIDInput::handleClicked(const QModelIndex& index) {
 	if (index.isValid()) {
-		currentContact_ = &contactListModel_->getList()[index.row()];
+		currentContact_ = contactListModel_->getContact(index.row());
 		setText("");
 		onUserSelected(currentContact_->jid);
 		hidePopup();
 	}
 }
 
 void QtSuggestingJIDInput::positionPopup() {
 	QDesktopWidget* desktop = QApplication::desktop();
 	int screen = desktop->screenNumber(this);
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
index 9ec0512..25e7d42 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
@@ -1,15 +1,21 @@
 /*
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014 Kevin Smith and Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
 #pragma once
 
 #include <QLineEdit>
 #include <QTreeView>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swift/Controllers/Contact.h>
 
 namespace Swift {
 
@@ -17,21 +23,21 @@ class ContactListDelegate;
 class SettingsProvider;
 class ContactListModel;
 
 class QtSuggestingJIDInput : public QLineEdit {
 	Q_OBJECT
 	public:
 		QtSuggestingJIDInput(QWidget* parent, SettingsProvider* settings);
 		virtual ~QtSuggestingJIDInput();
 
-		const Contact* getContact();
+		Contact::ref getContact();
 
-		void setSuggestions(const std::vector<Contact>& suggestions);
+		void setSuggestions(const std::vector<Contact::ref>& suggestions);
 
 		boost::signal<void (const JID&)> onUserSelected;
 
 	signals:
 		void editingDone();
 
 	protected:
 		virtual void keyPressEvent(QKeyEvent* event);
 
@@ -46,14 +52,13 @@ class QtSuggestingJIDInput : public QLineEdit {
 		void positionPopup();
 		void showPopup();
 		void hidePopup();
 
 	private:
 		SettingsProvider* settings_;
 		ContactListModel* contactListModel_;
 		QTreeView* treeViewPopup_;
 		ContactListDelegate* contactListDelegate_;
-		Contact manualContact_;
-		const Contact* currentContact_;
+		Contact::ref currentContact_;
 };
 
 }
diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
index 47d62d9..597c88b 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp
@@ -41,19 +41,19 @@ QtUserSearchFirstMultiJIDPage::QtUserSearchFirstMultiJIDPage(UserSearchWindow::T
 
 	setSubTitle(QString(tr("%1. If you know their address you can enter it directly, or you can search for them.")).arg(introText));
 
 	contactList_ = new QtContactListWidget(this, settings);
 	horizontalLayout_5->addWidget(contactList_);
 
 	jid_ = new QtSuggestingJIDInput(this, settings);
 	horizontalLayout_6->insertWidget(0, jid_);
 
-	connect(contactList_, SIGNAL(onListChanged(std::vector<Contact>)), this, SLOT(emitCompletenessCheck()));
+	connect(contactList_, SIGNAL(onListChanged(std::vector<Contact::ref>)), this, SLOT(emitCompletenessCheck()));
 	connect(jid_, SIGNAL(editingDone()), this, SLOT(handleEditingDone()));
 
 	setAcceptDrops(true);
 }
 
 bool QtUserSearchFirstMultiJIDPage::isComplete() const {
 	return !contactList_->getList().empty();
 }
 
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index ed0fae2..c154c8f 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -124,47 +124,46 @@ void QtUserSearchWindow::handleAccepted() {
 	JID jid;
 	std::vector<JID> jids;
 	switch(type_) {
 		case AddContact:
 			jid = getContactJID();
 			eventStream_->send(boost::make_shared<AddContactUIEvent>(jid, detailsPage_->getName(), detailsPage_->getSelectedGroups()));
 			break;
 		case ChatToContact:
 			if (contactVector_.size() == 1) {
-				boost::shared_ptr<UIEvent> event(new RequestChatUIEvent(contactVector_[0].jid));
+				boost::shared_ptr<UIEvent> event(new RequestChatUIEvent(contactVector_[0]->jid));
 				eventStream_->send(event);
 				break;
 			}
 
-			foreach(const Contact& contact, contactVector_) {
-				jids.push_back(contact.jid);
+			foreach(Contact::ref contact, contactVector_) {
+				jids.push_back(contact->jid);
 			}
 
 			eventStream_->send(boost::make_shared<CreateImpromptuMUCUIEvent>(jids, JID(), Q2PSTRING(firstMultiJIDPage_->reason_->text())));
 			break;
 		case InviteToChat:
-			foreach(const Contact& contact, contactVector_) {
-				jids.push_back(contact.jid);
+			foreach(Contact::ref contact, contactVector_) {
+				jids.push_back(contact->jid);
 			}
 			eventStream_->send(boost::make_shared<InviteToMUCUIEvent>(roomJID_, jids, Q2PSTRING(firstMultiJIDPage_->reason_->text())));
 			break;
 	}
 }
 
 void QtUserSearchWindow::handleContactSuggestionRequested(const QString& text) {
 	std::string stdText = Q2PSTRING(text);
 	onContactSuggestionsRequested(stdText);
 }
 
 void QtUserSearchWindow::addContact() {
-	if (firstMultiJIDPage_->jid_->getContact() != 0) {
-		Contact contact = *(firstMultiJIDPage_->jid_->getContact());
-		contactVector_.push_back(contact);
+	if (!!firstMultiJIDPage_->jid_->getContact()) {
+		contactVector_.push_back(firstMultiJIDPage_->jid_->getContact());
 	}
 	firstMultiJIDPage_->contactList_->setList(contactVector_);
 	firstMultiJIDPage_->emitCompletenessCheck();
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
 	}
 }
 
 int QtUserSearchWindow::nextId() const {
@@ -265,19 +264,19 @@ JID QtUserSearchWindow::getContactJID() const {
 		}
 	}
 	else {
 		jid = JID(Q2PSTRING(firstPage_->jid_->text().trimmed()));
 	}
 	return jid;
 }
 
 void QtUserSearchWindow::addSearchedJIDToList(const JID& jid) {
-	Contact contact(jid, jid.toString(), StatusShow::None, "");
+	Contact::ref contact = boost::make_shared<Contact>(jid, jid.toString(), StatusShow::None, "");
 	contactVector_.push_back(contact);
 	firstMultiJIDPage_->contactList_->setList(contactVector_);
 	firstMultiJIDPage_->emitCompletenessCheck();
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
 	}
 }
 
 void QtUserSearchWindow::show() {
@@ -330,19 +329,19 @@ void QtUserSearchWindow::setNameSuggestions(const std::vector<std::string>& sugg
 void QtUserSearchWindow::prepopulateJIDAndName(const JID& jid, const std::string& name) {
 	firstPage_->jid_->setText(P2QSTRING(jid.toBare().toString()));
 	detailsPage_->setJID(jid);
 	lastPage_ = 1;
 	restart();
 	next();
 	detailsPage_->setName(name);
 }
 
-void QtUserSearchWindow::setContactSuggestions(const std::vector<Contact>& suggestions) {
+void QtUserSearchWindow::setContactSuggestions(const std::vector<Contact::ref>& suggestions) {
 	if (type_ == AddContact) {
 		firstPage_->jid_->setSuggestions(suggestions);
 	} else {
 		firstMultiJIDPage_->jid_->setSuggestions(suggestions);
 	}
 }
 
 void QtUserSearchWindow::setJIDs(const std::vector<JID> &jids) {
 	foreach(JID jid, jids) {
@@ -355,63 +354,63 @@ void QtUserSearchWindow::setRoomJID(const JID& roomJID) {
 	roomJID_ = roomJID;
 }
 
 std::string QtUserSearchWindow::getReason() const {
 	return Q2PSTRING(firstMultiJIDPage_->reason_->text());
 }
 
 std::vector<JID> QtUserSearchWindow::getJIDs() const {
 	std::vector<JID> jids;
-	foreach (const Contact& contact, contactVector_) {
-		jids.push_back(contact.jid);
+	foreach (Contact::ref contact, contactVector_) {
+		jids.push_back(contact->jid);
 	}
 	return jids;
 }
 
 void QtUserSearchWindow::setCanStartImpromptuChats(bool supportsImpromptu) {
 	supportsImpromptu_ = supportsImpromptu;
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->contactList_->setMaximumNoOfContactsToOne(!supportsImpromptu_);
 	}
 }
 
-void QtUserSearchWindow::updateContacts(const std::vector<Contact>& contacts) {
+void QtUserSearchWindow::updateContacts(const std::vector<Contact::ref>& contacts) {
 	if (type_ != AddContact) {
 		firstMultiJIDPage_->contactList_->updateContacts(contacts);
 	}
 }
 
-void QtUserSearchWindow::addContacts(const std::vector<Contact>& contacts) {
+void QtUserSearchWindow::addContacts(const std::vector<Contact::ref>& contacts) {
 	if (type_ != AddContact) {
 		/* prevent duplicate JIDs from appearing in the contact list */
-		foreach (const Contact& newContact, contacts) {
+		foreach (Contact::ref newContact, contacts) {
 			bool found = false;
-			foreach (const Contact& oldContact, contactVector_) {
-				if (newContact.jid == oldContact.jid) {
+			foreach (Contact::ref oldContact, contactVector_) {
+				if (newContact->jid == oldContact->jid) {
 					found = true;
 					break;
 				}
 			}
 			if (!found) {
 				contactVector_.push_back(newContact);
 			}
 		}
 		firstMultiJIDPage_->contactList_->setList(contactVector_);
 		firstMultiJIDPage_->emitCompletenessCheck();
 	}
 }
 
 void QtUserSearchWindow::handleAddViaSearch() {
 	searchNext_ = true;
 	next();
 }
 
-void QtUserSearchWindow::handleListChanged(std::vector<Contact> list) {
+void QtUserSearchWindow::handleListChanged(std::vector<Contact::ref> list) {
 	contactVector_ = list;
 	if (type_ == ChatToContact) {
 		firstMultiJIDPage_->groupBox->setEnabled(supportsImpromptu_ ? 1 : (contactVector_.size() < 1));
 	}
 }
 
 void QtUserSearchWindow::handleJIDsAdded(std::vector<JID> jids) {
 	onJIDAddRequested(jids);
 }
@@ -464,19 +463,19 @@ void QtUserSearchWindow::setFirstPage(QString title) {
 #endif
 		firstPage_->service_->setEnabled(false);
 		setPage(1, firstPage_);
 	} else {
 		firstMultiJIDPage_ = new QtUserSearchFirstMultiJIDPage(type_, title.isEmpty() ? firstMultiJIDPage_->title() : title, settings_);
 		connect(firstMultiJIDPage_->addContactButton_, SIGNAL(clicked()), this, SLOT(addContact()));
 		connect(firstMultiJIDPage_->jid_, SIGNAL(textEdited(QString)), this, SLOT(handleContactSuggestionRequested(QString)));
 		firstMultiJIDPage_->jid_->onUserSelected.connect(boost::bind(&QtUserSearchWindow::addSearchedJIDToList, this, _1));
 		connect(firstMultiJIDPage_->addViaSearchButton_, SIGNAL(clicked()), this, SLOT(handleAddViaSearch()));
-		connect(firstMultiJIDPage_->contactList_, SIGNAL(onListChanged(std::vector<Contact>)), this, SLOT(handleListChanged(std::vector<Contact>)));
+		connect(firstMultiJIDPage_->contactList_, SIGNAL(onListChanged(std::vector<Contact::ref>)), this, SLOT(handleListChanged(std::vector<Contact::ref>)));
 		connect(firstMultiJIDPage_->contactList_, SIGNAL(onJIDsAdded(std::vector<JID>)), this, SLOT(handleJIDsAdded(std::vector<JID>)));
 		connect(firstMultiJIDPage_, SIGNAL(onJIDsDropped(std::vector<JID>)), this, SLOT(handleJIDsAdded(std::vector<JID>)));
 		setPage(1, firstMultiJIDPage_);
 	}
 }
 
 void QtUserSearchWindow::setSecondPage() {
 	if (page(2) != 0) {
 		removePage(2);
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
index 941e455..bb89e51 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h
@@ -37,38 +37,38 @@ namespace Swift {
 			virtual void show();
 			virtual void setResults(const std::vector<UserSearchResult>& results);
 			virtual void setResultsForm(Form::ref results);
 			virtual void setSelectedService(const JID& jid);
 			virtual void setServerSupportsSearch(bool error);
 			virtual void setSearchError(bool error);
 			virtual void setSearchFields(boost::shared_ptr<SearchPayload> fields);
 			virtual void setNameSuggestions(const std::vector<std::string>& suggestions);
 			virtual void prepopulateJIDAndName(const JID& jid, const std::string& name);
-			virtual void setContactSuggestions(const std::vector<Contact>& suggestions);
+			virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions);
 			virtual void setJIDs(const std::vector<JID> &jids);
 			virtual void setRoomJID(const JID &roomJID);
 			virtual std::string getReason() const;
 			virtual std::vector<JID> getJIDs() const;
 			virtual void setCanStartImpromptuChats(bool supportsImpromptu);
-			virtual void updateContacts(const std::vector<Contact> &contacts);
-			virtual void addContacts(const std::vector<Contact>& contacts);
+			virtual void updateContacts(const std::vector<Contact::ref> &contacts);
+			virtual void addContacts(const std::vector<Contact::ref>& contacts);
 
 		protected:
 			virtual int nextId() const;
 
 		private slots:
 			void handleFirstPageRadioChange();
 			virtual void handleCurrentChanged(int);
 			virtual void handleAccepted();
 			void handleContactSuggestionRequested(const QString& text);
 			void addContact();
 			void handleAddViaSearch();
-			void handleListChanged(std::vector<Contact> list);
+			void handleListChanged(std::vector<Contact::ref> list);
 			void handleJIDsAdded(std::vector<JID> jids);
 
 		private:
 			void setFirstPage(QString title = "");
 			void setSecondPage();
 			void setThirdPage();
 
 		private:
 			void clearForm();
@@ -85,15 +85,15 @@ namespace Swift {
 			UserSearchDelegate* delegate_;
 			QtUserSearchFirstPage* firstPage_;
 			QtUserSearchFirstMultiJIDPage* firstMultiJIDPage_;
 			QtUserSearchFieldsPage* fieldsPage_;
 			QtUserSearchResultsPage* resultsPage_;
 			QtUserSearchDetailsPage* detailsPage_;
 			JID myServer_;
 			JID roomJID_;
 			int lastPage_;
-			std::vector<Contact> contactVector_;
+			std::vector<Contact::ref> contactVector_;
 			SettingsProvider* settings_;
 			bool searchNext_;
 			bool supportsImpromptu_;
 	};
 }