diff 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/VCards | |
parent | 5caf2316dad81d6c02ff3e886a65121011ccc9fe (diff) | |
download | swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.zip swift-contrib-f4e2f1deecd322e859bfb27bc5a9ab97726481c5.tar.bz2 |
Change error from optional to shared_ptr in GenericRequest
Resolves: #692
Diffstat (limited to 'Swiften/VCards')
-rw-r--r-- | Swiften/VCards/VCardManager.cpp | 2 | ||||
-rw-r--r-- | Swiften/VCards/VCardManager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp index 5c26635..e0d3553 100644 --- a/Swiften/VCards/VCardManager.cpp +++ b/Swiften/VCards/VCardManager.cpp @@ -45,7 +45,7 @@ void VCardManager::requestOwnVCard() { } -void VCardManager::handleVCardReceived(const JID& actualJID, VCard::ref vcard, const boost::optional<ErrorPayload>& error) { +void VCardManager::handleVCardReceived(const JID& actualJID, VCard::ref vcard, ErrorPayload::ref error) { if (error) { vcard = VCard::ref(new VCard()); } diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h index 67a2ef8..e1ed44a 100644 --- a/Swiften/VCards/VCardManager.h +++ b/Swiften/VCards/VCardManager.h @@ -34,7 +34,7 @@ namespace Swift { boost::signal<void (const JID&, VCard::ref)> onVCardChanged; private: - void handleVCardReceived(const JID& from, VCard::ref, const boost::optional<ErrorPayload>&); + void handleVCardReceived(const JID& from, VCard::ref, ErrorPayload::ref); private: JID ownJID; |