Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-01-12 17:23:05 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-02-02 11:33:06 (GMT) |
| commit | 1b9ccc1fef6104eaf951153ddccdc6bb15899e9a (patch) | |
| tree | 428232448e9846265605820db6f380a5b98c018a /Swiften/Elements/Stanza.h | |
| parent | 3afd061b713ce5fff604dee62dec8410a1de6a9c (diff) | |
| download | swift-1b9ccc1fef6104eaf951153ddccdc6bb15899e9a.zip swift-1b9ccc1fef6104eaf951153ddccdc6bb15899e9a.tar.bz2 | |
Change stanza body to boost::optional<std::string> type
Changed MUCController to only handle message stanzas as
subject change if <subject/> is present and neither <body/>
nor <thread/> is present in the message stanza.
Test-Information:
Added unit tests verifying behavior described in XEP-0045
section 8.1.
Unit tests pass on OS X 10.11.2.
Change-Id: I1d22272da1675176be131ab360b214a98f20533f
Diffstat (limited to 'Swiften/Elements/Stanza.h')
| -rw-r--r-- | Swiften/Elements/Stanza.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Swiften/Elements/Stanza.h b/Swiften/Elements/Stanza.h index 41df894..8da6280 100644 --- a/Swiften/Elements/Stanza.h +++ b/Swiften/Elements/Stanza.h @@ -1,16 +1,17 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <vector> #include <string> -#include <boost/shared_ptr.hpp> -#include <boost/optional/optional_fwd.hpp> +#include <vector> + #include <boost/date_time/posix_time/ptime.hpp> +#include <boost/optional/optional_fwd.hpp> +#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> #include <Swiften/Elements/ToplevelElement.h> @@ -69,6 +70,7 @@ namespace Swift { void updatePayload(boost::shared_ptr<Payload> payload); + void removePayloadOfSameType(boost::shared_ptr<Payload>); boost::shared_ptr<Payload> getPayloadOfSameType(boost::shared_ptr<Payload>) const; const JID& getFrom() const { return from_; } |