summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-12 10:26:41 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-12 10:26:41 (GMT)
commit9bc8ddaf40d73647944592385bf56ece41046846 (patch)
tree200c49a14f60754050af71922234d4aadb991bd1 /Swiften/Queries/Requests
parenteded58915fd89e8b008ba7e078c5967fdef9f4cb (diff)
downloadswift-9bc8ddaf40d73647944592385bf56ece41046846.zip
swift-9bc8ddaf40d73647944592385bf56ece41046846.tar.bz2
Removing auto delete stuff from Request.
This should now be handled properly by using shared_ptrs.
Diffstat (limited to 'Swiften/Queries/Requests')
-rw-r--r--Swiften/Queries/Requests/GetDiscoInfoRequest.h4
-rw-r--r--Swiften/Queries/Requests/GetRosterRequest.h4
-rw-r--r--Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h5
3 files changed, 6 insertions, 7 deletions
diff --git a/Swiften/Queries/Requests/GetDiscoInfoRequest.h b/Swiften/Queries/Requests/GetDiscoInfoRequest.h
index 0e8508e..386dd10 100644
--- a/Swiften/Queries/Requests/GetDiscoInfoRequest.h
+++ b/Swiften/Queries/Requests/GetDiscoInfoRequest.h
@@ -7,8 +7,8 @@
namespace Swift {
class GetDiscoInfoRequest : public GenericRequest<DiscoInfo> {
public:
- GetDiscoInfoRequest(const JID& jid, IQRouter* router, AutoDeleteBehavior autoDeleteBehavior = DoNotAutoDelete) :
- GenericRequest<DiscoInfo>(IQ::Get, jid, boost::shared_ptr<DiscoInfo>(new DiscoInfo()), router, autoDeleteBehavior) {
+ GetDiscoInfoRequest(const JID& jid, IQRouter* router) :
+ GenericRequest<DiscoInfo>(IQ::Get, jid, boost::shared_ptr<DiscoInfo>(new DiscoInfo()), router) {
}
};
}
diff --git a/Swiften/Queries/Requests/GetRosterRequest.h b/Swiften/Queries/Requests/GetRosterRequest.h
index 2364d81..4ebb25e 100644
--- a/Swiften/Queries/Requests/GetRosterRequest.h
+++ b/Swiften/Queries/Requests/GetRosterRequest.h
@@ -7,8 +7,8 @@
namespace Swift {
class GetRosterRequest : public GenericRequest<RosterPayload> {
public:
- GetRosterRequest(IQRouter* router, AutoDeleteBehavior autoDeleteBehavior = DoNotAutoDelete) :
- GenericRequest<RosterPayload>(IQ::Get, JID(), boost::shared_ptr<Payload>(new RosterPayload()), router, autoDeleteBehavior) {
+ GetRosterRequest(IQRouter* router) :
+ GenericRequest<RosterPayload>(IQ::Get, JID(), boost::shared_ptr<Payload>(new RosterPayload()), router) {
}
};
}
diff --git a/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h b/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h
index 53ca3eb..3971c9d 100644
--- a/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h
+++ b/Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h
@@ -9,10 +9,9 @@ namespace Swift {
public:
GetSecurityLabelsCatalogRequest(
const JID& recipient,
- IQRouter* router,
- AutoDeleteBehavior autoDeleteBehavior = DoNotAutoDelete) :
+ IQRouter* router) :
GenericRequest<SecurityLabelsCatalog>(
- IQ::Get, JID(), boost::shared_ptr<SecurityLabelsCatalog>(new SecurityLabelsCatalog(recipient)), router, autoDeleteBehavior) {
+ IQ::Get, JID(), boost::shared_ptr<SecurityLabelsCatalog>(new SecurityLabelsCatalog(recipient)), router) {
}
};
}