summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Voicu <vladvoic@gmail.com>2011-04-30 21:29:11 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-04-30 21:40:27 (GMT)
commit5386ca8195d7471647431bda2f4ddf09b35c0825 (patch)
treeb796ebd69047f07da2bac5bdea71a05c0e867640 /Swiften/Parser/PayloadParsers
parente0e279b85622275dfc4df0bfd5a50ec09694a9b7 (diff)
downloadswift-5386ca8195d7471647431bda2f4ddf09b35c0825.zip
swift-5386ca8195d7471647431bda2f4ddf09b35c0825.tar.bz2
Minor fixes for Replace
Switched from passing by value License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
Diffstat (limited to 'Swiften/Parser/PayloadParsers')
-rw-r--r--Swiften/Parser/PayloadParsers/ReplaceParser.cpp2
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/ReplaceTest.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Parser/PayloadParsers/ReplaceParser.cpp b/Swiften/Parser/PayloadParsers/ReplaceParser.cpp
index 9a21d42..fb85fbd 100644
--- a/Swiften/Parser/PayloadParsers/ReplaceParser.cpp
+++ b/Swiften/Parser/PayloadParsers/ReplaceParser.cpp
@@ -14,7 +14,7 @@ namespace Swift {
void ReplaceParser::handleStartElement(const std::string&, const std::string&, const AttributeMap& attributes) {
if (level_ == 0) {
std::string id = attributes.getAttribute("id");
- getPayloadInternal()->setId(id);
+ getPayloadInternal()->setID(id);
}
level_++;
}
diff --git a/Swiften/Parser/PayloadParsers/UnitTest/ReplaceTest.cpp b/Swiften/Parser/PayloadParsers/UnitTest/ReplaceTest.cpp
index a683d26..c3f410f 100644
--- a/Swiften/Parser/PayloadParsers/UnitTest/ReplaceTest.cpp
+++ b/Swiften/Parser/PayloadParsers/UnitTest/ReplaceTest.cpp
@@ -23,13 +23,13 @@ class ReplaceParserTest : public CppUnit::TestFixture {
PayloadsParserTester parser;
CPPUNIT_ASSERT(parser.parse("<replace id='bad1' xmlns='http://swift.im/protocol/replace'/>"));
Replace::ref payload = boost::dynamic_pointer_cast <Replace>(parser.getPayload());
- CPPUNIT_ASSERT_EQUAL(std::string("bad1"), payload->getId());
+ CPPUNIT_ASSERT_EQUAL(std::string("bad1"), payload->getID());
}
void testParseChild() {
PayloadsParserTester parser;
CPPUNIT_ASSERT(parser.parse("<replace id='bad1' xmlns='http://swift.im/protocol/replace' ><child xmlns='blah' id=\"hi\"/></replace>"));
Replace::ref payload = boost::dynamic_pointer_cast <Replace>(parser.getPayload());
- CPPUNIT_ASSERT_EQUAL(std::string("bad1"), payload->getId());
+ CPPUNIT_ASSERT_EQUAL(std::string("bad1"), payload->getID());
}
};