1 files changed, 25 insertions, 25 deletions
diff --git a/Swiften/Disco/UnitTest/CapsManagerTest.cpp b/Swiften/Disco/UnitTest/CapsManagerTest.cpp
index 793fdba..52b4bf1 100644
--- a/Swiften/Disco/UnitTest/CapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsManagerTest.cpp
@@ -9,13 +9,13 @@
 #include <vector>
 #include <boost/bind.hpp>
 
-#include "Swiften/Disco/CapsManager.h"
-#include "Swiften/Disco/CapsMemoryStorage.h"
-#include "Swiften/Disco/CapsInfoGenerator.h"
-#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Elements/CapsInfo.h"
-#include "Swiften/Elements/DiscoInfo.h"
-#include "Swiften/Client/DummyStanzaChannel.h"
+#include <Swiften/Disco/CapsManager.h>
+#include <Swiften/Disco/CapsMemoryStorage.h>
+#include <Swiften/Disco/CapsInfoGenerator.h>
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/Elements/CapsInfo.h>
+#include <Swiften/Elements/DiscoInfo.h>
+#include <Swiften/Client/DummyStanzaChannel.h>
 
 using namespace Swift;
 
@@ -64,7 +64,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveNewHashRequestsDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 
 			CPPUNIT_ASSERT(stanzaChannel->isRequestAtIndex<DiscoInfo>(0, user1, IQ::Get));
@@ -74,7 +74,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveSameHashDoesNotRequestDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			stanzaChannel->sentStanzas.clear();
 			sendPresenceWithCaps(user1, capsInfo1);
@@ -83,14 +83,14 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveLegacyCapsDoesNotRequestDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, legacyCapsInfo);
 
 			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(stanzaChannel->sentStanzas.size()));
 		}
 
 		void testReceiveSameHashAfterSuccesfulDiscoDoesNotRequestDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendDiscoInfoResult(discoInfo1);
 
@@ -101,7 +101,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveSameHashFromSameUserAfterFailedDiscoDoesNotRequestDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getID()));
 
@@ -112,7 +112,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveSameHashFromSameUserAfterIncorrectVerificationDoesNotRequestDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendDiscoInfoResult(discoInfo2);
 
@@ -123,7 +123,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveSameHashFromDifferentUserAfterFailedDiscoRequestsDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID()));
 
@@ -133,7 +133,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveSameHashFromDifferentUserAfterIncorrectVerificationRequestsDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendDiscoInfoResult(discoInfo2);
 
@@ -143,7 +143,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveDifferentHashFromSameUserAfterFailedDiscoDoesNotRequestDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getID()));
 
@@ -154,7 +154,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveSuccesfulDiscoStoresCaps() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendDiscoInfoResult(discoInfo1);
 
@@ -164,7 +164,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveIncorrectVerificationDiscoDoesNotStoreCaps() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendDiscoInfoResult(discoInfo2);
 
@@ -173,7 +173,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveFailingDiscoFallsBack() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendPresenceWithCaps(user2, capsInfo1alt);
 			stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID()));
@@ -197,7 +197,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveFailingFallbackDiscoFallsBack() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendPresenceWithCaps(user2, capsInfo1alt);
 			sendPresenceWithCaps(user3, capsInfo1);
@@ -208,7 +208,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveSameHashFromFailingUserAfterReconnectRequestsDisco() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			stanzaChannel->onIQReceived(IQ::createError(JID("baz@fum.com/foo"), stanzaChannel->sentStanzas[0]->getTo(), stanzaChannel->sentStanzas[0]->getID()));
 			stanzaChannel->setAvailable(false);
@@ -221,7 +221,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReconnectResetsFallback() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			sendPresenceWithCaps(user2, capsInfo1alt);
 			stanzaChannel->setAvailable(false);
@@ -234,7 +234,7 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReconnectResetsRequests() {
-			std::auto_ptr<CapsManager> testling = createManager();
+			boost::shared_ptr<CapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 			stanzaChannel->sentStanzas.clear();
 			stanzaChannel->setAvailable(false);
@@ -245,8 +245,8 @@ class CapsManagerTest : public CppUnit::TestFixture {
 		}
 
 	private:
-		std::auto_ptr<CapsManager> createManager() {
-			std::auto_ptr<CapsManager> manager(new CapsManager(storage, stanzaChannel, iqRouter));
+		boost::shared_ptr<CapsManager> createManager() {
+			boost::shared_ptr<CapsManager> manager(new CapsManager(storage, stanzaChannel, iqRouter));
 			manager->setWarnOnInvalidHash(false);
 			//manager->onCapsChanged.connect(boost::bind(&CapsManagerTest::handleCapsChanged, this, _1));
 			return manager;