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/Presence/SubscriptionManager.h
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/Presence/SubscriptionManager.h')
-rw-r--r--Swiften/Presence/SubscriptionManager.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Presence/SubscriptionManager.h b/Swiften/Presence/SubscriptionManager.h
index fdf3c04..ad55f9d 100644
--- a/Swiften/Presence/SubscriptionManager.h
+++ b/Swiften/Presence/SubscriptionManager.h
@@ -8,7 +8,7 @@
#include <map>
-#include "Swiften/Base/String.h"
+#include <string>
#include "Swiften/JID/JID.h"
#include "Swiften/Base/boost_bsignals.h"
#include "Swiften/Elements/Presence.h"
@@ -33,9 +33,9 @@ namespace Swift {
* received. This is useful when the subscriber adds extensions to
* the request.
*/
- boost::signal<void (const JID&, const String&, Presence::ref)> onPresenceSubscriptionRequest;
+ boost::signal<void (const JID&, const std::string&, Presence::ref)> onPresenceSubscriptionRequest;
- boost::signal<void (const JID&, const String&)> onPresenceSubscriptionRevoked;
+ boost::signal<void (const JID&, const std::string&)> onPresenceSubscriptionRevoked;
private:
void handleIncomingPresence(Presence::ref presence);