Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-02-14 18:57:18 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-02-14 21:36:32 (GMT) |
| commit | cb05f5a908e20006c954ce38755c2e422ecc2388 (patch) | |
| tree | a793551a5fe279a57d4330119560e8542f745484 /Swiften/Server/ServerFromClientSession.h | |
| parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
| download | swift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 | |
Removed Swift::String.
Diffstat (limited to 'Swiften/Server/ServerFromClientSession.h')
| -rw-r--r-- | Swiften/Server/ServerFromClientSession.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Server/ServerFromClientSession.h b/Swiften/Server/ServerFromClientSession.h index 2ac4296..80ef063 100644 --- a/Swiften/Server/ServerFromClientSession.h +++ b/Swiften/Server/ServerFromClientSession.h @@ -10,7 +10,7 @@ #include "Swiften/Base/boost_bsignals.h" #include <boost/enable_shared_from_this.hpp> -#include "Swiften/Base/String.h" +#include <string> #include "Swiften/Session/Session.h" #include "Swiften/JID/JID.h" #include "Swiften/Network/Connection.h" @@ -31,7 +31,7 @@ namespace Swift { class ServerFromClientSession : public Session { public: ServerFromClientSession( - const String& id, + const std::string& id, boost::shared_ptr<Connection> connection, PayloadParserFactoryCollection* payloadParserFactories, PayloadSerializerCollection* payloadSerializers, @@ -50,11 +50,11 @@ namespace Swift { } private: - String id_; + std::string id_; UserRegistry* userRegistry_; bool authenticated_; bool initialized; bool allowSASLEXTERNAL; - String user_; + std::string user_; }; } |