Swift
summaryrefslogtreecommitdiffstats
path: root/Swift
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
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')
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.h2
-rw-r--r--Swift/Controllers/Chat/MUCController.h2
-rw-r--r--Swift/Controllers/Chat/MUCSearchController.h2
-rw-r--r--Swift/Controllers/EventController.h2
-rw-r--r--Swift/Controllers/MainController.h2
-rw-r--r--Swift/Controllers/RosterController.h2
-rw-r--r--Swift/Controllers/UIEvents/UIEventStream.h2
-rw-r--r--Swift/Controllers/UIInterfaces/ChatWindow.h2
-rw-r--r--Swift/Controllers/UIInterfaces/LoginWindow.h2
-rw-r--r--Swift/Controllers/UIInterfaces/MUCSearchWindow.h2
-rw-r--r--Swift/Controllers/UIInterfaces/MainWindow.h2
-rw-r--r--Swift/Controllers/XMLConsoleController.h2
-rw-r--r--Swift/Controllers/XMPPRosterController.h2
13 files changed, 13 insertions, 13 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"
diff --git a/Swift/Controllers/Chat/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index 247a942..950fcbb 100644
--- a/Swift/Controllers/Chat/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -7,7 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/signals/connection.hpp>
#include "Swiften/Base/String.h"
diff --git a/Swift/Controllers/Chat/MUCSearchController.h b/Swift/Controllers/Chat/MUCSearchController.h
index 6eba2a5..7250846 100644
--- a/Swift/Controllers/Chat/MUCSearchController.h
+++ b/Swift/Controllers/Chat/MUCSearchController.h
@@ -10,7 +10,7 @@
#include <map>
#include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include "Swiften/Base/String.h"
#include "Swiften/JID/JID.h"
diff --git a/Swift/Controllers/EventController.h b/Swift/Controllers/EventController.h
index af230e9..4e44e33 100644
--- a/Swift/Controllers/EventController.h
+++ b/Swift/Controllers/EventController.h
@@ -8,7 +8,7 @@
#define SWIFTEN_EventController_H
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 63e77f2..5d8897e 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -6,7 +6,7 @@
#pragma once
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/Swift/Controllers/RosterController.h b/Swift/Controllers/RosterController.h
index eca4e33..9e43a85 100644
--- a/Swift/Controllers/RosterController.h
+++ b/Swift/Controllers/RosterController.h
@@ -14,7 +14,7 @@
#include "Swiften/Avatars/AvatarManager.h"
#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Controllers/UIEvents/UIEventStream.h b/Swift/Controllers/UIEvents/UIEventStream.h
index 38ae9ef..151b4f1 100644
--- a/Swift/Controllers/UIEvents/UIEventStream.h
+++ b/Swift/Controllers/UIEvents/UIEventStream.h
@@ -6,7 +6,7 @@
#pragma once
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
#include "Swift/Controllers/UIEvents/UIEvent.h"
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 33133f3..36a1e0e 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -8,7 +8,7 @@
#define SWIFTEN_CHATWINDOW_H
#include <boost/optional.hpp>
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
#include <vector>
diff --git a/Swift/Controllers/UIInterfaces/LoginWindow.h b/Swift/Controllers/UIInterfaces/LoginWindow.h
index 15c2827..48d7265 100644
--- a/Swift/Controllers/UIInterfaces/LoginWindow.h
+++ b/Swift/Controllers/UIInterfaces/LoginWindow.h
@@ -9,7 +9,7 @@
#include "Swiften/Base/String.h"
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
index 3114a5a..0197a94 100644
--- a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
+++ b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
@@ -6,7 +6,7 @@
#pragma once
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include "Swiften/Base/String.h"
#include "Swiften/JID/JID.h"
diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h
index 6d6e980..3526dd3 100644
--- a/Swift/Controllers/UIInterfaces/MainWindow.h
+++ b/Swift/Controllers/UIInterfaces/MainWindow.h
@@ -11,7 +11,7 @@
#include "Swiften/JID/JID.h"
#include "Swiften/Elements/StatusShow.h"
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
namespace Swift {
diff --git a/Swift/Controllers/XMLConsoleController.h b/Swift/Controllers/XMLConsoleController.h
index 7fab1b9..c7b6841 100644
--- a/Swift/Controllers/XMLConsoleController.h
+++ b/Swift/Controllers/XMLConsoleController.h
@@ -6,7 +6,7 @@
#pragma once
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/Swift/Controllers/XMPPRosterController.h b/Swift/Controllers/XMPPRosterController.h
index a741469..8ecd3e4 100644
--- a/Swift/Controllers/XMPPRosterController.h
+++ b/Swift/Controllers/XMPPRosterController.h
@@ -12,7 +12,7 @@
#include "Swiften/Elements/RosterPayload.h"
#include "Swiften/Queries/Responders/RosterPushResponder.h"
-#include <boost/signals.hpp>
+#include "Swiften/Base/boost_signalslib.h"
#include <boost/shared_ptr.hpp>
namespace Swift {