8 files changed, 13 insertions, 13 deletions
diff --git a/Swiften/Jingle/IncomingJingleSession.cpp b/Swiften/Jingle/IncomingJingleSession.cpp
index 29155b8..b18d9d3 100644
--- a/Swiften/Jingle/IncomingJingleSession.cpp
+++ b/Swiften/Jingle/IncomingJingleSession.cpp
@@ -8,7 +8,7 @@
 
 namespace Swift {
 
-IncomingJingleSession::IncomingJingleSession(const String& id, const std::vector<JingleContent::ref>& contents) : JingleSession(id, contents) {
+IncomingJingleSession::IncomingJingleSession(const std::string& id, const std::vector<JingleContent::ref>& contents) : JingleSession(id, contents) {
 
 }
 
diff --git a/Swiften/Jingle/IncomingJingleSession.h b/Swiften/Jingle/IncomingJingleSession.h
index 222100f..64816f6 100644
--- a/Swiften/Jingle/IncomingJingleSession.h
+++ b/Swiften/Jingle/IncomingJingleSession.h
@@ -13,7 +13,7 @@
 namespace Swift {
 	class IncomingJingleSession : public JingleSession {
 		public:
-			IncomingJingleSession(const String& id, const std::vector<JingleContent::ref>& contents);
+			IncomingJingleSession(const std::string& id, const std::vector<JingleContent::ref>& contents);
 
 			typedef boost::shared_ptr<IncomingJingleSession> ref;
 	};
diff --git a/Swiften/Jingle/JingleResponder.cpp b/Swiften/Jingle/JingleResponder.cpp
index 3dfc327..2397e63 100644
--- a/Swiften/Jingle/JingleResponder.cpp
+++ b/Swiften/Jingle/JingleResponder.cpp
@@ -16,7 +16,7 @@ namespace Swift {
 JingleResponder::JingleResponder(JingleSessionManager* sessionManager, IQRouter* router) : SetResponder<JinglePayload>(router), sessionManager(sessionManager) {
 }
 
-bool JingleResponder::handleSetRequest(const JID& from, const JID&, const String& id, boost::shared_ptr<JinglePayload> payload) {
+bool JingleResponder::handleSetRequest(const JID& from, const JID&, const std::string& id, boost::shared_ptr<JinglePayload> payload) {
 	if (payload->getAction() == JinglePayload::SessionInitiate) {
 		if (sessionManager->getSession(from, payload->getSessionID())) {
 			// TODO: Add tie-break error
diff --git a/Swiften/Jingle/JingleResponder.h b/Swiften/Jingle/JingleResponder.h
index 47dc90a..6e1965c 100644
--- a/Swiften/Jingle/JingleResponder.h
+++ b/Swiften/Jingle/JingleResponder.h
@@ -18,7 +18,7 @@ namespace Swift {
 			JingleResponder(JingleSessionManager* sessionManager, IQRouter* router);
 
 		private:
-			virtual bool handleSetRequest(const JID& from, const JID& to, const String& id, boost::shared_ptr<JinglePayload> payload);
+			virtual bool handleSetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr<JinglePayload> payload);
 
 		private:
 			JingleSessionManager* sessionManager;
diff --git a/Swiften/Jingle/JingleSession.cpp b/Swiften/Jingle/JingleSession.cpp
index 3dbb12a..d255abd 100644
--- a/Swiften/Jingle/JingleSession.cpp
+++ b/Swiften/Jingle/JingleSession.cpp
@@ -10,7 +10,7 @@
 
 namespace Swift {
 
-JingleSession::JingleSession(const String& id, const std::vector<JingleContent::ref>& contents) : id(id), contents(contents) {
+JingleSession::JingleSession(const std::string& id, const std::vector<JingleContent::ref>& contents) : id(id), contents(contents) {
 
 }
 
diff --git a/Swiften/Jingle/JingleSession.h b/Swiften/Jingle/JingleSession.h
index 7ed86c2..c00492d 100644
--- a/Swiften/Jingle/JingleSession.h
+++ b/Swiften/Jingle/JingleSession.h
@@ -9,7 +9,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/Base/String.h>
+#include <string>
 #include <Swiften/Elements/JinglePayload.h>
 #include <Swiften/Elements/JingleContent.h>
 #include <Swiften/Base/foreach.h>
@@ -20,10 +20,10 @@ namespace Swift {
 		public:
 			typedef boost::shared_ptr<JingleSession> ref;
 
-			JingleSession(const String& id, const std::vector<JingleContent::ref>& contents);
+			JingleSession(const std::string& id, const std::vector<JingleContent::ref>& contents);
 			virtual ~JingleSession();
 
-			String getID() const {
+			std::string getID() const {
 				return id;
 			}
 
@@ -47,7 +47,7 @@ namespace Swift {
 			void handleIncomingAction(JinglePayload::ref);
 
 		private:
-			String id;
+			std::string id;
 			std::vector<JingleContent::ref> contents;
 	};
 }
diff --git a/Swiften/Jingle/JingleSessionManager.cpp b/Swiften/Jingle/JingleSessionManager.cpp
index d8630cc..e60449b 100644
--- a/Swiften/Jingle/JingleSessionManager.cpp
+++ b/Swiften/Jingle/JingleSessionManager.cpp
@@ -18,7 +18,7 @@ JingleSessionManager::~JingleSessionManager() {
 	delete responder;
 }
 
-JingleSession::ref JingleSessionManager::getSession(const JID& jid, const String& id) const {
+JingleSession::ref JingleSessionManager::getSession(const JID& jid, const std::string& id) const {
 	SessionMap::const_iterator i = incomingSessions.find(JIDSession(jid, id));
 	return i != incomingSessions.end() ? i->second : JingleSession::ref();
 }
diff --git a/Swiften/Jingle/JingleSessionManager.h b/Swiften/Jingle/JingleSessionManager.h
index ea4199d..3e99656 100644
--- a/Swiften/Jingle/JingleSessionManager.h
+++ b/Swiften/Jingle/JingleSessionManager.h
@@ -23,7 +23,7 @@ namespace Swift {
 			JingleSessionManager(IQRouter* router);
 			~JingleSessionManager();
 
-			JingleSession::ref getSession(const JID& jid, const String& id) const;
+			JingleSession::ref getSession(const JID& jid, const std::string& id) const;
 
 			void addIncomingSessionHandler(IncomingJingleSessionHandler* handler);
 			void removeIncomingSessionHandler(IncomingJingleSessionHandler* handler);
@@ -36,12 +36,12 @@ namespace Swift {
 			JingleResponder* responder;
 			std::vector<IncomingJingleSessionHandler*> incomingSessionHandlers;
 			struct JIDSession {
-				JIDSession(const JID& jid, const String& session) : jid(jid), session(session) {}
+				JIDSession(const JID& jid, const std::string& session) : jid(jid), session(session) {}
 				bool operator<(const JIDSession& o) const {
 					return jid == o.jid ? session < o.session : jid < o.jid;
 				}
 				JID jid;
-				String session;
+				std::string session;
 			};
 			typedef std::map<JIDSession, JingleSession::ref> SessionMap;
 			SessionMap incomingSessions;