Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Swiften/Client/MemoryStorages.cpp4
-rw-r--r--Swiften/Parser/GenericPayloadParser.h2
-rw-r--r--Swiften/Parser/GenericPayloadParserFactory.h2
-rw-r--r--Swiften/Parser/GenericPayloadParserFactory2.h2
-rw-r--r--Swiften/Parser/GenericPayloadTreeParser.h2
-rw-r--r--Swiften/Serializer/GenericPayloadSerializer.h2
6 files changed, 8 insertions, 6 deletions
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp
index f0f1493..fc65cd5 100644
--- a/Swiften/Client/MemoryStorages.cpp
+++ b/Swiften/Client/MemoryStorages.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2013 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -9,7 +9,9 @@
9#include <Swiften/Avatars/AvatarMemoryStorage.h> 9#include <Swiften/Avatars/AvatarMemoryStorage.h>
10#include <Swiften/Disco/CapsMemoryStorage.h> 10#include <Swiften/Disco/CapsMemoryStorage.h>
11#include <Swiften/Roster/RosterMemoryStorage.h> 11#include <Swiften/Roster/RosterMemoryStorage.h>
12#ifdef SWIFT_EXPERIMENTAL_HISTORY
12#include <Swiften/History/SQLiteHistoryStorage.h> 13#include <Swiften/History/SQLiteHistoryStorage.h>
14#endif
13 15
14namespace Swift { 16namespace Swift {
15 17
diff --git a/Swiften/Parser/GenericPayloadParser.h b/Swiften/Parser/GenericPayloadParser.h
index 7bc990a..b6cd2d7 100644
--- a/Swiften/Parser/GenericPayloadParser.h
+++ b/Swiften/Parser/GenericPayloadParser.h
@@ -23,7 +23,7 @@ namespace Swift {
23 * payload. 23 * payload.
24 */ 24 */
25 template<typename PAYLOAD_TYPE> 25 template<typename PAYLOAD_TYPE>
26 class SWIFTEN_API GenericPayloadParser : public PayloadParser { 26 class GenericPayloadParser : public PayloadParser {
27 public: 27 public:
28 GenericPayloadParser() : PayloadParser() { 28 GenericPayloadParser() : PayloadParser() {
29 payload_ = boost::make_shared<PAYLOAD_TYPE>(); 29 payload_ = boost::make_shared<PAYLOAD_TYPE>();
diff --git a/Swiften/Parser/GenericPayloadParserFactory.h b/Swiften/Parser/GenericPayloadParserFactory.h
index fd6d403..8e476c0 100644
--- a/Swiften/Parser/GenericPayloadParserFactory.h
+++ b/Swiften/Parser/GenericPayloadParserFactory.h
@@ -16,7 +16,7 @@ namespace Swift {
16 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class). 16 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class).
17 */ 17 */
18 template<typename PARSER_TYPE> 18 template<typename PARSER_TYPE>
19 class SWIFTEN_API GenericPayloadParserFactory : public PayloadParserFactory { 19 class GenericPayloadParserFactory : public PayloadParserFactory {
20 public: 20 public:
21 /** 21 /**
22 * Construct a parser factory that can parse the given top-level tag in the given namespace. 22 * Construct a parser factory that can parse the given top-level tag in the given namespace.
diff --git a/Swiften/Parser/GenericPayloadParserFactory2.h b/Swiften/Parser/GenericPayloadParserFactory2.h
index 09a2dbf..633050e 100644
--- a/Swiften/Parser/GenericPayloadParserFactory2.h
+++ b/Swiften/Parser/GenericPayloadParserFactory2.h
@@ -17,7 +17,7 @@ namespace Swift {
17 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class). 17 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class).
18 */ 18 */
19 template<typename PARSER_TYPE> 19 template<typename PARSER_TYPE>
20 class SWIFTEN_API GenericPayloadParserFactory2 : public PayloadParserFactory { 20 class GenericPayloadParserFactory2 : public PayloadParserFactory {
21 public: 21 public:
22 /** 22 /**
23 * Construct a parser factory that can parse the given top-level tag in the given namespace. 23 * Construct a parser factory that can parse the given top-level tag in the given namespace.
diff --git a/Swiften/Parser/GenericPayloadTreeParser.h b/Swiften/Parser/GenericPayloadTreeParser.h
index d90903c..37505ac 100644
--- a/Swiften/Parser/GenericPayloadTreeParser.h
+++ b/Swiften/Parser/GenericPayloadTreeParser.h
@@ -20,7 +20,7 @@ namespace Swift {
20 * Generic parser offering something a bit like a DOM to work with. 20 * Generic parser offering something a bit like a DOM to work with.
21 */ 21 */
22 template<typename PAYLOAD_TYPE> 22 template<typename PAYLOAD_TYPE>
23 class SWIFTEN_API GenericPayloadTreeParser : public GenericPayloadParser<PAYLOAD_TYPE> { 23 class GenericPayloadTreeParser : public GenericPayloadParser<PAYLOAD_TYPE> {
24 public: 24 public:
25 virtual void handleStartElement(const std::string& element, const std::string& xmlns, const AttributeMap& attributes) { 25 virtual void handleStartElement(const std::string& element, const std::string& xmlns, const AttributeMap& attributes) {
26 if (!root_) { 26 if (!root_) {
diff --git a/Swiften/Serializer/GenericPayloadSerializer.h b/Swiften/Serializer/GenericPayloadSerializer.h
index e964d80..f02ccda 100644
--- a/Swiften/Serializer/GenericPayloadSerializer.h
+++ b/Swiften/Serializer/GenericPayloadSerializer.h
@@ -13,7 +13,7 @@
13 13
14namespace Swift { 14namespace Swift {
15 template<typename PAYLOAD_TYPE> 15 template<typename PAYLOAD_TYPE>
16 class SWIFTEN_API GenericPayloadSerializer : public PayloadSerializer { 16 class GenericPayloadSerializer : public PayloadSerializer {
17 public: 17 public:
18 virtual std::string serialize(boost::shared_ptr<Payload> element) const { 18 virtual std::string serialize(boost::shared_ptr<Payload> element) const {
19 return serializePayload(boost::dynamic_pointer_cast<PAYLOAD_TYPE>(element)); 19 return serializePayload(boost::dynamic_pointer_cast<PAYLOAD_TYPE>(element));