1 files changed, 46 insertions, 38 deletions
diff --git a/Swift/QtUI/UserSearch/ContactListModel.h b/Swift/QtUI/UserSearch/ContactListModel.h
index e7f4a0b..026b01b 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.h
+++ b/Swift/QtUI/UserSearch/ContactListModel.h
@@ -4,55 +4,63 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <vector>
+
 #include <boost/bind.hpp>
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <QAbstractItemModel>
 
 #include <Swift/Controllers/Contact.h>
-#include <Swift/QtUI/ChatList/ChatListItem.h>
+
 #include <Swift/QtUI/ChatList/ChatListGroupItem.h>
+#include <Swift/QtUI/ChatList/ChatListItem.h>
 #include <Swift/QtUI/ChatList/ChatListRecentItem.h>
 
 namespace Swift {
-	class ContactListModel : public QAbstractItemModel {
-		Q_OBJECT
-		public:
-			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;
-
-			Qt::ItemFlags flags(const QModelIndex& index) const;
-			int columnCount(const QModelIndex& parent = QModelIndex()) const;
-			QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-			bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
-			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;
-
-		signals:
-			void onListChanged(std::vector<Contact> list);
-			void onJIDsDropped(const std::vector<JID>& contact);
-
-		private:
-			bool editable_;
-			std::vector<Contact> contacts_;
-	};
+    class ContactListModel : public QAbstractItemModel {
+        Q_OBJECT
+        public:
+            enum ContactRoles {
+                DetailTextRole = Qt::UserRole,
+                AvatarRole = Qt::UserRole + 1,
+                PresenceIconRole = Qt::UserRole + 2
+            };
+
+        public:
+            ContactListModel(bool editable);
+
+            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::ref& contact, int role) const;
+            QIcon getPresenceIconForContact(const Contact::ref& contact) const;
+
+        signals:
+            void onListChanged(std::vector<Contact::ref> list);
+            void onJIDsDropped(const std::vector<JID>& contact);
+
+        private:
+            bool editable_;
+            std::vector<Contact::ref> contacts_;
+    };
 
 }