summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Queries/Request.cpp')
-rw-r--r--Swiften/Queries/Request.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Queries/Request.cpp b/Swiften/Queries/Request.cpp
index 45ece8a..35475c1 100644
--- a/Swiften/Queries/Request.cpp
+++ b/Swiften/Queries/Request.cpp
@@ -40,15 +40,15 @@ bool Request::handleIQ(boost::shared_ptr<IQ> iq) {
bool handled = false;
if (sent_ && iq->getID() == id_) {
if (iq->getType() == IQ::Result) {
- handleResponse(iq->getPayloadOfSameType(payload_), boost::optional<ErrorPayload>());
+ handleResponse(iq->getPayloadOfSameType(payload_), ErrorPayload::ref());
}
else {
- boost::shared_ptr<ErrorPayload> errorPayload = iq->getPayload<ErrorPayload>();
+ ErrorPayload::ref errorPayload = iq->getPayload<ErrorPayload>();
if (errorPayload) {
- handleResponse(boost::shared_ptr<Payload>(), boost::optional<ErrorPayload>(*errorPayload));
+ handleResponse(boost::shared_ptr<Payload>(), errorPayload);
}
else {
- handleResponse(boost::shared_ptr<Payload>(), boost::optional<ErrorPayload>(ErrorPayload::UndefinedCondition));
+ handleResponse(boost::shared_ptr<Payload>(), ErrorPayload::ref(new ErrorPayload(ErrorPayload::UndefinedCondition)));
}
}
router_->removeHandler(this);