5 files changed, 47 insertions, 47 deletions
diff --git a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
index d4cb331..52fdbaa 100644
--- a/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
+++ b/Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp
@@ -7,8 +7,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include "Swiften/Elements/DiscoInfo.h"
-#include "Swiften/Disco/CapsInfoGenerator.h"
+#include <Swiften/Elements/DiscoInfo.h>
+#include <Swiften/Disco/CapsInfoGenerator.h>
 
 using namespace Swift;
 
diff --git a/Swiften/Disco/UnitTest/CapsManagerTest.cpp b/Swiften/Disco/UnitTest/CapsManagerTest.cpp
index d5b9896..6d4be30 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;
 
@@ -63,7 +63,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));
@@ -73,7 +73,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);
@@ -82,14 +82,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);
 
@@ -100,7 +100,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()));
 
@@ -111,7 +111,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);
 
@@ -122,7 +122,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]->getID()));
 
@@ -132,7 +132,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);
 
@@ -142,7 +142,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()));
 
@@ -153,7 +153,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);
 
@@ -163,7 +163,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);
 
@@ -172,7 +172,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]->getID()));
@@ -184,7 +184,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);
@@ -195,7 +195,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]->getID()));
 			stanzaChannel->setAvailable(false);
@@ -208,7 +208,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);
@@ -221,7 +221,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);
@@ -232,8 +232,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;
diff --git a/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
index bccf0d4..1477e23 100644
--- a/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
+++ b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
@@ -8,9 +8,9 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <typeinfo>
 
-#include "Swiften/Disco/DiscoInfoResponder.h"
-#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Queries/DummyIQChannel.h"
+#include <Swiften/Disco/DiscoInfoResponder.h>
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/Queries/DummyIQChannel.h>
 
 using namespace Swift;
 
diff --git a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
index 544bdad..7b61cb5 100644
--- a/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
+++ b/Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp
@@ -9,11 +9,11 @@
 #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"
+#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;
 
@@ -52,7 +52,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveKnownHash() {
-			std::auto_ptr<EntityCapsManager> testling = createManager();
+			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
 			sendPresenceWithCaps(user1, capsInfo1);
 
@@ -62,7 +62,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveKnownHashTwiceDoesNotTriggerChange() {
-			std::auto_ptr<EntityCapsManager> testling = createManager();
+			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
 			sendPresenceWithCaps(user1, capsInfo1);
 			changes.clear();
@@ -73,14 +73,14 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveUnknownHashDoesNotTriggerChange() {
-			std::auto_ptr<EntityCapsManager> testling = createManager();
+			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 
 			CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(changes.size()));
 		}
 
 		void testHashAvailable() {
-			std::auto_ptr<EntityCapsManager> testling = createManager();
+			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			sendPresenceWithCaps(user1, capsInfo1);
 
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
@@ -92,7 +92,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveUnknownHashAfterKnownHashTriggersChangeAndClearsCaps() {
-			std::auto_ptr<EntityCapsManager> testling = createManager();
+			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
 			sendPresenceWithCaps(user1, capsInfo1);
 			changes.clear();
@@ -104,7 +104,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReceiveUnavailablePresenceAfterKnownHashTriggersChangeAndClearsCaps() {
-			std::auto_ptr<EntityCapsManager> testling = createManager();
+			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
 			sendPresenceWithCaps(user1, capsInfo1);
 			changes.clear();
@@ -116,7 +116,7 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 		}
 
 		void testReconnectTriggersChangeAndClearsCaps() {
-			std::auto_ptr<EntityCapsManager> testling = createManager();
+			boost::shared_ptr<EntityCapsManager> testling = createManager();
 			capsProvider->caps[capsInfo1->getVersion()] = discoInfo1;
 			capsProvider->caps[capsInfo2->getVersion()] = discoInfo2;
 			sendPresenceWithCaps(user1, capsInfo1);
@@ -133,8 +133,8 @@ class EntityCapsManagerTest : public CppUnit::TestFixture {
 		}
 
 	private:
-		std::auto_ptr<EntityCapsManager> createManager() {
-			std::auto_ptr<EntityCapsManager> manager(new EntityCapsManager(capsProvider, stanzaChannel));
+		boost::shared_ptr<EntityCapsManager> createManager() {
+			boost::shared_ptr<EntityCapsManager> manager(new EntityCapsManager(capsProvider, stanzaChannel));
 			manager->onCapsChanged.connect(boost::bind(&EntityCapsManagerTest::handleCapsChanged, this, _1));
 			return manager;
 		}
diff --git a/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
index ef61afa..7e2e3dd 100644
--- a/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
+++ b/Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp
@@ -8,9 +8,9 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <typeinfo>
 
-#include "Swiften/Disco/JIDDiscoInfoResponder.h"
-#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Queries/DummyIQChannel.h"
+#include <Swiften/Disco/JIDDiscoInfoResponder.h>
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/Queries/DummyIQChannel.h>
 
 using namespace Swift;