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/Roster | |
| parent | 721b89dee808c822db1a4211d58b3dd9fae55e62 (diff) | |
| download | swift-contrib-9a0d8edbcb89c8d83839c4131425c1a1c598fca4.zip swift-contrib-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/Roster')
| -rw-r--r-- | Swiften/Roster/ContactRosterItem.h | 2 | ||||
| -rw-r--r-- | Swiften/Roster/Roster.h | 2 | ||||
| -rw-r--r-- | Swiften/Roster/RosterItem.h | 2 | ||||
| -rw-r--r-- | Swiften/Roster/XMPPRoster.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Roster/ContactRosterItem.h b/Swiften/Roster/ContactRosterItem.h index bd49e05..51c4ade 100644 --- a/Swiften/Roster/ContactRosterItem.h +++ b/Swiften/Roster/ContactRosterItem.h @@ -14,7 +14,7 @@ #include <map> #include <boost/bind.hpp> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swiften/Roster/Roster.h b/Swiften/Roster/Roster.h index fcc075a..f6c751b 100644 --- a/Swiften/Roster/Roster.h +++ b/Swiften/Roster/Roster.h @@ -14,7 +14,7 @@ #include <vector> #include <map> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> namespace Swift { diff --git a/Swiften/Roster/RosterItem.h b/Swiften/Roster/RosterItem.h index 3a1a1b1..520a0f5 100644 --- a/Swiften/Roster/RosterItem.h +++ b/Swiften/Roster/RosterItem.h @@ -6,7 +6,7 @@ #pragma once -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" #include <boost/shared_ptr.hpp> #include "Swiften/Base/String.h" diff --git a/Swiften/Roster/XMPPRoster.h b/Swiften/Roster/XMPPRoster.h index 2e80b69..a193b34 100644 --- a/Swiften/Roster/XMPPRoster.h +++ b/Swiften/Roster/XMPPRoster.h @@ -13,7 +13,7 @@ #include <map> #include <vector> -#include <boost/signal.hpp> +#include "Swiften/Base/boost_signalslib.h" namespace Swift { |