summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/AdHocManager.h')
-rw-r--r--Swift/Controllers/AdHocManager.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/Swift/Controllers/AdHocManager.h b/Swift/Controllers/AdHocManager.h
index 3a908ec..20e5db7 100644
--- a/Swift/Controllers/AdHocManager.h
+++ b/Swift/Controllers/AdHocManager.h
@@ -4,17 +4,21 @@
* 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/Client/Client.h>
+#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;
@@ -31,7 +35,7 @@ public:
private:
void handleServerDiscoItemsResponse(std::shared_ptr<DiscoItems>, ErrorPayload::ref error);
void handleUIEvent(std::shared_ptr<UIEvent> event);
- boost::signal<void (const AdHocController&)> onControllerComplete;
+ boost::signals2::signal<void (const AdHocController&)> onControllerComplete;
JID jid_;
IQRouter* iqRouter_;
UIEventStream* uiEventStream_;