summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 21:47:16 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:47:16 (GMT)
commitd1fa106d971cd898c288460fe727d4d088ba0556 (patch)
treeff83e46617196c9b8215a8cbeb5df581d0419b11
parent0b86f3b7936e38b23e4c02c6f59932f889bc985d (diff)
downloadswift-d1fa106d971cd898c288460fe727d4d088ba0556.zip
swift-d1fa106d971cd898c288460fe727d4d088ba0556.tar.bz2
Fixed ExpatParser compilation.
-rw-r--r--Swiften/Parser/ExpatParser.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/Parser/ExpatParser.cpp b/Swiften/Parser/ExpatParser.cpp
index c972ef7..88be752 100644
--- a/Swiften/Parser/ExpatParser.cpp
+++ b/Swiften/Parser/ExpatParser.cpp
@@ -7,8 +7,9 @@
#include "Swiften/Parser/ExpatParser.h"
#include <iostream>
-
#include <string>
+
+#include <Swiften/Base/String.h>
#include "Swiften/Parser/XMLParserClient.h"
namespace Swift {
@@ -16,7 +17,7 @@ namespace Swift {
static const char NAMESPACE_SEPARATOR = '\x01';
static void handleStartElement(void* client, const XML_Char* name, const XML_Char** attributes) {
- std::pair<std::string,std::string> nsTagPair = std::string(name).getSplittedAtFirst(NAMESPACE_SEPARATOR);
+ std::pair<std::string,std::string> nsTagPair = String::getSplittedAtFirst(name, NAMESPACE_SEPARATOR);
if (nsTagPair.second == "") {
nsTagPair.second = nsTagPair.first;
nsTagPair.first = "";
@@ -24,7 +25,7 @@ static void handleStartElement(void* client, const XML_Char* name, const XML_Cha
AttributeMap attributeValues;
const XML_Char** currentAttribute = attributes;
while (*currentAttribute) {
- std::pair<std::string,std::string> nsAttributePair = std::string(*currentAttribute).getSplittedAtFirst(NAMESPACE_SEPARATOR);
+ std::pair<std::string,std::string> nsAttributePair = String::getSplittedAtFirst(*currentAttribute, NAMESPACE_SEPARATOR);
if (nsAttributePair.second == "") {
nsAttributePair.second = nsAttributePair.first;
nsAttributePair.first = "";
@@ -37,7 +38,7 @@ static void handleStartElement(void* client, const XML_Char* name, const XML_Cha
}
static void handleEndElement(void* client, const XML_Char* name) {
- std::pair<std::string,std::string> nsTagPair = std::string(name).getSplittedAtFirst(NAMESPACE_SEPARATOR);
+ std::pair<std::string,std::string> nsTagPair = String::getSplittedAtFirst(name, NAMESPACE_SEPARATOR);
if (nsTagPair.second == "") {
nsTagPair.second = nsTagPair.first;
nsTagPair.first = "";