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/Presence/UnitTest/PresenceOracleTest.cpp | |
| parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
| download | swift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 | |
Removed Swift::String.
Diffstat (limited to 'Swiften/Presence/UnitTest/PresenceOracleTest.cpp')
| -rw-r--r-- | Swiften/Presence/UnitTest/PresenceOracleTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp index aa450a2..24cc62c 100644 --- a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp +++ b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp @@ -122,7 +122,7 @@ class PresenceOracleTest : public CppUnit::TestFixture { } void testSubscriptionRequest() { - String reasonText = "Because I want to"; + std::string reasonText = "Because I want to"; JID sentJID = JID("me@example.com"); boost::shared_ptr<Presence> sentPresence(new Presence()); @@ -147,14 +147,14 @@ class PresenceOracleTest : public CppUnit::TestFixture { } private: - Presence::ref makeOnline(const String& resource, int priority) { + Presence::ref makeOnline(const std::string& resource, int priority) { Presence::ref presence(new Presence()); presence->setPriority(priority); presence->setFrom(JID("alice@wonderland.lit/" + resource)); return presence; } - Presence::ref makeOffline(const String& resource) { + Presence::ref makeOffline(const std::string& resource) { Presence::ref presence(new Presence()); presence->setFrom(JID("alice@wonderland.lit" + resource)); presence->setType(Presence::Unavailable); @@ -165,7 +165,7 @@ class PresenceOracleTest : public CppUnit::TestFixture { changes.push_back(newPresence); } - void handlePresenceSubscriptionRequest(const JID& jid, const String& reason) { + void handlePresenceSubscriptionRequest(const JID& jid, const std::string& reason) { SubscriptionRequestInfo subscriptionRequest; subscriptionRequest.jid = jid; subscriptionRequest.reason = reason; @@ -181,7 +181,7 @@ class PresenceOracleTest : public CppUnit::TestFixture { private: struct SubscriptionRequestInfo { JID jid; - String reason; + std::string reason; }; PresenceOracle* oracle_; SubscriptionManager* subscriptionManager_; |