Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/Serializer/StreamErrorSerializer.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/Serializer/StreamErrorSerializer.cpp')
| -rw-r--r-- | Swiften/Serializer/StreamErrorSerializer.cpp | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/Swiften/Serializer/StreamErrorSerializer.cpp b/Swiften/Serializer/StreamErrorSerializer.cpp index 6ddaf4c..3cad478 100644 --- a/Swiften/Serializer/StreamErrorSerializer.cpp +++ b/Swiften/Serializer/StreamErrorSerializer.cpp @@ -16,44 +16,44 @@ StreamErrorSerializer::StreamErrorSerializer() : GenericElementSerializer<Stream } SafeByteArray StreamErrorSerializer::serialize(boost::shared_ptr<ToplevelElement> element) const { - StreamError::ref error = boost::dynamic_pointer_cast<StreamError>(element); - XMLElement errorElement("error", "http://etherx.jabber.org/streams"); - - std::string typeTag; - switch (error->getType()) { - case StreamError::BadFormat: typeTag = "bad-format"; break; - case StreamError::BadNamespacePrefix: typeTag = "bad-namespace-prefix"; break; - case StreamError::Conflict: typeTag = "conflict"; break; - case StreamError::ConnectionTimeout: typeTag = "connection-timeout"; break; - case StreamError::HostGone: typeTag = "host-gone"; break; - case StreamError::HostUnknown: typeTag = "host-unknown"; break; - case StreamError::ImproperAddressing: typeTag = "improper-addressing"; break; - case StreamError::InternalServerError: typeTag = "internal-server-error"; break; - case StreamError::InvalidFrom: typeTag = "invalid-from"; break; - case StreamError::InvalidID: typeTag = "invalid-id"; break; - case StreamError::InvalidNamespace: typeTag = "invalid-namespace"; break; - case StreamError::InvalidXML: typeTag = "invalid-xml"; break; - case StreamError::NotAuthorized: typeTag = "not-authorized"; break; - case StreamError::NotWellFormed: typeTag = "not-well-formed"; break; - case StreamError::PolicyViolation: typeTag = "policy-violation"; break; - case StreamError::RemoteConnectionFailed: typeTag = "remote-connection-failed"; break; - case StreamError::Reset: typeTag = "reset"; break; - case StreamError::ResourceConstraint: typeTag = "resource-constraint"; break; - case StreamError::RestrictedXML: typeTag = "restricted-xml"; break; - case StreamError::SeeOtherHost: typeTag = "see-other-host"; break; - case StreamError::SystemShutdown: typeTag = "system-shutdown"; break; - case StreamError::UndefinedCondition: typeTag = "undefined-condition"; break; - case StreamError::UnsupportedEncoding: typeTag = "unsupported-encoding"; break; - case StreamError::UnsupportedStanzaType: typeTag = "unsupported-stanza-type"; break; - case StreamError::UnsupportedVersion: typeTag = "unsupported-version"; break; - } - errorElement.addNode(boost::make_shared<XMLElement>(typeTag, "urn:ietf:params:xml:ns:xmpp-streams")); - - if (!error->getText().empty()) { - errorElement.addNode(boost::make_shared<XMLElement>("text", "urn:ietf:params:xml:ns:xmpp-streams", error->getText())); - } - - return createSafeByteArray(errorElement.serialize()); + StreamError::ref error = boost::dynamic_pointer_cast<StreamError>(element); + XMLElement errorElement("error", "http://etherx.jabber.org/streams"); + + std::string typeTag; + switch (error->getType()) { + case StreamError::BadFormat: typeTag = "bad-format"; break; + case StreamError::BadNamespacePrefix: typeTag = "bad-namespace-prefix"; break; + case StreamError::Conflict: typeTag = "conflict"; break; + case StreamError::ConnectionTimeout: typeTag = "connection-timeout"; break; + case StreamError::HostGone: typeTag = "host-gone"; break; + case StreamError::HostUnknown: typeTag = "host-unknown"; break; + case StreamError::ImproperAddressing: typeTag = "improper-addressing"; break; + case StreamError::InternalServerError: typeTag = "internal-server-error"; break; + case StreamError::InvalidFrom: typeTag = "invalid-from"; break; + case StreamError::InvalidID: typeTag = "invalid-id"; break; + case StreamError::InvalidNamespace: typeTag = "invalid-namespace"; break; + case StreamError::InvalidXML: typeTag = "invalid-xml"; break; + case StreamError::NotAuthorized: typeTag = "not-authorized"; break; + case StreamError::NotWellFormed: typeTag = "not-well-formed"; break; + case StreamError::PolicyViolation: typeTag = "policy-violation"; break; + case StreamError::RemoteConnectionFailed: typeTag = "remote-connection-failed"; break; + case StreamError::Reset: typeTag = "reset"; break; + case StreamError::ResourceConstraint: typeTag = "resource-constraint"; break; + case StreamError::RestrictedXML: typeTag = "restricted-xml"; break; + case StreamError::SeeOtherHost: typeTag = "see-other-host"; break; + case StreamError::SystemShutdown: typeTag = "system-shutdown"; break; + case StreamError::UndefinedCondition: typeTag = "undefined-condition"; break; + case StreamError::UnsupportedEncoding: typeTag = "unsupported-encoding"; break; + case StreamError::UnsupportedStanzaType: typeTag = "unsupported-stanza-type"; break; + case StreamError::UnsupportedVersion: typeTag = "unsupported-version"; break; + } + errorElement.addNode(boost::make_shared<XMLElement>(typeTag, "urn:ietf:params:xml:ns:xmpp-streams")); + + if (!error->getText().empty()) { + errorElement.addNode(boost::make_shared<XMLElement>("text", "urn:ietf:params:xml:ns:xmpp-streams", error->getText())); + } + + return createSafeByteArray(errorElement.serialize()); } } |