summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp')
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp b/Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp
index c67fcdb..3875efd 100644
--- a/Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp
+++ b/Swiften/Serializer/PayloadSerializers/UnitTest/DiscoInfoSerializerTest.cpp
@@ -30,7 +30,7 @@ class DiscoInfoSerializerTest : public CppUnit::TestFixture
discoInfo->addFeature("http://jabber.org/protocol/disco#info");
discoInfo->setNode("http://swift.im#bla");
- String expectedResult =
+ std::string expectedResult =
"<query node=\"http://swift.im#bla\" xmlns=\"http://jabber.org/protocol/disco#info\">"
"<identity category=\"client\" name=\"Swift\" type=\"pc\"/>"
"<identity category=\"client\" name=\"Vlug\" type=\"pc\" xml:lang=\"nl\"/>"
@@ -50,7 +50,7 @@ class DiscoInfoSerializerTest : public CppUnit::TestFixture
form->setTitle("Bot Configuration");
discoInfo->addExtension(form);
- String expectedResult =
+ std::string expectedResult =
"<query xmlns=\"http://jabber.org/protocol/disco#info\">"
"<feature var=\"http://jabber.org/protocol/caps\"/>"
"<feature var=\"http://jabber.org/protocol/disco#info\"/>"