6 files changed, 32 insertions, 22 deletions
diff --git a/Swiften/Elements/IBB.h b/Swiften/Elements/IBB.h
index faee71d..8138e83 100644
--- a/Swiften/Elements/IBB.h
+++ b/Swiften/Elements/IBB.h
@@ -6,11 +6,11 @@
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
 #include <string>
+#include <vector>
+#include <boost/shared_ptr.hpp>
 
-#include "Swiften/Base/ByteArray.h"
-#include "Swiften/Elements/Payload.h"
+#include <Swiften/Elements/Payload.h>
 
 namespace Swift {
 	class IBB : public Payload {
@@ -36,7 +36,7 @@ namespace Swift {
 				return result;
 			}
 
-			static IBB::ref createIBBData(const std::string& streamID, int sequenceNumber, const ByteArray& data) {
+			static IBB::ref createIBBData(const std::string& streamID, int sequenceNumber, const std::vector<unsigned char>& data) {
 				IBB::ref result(new IBB(Data, streamID));
 				result->setSequenceNumber(sequenceNumber);
 				result->setData(data);
@@ -71,11 +71,11 @@ namespace Swift {
 				return streamID;
 			}
 
-			const ByteArray& getData() const {
+			const std::vector<unsigned char>& getData() const {
 				return data;
 			}
 
-			void setData(const ByteArray& data) {
+			void setData(const std::vector<unsigned char>& data) {
 				this->data = data;
 			}
 
@@ -98,7 +98,7 @@ namespace Swift {
 		private:
 			Action action;
 			std::string streamID;
-			ByteArray data;
+			std::vector<unsigned char> data;
 			StanzaType stanzaType;
 			int blockSize;
 			int sequenceNumber;
diff --git a/Swiften/Elements/JingleContent.h b/Swiften/Elements/JingleContentPayload.h
index 97b071f..c44a806 100644
--- a/Swiften/Elements/JingleContent.h
+++ b/Swiften/Elements/JingleContentPayload.h
@@ -13,12 +13,12 @@
 #include <Swiften/JID/JID.h>
 #include <Swiften/Elements/Payload.h>
 #include <Swiften/Elements/JingleDescription.h>
-#include <Swiften/Elements/JingleTransport.h>
+#include <Swiften/Elements/JingleTransportPayload.h>
 
 namespace Swift {
-	class JingleContent : public Payload {
+	class JingleContentPayload : public Payload {
 		public:
-			typedef boost::shared_ptr<JingleContent> ref;
+			typedef boost::shared_ptr<JingleContentPayload> ref;
 
 			enum Creator {
 				InitiatorCreator,
@@ -32,10 +32,18 @@ namespace Swift {
 				BothSenders,
 			};*/
 
+			Creator getCreator() const {
+				return creator;
+			}
+
 			void setCreator(Creator creator) {
 				this->creator = creator;
 			}
 
+			const std::string& getName() const {
+				return name;
+			}
+
 			void setName(const std::string& name) {
 				this->name = name;
 			}
@@ -83,10 +91,6 @@ namespace Swift {
 			std::string name;
 			//Senders senders;
 			std::vector<JingleDescription::ref> descriptions;
-<<<<<<< HEAD:Swiften/Elements/JingleContent.h
-			std::vector<JingleTransport::ref> transports;
-=======
 			std::vector<boost::shared_ptr<JingleTransportPayload> > transports;
->>>>>>> 7c05f3f... Cleaned up headers.:Swiften/Elements/JingleContentPayload.h
 	};
 }
diff --git a/Swiften/Elements/JingleIBBTransport.h b/Swiften/Elements/JingleIBBTransportPayload.h
index faa5af3..67aab09 100644
--- a/Swiften/Elements/JingleIBBTransport.h
+++ b/Swiften/Elements/JingleIBBTransportPayload.h
@@ -6,12 +6,16 @@
 
 #pragma once
 
+#include <boost/shared_ptr.hpp>
 #include <string>
-#include <Swiften/Elements/JingleTransport.h>
+
+#include <Swiften/Elements/JingleTransportPayload.h>
 
 namespace Swift {
-	class JingleIBBTransport : public JingleTransport {
+	class JingleIBBTransportPayload : public JingleTransportPayload {
 		public:
+			typedef boost::shared_ptr<JingleIBBTransportPayload> ref;
+
 			enum StanzaType {
 				IQStanza,
 				MessageStanza,
diff --git a/Swiften/Elements/JinglePayload.h b/Swiften/Elements/JinglePayload.h
index 59d3c99..be02543 100644
--- a/Swiften/Elements/JinglePayload.h
+++ b/Swiften/Elements/JinglePayload.h
@@ -12,7 +12,7 @@
 #include <string>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Elements/Payload.h>
-#include <Swiften/Elements/JingleContent.h>
+#include <Swiften/Elements/JingleContentPayload.h>
 
 
 namespace Swift {
@@ -98,11 +98,11 @@ namespace Swift {
 				return sessionID;
 			}
 
-			void addContent(JingleContent::ref content) {
+			void addContent(JingleContentPayload::ref content) {
 				this->contents.push_back(content);
 			}
 
-			const std::vector<JingleContent::ref> getContents() const {
+			const std::vector<JingleContentPayload::ref> getContents() const {
 				return contents;
 			}
 
@@ -119,7 +119,7 @@ namespace Swift {
 			JID initiator;
 			JID responder;
 			std::string sessionID;
-			std::vector<JingleContent::ref> contents;
+			std::vector<JingleContentPayload::ref> contents;
 			boost::optional<Reason> reason;
 	};
 }
diff --git a/Swiften/Elements/JingleS5BTransport.h b/Swiften/Elements/JingleS5BTransportPayload.h
index 4522417..7b3089f 100644
--- a/Swiften/Elements/JingleS5BTransport.h
+++ b/Swiften/Elements/JingleS5BTransportPayload.h
@@ -6,11 +6,13 @@
 
 #pragma once
 
-#include <Swiften/Elements/JingleTransport.h>
+#include <Swiften/Elements/JingleTransportPayload.h>
 #include <Swiften/Elements/Bytestreams.h>
 
+// FIXME: Remove Bytestreams, and replace by our own candidate
+
 namespace Swift {
-	class JingleS5BTransport : public JingleTransport {
+	class JingleS5BTransportPayload : public JingleTransportPayload {
 		public:
 			const Bytestreams& getInfo() const {
 				return info;
diff --git a/Swiften/Elements/JingleTransport.h b/Swiften/Elements/JingleTransportPayload.h
index 7a9ea29..7a9ea29 100644
--- a/Swiften/Elements/JingleTransport.h
+++ b/Swiften/Elements/JingleTransportPayload.h