Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-06-02 18:54:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-06-02 18:56:06 (GMT) |
| commit | 9a0d8edbcb89c8d83839c4131425c1a1c598fca4 (patch) | |
| tree | 1cad70f294b2d7f73ef7c54a4207513b9307c90c /Swiften/StreamStack | |
| parent | 721b89dee808c822db1a4211d58b3dd9fae55e62 (diff) | |
| download | swift-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/StreamStack')
| -rw-r--r-- | Swiften/StreamStack/CompressionLayer.h | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/ConnectionLayer.h | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/HighLayer.h | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/LowLayer.h | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/OpenSSLLayer.h | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/StreamLayer.h | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/StreamStack.h | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/XMPPLayer.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/StreamStack/CompressionLayer.h b/Swiften/StreamStack/CompressionLayer.h index cafdfc1..aa85f78 100644 --- a/Swiften/StreamStack/CompressionLayer.h +++ b/Swiften/StreamStack/CompressionLayer.h @@ -8,7 +8,7 @@ #define SWIFTEN_COMPRESSIONLAYER_H #include <boost/noncopyable.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/StreamStack/StreamLayer.h" diff --git a/Swiften/StreamStack/ConnectionLayer.h b/Swiften/StreamStack/ConnectionLayer.h index d4e508f..bba94d4 100644 --- a/Swiften/StreamStack/ConnectionLayer.h +++ b/Swiften/StreamStack/ConnectionLayer.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/StreamStack/LowLayer.h" diff --git a/Swiften/StreamStack/HighLayer.h b/Swiften/StreamStack/HighLayer.h index de02c55..41199cc 100644 --- a/Swiften/StreamStack/HighLayer.h +++ b/Swiften/StreamStack/HighLayer.h @@ -7,7 +7,7 @@ #ifndef SWIFTEN_HIGHLAYER_H #define SWIFTEN_HIGHLAYER_H -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" diff --git a/Swiften/StreamStack/LowLayer.h b/Swiften/StreamStack/LowLayer.h index 5c1860a..b493600 100644 --- a/Swiften/StreamStack/LowLayer.h +++ b/Swiften/StreamStack/LowLayer.h @@ -7,7 +7,7 @@ #ifndef SWIFTEN_LOWLAYER_H #define SWIFTEN_LOWLAYER_H -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" diff --git a/Swiften/StreamStack/OpenSSLLayer.h b/Swiften/StreamStack/OpenSSLLayer.h index 3e0c7a0..128569d 100644 --- a/Swiften/StreamStack/OpenSSLLayer.h +++ b/Swiften/StreamStack/OpenSSLLayer.h @@ -8,7 +8,7 @@ #define SWIFTEN_OpenSSLLayer_H #include <boost/noncopyable.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/Base/ByteArray.h" #include "Swiften/StreamStack/TLSLayer.h" diff --git a/Swiften/StreamStack/StreamLayer.h b/Swiften/StreamStack/StreamLayer.h index cb91657..6742012 100644 --- a/Swiften/StreamStack/StreamLayer.h +++ b/Swiften/StreamStack/StreamLayer.h @@ -7,7 +7,7 @@ #ifndef SWIFTEN_STREAMLAYER_H #define SWIFTEN_STREAMLAYER_H -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include "Swiften/StreamStack/LowLayer.h" #include "Swiften/StreamStack/HighLayer.h" diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h index 0f9245a..a641c55 100644 --- a/Swiften/StreamStack/StreamStack.h +++ b/Swiften/StreamStack/StreamStack.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <vector> #include "Swiften/Elements/Stanza.h" diff --git a/Swiften/StreamStack/XMPPLayer.h b/Swiften/StreamStack/XMPPLayer.h index 7037781..f45657a 100644 --- a/Swiften/StreamStack/XMPPLayer.h +++ b/Swiften/StreamStack/XMPPLayer.h @@ -7,7 +7,7 @@ #pragma once #include <boost/shared_ptr.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/noncopyable.hpp> #include "Swiften/Base/ByteArray.h" |