diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-02-14 18:57:18 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-02-14 21:36:32 (GMT) |
commit | cb05f5a908e20006c954ce38755c2e422ecc2388 (patch) | |
tree | a793551a5fe279a57d4330119560e8542f745484 /Swiften/Serializer/XML/XMLElement.cpp | |
parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
download | swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 |
Removed Swift::String.
Diffstat (limited to 'Swiften/Serializer/XML/XMLElement.cpp')
-rw-r--r-- | Swiften/Serializer/XML/XMLElement.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/Serializer/XML/XMLElement.cpp b/Swiften/Serializer/XML/XMLElement.cpp index 289ce31..6c90e0d 100644 --- a/Swiften/Serializer/XML/XMLElement.cpp +++ b/Swiften/Serializer/XML/XMLElement.cpp @@ -11,19 +11,19 @@ namespace Swift { -XMLElement::XMLElement(const String& tag, const String& xmlns, const String& text) : tag_(tag) { - if (!xmlns.isEmpty()) { +XMLElement::XMLElement(const std::string& tag, const std::string& xmlns, const std::string& text) : tag_(tag) { + if (!xmlns.empty()) { setAttribute("xmlns", xmlns); } - if (!text.isEmpty()) { + if (!text.empty()) { addNode(XMLTextNode::ref(new XMLTextNode(text))); } } -String XMLElement::serialize() { - String result; +std::string XMLElement::serialize() { + std::string result; result += "<" + tag_; - typedef std::pair<String,String> Pair; + typedef std::pair<std::string,std::string> Pair; foreach(const Pair& p, attributes_) { result += " " + p.first + "=\"" + p.second + "\""; } @@ -41,13 +41,13 @@ String XMLElement::serialize() { return result; } -void XMLElement::setAttribute(const String& attribute, const String& value) { - String escapedValue(value); - escapedValue.replaceAll('&', "&"); - escapedValue.replaceAll('<', "<"); - escapedValue.replaceAll('>', ">"); - escapedValue.replaceAll('\'', "'"); - escapedValue.replaceAll('"', """); +void XMLElement::setAttribute(const std::string& attribute, const std::string& value) { + std::string escapedValue(value); + String::replaceAll(escapedValue, '&', "&"); + String::replaceAll(escapedValue, '<', "<"); + String::replaceAll(escapedValue, '>', ">"); + String::replaceAll(escapedValue, '\'', "'"); + String::replaceAll(escapedValue, '"', """); attributes_[attribute] = escapedValue; } |