Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
| commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
| tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/Queries/Request.h | |
| parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
| download | swift-741c45b74d5f634622eb5f757c49323274fb8937.zip swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2 | |
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed'
replacement calls to all source files:
's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g'
's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g'
's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g'
's/boost::make_shared/std::make_shared/g'
's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g'
's/boost::shared_ptr/std::shared_ptr/g'
's/boost::weak_ptr/std::weak_ptr/g'
's/boost::enable_shared_from_this/std::enable_shared_from_this/g'
The remaining issues have been fixed manually.
Test-Information:
Code builds on OS X 10.11.4 and unit tests pass.
Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Swiften/Queries/Request.h')
| -rw-r--r-- | Swiften/Queries/Request.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Swiften/Queries/Request.h b/Swiften/Queries/Request.h index 7ad0dd6..a62c103 100644 --- a/Swiften/Queries/Request.h +++ b/Swiften/Queries/Request.h @@ -6,11 +6,10 @@ #pragma once +#include <memory> #include <string> -#include <boost/enable_shared_from_this.hpp> #include <boost/optional.hpp> -#include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> #include <Swiften/Elements/ErrorPayload.h> @@ -23,7 +22,7 @@ namespace Swift { /** * An IQ get/set request query. */ - class SWIFTEN_API Request : public IQHandler, public boost::enable_shared_from_this<Request> { + class SWIFTEN_API Request : public IQHandler, public std::enable_shared_from_this<Request> { public: std::string send(); @@ -48,7 +47,7 @@ namespace Swift { Request( IQ::Type type, const JID& receiver, - boost::shared_ptr<Payload> payload, + std::shared_ptr<Payload> payload, IQRouter* router); /** @@ -59,7 +58,7 @@ namespace Swift { IQ::Type type, const JID& sender, const JID& receiver, - boost::shared_ptr<Payload> payload, + std::shared_ptr<Payload> payload, IQRouter* router); @@ -81,18 +80,18 @@ namespace Swift { IQRouter* router); - virtual void setPayload(boost::shared_ptr<Payload> payload) { + virtual void setPayload(std::shared_ptr<Payload> payload) { payload_ = payload; } - boost::shared_ptr<Payload> getPayload() const { + std::shared_ptr<Payload> getPayload() const { return payload_; } - virtual void handleResponse(boost::shared_ptr<Payload>, boost::shared_ptr<ErrorPayload>) = 0; + virtual void handleResponse(std::shared_ptr<Payload>, std::shared_ptr<ErrorPayload>) = 0; private: - bool handleIQ(boost::shared_ptr<IQ>); + bool handleIQ(std::shared_ptr<IQ>); bool isCorrectSender(const JID& jid); private: @@ -100,7 +99,7 @@ namespace Swift { IQ::Type type_; JID sender_; JID receiver_; - boost::shared_ptr<Payload> payload_; + std::shared_ptr<Payload> payload_; std::string id_; bool sent_; }; |