1 files changed, 25 insertions, 14 deletions
diff --git a/Swift/Controllers/ContactSuggester.cpp b/Swift/Controllers/ContactSuggester.cpp
index f1104b0..41e0261 100644
--- a/Swift/Controllers/ContactSuggester.cpp
+++ b/Swift/Controllers/ContactSuggester.cpp
@@ -5,4 +5,10 @@
  */
 
+/*
+ * 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/Controllers/ContactSuggester.h>
 
@@ -35,10 +41,10 @@ void ContactSuggester::addContactProvider(ContactProvider* provider) {
 }
 
-bool ContactSuggester::matchContact(const std::string& search, const Contact& c) {
-	return fuzzyMatch(c.name, search) || fuzzyMatch(c.jid.toString(), search);
+bool ContactSuggester::matchContact(const std::string& search, const Contact::ref& c) {
+	return fuzzyMatch(c->name, search) || fuzzyMatch(c->jid.toString(), search);
 }
 
-std::vector<Contact> ContactSuggester::getSuggestions(const std::string& search) const {
-	std::vector<Contact> results;
+std::vector<Contact::ref> ContactSuggester::getSuggestions(const std::string& search) const {
+	std::vector<Contact::ref> results;
 
 	foreach(ContactProvider* provider, contactProviders_) {
@@ -46,12 +52,9 @@ std::vector<Contact> ContactSuggester::getSuggestions(const std::string& search)
 	}
 
-	std::sort(results.begin(), results.end(),
-		lambda::bind(&Contact::jid, lambda::_1) < lambda::bind(&Contact::jid, lambda::_2));
-	results.erase(std::unique(results.begin(), results.end(),
-		lambda::bind(&Contact::jid, lambda::_1) == lambda::bind(&Contact::jid, lambda::_2)),
-		results.end());
+	std::sort(results.begin(), results.end(), ContactSuggester::contactLexicographicalSortPredicate);
+	results.erase(std::unique(results.begin(), results.end(), ContactSuggester::contactEqualityPredicate), results.end());
 	results.erase(std::remove_if(results.begin(), results.end(), !lambda::bind(&ContactSuggester::matchContact, search, lambda::_1)),
 		results.end());
-	std::sort(results.begin(), results.end(), ContactSuggester::chatSortPredicate);
+	std::sort(results.begin(), results.end(), ContactSuggester::contactSmartSortPredicate);
 
 	return results;
@@ -70,9 +73,17 @@ bool ContactSuggester::fuzzyMatch(std::string text, std::string match) {
 }
 
-bool ContactSuggester::chatSortPredicate(const Contact& a, const Contact& b) {
-	if (a.statusType == b.statusType) {
-		return a.name.compare(b.name) < 0;
+bool ContactSuggester::contactLexicographicalSortPredicate(const Contact::ref& a, const Contact::ref& b) {
+	return a->jid < b->jid;
+}
+
+bool ContactSuggester::contactEqualityPredicate(const Contact::ref& a, const Contact::ref& b) {
+	return a->jid == b->jid;
+}
+
+bool ContactSuggester::contactSmartSortPredicate(const Contact::ref& a, const Contact::ref& b) {
+	if (a->statusType == b->statusType) {
+		return a->name.compare(b->name) < 0;
 	} else {
-		return a.statusType < b.statusType;
+		return a->statusType < b->statusType;
 	}
 }