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/Parser/XMPPParser.cpp | |
parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
download | swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 |
Removed Swift::String.
Diffstat (limited to 'Swiften/Parser/XMPPParser.cpp')
-rw-r--r-- | Swiften/Parser/XMPPParser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Parser/XMPPParser.cpp b/Swiften/Parser/XMPPParser.cpp index b274c94..1fb7682 100644 --- a/Swiften/Parser/XMPPParser.cpp +++ b/Swiften/Parser/XMPPParser.cpp @@ -10,7 +10,7 @@ #include <cassert> #include "Swiften/Elements/ProtocolHeader.h" -#include "Swiften/Base/String.h" +#include <string> #include "Swiften/Parser/XMLParser.h" #include "Swiften/Parser/PlatformXMLParserFactory.h" #include "Swiften/Parser/XMPPParserClient.h" @@ -62,12 +62,12 @@ XMPPParser::~XMPPParser() { delete xmlParser_; } -bool XMPPParser::parse(const String& data) { +bool XMPPParser::parse(const std::string& data) { bool xmlParseResult = xmlParser_->parse(data); return xmlParseResult && !parseErrorOccurred_; } -void XMPPParser::handleStartElement(const String& element, const String& ns, const AttributeMap& attributes) { +void XMPPParser::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) { if (!parseErrorOccurred_) { if (level_ == TopLevel) { if (element == "stream" && ns == "http://etherx.jabber.org/streams") { @@ -93,7 +93,7 @@ void XMPPParser::handleStartElement(const String& element, const String& ns, con ++level_; } -void XMPPParser::handleEndElement(const String& element, const String& ns) { +void XMPPParser::handleEndElement(const std::string& element, const std::string& ns) { assert(level_ > TopLevel); --level_; if (!parseErrorOccurred_) { @@ -113,7 +113,7 @@ void XMPPParser::handleEndElement(const String& element, const String& ns) { } } -void XMPPParser::handleCharacterData(const String& data) { +void XMPPParser::handleCharacterData(const std::string& data) { if (!parseErrorOccurred_) { if (currentElementParser_) { currentElementParser_->handleCharacterData(data); @@ -124,7 +124,7 @@ void XMPPParser::handleCharacterData(const String& data) { } } -ElementParser* XMPPParser::createElementParser(const String& element, const String& ns) { +ElementParser* XMPPParser::createElementParser(const std::string& element, const std::string& ns) { if (element == "presence") { return new PresenceParser(payloadParserFactories_); } |