Fix crash in QtUserSearchWindow.

Avoid storing pointers to items in vectors. Using shared_ptr for Contact items. Change-Id: I3baa05fc058011b2beca14dc620ab794988a2b37
author: Richard Maudsley <richard.maudsley@isode.com> 2014-04-09 07:53:12 (GMT)
committer: Swift Review <review@swift.im> 2014-04-22 21:12:21 (GMT)
commit: a7fb55381ab4a5c470bf891b31ac6e201611a2c1 (patch)
tree: 475b3b7fc0142946863580506b00aa250ef8ca14 /Swift/QtUI/UserSearch
parent: 4444aeb255f8d1712b794c31166f362bb3ec335a (diff)
download: swift-contrib-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.zip
swift-contrib-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.tar.bz2
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
@@ -6,2 +6,8 @@
 
+/*
+ * 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>
@@ -23,3 +29,3 @@ void ContactListDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
 	}
-	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>();
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
@@ -54,3 +54,3 @@ ContactListModel::ContactListModel(bool editable) : QAbstractItemModel(), editab
 
-void ContactListModel::setList(const std::vector<Contact>& list) {
+void ContactListModel::setList(const std::vector<Contact::ref>& list) {
 	emit layoutAboutToBeChanged();
@@ -60,3 +60,3 @@ void ContactListModel::setList(const std::vector<Contact>& list) {
 
-const std::vector<Contact>& ContactListModel::getList() const {
+const std::vector<Contact::ref>& ContactListModel::getList() const {
 	return contacts_;
@@ -64,2 +64,6 @@ const std::vector<Contact>& ContactListModel::getList() const {
 
+Contact::ref ContactListModel::getContact(const size_t i) const {
+	return contacts_[i];
+}
+
 Qt::ItemFlags ContactListModel::flags(const QModelIndex& index) const {
@@ -80,5 +84,5 @@ 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());
 		}
@@ -95,3 +99,3 @@ QModelIndex ContactListModel::index(int row, int column, const QModelIndex& pare
 
-	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();
 }
@@ -120,7 +124,7 @@ bool ContactListModel::removeRows(int row, int /*count*/, const QModelIndex& /*p
 
-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);
@@ -130,4 +134,4 @@ QVariant ContactListModel::dataForContact(const Contact& contact, int role) cons
 
-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
@@ -38,4 +38,5 @@ namespace Swift {
 
-			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;
 
@@ -50,7 +51,7 @@ namespace Swift {
 		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);
@@ -59,3 +60,3 @@ namespace Swift {
 			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
@@ -28,3 +28,3 @@ QtContactListWidget::QtContactListWidget(QWidget* parent, SettingsProvider* sett
 
-	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>)));
@@ -63,3 +63,3 @@ QtContactListWidget::~QtContactListWidget() {
 
-void QtContactListWidget::setList(const std::vector<Contact>& list) {
+void QtContactListWidget::setList(const std::vector<Contact::ref>& list) {
 	contactListModel_->setList(list);
@@ -67,3 +67,3 @@ void QtContactListWidget::setList(const std::vector<Contact>& list) {
 
-std::vector<Contact> QtContactListWidget::getList() const {
+std::vector<Contact::ref> QtContactListWidget::getList() const {
 	return contactListModel_->getList();
@@ -71,2 +71,6 @@ std::vector<Contact> QtContactListWidget::getList() const {
 
+Contact::ref QtContactListWidget::getContact(const size_t i) {
+	return contactListModel_->getContact(i);
+}
+
 void QtContactListWidget::setMaximumNoOfContactsToOne(bool limited) {
@@ -75,7 +79,7 @@ void QtContactListWidget::setMaximumNoOfContactsToOne(bool 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;
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
@@ -38,4 +38,5 @@ public:
 
-	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);
@@ -43,6 +44,6 @@ public:
 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);
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
@@ -6,2 +6,8 @@
 
+/*
+ * 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>
@@ -25,3 +31,3 @@ 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();
@@ -59,19 +65,20 @@ QtSuggestingJIDInput::~QtSuggestingJIDInput() {
 
-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);
@@ -82,3 +89,3 @@ void QtSuggestingJIDInput::setSuggestions(const std::vector<Contact>& suggestion
 	} else {
-		currentContact_ = NULL;
+		currentContact_.reset();
 	}
@@ -102,3 +109,3 @@ void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) {
 		if (!contactListModel_->getList().empty() && index.isValid()) {
-			currentContact_ = &contactListModel_->getList()[index.row()];
+			currentContact_ = contactListModel_->getContact(index.row());
 			setText(P2QSTRING(currentContact_->jid.toString()));
@@ -107,3 +114,3 @@ void QtSuggestingJIDInput::keyPressEvent(QKeyEvent* event) {
 		} else {
-			currentContact_ = NULL;
+			currentContact_.reset();
 		}
@@ -132,3 +139,3 @@ void QtSuggestingJIDInput::handleClicked(const QModelIndex& index) {
 	if (index.isValid()) {
-		currentContact_ = &contactListModel_->getList()[index.row()];
+		currentContact_ = contactListModel_->getContact(index.row());
 		setText("");
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
@@ -6,2 +6,8 @@
 
+/*
+ * 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
@@ -25,5 +31,5 @@ class QtSuggestingJIDInput : public QLineEdit {
 
-		const Contact* getContact();
+		Contact::ref getContact();
 
-		void setSuggestions(const std::vector<Contact>& suggestions);
+		void setSuggestions(const std::vector<Contact::ref>& suggestions);
 
@@ -54,4 +60,3 @@ class QtSuggestingJIDInput : public QLineEdit {
 		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
@@ -49,3 +49,3 @@ QtUserSearchFirstMultiJIDPage::QtUserSearchFirstMultiJIDPage(UserSearchWindow::T
 
-	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()));
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
@@ -132,3 +132,3 @@ void QtUserSearchWindow::handleAccepted() {
 			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);
@@ -137,4 +137,4 @@ void QtUserSearchWindow::handleAccepted() {
 
-			foreach(const Contact& contact, contactVector_) {
-				jids.push_back(contact.jid);
+			foreach(Contact::ref contact, contactVector_) {
+				jids.push_back(contact->jid);
 			}
@@ -144,4 +144,4 @@ void QtUserSearchWindow::handleAccepted() {
 		case InviteToChat:
-			foreach(const Contact& contact, contactVector_) {
-				jids.push_back(contact.jid);
+			foreach(Contact::ref contact, contactVector_) {
+				jids.push_back(contact->jid);
 			}
@@ -158,5 +158,4 @@ void QtUserSearchWindow::handleContactSuggestionRequested(const QString& text) {
 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());
 	}
@@ -273,3 +272,3 @@ JID QtUserSearchWindow::getContactJID() const {
 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);
@@ -338,3 +337,3 @@ void QtUserSearchWindow::prepopulateJIDAndName(const JID& jid, const std::string
 
-void QtUserSearchWindow::setContactSuggestions(const std::vector<Contact>& suggestions) {
+void QtUserSearchWindow::setContactSuggestions(const std::vector<Contact::ref>& suggestions) {
 	if (type_ == AddContact) {
@@ -363,4 +362,4 @@ 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);
 	}
@@ -376,3 +375,3 @@ void QtUserSearchWindow::setCanStartImpromptuChats(bool supportsImpromptu) {
 
-void QtUserSearchWindow::updateContacts(const std::vector<Contact>& contacts) {
+void QtUserSearchWindow::updateContacts(const std::vector<Contact::ref>& contacts) {
 	if (type_ != AddContact) {
@@ -382,9 +381,9 @@ void QtUserSearchWindow::updateContacts(const std::vector<Contact>& 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;
@@ -407,3 +406,3 @@ void QtUserSearchWindow::handleAddViaSearch() {
 
-void QtUserSearchWindow::handleListChanged(std::vector<Contact> list) {
+void QtUserSearchWindow::handleListChanged(std::vector<Contact::ref> list) {
 	contactVector_ = list;
@@ -472,3 +471,3 @@ void QtUserSearchWindow::setFirstPage(QString title) {
 		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>)));
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
@@ -45,3 +45,3 @@ namespace Swift {
 			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);
@@ -51,4 +51,4 @@ namespace Swift {
 			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);
 
@@ -64,3 +64,3 @@ namespace Swift {
 			void handleAddViaSearch();
-			void handleListChanged(std::vector<Contact> list);
+			void handleListChanged(std::vector<Contact::ref> list);
 			void handleJIDsAdded(std::vector<JID> jids);
@@ -93,3 +93,3 @@ namespace Swift {
 			int lastPage_;
-			std::vector<Contact> contactVector_;
+			std::vector<Contact::ref> contactVector_;
 			SettingsProvider* settings_;
author	Richard Maudsley <richard.maudsley@isode.com>	2014-04-09 07:53:12 (GMT)
committer	Swift Review <review@swift.im>	2014-04-22 21:12:21 (GMT)
commit	a7fb55381ab4a5c470bf891b31ac6e201611a2c1 (patch)
tree	475b3b7fc0142946863580506b00aa250ef8ca14 /Swift/QtUI/UserSearch
parent	4444aeb255f8d1712b794c31166f362bb3ec335a (diff)
download	swift-contrib-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.zip swift-contrib-a7fb55381ab4a5c470bf891b31ac6e201611a2c1.tar.bz2