summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-02 18:54:54 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-02 18:56:06 (GMT)
commit9a0d8edbcb89c8d83839c4131425c1a1c598fca4 (patch)
tree1cad70f294b2d7f73ef7c54a4207513b9307c90c /Swiften/MUC
parent721b89dee808c822db1a4211d58b3dd9fae55e62 (diff)
downloadswift-9a0d8edbcb89c8d83839c4131425c1a1c598fca4.zip
swift-9a0d8edbcb89c8d83839c4131425c1a1c598fca4.tar.bz2
Using Boost workaround for Qt signals keyword clash.
This should allow us to link against system boost versions.
Diffstat (limited to 'Swiften/MUC')
-rw-r--r--Swiften/MUC/MUC.h2
-rw-r--r--Swiften/MUC/MUCBookmarkManager.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index fc691f1..d7fee2c 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -13,7 +13,7 @@
#include "Swiften/MUC/MUCOccupant.h"
#include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/signals/connection.hpp>
#include <map>
diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h
index 136c76f..f2d7ae1 100644
--- a/Swiften/MUC/MUCBookmarkManager.h
+++ b/Swiften/MUC/MUCBookmarkManager.h
@@ -9,7 +9,7 @@
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/optional.hpp>
#include "Swiften/MUC/MUCBookmark.h"