2 files changed, 9 insertions, 16 deletions
diff --git a/Swiften/Disco/CapsInfoGenerator.cpp b/Swiften/Disco/CapsInfoGenerator.cpp
index cb93182..4332f76 100644
--- a/Swiften/Disco/CapsInfoGenerator.cpp
+++ b/Swiften/Disco/CapsInfoGenerator.cpp
@@ -49,7 +49,7 @@ CapsInfo CapsInfoGenerator::generateCapsInfo(const DiscoInfo& discoInfo) const {
 				continue;
 			}
 			serializedCaps += field->getName() + "<";
-			std::vector<std::string> values(field->getRawValues());
+			std::vector<std::string> values(field->getValues());
 			std::sort(values.begin(), values.end());
 			foreach(const std::string& value, values) {
 				serializedCaps += value + "<";
diff --git a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
index a1b1a7b..67d27c0 100644
--- a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
@@ -51,32 +51,25 @@ class CapsInfoGeneratorTest : public CppUnit::TestFixture {
 			discoInfo.addFeature("http://jabber.org/protocol/muc");
 
 			Form::ref extension(new Form(Form::ResultType));
-			FormField::ref field = HiddenFormField::create("urn:xmpp:dataforms:softwareinfo");
+			FormField::ref field = boost::make_shared<FormField>(FormField::HiddenType, "urn:xmpp:dataforms:softwareinfo");
 			field->setName("FORM_TYPE");
 			extension->addField(field);
-			std::vector<std::string> ipVersions;
-			ipVersions.push_back("ipv6");
-			ipVersions.push_back("ipv4");
-			field = ListMultiFormField::create(ipVersions);
-			field->addRawValue("ipv6");
-			field->addRawValue("ipv4");
+			field = boost::make_shared<FormField>(FormField::ListMultiType);
+			field->addValue("ipv6");
+			field->addValue("ipv4");
 			field->setName("ip_version");
 			extension->addField(field);
-			field = TextSingleFormField::create("Psi");
-			field->addRawValue("Psi");
+			field = boost::make_shared<FormField>(FormField::TextSingleType, "Psi");
 			field->setName("software");
 			extension->addField(field);
-			field = TextSingleFormField::create("0.11");
-			field->addRawValue("0.11");
+			field = boost::make_shared<FormField>(FormField::TextSingleType, "0.11");
 			field->setName("software_version");
 			extension->addField(field);
-			field = TextSingleFormField::create("Mac");
+			field = boost::make_shared<FormField>(FormField::TextSingleType, "Mac");
 			field->setName("os");
-			field->addRawValue("Mac");
 			extension->addField(field);
-			field = TextSingleFormField::create("10.5.1");
+			field = boost::make_shared<FormField>(FormField::TextSingleType, "10.5.1");
 			field->setName("os_version");
-			field->addRawValue("10.5.1");
 			extension->addField(field);
 			discoInfo.addExtension(extension);