1 files changed, 28 insertions, 21 deletions
diff --git a/Swift/Controllers/AdHocManager.h b/Swift/Controllers/AdHocManager.h
index 00289b0..0786370 100644
--- a/Swift/Controllers/AdHocManager.h
+++ b/Swift/Controllers/AdHocManager.h
@@ -1,44 +1,51 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
+#pragma once
+
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/JID/JID.h>
+#include <boost/signals2.hpp>
+
+#include <Swiften/Disco/GetDiscoItemsRequest.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Elements/ErrorPayload.h>
-#include <Swiften/Disco/GetDiscoItemsRequest.h>
-#include <Swiften/Client/Client.h>
-#include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/AdHocController.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
 
 namespace Swift {
 class IQRouter;
 class MainWindow;
 class UIEventStream;
 class AdHocCommandWindowFactory;
+
 class AdHocManager {
 public:
-	AdHocManager(const JID& jid, AdHocCommandWindowFactory* factory, IQRouter* iqRouter, UIEventStream* uiEventStream, MainWindow* mainWindow);
-	~AdHocManager();
-	void removeController(boost::shared_ptr<AdHocController> contoller);
-	void setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info);
-	void setOnline(bool online);
+    AdHocManager(const JID& jid, AdHocCommandWindowFactory* factory, IQRouter* iqRouter, UIEventStream* uiEventStream, MainWindow* mainWindow);
+    ~AdHocManager();
+    void removeController(std::shared_ptr<AdHocController> contoller);
+    void setServerDiscoInfo(std::shared_ptr<DiscoInfo> info);
+    void setOnline(bool online);
+
+private:
+    void handleServerDiscoItemsResponse(std::shared_ptr<DiscoItems>, ErrorPayload::ref error);
+    void handleUIEvent(std::shared_ptr<UIEvent> event);
+    boost::signals2::signal<void (const AdHocController&)> onControllerComplete;
+
 private:
-	void handleServerDiscoItemsResponse(boost::shared_ptr<DiscoItems>, ErrorPayload::ref error);
-	void handleUIEvent(boost::shared_ptr<UIEvent> event);
-	boost::signal<void (const AdHocController&)> onControllerComplete;
-	JID jid_;
-	IQRouter* iqRouter_;
-	UIEventStream* uiEventStream_;
-	MainWindow* mainWindow_;
-	AdHocCommandWindowFactory* factory_;
-	GetDiscoItemsRequest::ref discoItemsRequest_;
-	std::vector<boost::shared_ptr<AdHocController> > controllers_;
+    JID jid_;
+    IQRouter* iqRouter_;
+    UIEventStream* uiEventStream_;
+    MainWindow* mainWindow_;
+    AdHocCommandWindowFactory* factory_;
+    GetDiscoItemsRequest::ref discoItemsRequest_;
+    std::vector<std::shared_ptr<AdHocController> > controllers_;
 };
 
 }