1 files changed, 23 insertions, 15 deletions
diff --git a/Swift/Controllers/BlockListController.h b/Swift/Controllers/BlockListController.h
index 4c9caad..c1f6fee 100644
--- a/Swift/Controllers/BlockListController.h
+++ b/Swift/Controllers/BlockListController.h
@@ -4,11 +4,18 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 #include <Swiften/Queries/GenericRequest.h>
+
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 #include <Swift/Controllers/UIInterfaces/BlockListEditorWidgetFactory.h>
 
@@ -21,28 +28,29 @@ class EventController;
 
 class BlockListController {
 public:
-	BlockListController(ClientBlockListManager* blockListManager, UIEventStream* uiEventStream, BlockListEditorWidgetFactory* blockListEditorWidgetFactory, EventController* eventController);
-	~BlockListController();
+    BlockListController(ClientBlockListManager* blockListManager, UIEventStream* uiEventStream, BlockListEditorWidgetFactory* blockListEditorWidgetFactory, EventController* eventController);
+    ~BlockListController();
 
 private:
-	void blockListDifferences(const std::vector<JID> &newBlockList, std::vector<JID>& jidsToUnblock, std::vector<JID>& jidsToBlock) const;
+    void blockListDifferences(const std::vector<JID> &newBlockList, std::vector<JID>& jidsToUnblock, std::vector<JID>& jidsToBlock) const;
 
-	void handleUIEvent(boost::shared_ptr<UIEvent> event);
+    void handleUIEvent(std::shared_ptr<UIEvent> event);
 
-	void handleBlockResponse(GenericRequest<BlockPayload>::ref, boost::shared_ptr<BlockPayload>, ErrorPayload::ref error, const std::vector<JID>& jids, bool originEditor);
-	void handleUnblockResponse(GenericRequest<UnblockPayload>::ref, boost::shared_ptr<UnblockPayload>, ErrorPayload::ref error, const std::vector<JID>& jids, bool originEditor);
+    void handleBlockResponse(GenericRequest<BlockPayload>::ref, std::shared_ptr<BlockPayload>, ErrorPayload::ref error, const std::vector<JID>& jids, bool originEditor);
+    void handleUnblockResponse(GenericRequest<UnblockPayload>::ref, std::shared_ptr<UnblockPayload>, ErrorPayload::ref error, const std::vector<JID>& jids, bool originEditor);
 
-	void handleSetNewBlockList(const std::vector<JID>& newBlockList);
+    void handleSetNewBlockList(const std::vector<JID>& newBlockList);
 
-	void handleBlockListChanged();
+    void handleBlockListChanged();
 
 private:
-	ClientBlockListManager* blockListManager_;
-	BlockListEditorWidgetFactory* blockListEditorWidgetFactory_;
-	BlockListEditorWidget* blockListEditorWidget_;
-	EventController* eventController_;
-	std::vector<JID> blockListBeforeEdit;
-	int remainingRequests_;
+    ClientBlockListManager* blockListManager_;
+    BlockListEditorWidgetFactory* blockListEditorWidgetFactory_;
+    BlockListEditorWidget* blockListEditorWidget_;
+    EventController* eventController_;
+    std::vector<JID> blockListBeforeEdit;
+    int remainingRequests_;
+    UIEventStream* uiEventStream_;
 };
 
 }