diff 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/Examples/ConnectivityTest | |
parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
download | swift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 |
Removed Swift::String.
Diffstat (limited to 'Swiften/Examples/ConnectivityTest')
-rw-r--r-- | Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp index 2f3a751..fda203a 100644 --- a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp +++ b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp @@ -62,13 +62,13 @@ int main(int argc, char* argv[]) { int argi = 1; - String jid = argv[argi++]; - String connectHost = ""; + std::string jid = argv[argi++]; + std::string connectHost = ""; if (argc == 5) { connectHost = argv[argi++]; } - client = new Swift::Client(JID(jid), String(argv[argi++]), &networkFactories); + client = new Swift::Client(JID(jid), std::string(argv[argi++]), &networkFactories); char* timeoutChar = argv[argi++]; int timeout = atoi(timeoutChar); timeout = (timeout ? timeout : 30) * 1000; @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) { client->onConnected.connect(&handleConnected); errorConnection = client->onDisconnected.connect(&handleDisconnected); std::cout << "Connecting to JID " << jid << " with timeout " << timeout << "ms on host: "; ; - if (!connectHost.isEmpty()) { + if (!connectHost.empty()) { std::cout << connectHost << std::endl; client->connect(connectHost); } else { |