1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
index 7b61cb5..0fd966d 100644
--- a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
@@ -2,80 +2,80 @@
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <vector>
 #include <boost/bind.hpp>
 
 #include <Swiften/Disco/EntityCapsManager.h>
 #include <Swiften/Disco/CapsProvider.h>
 #include <Swiften/Elements/CapsInfo.h>
 #include <Swiften/Client/DummyStanzaChannel.h>
 #include <Swiften/Disco/CapsInfoGenerator.h>
 
 using namespace Swift;
 
 class EntityCapsManagerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(EntityCapsManagerTest);
 		CPPUNIT_TEST(testReceiveKnownHash);
 		CPPUNIT_TEST(testReceiveKnownHashTwiceDoesNotTriggerChange);
 		CPPUNIT_TEST(testReceiveUnknownHashDoesNotTriggerChange);
 		CPPUNIT_TEST(testReceiveUnknownHashAfterKnownHashTriggersChangeAndClearsCaps);
 		CPPUNIT_TEST(testReceiveUnavailablePresenceAfterKnownHashTriggersChangeAndClearsCaps);
 		CPPUNIT_TEST(testReconnectTriggersChangeAndClearsCaps);
 		CPPUNIT_TEST(testHashAvailable);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
 			stanzaChannel = new DummyStanzaChannel();
 			capsProvider = new DummyCapsProvider();
 
 			user1 = JID("user1@bar.com/bla");
-			discoInfo1 = boost::shared_ptr<DiscoInfo>(new DiscoInfo());
+			discoInfo1 = boost::make_shared<DiscoInfo>();
 			discoInfo1->addFeature("http://swift.im/feature1");
-			capsInfo1 = boost::shared_ptr<CapsInfo>(new CapsInfo(CapsInfoGenerator("http://node1.im").generateCapsInfo(*discoInfo1.get())));
-			capsInfo1alt = boost::shared_ptr<CapsInfo>(new CapsInfo(CapsInfoGenerator("http://node2.im").generateCapsInfo(*discoInfo1.get())));
+			capsInfo1 = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node1.im").generateCapsInfo(*discoInfo1.get()));
+			capsInfo1alt = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im").generateCapsInfo(*discoInfo1.get()));
 			user2 = JID("user2@foo.com/baz");
-			discoInfo2 = boost::shared_ptr<DiscoInfo>(new DiscoInfo());
+			discoInfo2 = boost::make_shared<DiscoInfo>();
 			discoInfo2->addFeature("http://swift.im/feature2");
-			capsInfo2 = boost::shared_ptr<CapsInfo>(new CapsInfo(CapsInfoGenerator("http://node2.im").generateCapsInfo(*discoInfo2.get())));
+			capsInfo2 = boost::make_shared<CapsInfo>(CapsInfoGenerator("http://node2.im").generateCapsInfo(*discoInfo2.get()));
 			user3 = JID("user3@foo.com/baz");
-			legacyCapsInfo = boost::shared_ptr<CapsInfo>(new CapsInfo("http://swift.im", "ver1", ""));
+			legacyCapsInfo = boost::make_shared<CapsInfo>("http://swift.im", "ver1", "");
 		}
 
 		void tearDown() {
 			delete capsProvider;
 			delete stanzaChannel;
 		}
 
 		void testReceiveKnownHash() {
 			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
 			sendPresenceWithCaps(user1, capsInfo1);
 
 			CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(changes.size()));
 			CPPUNIT_ASSERT_EQUAL(user1, changes[0]);
 			CPPUNIT_ASSERT_EQUAL(discoInfo1, testling->getCaps(user1));
 		}
 
 		void testReceiveKnownHashTwiceDoesNotTriggerChange() {
 			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
 			sendPresenceWithCaps(user1, capsInfo1);
 			changes.clear();
 
 			sendPresenceWithCaps(user1, capsInfo1);
 
 			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(changes.size()));
 		}
 
 		void testReceiveUnknownHashDoesNotTriggerChange() {
 			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 
 			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(changes.size()));
 		}