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
parente0e279b85622275dfc4df0bfd5a50ec09694a9b7 (diff)
downloadswift-contrib-5386ca8195d7471647431bda2f4ddf09b35c0825.zip
swift-contrib-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
-rw-r--r--Swiften/Elements/Replace.h6
-rw-r--r--Swiften/Parser/PayloadParsers/ReplaceParser.cpp2
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/ReplaceTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h2
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Elements/Replace.h b/Swiften/Elements/Replace.h
index 4c7d48e..44a91af 100644
--- a/Swiften/Elements/Replace.h
+++ b/Swiften/Elements/Replace.h
@@ -15,11 +15,11 @@ namespace Swift {
class Replace : public Payload {
public:
typedef boost::shared_ptr<Replace> ref;
- Replace(std::string id = "") : replaceID_(id) {};
- std::string getId() {
+ Replace(const std::string& id = std::string()) : replaceID_(id) {};
+ std::string getID() {
return replaceID_;
}
- void setId(std::string id) {
+ void setID(const std::string& id) {
replaceID_ = id;
}
private:
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());
}
};
diff --git a/Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h b/Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h
index 67dca97..88ad2b3 100644
--- a/Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h
@@ -16,7 +16,7 @@ namespace Swift {
ReplaceSerializer() : GenericPayloadSerializer<Replace>() {}
virtual std::string serializePayload(boost::shared_ptr<Replace> replace) const {
- return "<replace id = '" + replace->getId() + "' xmlns='http://swift.im/protocol/replace'/>";
+ return "<replace id = '" + replace->getID() + "' xmlns='http://swift.im/protocol/replace'/>";
}
};
}
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp
index 80bebee..3d054cc 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/ReplaceSerializerTest.cpp
@@ -22,7 +22,7 @@ class ReplaceSerializerTest: public CppUnit::TestFixture {
void testSerialize() {
ReplaceSerializer testling;
boost::shared_ptr<Replace> replace(new Replace());
- replace->setId("bad1");
+ replace->setID("bad1");
CPPUNIT_ASSERT_EQUAL(std::string("<replace id = 'bad1' xmlns='http://swift.im/protocol/replace'/>"), testling.serialize(replace));
}
};