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/Network/Connector.h | |
| parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
| download | swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 | |
Removed Swift::String.
Diffstat (limited to 'Swiften/Network/Connector.h')
| -rw-r--r-- | Swiften/Network/Connector.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Network/Connector.h b/Swiften/Network/Connector.h index 52779c2..b3e7d83 100644 --- a/Swiften/Network/Connector.h +++ b/Swiften/Network/Connector.h @@ -14,7 +14,7 @@ #include "Swiften/Network/Connection.h" #include "Swiften/Network/Timer.h" #include "Swiften/Network/HostAddressPort.h" -#include "Swiften/Base/String.h" +#include <string> #include "Swiften/Network/DomainNameResolveError.h" namespace Swift { @@ -27,7 +27,7 @@ namespace Swift { public: typedef boost::shared_ptr<Connector> ref; - static Connector::ref create(const String& hostname, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory) { + static Connector::ref create(const std::string& hostname, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory) { return Connector::ref(new Connector(hostname, resolver, connectionFactory, timerFactory)); } @@ -38,11 +38,11 @@ namespace Swift { boost::signal<void (boost::shared_ptr<Connection>)> onConnectFinished; private: - Connector(const String& hostname, DomainNameResolver*, ConnectionFactory*, TimerFactory*); + Connector(const std::string& hostname, DomainNameResolver*, ConnectionFactory*, TimerFactory*); void handleServiceQueryResult(const std::vector<DomainNameServiceQuery::Result>& result); void handleAddressQueryResult(const std::vector<HostAddress>& address, boost::optional<DomainNameResolveError> error); - void queryAddress(const String& hostname); + void queryAddress(const std::string& hostname); void tryNextServiceOrFallback(); void tryNextAddress(); @@ -54,7 +54,7 @@ namespace Swift { private: - String hostname; + std::string hostname; DomainNameResolver* resolver; ConnectionFactory* connectionFactory; TimerFactory* timerFactory; |