1 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Parser/LibXMLParser.cpp b/Swiften/Parser/LibXMLParser.cpp
index 34db4ca..c94a360 100644
--- a/Swiften/Parser/LibXMLParser.cpp
+++ b/Swiften/Parser/LibXMLParser.cpp
@@ -9,32 +9,32 @@
 #include <iostream>
 #include <cassert>
 #include <cstring>
 
 #include <string>
 #include "Swiften/Parser/XMLParserClient.h"
 
 namespace Swift {
 
-static void handleStartElement(void *client, const xmlChar* name, const xmlChar*, const xmlChar* xmlns, int, const xmlChar**, int nbAttributes, int, const xmlChar ** attributes) {
+static void handleStartElement(void *parser, const xmlChar* name, const xmlChar*, const xmlChar* xmlns, int, const xmlChar**, int nbAttributes, int, const xmlChar ** attributes) {
 	AttributeMap attributeValues;
 	for (int i = 0; i < nbAttributes*5; i += 5) {
 		attributeValues[std::string(reinterpret_cast<const char*>(attributes[i]))] = std::string(reinterpret_cast<const char*>(attributes[i+3]), attributes[i+4]-attributes[i+3]);
 	}
-	static_cast<XMLParserClient*>(client)->handleStartElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string()), attributeValues);
+	static_cast<XMLParser*>(parser)->getClient()->handleStartElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string()), attributeValues);
 }
 
-static void handleEndElement(void *client, const xmlChar* name, const xmlChar*, const xmlChar* xmlns) {
-	static_cast<XMLParserClient*>(client)->handleEndElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string()));
+static void handleEndElement(void *parser, const xmlChar* name, const xmlChar*, const xmlChar* xmlns) {
+	static_cast<XMLParser*>(parser)->getClient()->handleEndElement(reinterpret_cast<const char*>(name), (xmlns ? reinterpret_cast<const char*>(xmlns) : std::string()));
 }
 
-static void handleCharacterData(void* client, const xmlChar* data, int len) {
-	static_cast<XMLParserClient*>(client)->handleCharacterData(std::string(reinterpret_cast<const char*>(data), len));
+static void handleCharacterData(void* parser, const xmlChar* data, int len) {
+	static_cast<XMLParser*>(parser)->getClient()->handleCharacterData(std::string(reinterpret_cast<const char*>(data), len));
 }
 
 static void handleError(void*, const char* /*m*/, ... ) {
 	/*
 	va_list args;
 	va_start(args, m);
 	vfprintf(stdout, m, args);
 	va_end(args);
 	*/
@@ -48,19 +48,19 @@ static void handleWarning(void*, const char*, ... ) {
 LibXMLParser::LibXMLParser(XMLParserClient* client) : XMLParser(client) {
 	memset(&handler_, 0, sizeof(handler_) );
 	handler_.initialized = XML_SAX2_MAGIC;
 	handler_.startElementNs = &handleStartElement;
 	handler_.endElementNs = &handleEndElement;
 	handler_.characters = &handleCharacterData;
 	handler_.warning = &handleWarning;
 	handler_.error = &handleError;
 
-	context_ = xmlCreatePushParserCtxt(&handler_, client, 0, 0, 0);
+	context_ = xmlCreatePushParserCtxt(&handler_, this, 0, 0, 0);
 	assert(context_);
 }
 
 LibXMLParser::~LibXMLParser() {
 	if (context_) {
 		xmlFreeParserCtxt(context_);
 	}
 }