Swiftdiff options
| author | Richard Maudsley <richard.maudsley@isode.com> | 2014-04-28 15:36:22 (GMT) |
|---|---|---|
| committer | Richard Maudsley <richard.maudsley@isode.com> | 2014-04-28 15:41:57 (GMT) |
| commit | c4b64106e7b9493c7b28cc653797457d5f7fbdda (patch) | |
| tree | 8ff1bde1f9ade25561408f02de530f1386b32180 | |
| parent | be642f17bfa2df7cb88ddb5fb4aa37438d9e2110 (diff) | |
| download | swift-contrib-c4b64106e7b9493c7b28cc653797457d5f7fbdda.zip swift-contrib-c4b64106e7b9493c7b28cc653797457d5f7fbdda.tar.bz2 | |
Make ToplevelElement and Payload inherit from Element.
Change-Id: I962e59a25e49d593c62fa852d60e178f349eb3c4
| -rw-r--r-- | Swiften/Elements/Element.cpp | 14 | ||||
| -rw-r--r-- | Swiften/Elements/Element.h | 16 | ||||
| -rw-r--r-- | Swiften/Elements/Payload.h | 4 | ||||
| -rw-r--r-- | Swiften/Elements/ToplevelElement.h | 3 | ||||
| -rw-r--r-- | Swiften/SConscript | 1 |
5 files changed, 35 insertions, 3 deletions
diff --git a/Swiften/Elements/Element.cpp b/Swiften/Elements/Element.cpp new file mode 100644 index 0000000..6014ea2 --- /dev/null +++ b/Swiften/Elements/Element.cpp @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2010-2014 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#include <Swiften/Elements/Element.h> + +namespace Swift { + +Element::~Element() { +} + +} diff --git a/Swiften/Elements/Element.h b/Swiften/Elements/Element.h new file mode 100644 index 0000000..d07dae2 --- /dev/null +++ b/Swiften/Elements/Element.h @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2010-2014 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include <Swiften/Base/API.h> + +namespace Swift { + class SWIFTEN_API Element { + public: + virtual ~Element(); + }; +} diff --git a/Swiften/Elements/Payload.h b/Swiften/Elements/Payload.h index 7d6789c..7cc00da 100644 --- a/Swiften/Elements/Payload.h +++ b/Swiften/Elements/Payload.h @@ -1,25 +1,25 @@ /* * Copyright (c) 2010-2014 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #pragma once #include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Elements/ToplevelElement.h> +#include <Swiften/Elements/Element.h> namespace Swift { - class SWIFTEN_API Payload : public ToplevelElement { + class SWIFTEN_API Payload : public Element { public: typedef boost::shared_ptr<Payload> ref; public: Payload() {} SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Payload) virtual ~Payload(); SWIFTEN_DEFAULT_COPY_ASSIGMNENT_OPERATOR(Payload) }; } diff --git a/Swiften/Elements/ToplevelElement.h b/Swiften/Elements/ToplevelElement.h index b3f60c7..bce90b9 100644 --- a/Swiften/Elements/ToplevelElement.h +++ b/Swiften/Elements/ToplevelElement.h @@ -1,18 +1,19 @@ /* * Copyright (c) 2010-2014 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #pragma once #include <Swiften/Base/API.h> +#include <Swiften/Elements/Element.h> namespace Swift { - class SWIFTEN_API ToplevelElement { + class SWIFTEN_API ToplevelElement : public Element { public: ToplevelElement() {} SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(ToplevelElement) virtual ~ToplevelElement(); }; } diff --git a/Swiften/SConscript b/Swiften/SConscript index d898bfa..7656c83 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -90,70 +90,71 @@ if env["SCONS_STAGE"] == "build" : swiften_env.UseFlags(swiften_env["PLATFORM_FLAGS"]) if swiften_env["SWIFTEN_DLL"] : swiften_env.AddMethod(lambda e,l,o : e.SharedLibrary(l,o), "SwiftenLibrary") else : swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"]) swiften_env.AddMethod(lambda e,l,o : e.StaticLibrary(l,o), "SwiftenLibrary") Export("swiften_env") # TODO: Move all this to a submodule SConscript sources = [ "Chat/ChatStateTracker.cpp", "Chat/ChatStateNotifier.cpp", "Client/ClientSessionStanzaChannel.cpp", "Client/CoreClient.cpp", "Client/Client.cpp", "Client/ClientXMLTracer.cpp", "Client/ClientSession.cpp", "Client/BlockList.cpp", "Client/BlockListImpl.cpp", "Client/ClientBlockListManager.cpp", "Client/MemoryStorages.cpp", "Client/NickResolver.cpp", "Client/NickManager.cpp", "Client/NickManagerImpl.cpp", "Client/Storages.cpp", "Client/XMLBeautifier.cpp", "Compress/ZLibCodecompressor.cpp", "Compress/ZLibDecompressor.cpp", "Compress/ZLibCompressor.cpp", "Elements/DiscoInfo.cpp", "Elements/Presence.cpp", "Elements/Form.cpp", "Elements/FormField.cpp", "Elements/StreamFeatures.cpp", + "Elements/Element.cpp", "Elements/ToplevelElement.cpp", "Elements/IQ.cpp", "Elements/Payload.cpp", "Elements/PubSubPayload.cpp", "Elements/PubSubOwnerPayload.cpp", "Elements/PubSubEventPayload.cpp", "Elements/RosterItemExchangePayload.cpp", "Elements/RosterPayload.cpp", "Elements/SecurityLabel.cpp", "Elements/Stanza.cpp", "Elements/StanzaAck.cpp", "Elements/StatusShow.cpp", "Elements/StreamManagementEnabled.cpp", "Elements/StreamResume.cpp", "Elements/StreamResumed.cpp", "Elements/UserLocation.cpp", "Elements/UserTune.cpp", "Elements/VCard.cpp", "Elements/MUCOccupant.cpp", "Elements/ResultSet.cpp", "Elements/Forwarded.cpp", "Elements/MAMResult.cpp", "Elements/MAMQuery.cpp", "Elements/MAMArchived.cpp", "Entity/Entity.cpp", "Entity/PayloadPersister.cpp", "MUC/MUC.cpp", "MUC/MUCImpl.cpp", "MUC/MUCManager.cpp", "MUC/MUCRegistry.cpp", "MUC/MUCBookmarkManager.cpp", "PubSub/PubSubManager.cpp", "PubSub/PubSubManagerImpl.cpp", "Queries/IQChannel.cpp", "Queries/IQHandler.cpp", |