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/Component/ComponentSession.h
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Component/ComponentSession.h')
-rw-r--r--Swiften/Component/ComponentSession.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h
index dbe6e27..168e618 100644
--- a/Swiften/Component/ComponentSession.h
+++ b/Swiften/Component/ComponentSession.h
@@ -12,7 +12,7 @@
#include "Swiften/JID/JID.h"
#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Base/Error.h"
-#include "Swiften/Base/String.h"
+#include <string>
#include "Swiften/Elements/Element.h"
#include "Swiften/Elements/Stanza.h"
#include "Swiften/Session/SessionStream.h"
@@ -41,7 +41,7 @@ namespace Swift {
~ComponentSession();
- static boost::shared_ptr<ComponentSession> create(const JID& jid, const String& secret, boost::shared_ptr<SessionStream> stream) {
+ static boost::shared_ptr<ComponentSession> create(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream> stream) {
return boost::shared_ptr<ComponentSession>(new ComponentSession(jid, secret, stream));
}
@@ -60,7 +60,7 @@ namespace Swift {
boost::signal<void (boost::shared_ptr<Stanza>)> onStanzaReceived;
private:
- ComponentSession(const JID& jid, const String& secret, boost::shared_ptr<SessionStream>);
+ ComponentSession(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream>);
void finishSession(Error::Type error);
void finishSession(boost::shared_ptr<Swift::Error> error);
@@ -75,7 +75,7 @@ namespace Swift {
private:
JID jid;
- String secret;
+ std::string secret;
boost::shared_ptr<SessionStream> stream;
boost::shared_ptr<Swift::Error> error;
State state;