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 /Swift/Controllers/Chat/ChatControllerBase.h
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 'Swift/Controllers/Chat/ChatControllerBase.h')
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h
index f7cf087..c274b5a 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.h
+++ b/Swift/Controllers/Chat/ChatControllerBase.h
@@ -10,7 +10,7 @@
#include <map>
#include <vector>
#include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/filesystem.hpp>
#include "Swiften/Base/String.h"