summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/Jingle/JingleSession.h
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Jingle/JingleSession.h')
-rw-r--r--Swiften/Jingle/JingleSession.h8
1 files changed, 4 insertions, 4 deletions
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;
};
}