17 files changed, 3 insertions, 35 deletions
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.cpp b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
index 0c3ad23..3c086d5 100644
--- a/Swiften/Avatars/VCardUpdateAvatarManager.cpp
+++ b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
@@ -20,7 +20,7 @@
 
 namespace Swift {
 
-VCardUpdateAvatarManager::VCardUpdateAvatarManager(VCardManager* vcardManager, StanzaChannel* stanzaChannel, AvatarStorage* avatarStorage, MUCRegistry* mucRegistry) : vcardManager_(vcardManager), stanzaChannel_(stanzaChannel), avatarStorage_(avatarStorage), mucRegistry_(mucRegistry) {
+VCardUpdateAvatarManager::VCardUpdateAvatarManager(VCardManager* vcardManager, StanzaChannel* stanzaChannel, AvatarStorage* avatarStorage, MUCRegistry* mucRegistry) : vcardManager_(vcardManager), avatarStorage_(avatarStorage), mucRegistry_(mucRegistry) {
 	stanzaChannel->onPresenceReceived.connect(boost::bind(&VCardUpdateAvatarManager::handlePresenceReceived, this, _1));
 	stanzaChannel->onAvailableChanged.connect(boost::bind(&VCardUpdateAvatarManager::handleStanzaChannelAvailableChanged, this, _1));
 	vcardManager_->onVCardChanged.connect(boost::bind(&VCardUpdateAvatarManager::handleVCardChanged, this, _1, _2));
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.h b/Swiften/Avatars/VCardUpdateAvatarManager.h
index de68672..28630ea 100644
--- a/Swiften/Avatars/VCardUpdateAvatarManager.h
+++ b/Swiften/Avatars/VCardUpdateAvatarManager.h
@@ -36,7 +36,6 @@ namespace Swift {
 
 		private:
 			VCardManager* vcardManager_;
-			StanzaChannel* stanzaChannel_;
 			AvatarStorage* avatarStorage_;
 			MUCRegistry* mucRegistry_;
 			std::map<JID, std::string> avatarHashes_;
diff --git a/Swiften/Examples/SendFile/ReceiveFile.cpp b/Swiften/Examples/SendFile/ReceiveFile.cpp
index f80f03a..39b3cc3 100644
--- a/Swiften/Examples/SendFile/ReceiveFile.cpp
+++ b/Swiften/Examples/SendFile/ReceiveFile.cpp
@@ -118,9 +118,6 @@ class FileReceiver {
 		JingleSessionManager* jingleSessionManager;
 		IncomingFileTransferManager* incomingFileTransferManager;
 		std::vector<IncomingFileTransfer::ref> incomingFileTransfers;
-		DefaultLocalJingleTransportCandidateGeneratorFactory *localFactory;
-		DefaultRemoteJingleTransportCandidateSelectorFactory *remoteFactory;
-		SOCKS5BytestreamRegistry* bytestreamRegistry;
 };
 
 
diff --git a/Swiften/Examples/SendFile/SendFile.cpp b/Swiften/Examples/SendFile/SendFile.cpp
index df3cea4..a926170 100644
--- a/Swiften/Examples/SendFile/SendFile.cpp
+++ b/Swiften/Examples/SendFile/SendFile.cpp
@@ -125,8 +125,6 @@ class FileSender {
 	
 	private:
 		BoostConnectionServer::ref connectionServer;
-		SOCKS5BytestreamServer* socksBytestreamServer;
-		SOCKS5BytestreamRegistry* registry;
 		OutgoingFileTransfer::ref outgoingFileTransfer;
 		JID jid;
 		std::string password;
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index 83320b2..853738c 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -31,7 +31,7 @@
 
 namespace Swift {
 
-FileTransferManagerImpl::FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, NATTraverser* natTraverser) : ownJID(ownFullJID), jingleSM(jingleSessionManager), iqRouter(router), capsProvider(capsProvider), presenceOracle(presOracle), timerFactory(timerFactory), connectionFactory(connectionFactory), connectionServerFactory(connectionServerFactory), natTraverser(natTraverser), bytestreamServer(NULL), s5bProxyFinder(NULL) {
+FileTransferManagerImpl::FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, NATTraverser* natTraverser) : ownJID(ownFullJID), jingleSM(jingleSessionManager), iqRouter(router), capsProvider(capsProvider), presenceOracle(presOracle), connectionServerFactory(connectionServerFactory), bytestreamServer(NULL), s5bProxyFinder(NULL) {
 	assert(!ownFullJID.isBare());
 
 	connectivityManager = new ConnectivityManager(natTraverser);
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h
index 248b437..ecc692d 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.h
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.h
@@ -67,10 +67,7 @@ namespace Swift {
 			EntityCapsProvider* capsProvider;
 			PresenceOracle* presenceOracle;
 
-			TimerFactory* timerFactory;
-			ConnectionFactory* connectionFactory;
 			ConnectionServerFactory* connectionServerFactory;
-			NATTraverser* natTraverser;
 			SOCKS5BytestreamRegistry* bytestreamRegistry;
 			SOCKS5BytestreamServer* bytestreamServer;
 			SOCKS5BytestreamProxy* bytestreamProxy;
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
index 35f6bea..808ff58 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
@@ -41,7 +41,6 @@ IncomingJingleFileTransfer::IncomingJingleFileTransfer(
 			ourJID(ourJID),
 			session(session),
 			router(router),
-			timerFactory(timerFactory),
 			initialContent(content),
 			state(Initial),
 			receivedBytes(0),
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index 4ae0bfb..746d837 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -101,7 +101,6 @@ namespace Swift {
 			JID ourJID;
 			JingleSession::ref session;
 			IQRouter* router;
-			TimerFactory* timerFactory;
 			JingleContentPayload::ref initialContent;
 			State state;
 			JingleFileTransferDescription::ref description;
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
index 5e2a1c3..e22260e 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.cpp
@@ -45,7 +45,7 @@ OutgoingJingleFileTransfer::OutgoingJingleFileTransfer(JingleSession::ref sessio
 					const StreamInitiationFileInfo &fileInfo,
 					SOCKS5BytestreamRegistry* bytestreamRegistry,
 					SOCKS5BytestreamProxy* bytestreamProxy) :
-	session(session), remoteFactory(remoteFactory), localFactory(localFactory), router(router), idGenerator(idGenerator), fromJID(fromJID), toJID(toJID), readStream(readStream), fileInfo(fileInfo), s5bRegistry(bytestreamRegistry), s5bProxy(bytestreamProxy), serverSession(NULL), contentID(JingleContentID(idGenerator->generateID(), JingleContentPayload::InitiatorCreator)), canceled(false) {
+	session(session), router(router), idGenerator(idGenerator), fromJID(fromJID), toJID(toJID), readStream(readStream), fileInfo(fileInfo), s5bRegistry(bytestreamRegistry), s5bProxy(bytestreamProxy), serverSession(NULL), contentID(JingleContentID(idGenerator->generateID(), JingleContentPayload::InitiatorCreator)), canceled(false) {
 	session->onSessionAcceptReceived.connect(boost::bind(&OutgoingJingleFileTransfer::handleSessionAcceptReceived, this, _1, _2, _3));
 	session->onSessionTerminateReceived.connect(boost::bind(&OutgoingJingleFileTransfer::handleSessionTerminateReceived, this, _1));
 	session->onTransportInfoReceived.connect(boost::bind(&OutgoingJingleFileTransfer::handleTransportInfoReceived, this, _1, _2));
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
index ff7bfc7..0260016 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
@@ -85,9 +85,7 @@ private:
 private:
 	JingleSession::ref session;
 	RemoteJingleTransportCandidateSelector* remoteCandidateSelector;
-	RemoteJingleTransportCandidateSelectorFactory* remoteFactory;
 	LocalJingleTransportCandidateGenerator* localCandidateGenerator;
-	LocalJingleTransportCandidateGeneratorFactory* localFactory;
 
 	IQRouter* router;
 	IDGenerator* idGenerator;
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
index ea45955..e522ff8 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
@@ -79,7 +79,6 @@ private:
 	std::string destination; // hexify(SHA1(sessionID + requester + target))
 
 	State state;
-	int destinationPort;
 
 	ByteArray unprocessedData;
 	ByteArray authenticateAddress;
diff --git a/Swiften/Network/BOSHConnectionPool.cpp b/Swiften/Network/BOSHConnectionPool.cpp
index 0adeb45..293bc1a 100644
--- a/Swiften/Network/BOSHConnectionPool.cpp
+++ b/Swiften/Network/BOSHConnectionPool.cpp
@@ -21,7 +21,6 @@ BOSHConnectionPool::BOSHConnectionPool(const URL& boshURL, DomainNameResolver* r
 		boshURL(boshURL),
 		connectionFactory(connectionFactoryParameter),
 		xmlParserFactory(parserFactory),
-		tlsFactory(tlsFactory),
 		timerFactory(timerFactory),
 		rid(initialRID),
 		pendingTerminate(false),
diff --git a/Swiften/Network/BOSHConnectionPool.h b/Swiften/Network/BOSHConnectionPool.h
index 8bc0a7c..00c1e65 100644
--- a/Swiften/Network/BOSHConnectionPool.h
+++ b/Swiften/Network/BOSHConnectionPool.h
@@ -53,7 +53,6 @@ namespace Swift {
 			URL boshURL;
 			ConnectionFactory* connectionFactory;
 			XMLParserFactory* xmlParserFactory;
-			TLSContextFactory* tlsFactory;
 			TimerFactory* timerFactory;
 			std::vector<BOSHConnection::ref> connections;
 			std::string sid;
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp
index 6f15b84..479e415 100644
--- a/Swiften/Session/BOSHSessionStream.cpp
+++ b/Swiften/Session/BOSHSessionStream.cpp
@@ -41,11 +41,6 @@ BOSHSessionStream::BOSHSessionStream(
 		const SafeString& boshHTTPConnectProxyAuthID,
 		const SafeString& boshHTTPConnectProxyAuthPassword) :
 			available(false), 
-			payloadParserFactories(payloadParserFactories), 
-			payloadSerializers(payloadSerializers), 
-			tlsContextFactory(tlsContextFactory), 
-			timerFactory(timerFactory),
-			xmlParserFactory(xmlParserFactory),
 			eventLoop(eventLoop),
 			firstHeader(true) {
 
diff --git a/Swiften/Session/BOSHSessionStream.h b/Swiften/Session/BOSHSessionStream.h
index 99851b5..290a4c5 100644
--- a/Swiften/Session/BOSHSessionStream.h
+++ b/Swiften/Session/BOSHSessionStream.h
@@ -87,11 +87,6 @@ namespace Swift {
 		private:
 			BOSHConnectionPool* connectionPool;
 			bool available;
-			PayloadParserFactoryCollection* payloadParserFactories;
-			PayloadSerializerCollection* payloadSerializers;
-			TLSContextFactory* tlsContextFactory;
-			TimerFactory* timerFactory;
-			XMLParserFactory* xmlParserFactory;
 			XMPPLayer* xmppLayer;
 			ProtocolHeader streamHeader;
 			EventLoop* eventLoop;
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp
index cbe85ab..cd6d0e6 100644
--- a/Swiften/Session/BasicSessionStream.cpp
+++ b/Swiften/Session/BasicSessionStream.cpp
@@ -30,11 +30,8 @@ BasicSessionStream::BasicSessionStream(
 		XMLParserFactory* xmlParserFactory) :
 			available(false), 
 			connection(connection), 
-			payloadParserFactories(payloadParserFactories), 
-			payloadSerializers(payloadSerializers), 
 			tlsContextFactory(tlsContextFactory), 
 			timerFactory(timerFactory), 
-			streamType(streamType),
 			compressionLayer(NULL),
 			tlsLayer(NULL),
 			whitespacePingLayer(NULL) {
diff --git a/Swiften/Session/BasicSessionStream.h b/Swiften/Session/BasicSessionStream.h
index 084a191..389ecbe 100644
--- a/Swiften/Session/BasicSessionStream.h
+++ b/Swiften/Session/BasicSessionStream.h
@@ -77,11 +77,8 @@ namespace Swift {
 		private:
 			bool available;
 			boost::shared_ptr<Connection> connection;
-			PayloadParserFactoryCollection* payloadParserFactories;
-			PayloadSerializerCollection* payloadSerializers;
 			TLSContextFactory* tlsContextFactory;
 			TimerFactory* timerFactory;
-			StreamType streamType;
 			XMPPLayer* xmppLayer;
 			ConnectionLayer* connectionLayer;
 			CompressionLayer* compressionLayer;