Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-09-17 18:01:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-09-17 18:01:03 (GMT) |
| commit | 3d6aa3b50090c19b50ae488494f1459bade88da3 (patch) | |
| tree | 60db50a40f01d2dc4b48e5aee1011f0e72643c39 /Swiften/Elements | |
| parent | 7693734b10699b5fc4bfc3d7dc33128d558e202d (diff) | |
| download | swift-contrib-3d6aa3b50090c19b50ae488494f1459bade88da3.zip swift-contrib-3d6aa3b50090c19b50ae488494f1459bade88da3.tar.bz2 | |
Support for building swiften as a DLL
Added missing SWIFTEN_API declarations.
Changed test infrastructure to extend path before running
tests.
Diffstat (limited to 'Swiften/Elements')
| -rw-r--r-- | Swiften/Elements/RosterItemExchangePayload.h | 6 | ||||
| -rw-r--r-- | Swiften/Elements/RosterPayload.h | 3 | ||||
| -rw-r--r-- | Swiften/Elements/StatusShow.h | 3 | ||||
| -rw-r--r-- | Swiften/Elements/StreamFeatures.h | 3 | ||||
| -rw-r--r-- | Swiften/Elements/StreamManagementEnabled.h | 3 | ||||
| -rw-r--r-- | Swiften/Elements/Whiteboard/WhiteboardColor.h | 4 |
6 files changed, 14 insertions, 8 deletions
diff --git a/Swiften/Elements/RosterItemExchangePayload.h b/Swiften/Elements/RosterItemExchangePayload.h index f9aa2c8..622c775 100644 --- a/Swiften/Elements/RosterItemExchangePayload.h +++ b/Swiften/Elements/RosterItemExchangePayload.h @@ -9,18 +9,18 @@ #include <vector> #include <string> #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Elements/Payload.h> #include <Swiften/JID/JID.h> - namespace Swift { - class RosterItemExchangePayload : public Payload { + class SWIFTEN_API RosterItemExchangePayload : public Payload { public: typedef boost::shared_ptr<RosterItemExchangePayload> ref; - class Item { + class SWIFTEN_API Item { public: enum Action { Add, Modify, Delete }; Item(Action action = Add); diff --git a/Swiften/Elements/RosterPayload.h b/Swiften/Elements/RosterPayload.h index c4907cb..47d27f2 100644 --- a/Swiften/Elements/RosterPayload.h +++ b/Swiften/Elements/RosterPayload.h @@ -9,14 +9,15 @@ #include <vector> #include <boost/optional.hpp> #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Elements/RosterItemPayload.h> #include <Swiften/Elements/Payload.h> namespace Swift { - class RosterPayload : public Payload { + class SWIFTEN_API RosterPayload : public Payload { public: typedef boost::shared_ptr<RosterPayload> ref; typedef std::vector<RosterItemPayload> RosterItemPayloads; diff --git a/Swiften/Elements/StatusShow.h b/Swiften/Elements/StatusShow.h index cd3477e..3eeb44e 100644 --- a/Swiften/Elements/StatusShow.h +++ b/Swiften/Elements/StatusShow.h @@ -5,12 +5,13 @@ */ #pragma once +#include <Swiften/Base/API.h> #include <Swiften/Elements/Payload.h> namespace Swift { - class StatusShow : public Payload { + class SWIFTEN_API StatusShow : public Payload { public: enum Type { Online, Away, FFC, XA, DND, None }; StatusShow(const Type& type = Online); diff --git a/Swiften/Elements/StreamFeatures.h b/Swiften/Elements/StreamFeatures.h index cae5532..5e7b6c9 100644 --- a/Swiften/Elements/StreamFeatures.h +++ b/Swiften/Elements/StreamFeatures.h @@ -9,12 +9,13 @@ #include <vector> #include <string> #include <boost/shared_ptr.hpp> +#include <Swiften/Base/API.h> #include <Swiften/Elements/Element.h> namespace Swift { - class StreamFeatures : public Element { + class SWIFTEN_API StreamFeatures : public Element { public: typedef boost::shared_ptr<StreamFeatures> ref; StreamFeatures() : hasStartTLS_(false), hasResourceBind_(false), hasSession_(false), hasStreamManagement_(false), hasRosterVersioning_(false) {} diff --git a/Swiften/Elements/StreamManagementEnabled.h b/Swiften/Elements/StreamManagementEnabled.h index 02e77f3..0985574 100644 --- a/Swiften/Elements/StreamManagementEnabled.h +++ b/Swiften/Elements/StreamManagementEnabled.h @@ -7,12 +7,13 @@ #pragma once #include <string> +#include <Swiften/Base/API.h> #include <Swiften/Elements/Element.h> namespace Swift { - class StreamManagementEnabled : public Element { + class SWIFTEN_API StreamManagementEnabled : public Element { public: StreamManagementEnabled(); ~StreamManagementEnabled(); diff --git a/Swiften/Elements/Whiteboard/WhiteboardColor.h b/Swiften/Elements/Whiteboard/WhiteboardColor.h index a940338..3b3d93c 100644 --- a/Swiften/Elements/Whiteboard/WhiteboardColor.h +++ b/Swiften/Elements/Whiteboard/WhiteboardColor.h @@ -7,10 +7,12 @@ #pragma once #include <string> +#include <Swiften/Base/API.h> + namespace Swift { - class WhiteboardColor { + class SWIFTEN_API WhiteboardColor { public: WhiteboardColor(); WhiteboardColor(int red, int green, int blue, int alpha = 255); WhiteboardColor(const std::string& hex); |