summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/Parser/PayloadParsers/VCardParser.cpp
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Parser/PayloadParsers/VCardParser.cpp')
-rw-r--r--Swiften/Parser/PayloadParsers/VCardParser.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Parser/PayloadParsers/VCardParser.cpp b/Swiften/Parser/PayloadParsers/VCardParser.cpp
index 2f1f8dc..61af0ba 100644
--- a/Swiften/Parser/PayloadParsers/VCardParser.cpp
+++ b/Swiften/Parser/PayloadParsers/VCardParser.cpp
@@ -14,9 +14,9 @@ namespace Swift {
VCardParser::VCardParser() : unknownContentParser_(NULL) {
}
-void VCardParser::handleStartElement(const String& element, const String& ns, const AttributeMap& attributes) {
+void VCardParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
elementStack_.push_back(element);
- String elementHierarchy = getElementHierarchy();
+ std::string elementHierarchy = getElementHierarchy();
if (elementHierarchy == "/vCard/EMAIL") {
currentEMailAddress_ = VCard::EMailAddress();
}
@@ -32,12 +32,12 @@ void VCardParser::handleStartElement(const String& element, const String& ns, co
currentText_ = "";
}
-void VCardParser::handleEndElement(const String& element, const String& ns) {
+void VCardParser::handleEndElement(const std::string& element, const std::string& ns) {
if (unknownContentParser_) {
unknownContentParser_->handleEndElement(element, ns);
}
- String elementHierarchy = getElementHierarchy();
+ std::string elementHierarchy = getElementHierarchy();
if (elementHierarchy == "/vCard/VERSION") {
getPayloadInternal()->setVersion(currentText_);
}
@@ -104,16 +104,16 @@ void VCardParser::handleEndElement(const String& element, const String& ns) {
elementStack_.pop_back();
}
-void VCardParser::handleCharacterData(const String& text) {
+void VCardParser::handleCharacterData(const std::string& text) {
if (unknownContentParser_) {
unknownContentParser_->handleCharacterData(text);
}
currentText_ += text;
}
-String VCardParser::getElementHierarchy() const {
- String result;
- foreach(const String& element, elementStack_) {
+std::string VCardParser::getElementHierarchy() const {
+ std::string result;
+ foreach(const std::string& element, elementStack_) {
result += "/" + element;
}
return result;