From f2301a18167bc1221cc0b70b71692ce9d1021119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Sun, 29 Aug 2010 16:43:25 +0200 Subject: Renamed SessionManagement* to StreamManagement*. diff --git a/Swiften/Elements/EnableSessionManagement.h b/Swiften/Elements/EnableSessionManagement.h deleted file mode 100644 index f89ac2e..0000000 --- a/Swiften/Elements/EnableSessionManagement.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include "Swiften/Elements/Element.h" -#include "Swiften/Base/Shared.h" - -namespace Swift { - class EnableSessionManagement : public Element, public Shared { - public: - EnableSessionManagement() {} - }; -} diff --git a/Swiften/Elements/EnableStreamManagement.h b/Swiften/Elements/EnableStreamManagement.h new file mode 100644 index 0000000..3383e77 --- /dev/null +++ b/Swiften/Elements/EnableStreamManagement.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include "Swiften/Elements/Element.h" +#include "Swiften/Base/Shared.h" + +namespace Swift { + class EnableStreamManagement : public Element, public Shared { + public: + EnableStreamManagement() {} + }; +} diff --git a/Swiften/Elements/SessionManagementEnabled.h b/Swiften/Elements/SessionManagementEnabled.h deleted file mode 100644 index 1645ca4..0000000 --- a/Swiften/Elements/SessionManagementEnabled.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include "Swiften/Elements/Element.h" -#include "Swiften/Base/Shared.h" - -namespace Swift { - class SessionManagementEnabled : public Element, public Shared { - public: - SessionManagementEnabled() {} - }; -} diff --git a/Swiften/Elements/SessionManagementFailed.h b/Swiften/Elements/SessionManagementFailed.h deleted file mode 100644 index e71f2a6..0000000 --- a/Swiften/Elements/SessionManagementFailed.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include "Swiften/Elements/Element.h" -#include "Swiften/Base/Shared.h" - -namespace Swift { - class SessionManagementFailed : public Element, public Shared { - public: - SessionManagementFailed() {} - }; -} diff --git a/Swiften/Elements/StreamManagementEnabled.h b/Swiften/Elements/StreamManagementEnabled.h new file mode 100644 index 0000000..12cff51 --- /dev/null +++ b/Swiften/Elements/StreamManagementEnabled.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include "Swiften/Elements/Element.h" +#include "Swiften/Base/Shared.h" + +namespace Swift { + class StreamManagementEnabled : public Element, public Shared { + public: + StreamManagementEnabled() {} + }; +} diff --git a/Swiften/Elements/StreamManagementFailed.h b/Swiften/Elements/StreamManagementFailed.h new file mode 100644 index 0000000..e95d767 --- /dev/null +++ b/Swiften/Elements/StreamManagementFailed.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include "Swiften/Elements/Element.h" +#include "Swiften/Base/Shared.h" + +namespace Swift { + class StreamManagementFailed : public Element, public Shared { + public: + StreamManagementFailed() {} + }; +} diff --git a/Swiften/Parser/EnableSessionManagementParser.h b/Swiften/Parser/EnableSessionManagementParser.h deleted file mode 100644 index 8a878fd..0000000 --- a/Swiften/Parser/EnableSessionManagementParser.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include "Swiften/Parser/GenericElementParser.h" -#include "Swiften/Elements/EnableSessionManagement.h" - -namespace Swift { - class EnableSessionManagementParser : public GenericElementParser { - public: - EnableSessionManagementParser() : GenericElementParser() {} - }; -} diff --git a/Swiften/Parser/EnableStreamManagementParser.h b/Swiften/Parser/EnableStreamManagementParser.h new file mode 100644 index 0000000..bd86420 --- /dev/null +++ b/Swiften/Parser/EnableStreamManagementParser.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include "Swiften/Parser/GenericElementParser.h" +#include "Swiften/Elements/EnableStreamManagement.h" + +namespace Swift { + class EnableStreamManagementParser : public GenericElementParser { + public: + EnableStreamManagementParser() : GenericElementParser() {} + }; +} diff --git a/Swiften/Parser/SessionManagementEnabledParser.h b/Swiften/Parser/SessionManagementEnabledParser.h deleted file mode 100644 index 968ea3e..0000000 --- a/Swiften/Parser/SessionManagementEnabledParser.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include "Swiften/Parser/GenericElementParser.h" -#include "Swiften/Elements/SessionManagementEnabled.h" - -namespace Swift { - class SessionManagementEnabledParser : public GenericElementParser { - public: - SessionManagementEnabledParser() : GenericElementParser() {} - }; -} diff --git a/Swiften/Parser/SessionManagementFailedParser.h b/Swiften/Parser/SessionManagementFailedParser.h deleted file mode 100644 index 945cade..0000000 --- a/Swiften/Parser/SessionManagementFailedParser.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include "Swiften/Parser/GenericElementParser.h" -#include "Swiften/Elements/SessionManagementFailed.h" - -namespace Swift { - class SessionManagementFailedParser : public GenericElementParser { - public: - SessionManagementFailedParser() : GenericElementParser() {} - }; -} diff --git a/Swiften/Parser/StreamManagementEnabledParser.h b/Swiften/Parser/StreamManagementEnabledParser.h new file mode 100644 index 0000000..adc45ab --- /dev/null +++ b/Swiften/Parser/StreamManagementEnabledParser.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include "Swiften/Parser/GenericElementParser.h" +#include "Swiften/Elements/StreamManagementEnabled.h" + +namespace Swift { + class StreamManagementEnabledParser : public GenericElementParser { + public: + StreamManagementEnabledParser() : GenericElementParser() {} + }; +} diff --git a/Swiften/Parser/StreamManagementFailedParser.h b/Swiften/Parser/StreamManagementFailedParser.h new file mode 100644 index 0000000..07f5935 --- /dev/null +++ b/Swiften/Parser/StreamManagementFailedParser.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include "Swiften/Parser/GenericElementParser.h" +#include "Swiften/Elements/StreamManagementFailed.h" + +namespace Swift { + class StreamManagementFailedParser : public GenericElementParser { + public: + StreamManagementFailedParser() : GenericElementParser() {} + }; +} diff --git a/Swiften/Parser/XMPPParser.cpp b/Swiften/Parser/XMPPParser.cpp index 9b8a604..034077e 100644 --- a/Swiften/Parser/XMPPParser.cpp +++ b/Swiften/Parser/XMPPParser.cpp @@ -25,9 +25,9 @@ #include "Swiften/Parser/AuthFailureParser.h" #include "Swiften/Parser/AuthChallengeParser.h" #include "Swiften/Parser/AuthResponseParser.h" -#include "Swiften/Parser/EnableSessionManagementParser.h" -#include "Swiften/Parser/SessionManagementEnabledParser.h" -#include "Swiften/Parser/SessionManagementFailedParser.h" +#include "Swiften/Parser/EnableStreamManagementParser.h" +#include "Swiften/Parser/StreamManagementEnabledParser.h" +#include "Swiften/Parser/StreamManagementFailedParser.h" #include "Swiften/Parser/StanzaAckParser.h" #include "Swiften/Parser/StanzaAckRequestParser.h" #include "Swiften/Parser/StartTLSParser.h" @@ -165,13 +165,13 @@ ElementParser* XMPPParser::createElementParser(const String& element, const Stri return new TLSProceedParser(); } else if (element == "enable" && ns == "urn:xmpp:sm:2") { - return new EnableSessionManagementParser(); + return new EnableStreamManagementParser(); } else if (element == "enabled" && ns == "urn:xmpp:sm:2") { - return new SessionManagementEnabledParser(); + return new StreamManagementEnabledParser(); } else if (element == "failed" && ns == "urn:xmpp:sm:2") { - return new SessionManagementFailedParser(); + return new StreamManagementFailedParser(); } else if (element == "a" && ns == "urn:xmpp:sm:2") { return new StanzaAckParser(); diff --git a/Swiften/Serializer/EnableSessionManagementSerializer.h b/Swiften/Serializer/EnableSessionManagementSerializer.h deleted file mode 100644 index 0820cdf..0000000 --- a/Swiften/Serializer/EnableSessionManagementSerializer.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include - -#include "Swiften/Elements/EnableSessionManagement.h" -#include "Swiften/Serializer/GenericElementSerializer.h" -#include "Swiften/Serializer/XML/XMLElement.h" - -namespace Swift { - class EnableSessionManagementSerializer : public GenericElementSerializer { - public: - EnableSessionManagementSerializer() : GenericElementSerializer() { - } - - virtual String serialize(boost::shared_ptr) const { - return XMLElement("enable", "urn:xmpp:sm:2").serialize(); - } - }; -} diff --git a/Swiften/Serializer/EnableStreamManagementSerializer.h b/Swiften/Serializer/EnableStreamManagementSerializer.h new file mode 100644 index 0000000..c5a5011 --- /dev/null +++ b/Swiften/Serializer/EnableStreamManagementSerializer.h @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include + +#include "Swiften/Elements/EnableStreamManagement.h" +#include "Swiften/Serializer/GenericElementSerializer.h" +#include "Swiften/Serializer/XML/XMLElement.h" + +namespace Swift { + class EnableStreamManagementSerializer : public GenericElementSerializer { + public: + EnableStreamManagementSerializer() : GenericElementSerializer() { + } + + virtual String serialize(boost::shared_ptr) const { + return XMLElement("enable", "urn:xmpp:sm:2").serialize(); + } + }; +} diff --git a/Swiften/Serializer/SessionManagementEnabledSerializer.h b/Swiften/Serializer/SessionManagementEnabledSerializer.h deleted file mode 100644 index 4c492b7..0000000 --- a/Swiften/Serializer/SessionManagementEnabledSerializer.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include - -#include "Swiften/Elements/SessionManagementEnabled.h" -#include "Swiften/Serializer/GenericElementSerializer.h" -#include "Swiften/Serializer/XML/XMLElement.h" - -namespace Swift { - class SessionManagementEnabledSerializer : public GenericElementSerializer { - public: - SessionManagementEnabledSerializer() : GenericElementSerializer() { - } - - virtual String serialize(boost::shared_ptr) const { - return XMLElement("enabled", "urn:xmpp:sm:2").serialize(); - } - }; -} diff --git a/Swiften/Serializer/SessionManagementFailedSerializer.h b/Swiften/Serializer/SessionManagementFailedSerializer.h deleted file mode 100644 index ecc0cb8..0000000 --- a/Swiften/Serializer/SessionManagementFailedSerializer.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include - -#include "Swiften/Elements/SessionManagementFailed.h" -#include "Swiften/Serializer/GenericElementSerializer.h" -#include "Swiften/Serializer/XML/XMLElement.h" - -namespace Swift { - class SessionManagementFailedSerializer : public GenericElementSerializer { - public: - SessionManagementFailedSerializer() : GenericElementSerializer() { - } - - virtual String serialize(boost::shared_ptr) const { - return XMLElement("failed", "urn:xmpp:sm:2").serialize(); - } - }; -} diff --git a/Swiften/Serializer/StreamManagementEnabledSerializer.h b/Swiften/Serializer/StreamManagementEnabledSerializer.h new file mode 100644 index 0000000..a135390 --- /dev/null +++ b/Swiften/Serializer/StreamManagementEnabledSerializer.h @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include + +#include "Swiften/Elements/StreamManagementEnabled.h" +#include "Swiften/Serializer/GenericElementSerializer.h" +#include "Swiften/Serializer/XML/XMLElement.h" + +namespace Swift { + class StreamManagementEnabledSerializer : public GenericElementSerializer { + public: + StreamManagementEnabledSerializer() : GenericElementSerializer() { + } + + virtual String serialize(boost::shared_ptr) const { + return XMLElement("enabled", "urn:xmpp:sm:2").serialize(); + } + }; +} diff --git a/Swiften/Serializer/StreamManagementFailedSerializer.h b/Swiften/Serializer/StreamManagementFailedSerializer.h new file mode 100644 index 0000000..d6aa24b --- /dev/null +++ b/Swiften/Serializer/StreamManagementFailedSerializer.h @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2010 Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + +#pragma once + +#include + +#include "Swiften/Elements/StreamManagementFailed.h" +#include "Swiften/Serializer/GenericElementSerializer.h" +#include "Swiften/Serializer/XML/XMLElement.h" + +namespace Swift { + class StreamManagementFailedSerializer : public GenericElementSerializer { + public: + StreamManagementFailedSerializer() : GenericElementSerializer() { + } + + virtual String serialize(boost::shared_ptr) const { + return XMLElement("failed", "urn:xmpp:sm:2").serialize(); + } + }; +} diff --git a/Swiften/Serializer/XMPPSerializer.cpp b/Swiften/Serializer/XMPPSerializer.cpp index b619cae..d2eb520 100644 --- a/Swiften/Serializer/XMPPSerializer.cpp +++ b/Swiften/Serializer/XMPPSerializer.cpp @@ -19,9 +19,9 @@ #include "Swiften/Serializer/AuthSuccessSerializer.h" #include "Swiften/Serializer/AuthChallengeSerializer.h" #include "Swiften/Serializer/AuthResponseSerializer.h" -#include "Swiften/Serializer/EnableSessionManagementSerializer.h" -#include "Swiften/Serializer/SessionManagementEnabledSerializer.h" -#include "Swiften/Serializer/SessionManagementFailedSerializer.h" +#include "Swiften/Serializer/EnableStreamManagementSerializer.h" +#include "Swiften/Serializer/StreamManagementEnabledSerializer.h" +#include "Swiften/Serializer/StreamManagementFailedSerializer.h" #include "Swiften/Serializer/StanzaAckSerializer.h" #include "Swiften/Serializer/StanzaAckRequestSerializer.h" #include "Swiften/Serializer/StartTLSRequestSerializer.h" @@ -48,9 +48,9 @@ XMPPSerializer::XMPPSerializer(PayloadSerializerCollection* payloadSerializers) serializers_.push_back(boost::shared_ptr(new StartTLSFailureSerializer())); serializers_.push_back(boost::shared_ptr(new TLSProceedSerializer())); serializers_.push_back(boost::shared_ptr(new StreamFeaturesSerializer())); - serializers_.push_back(boost::shared_ptr(new EnableSessionManagementSerializer())); - serializers_.push_back(boost::shared_ptr(new SessionManagementEnabledSerializer())); - serializers_.push_back(boost::shared_ptr(new SessionManagementFailedSerializer())); + serializers_.push_back(boost::shared_ptr(new EnableStreamManagementSerializer())); + serializers_.push_back(boost::shared_ptr(new StreamManagementEnabledSerializer())); + serializers_.push_back(boost::shared_ptr(new StreamManagementFailedSerializer())); serializers_.push_back(boost::shared_ptr(new StanzaAckSerializer())); serializers_.push_back(boost::shared_ptr(new StanzaAckRequestSerializer())); } -- cgit v0.10.2-6-g49f6