Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-28 12:08:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-28 12:18:04 (GMT) |
| commit | f4e2f1deecd322e859bfb27bc5a9ab97726481c5 (patch) | |
| tree | b50dc4515108f5a19cbbd4b615cff01c13c5866c /Swiften/Queries/Request.cpp | |
| parent | 5caf2316dad81d6c02ff3e886a65121011ccc9fe (diff) | |
| download | swift-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.zip swift-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.tar.bz2 | |
Change error from optional to shared_ptr in GenericRequest
Resolves: #692
Diffstat (limited to 'Swiften/Queries/Request.cpp')
| -rw-r--r-- | Swiften/Queries/Request.cpp | 8 |
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); |