Swiftdiff options
| -rw-r--r-- | Swiften/Parser/ExpatParser.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Parser/LibXMLParser.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Parser/UnitTest/XMLParserTest.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Parser/XMLParserClient.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Parser/XMLParserClient.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Parser/ExpatParser.cpp b/Swiften/Parser/ExpatParser.cpp index 6c3845a..32d4f53 100644 --- a/Swiften/Parser/ExpatParser.cpp +++ b/Swiften/Parser/ExpatParser.cpp | |||
| @@ -67,7 +67,7 @@ static void handleStartElement(void* parser, const XML_Char* name, const XML_Cha | |||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | auto* client = static_cast<XMLParser*>(parser)->getClient(); | 69 | auto* client = static_cast<XMLParser*>(parser)->getClient(); |
| 70 | client->handleStartElementPrefix(elemInfo.prefix, elemInfo.uri, elemInfo.name, elemInfo.name, elemInfo.uri, attributeValues); | 70 | client->handleStartElementPrefix(elemInfo.prefix, elemInfo.uri, elemInfo.name, attributeValues); |
| 71 | client->handleStartElement(elemInfo.name, elemInfo.uri, attributeValues); | 71 | client->handleStartElement(elemInfo.name, elemInfo.uri, attributeValues); |
| 72 | } | 72 | } |
| 73 | 73 | ||
diff --git a/Swiften/Parser/LibXMLParser.cpp b/Swiften/Parser/LibXMLParser.cpp index 71515a7..b8d941c 100644 --- a/Swiften/Parser/LibXMLParser.cpp +++ b/Swiften/Parser/LibXMLParser.cpp | |||
| @@ -57,7 +57,7 @@ static void handleStartElement(void* parser, const xmlChar* name, const xmlChar* | |||
| 57 | auto nameStr = asString(name); | 57 | auto nameStr = asString(name); |
| 58 | auto xmlsnsStr = asString(xmlns); | 58 | auto xmlsnsStr = asString(xmlns); |
| 59 | auto prefixStr = asString(prefix); | 59 | auto prefixStr = asString(prefix); |
| 60 | client->handleStartElementPrefix(prefixStr, xmlsnsStr, nameStr, nameStr, xmlsnsStr, attributeValues); | 60 | client->handleStartElementPrefix(prefixStr, xmlsnsStr, nameStr, attributeValues); |
| 61 | client->handleStartElement(nameStr, xmlsnsStr, attributeValues); | 61 | client->handleStartElement(nameStr, xmlsnsStr, attributeValues); |
| 62 | } | 62 | } |
| 63 | 63 | ||
diff --git a/Swiften/Parser/UnitTest/XMLParserTest.cpp b/Swiften/Parser/UnitTest/XMLParserTest.cpp index 4db694e..d38c1cc 100644 --- a/Swiften/Parser/UnitTest/XMLParserTest.cpp +++ b/Swiften/Parser/UnitTest/XMLParserTest.cpp | |||
| @@ -449,7 +449,7 @@ class XMLParserTest : public CppUnit::TestFixture { | |||
| 449 | events.push_back(Event(StartElement, element, ns, attributes, std::move(namespaces_))); | 449 | events.push_back(Event(StartElement, element, ns, attributes, std::move(namespaces_))); |
| 450 | } | 450 | } |
| 451 | 451 | ||
| 452 | void handleStartElementPrefix(const std::string& prefix, const std::string& uri, const std::string& name, const std::string&, const std::string&, const AttributeMap&) override { | 452 | void handleStartElementPrefix(const std::string& prefix, const std::string& uri, const std::string& name, const AttributeMap&) override { |
| 453 | if (!testingStartElementPrefix) return; | 453 | if (!testingStartElementPrefix) return; |
| 454 | events.push_back(Event(StartElementPrefix, name, uri, prefix, AttributeMap(), NamespaceMap())); | 454 | events.push_back(Event(StartElementPrefix, name, uri, prefix, AttributeMap(), NamespaceMap())); |
| 455 | } | 455 | } |
diff --git a/Swiften/Parser/XMLParserClient.cpp b/Swiften/Parser/XMLParserClient.cpp index 847e1f3..6698900 100644 --- a/Swiften/Parser/XMLParserClient.cpp +++ b/Swiften/Parser/XMLParserClient.cpp | |||
| @@ -14,7 +14,7 @@ XMLParserClient::~XMLParserClient() { | |||
| 14 | void XMLParserClient::handleStartElement(const std::string&, const std::string&, const AttributeMap&) { | 14 | void XMLParserClient::handleStartElement(const std::string&, const std::string&, const AttributeMap&) { |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | void XMLParserClient::handleStartElementPrefix(const std::string&, const std::string&, const std::string&, const std::string&, const std::string&, const AttributeMap&) { | 17 | void XMLParserClient::handleStartElementPrefix(const std::string&, const std::string&, const std::string&, const AttributeMap&) { |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | void XMLParserClient::handleNamespaceDeclaration(const std::string&, const std::string&) { | 20 | void XMLParserClient::handleNamespaceDeclaration(const std::string&, const std::string&) { |
diff --git a/Swiften/Parser/XMLParserClient.h b/Swiften/Parser/XMLParserClient.h index f519646..2f0bc9e 100644 --- a/Swiften/Parser/XMLParserClient.h +++ b/Swiften/Parser/XMLParserClient.h | |||
| @@ -19,7 +19,7 @@ namespace Swift { | |||
| 19 | * he is interested in processing the element prefix or not. | 19 | * he is interested in processing the element prefix or not. |
| 20 | */ | 20 | */ |
| 21 | virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes); | 21 | virtual void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes); |
| 22 | virtual void handleStartElementPrefix(const std::string& prefix, const std::string& uri, const std::string& name, const std::string& element, const std::string& ns, const AttributeMap& attributes); | 22 | virtual void handleStartElementPrefix(const std::string& prefix, const std::string& uri, const std::string& element, const AttributeMap& attributes); |
| 23 | 23 | ||
| 24 | virtual void handleEndElement(const std::string& element, const std::string& ns) = 0; | 24 | virtual void handleEndElement(const std::string& element, const std::string& ns) = 0; |
| 25 | virtual void handleCharacterData(const std::string& data) = 0; | 25 | virtual void handleCharacterData(const std::string& data) = 0; |