Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Jingle
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-01 17:23:49 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-04 08:28:23 (GMT)
commit741c45b74d5f634622eb5f757c49323274fb8937 (patch)
treeb9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/Jingle
parenteddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff)
downloadswift-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/Jingle')
-rw-r--r--Swiften/Jingle/AbstractJingleSessionListener.cpp14
-rw-r--r--Swiften/Jingle/AbstractJingleSessionListener.h14
-rw-r--r--Swiften/Jingle/FakeJingleSession.cpp6
-rw-r--r--Swiften/Jingle/FakeJingleSession.h20
-rw-r--r--Swiften/Jingle/JingleResponder.cpp10
-rw-r--r--Swiften/Jingle/JingleResponder.h2
-rw-r--r--Swiften/Jingle/JingleSession.cpp2
-rw-r--r--Swiften/Jingle/JingleSession.h6
-rw-r--r--Swiften/Jingle/JingleSessionImpl.cpp26
-rw-r--r--Swiften/Jingle/JingleSessionImpl.h9
-rw-r--r--Swiften/Jingle/JingleSessionListener.h16
-rw-r--r--Swiften/Jingle/JingleSessionManager.h3
12 files changed, 63 insertions, 65 deletions
diff --git a/Swiften/Jingle/AbstractJingleSessionListener.cpp b/Swiften/Jingle/AbstractJingleSessionListener.cpp
index 791dcb3..20edf15 100644
--- a/Swiften/Jingle/AbstractJingleSessionListener.cpp
+++ b/Swiften/Jingle/AbstractJingleSessionListener.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,11 +10,11 @@
using namespace Swift;
-void AbstractJingleSessionListener::handleSessionAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleDescription>, boost::shared_ptr<JingleTransportPayload>) {
+void AbstractJingleSessionListener::handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) {
SWIFT_LOG(warning) << "Unimplemented" << std::endl;
}
-void AbstractJingleSessionListener::handleSessionInfoReceived(boost::shared_ptr<JinglePayload>) {
+void AbstractJingleSessionListener::handleSessionInfoReceived(std::shared_ptr<JinglePayload>) {
SWIFT_LOG(warning) << "Unimplemented" << std::endl;
}
@@ -22,19 +22,19 @@ void AbstractJingleSessionListener::handleSessionTerminateReceived(boost::option
SWIFT_LOG(warning) << "Unimplemented" << std::endl;
}
-void AbstractJingleSessionListener::handleTransportAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) {
+void AbstractJingleSessionListener::handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) {
SWIFT_LOG(warning) << "Unimplemented" << std::endl;
}
-void AbstractJingleSessionListener::handleTransportInfoReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) {
+void AbstractJingleSessionListener::handleTransportInfoReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) {
SWIFT_LOG(warning) << "Unimplemented" << std::endl;
}
-void AbstractJingleSessionListener::handleTransportRejectReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) {
+void AbstractJingleSessionListener::handleTransportRejectReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) {
SWIFT_LOG(warning) << "Unimplemented" << std::endl;
}
-void AbstractJingleSessionListener::handleTransportReplaceReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) {
+void AbstractJingleSessionListener::handleTransportReplaceReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) {
SWIFT_LOG(warning) << "Unimplemented" << std::endl;
}
diff --git a/Swiften/Jingle/AbstractJingleSessionListener.h b/Swiften/Jingle/AbstractJingleSessionListener.h
index 678f173..590cd14 100644
--- a/Swiften/Jingle/AbstractJingleSessionListener.h
+++ b/Swiften/Jingle/AbstractJingleSessionListener.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -13,13 +13,13 @@
namespace Swift {
class SWIFTEN_API AbstractJingleSessionListener : public JingleSessionListener {
public:
- virtual void handleSessionAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleDescription>, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
- virtual void handleSessionInfoReceived(boost::shared_ptr<JinglePayload>) SWIFTEN_OVERRIDE;
+ virtual void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
+ virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) SWIFTEN_OVERRIDE;
virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>) SWIFTEN_OVERRIDE;
- virtual void handleTransportAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
- virtual void handleTransportInfoReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
- virtual void handleTransportRejectReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
- virtual void handleTransportReplaceReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
+ virtual void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
+ virtual void handleTransportInfoReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
+ virtual void handleTransportRejectReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
+ virtual void handleTransportReplaceReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>) SWIFTEN_OVERRIDE;
virtual void handleTransportInfoAcknowledged(const std::string& id) SWIFTEN_OVERRIDE;
};
}
diff --git a/Swiften/Jingle/FakeJingleSession.cpp b/Swiften/Jingle/FakeJingleSession.cpp
index ec792ab..6b88477 100644
--- a/Swiften/Jingle/FakeJingleSession.cpp
+++ b/Swiften/Jingle/FakeJingleSession.cpp
@@ -12,7 +12,7 @@
#include <Swiften/Jingle/FakeJingleSession.h>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
#include <Swiften/Jingle/JingleSessionListener.h>
@@ -33,7 +33,7 @@ void FakeJingleSession::sendTerminate(JinglePayload::Reason::Type reason) {
calledCommands.push_back(TerminateCall(reason));
}
-void FakeJingleSession::sendInfo(boost::shared_ptr<Payload> payload) {
+void FakeJingleSession::sendInfo(std::shared_ptr<Payload> payload) {
calledCommands.push_back(InfoCall(payload));
}
@@ -74,7 +74,7 @@ void FakeJingleSession::handleSessionTerminateReceived(boost::optional<JinglePay
notifyListeners(&JingleSessionListener::handleSessionTerminateReceived, reason);
}
-void FakeJingleSession::handleSessionAcceptReceived(const JingleContentID& contentID, boost::shared_ptr<JingleDescription> desc, boost::shared_ptr<JingleTransportPayload> payload) {
+void FakeJingleSession::handleSessionAcceptReceived(const JingleContentID& contentID, std::shared_ptr<JingleDescription> desc, std::shared_ptr<JingleTransportPayload> payload) {
notifyListeners(&JingleSessionListener::handleSessionAcceptReceived, contentID, desc, payload);
}
diff --git a/Swiften/Jingle/FakeJingleSession.h b/Swiften/Jingle/FakeJingleSession.h
index 0107384..d961d1d 100644
--- a/Swiften/Jingle/FakeJingleSession.h
+++ b/Swiften/Jingle/FakeJingleSession.h
@@ -12,10 +12,10 @@
#pragma once
+#include <memory>
#include <string>
#include <vector>
-#include <boost/shared_ptr.hpp>
#include <boost/variant.hpp>
#include <Swiften/Base/API.h>
@@ -45,8 +45,8 @@ namespace Swift {
};
struct InfoCall {
- InfoCall(boost::shared_ptr<Payload> info) : payload(info) {}
- boost::shared_ptr<Payload> payload;
+ InfoCall(std::shared_ptr<Payload> info) : payload(info) {}
+ std::shared_ptr<Payload> payload;
};
struct AcceptCall {
@@ -83,14 +83,14 @@ namespace Swift {
typedef boost::variant<InitiateCall, TerminateCall, AcceptCall, InfoCall, InfoTransportCall, AcceptTransportCall, RejectTransportCall, ReplaceTransportCall> Command;
public:
- typedef boost::shared_ptr<FakeJingleSession> ref;
+ typedef std::shared_ptr<FakeJingleSession> ref;
FakeJingleSession(const JID& initiator, const std::string& id);
virtual ~FakeJingleSession();
virtual void sendInitiate(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
virtual void sendTerminate(JinglePayload::Reason::Type reason) SWIFTEN_OVERRIDE;
- virtual void sendInfo(boost::shared_ptr<Payload>) SWIFTEN_OVERRIDE;
+ virtual void sendInfo(std::shared_ptr<Payload>) SWIFTEN_OVERRIDE;
virtual void sendAccept(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref = JingleTransportPayload::ref()) SWIFTEN_OVERRIDE;
virtual std::string sendTransportInfo(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
virtual void sendTransportAccept(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
@@ -98,13 +98,13 @@ namespace Swift {
virtual void sendTransportReplace(const JingleContentID&, JingleTransportPayload::ref) SWIFTEN_OVERRIDE;
void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>);
- void handleSessionAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleDescription>, boost::shared_ptr<JingleTransportPayload>);
- void handleSessionInfoReceived(boost::shared_ptr<JinglePayload>);
+ void handleSessionAcceptReceived(const JingleContentID&, std::shared_ptr<JingleDescription>, std::shared_ptr<JingleTransportPayload>);
+ void handleSessionInfoReceived(std::shared_ptr<JinglePayload>);
void handleTransportReplaceReceived(const JingleContentID&, JingleTransportPayload::ref);
- void handleTransportAcceptReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>);
- void handleTransportInfoReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>);
- void handleTransportRejectReceived(const JingleContentID&, boost::shared_ptr<JingleTransportPayload>);
+ void handleTransportAcceptReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>);
+ void handleTransportInfoReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>);
+ void handleTransportRejectReceived(const JingleContentID&, std::shared_ptr<JingleTransportPayload>);
void handleTransportInfoAcknowledged(const std::string& id);
public:
diff --git a/Swiften/Jingle/JingleResponder.cpp b/Swiften/Jingle/JingleResponder.cpp
index d0c2edd..09bb234 100644
--- a/Swiften/Jingle/JingleResponder.cpp
+++ b/Swiften/Jingle/JingleResponder.cpp
@@ -6,7 +6,7 @@
#include <Swiften/Jingle/JingleResponder.h>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
#include <Swiften/Base/Log.h>
#include <Swiften/Jingle/JingleSessionImpl.h>
@@ -20,16 +20,16 @@ JingleResponder::JingleResponder(JingleSessionManager* sessionManager, IQRouter*
JingleResponder::~JingleResponder() {
}
-bool JingleResponder::handleSetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr<JinglePayload> payload) {
+bool JingleResponder::handleSetRequest(const JID& from, const JID& to, const std::string& id, std::shared_ptr<JinglePayload> payload) {
if (payload->getAction() == JinglePayload::SessionInitiate) {
if (sessionManager->getSession(from, payload->getSessionID())) {
// TODO: Add tie-break error
sendError(from, id, ErrorPayload::Conflict, ErrorPayload::Cancel);
}
else {
- sendResponse(from, id, boost::shared_ptr<JinglePayload>());
+ sendResponse(from, id, std::shared_ptr<JinglePayload>());
if (!payload->getInitiator().isBare()) {
- JingleSessionImpl::ref session = boost::make_shared<JingleSessionImpl>(payload->getInitiator(), from, payload->getSessionID(), router);
+ JingleSessionImpl::ref session = std::make_shared<JingleSessionImpl>(payload->getInitiator(), from, payload->getSessionID(), router);
sessionManager->handleIncomingSession(from, to, session, payload->getContents());
} else {
SWIFT_LOG(debug) << "Unable to create Jingle session due to initiator not being a full JID." << std::endl;
@@ -47,7 +47,7 @@ bool JingleResponder::handleSetRequest(const JID& from, const JID& to, const std
}
if (session) {
session->handleIncomingAction(payload);
- sendResponse(from, id, boost::shared_ptr<JinglePayload>());
+ sendResponse(from, id, std::shared_ptr<JinglePayload>());
}
else {
SWIFT_LOG(warning) << "Didn't find jingle session!";
diff --git a/Swiften/Jingle/JingleResponder.h b/Swiften/Jingle/JingleResponder.h
index 1340835..cb9220c 100644
--- a/Swiften/Jingle/JingleResponder.h
+++ b/Swiften/Jingle/JingleResponder.h
@@ -19,7 +19,7 @@ namespace Swift {
JingleResponder(JingleSessionManager* sessionManager, IQRouter* router);
virtual ~JingleResponder();
private:
- virtual bool handleSetRequest(const JID& from, const JID& to, const std::string& id, boost::shared_ptr<JinglePayload> payload);
+ virtual bool handleSetRequest(const JID& from, const JID& to, const std::string& id, std::shared_ptr<JinglePayload> payload);
private:
JingleSessionManager* sessionManager;
diff --git a/Swiften/Jingle/JingleSession.cpp b/Swiften/Jingle/JingleSession.cpp
index 8abbd56..778ee1d 100644
--- a/Swiften/Jingle/JingleSession.cpp
+++ b/Swiften/Jingle/JingleSession.cpp
@@ -7,9 +7,9 @@
#include <Swiften/Jingle/JingleSession.h>
#include <algorithm>
+#include <memory>
#include <boost/function.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <Swiften/Base/foreach.h>
diff --git a/Swiften/Jingle/JingleSession.h b/Swiften/Jingle/JingleSession.h
index 7a64c47..993e8de 100644
--- a/Swiften/Jingle/JingleSession.h
+++ b/Swiften/Jingle/JingleSession.h
@@ -6,11 +6,11 @@
#pragma once
+#include <memory>
#include <string>
#include <vector>
#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Base/Listenable.h>
@@ -24,7 +24,7 @@ namespace Swift {
class SWIFTEN_API JingleSession : public Listenable<JingleSessionListener> {
public:
- typedef boost::shared_ptr<JingleSession> ref;
+ typedef std::shared_ptr<JingleSession> ref;
JingleSession(const JID& initiator, const std::string& id);
virtual ~JingleSession();
@@ -39,7 +39,7 @@ namespace Swift {
virtual void sendInitiate(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref) = 0;
virtual void sendTerminate(JinglePayload::Reason::Type reason) = 0;
- virtual void sendInfo(boost::shared_ptr<Payload>) = 0;
+ virtual void sendInfo(std::shared_ptr<Payload>) = 0;
virtual void sendAccept(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref = JingleTransportPayload::ref()) = 0;
virtual std::string sendTransportInfo(const JingleContentID&, JingleTransportPayload::ref) = 0;
virtual void sendTransportAccept(const JingleContentID&, JingleTransportPayload::ref) = 0;
diff --git a/Swiften/Jingle/JingleSessionImpl.cpp b/Swiften/Jingle/JingleSessionImpl.cpp
index 3063242..06aa039 100644
--- a/Swiften/Jingle/JingleSessionImpl.cpp
+++ b/Swiften/Jingle/JingleSessionImpl.cpp
@@ -7,9 +7,9 @@
#include <Swiften/Jingle/JingleSessionImpl.h>
#include <algorithm>
+#include <memory>
#include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <Swiften/Base/Log.h>
#include <Swiften/Elements/JingleContentPayload.h>
@@ -81,9 +81,9 @@ void JingleSessionImpl::handleIncomingAction(JinglePayload::ref action) {
}
void JingleSessionImpl::sendInitiate(const JingleContentID& id, JingleDescription::ref description, JingleTransportPayload::ref transport) {
- JinglePayload::ref payload = boost::make_shared<JinglePayload>(JinglePayload::SessionInitiate, getID());
+ JinglePayload::ref payload = std::make_shared<JinglePayload>(JinglePayload::SessionInitiate, getID());
payload->setInitiator(getInitiator());
- JingleContentPayload::ref content = boost::make_shared<JingleContentPayload>();
+ JingleContentPayload::ref content = std::make_shared<JingleContentPayload>();
content->setCreator(id.getCreator());
content->setName(id.getName());
content->addDescription(description);
@@ -94,14 +94,14 @@ void JingleSessionImpl::sendInitiate(const JingleContentID& id, JingleDescriptio
}
void JingleSessionImpl::sendTerminate(JinglePayload::Reason::Type reason) {
- JinglePayload::ref payload = boost::make_shared<JinglePayload>(JinglePayload::SessionTerminate, getID());
+ JinglePayload::ref payload = std::make_shared<JinglePayload>(JinglePayload::SessionTerminate, getID());
payload->setReason(JinglePayload::Reason(reason));
payload->setInitiator(getInitiator());
sendSetRequest(payload);
}
-void JingleSessionImpl::sendInfo(boost::shared_ptr<Payload> info) {
- JinglePayload::ref payload = boost::make_shared<JinglePayload>(JinglePayload::SessionInfo, getID());
+void JingleSessionImpl::sendInfo(std::shared_ptr<Payload> info) {
+ JinglePayload::ref payload = std::make_shared<JinglePayload>(JinglePayload::SessionInfo, getID());
payload->addPayload(info);
sendSetRequest(payload);
@@ -110,7 +110,7 @@ void JingleSessionImpl::sendInfo(boost::shared_ptr<Payload> info) {
void JingleSessionImpl::sendAccept(const JingleContentID& id, JingleDescription::ref description, JingleTransportPayload::ref transPayload) {
JinglePayload::ref payload = createPayload();
- JingleContentPayload::ref content = boost::make_shared<JingleContentPayload>();
+ JingleContentPayload::ref content = std::make_shared<JingleContentPayload>();
content->setCreator(id.getCreator());
content->setName(id.getName());
content->addTransport(transPayload);
@@ -126,7 +126,7 @@ void JingleSessionImpl::sendAccept(const JingleContentID& id, JingleDescription:
void JingleSessionImpl::sendTransportAccept(const JingleContentID& id, JingleTransportPayload::ref transPayload) {
JinglePayload::ref payload = createPayload();
- JingleContentPayload::ref content = boost::make_shared<JingleContentPayload>();
+ JingleContentPayload::ref content = std::make_shared<JingleContentPayload>();
content->setCreator(id.getCreator());
content->setName(id.getName());
content->addTransport(transPayload);
@@ -140,7 +140,7 @@ void JingleSessionImpl::sendTransportAccept(const JingleContentID& id, JingleTra
std::string JingleSessionImpl::sendTransportInfo(const JingleContentID& id, JingleTransportPayload::ref transPayload) {
JinglePayload::ref payload = createPayload();
- JingleContentPayload::ref content = boost::make_shared<JingleContentPayload>();
+ JingleContentPayload::ref content = std::make_shared<JingleContentPayload>();
content->setCreator(id.getCreator());
content->setName(id.getName());
content->addTransport(transPayload);
@@ -153,7 +153,7 @@ std::string JingleSessionImpl::sendTransportInfo(const JingleContentID& id, Jing
void JingleSessionImpl::sendTransportReject(const JingleContentID& id, JingleTransportPayload::ref transPayload) {
JinglePayload::ref payload = createPayload();
- JingleContentPayload::ref content = boost::make_shared<JingleContentPayload>();
+ JingleContentPayload::ref content = std::make_shared<JingleContentPayload>();
content->setCreator(id.getCreator());
content->setName(id.getName());
content->addTransport(transPayload);
@@ -166,7 +166,7 @@ void JingleSessionImpl::sendTransportReject(const JingleContentID& id, JingleTra
void JingleSessionImpl::sendTransportReplace(const JingleContentID& id, JingleTransportPayload::ref transPayload) {
JinglePayload::ref payload = createPayload();
- JingleContentPayload::ref content = boost::make_shared<JingleContentPayload>();
+ JingleContentPayload::ref content = std::make_shared<JingleContentPayload>();
content->setCreator(id.getCreator());
content->setName(id.getName());
content->addTransport(transPayload);
@@ -178,7 +178,7 @@ void JingleSessionImpl::sendTransportReplace(const JingleContentID& id, JingleTr
std::string JingleSessionImpl::sendSetRequest(JinglePayload::ref payload) {
- boost::shared_ptr<GenericRequest<JinglePayload> > request = boost::make_shared<GenericRequest<JinglePayload> >(
+ std::shared_ptr<GenericRequest<JinglePayload> > request = std::make_shared<GenericRequest<JinglePayload> >(
IQ::Set, peerJID, payload, iqRouter);
pendingRequests.insert(std::make_pair(
request,
@@ -188,7 +188,7 @@ std::string JingleSessionImpl::sendSetRequest(JinglePayload::ref payload) {
JinglePayload::ref JingleSessionImpl::createPayload() const {
- JinglePayload::ref payload = boost::make_shared<JinglePayload>();
+ JinglePayload::ref payload = std::make_shared<JinglePayload>();
payload->setSessionID(getID());
payload->setInitiator(getInitiator());
return payload;
diff --git a/Swiften/Jingle/JingleSessionImpl.h b/Swiften/Jingle/JingleSessionImpl.h
index eec2370..4dd32ed 100644
--- a/Swiften/Jingle/JingleSessionImpl.h
+++ b/Swiften/Jingle/JingleSessionImpl.h
@@ -7,8 +7,7 @@
#pragma once
#include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <Swiften/Jingle/JingleSession.h>
#include <Swiften/Queries/GenericRequest.h>
@@ -20,13 +19,13 @@ namespace Swift {
class JingleSessionImpl : public JingleSession {
friend class JingleResponder;
public:
- typedef boost::shared_ptr<JingleSessionImpl> ref;
+ typedef std::shared_ptr<JingleSessionImpl> ref;
JingleSessionImpl(const JID& initiator, const JID&, const std::string& id, IQRouter* router);
virtual void sendInitiate(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref);
virtual void sendTerminate(JinglePayload::Reason::Type reason);
- virtual void sendInfo(boost::shared_ptr<Payload>);
+ virtual void sendInfo(std::shared_ptr<Payload>);
virtual void sendAccept(const JingleContentID&, JingleDescription::ref, JingleTransportPayload::ref);
virtual std::string sendTransportInfo(const JingleContentID&, JingleTransportPayload::ref);
virtual void sendTransportAccept(const JingleContentID&, JingleTransportPayload::ref);
@@ -34,7 +33,7 @@ namespace Swift {
virtual void sendTransportReplace(const JingleContentID&, JingleTransportPayload::ref);
private:
- typedef boost::shared_ptr<GenericRequest<JinglePayload> > RequestRef;
+ typedef std::shared_ptr<GenericRequest<JinglePayload> > RequestRef;
void handleIncomingAction(JinglePayload::ref);
diff --git a/Swiften/Jingle/JingleSessionListener.h b/Swiften/Jingle/JingleSessionListener.h
index 54101b6..7c015f0 100644
--- a/Swiften/Jingle/JingleSessionListener.h
+++ b/Swiften/Jingle/JingleSessionListener.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -20,20 +20,20 @@ namespace Swift {
virtual void handleSessionAcceptReceived(
const JingleContentID&,
- boost::shared_ptr<JingleDescription>,
- boost::shared_ptr<JingleTransportPayload>) = 0;
- virtual void handleSessionInfoReceived(boost::shared_ptr<JinglePayload>) = 0;
+ std::shared_ptr<JingleDescription>,
+ std::shared_ptr<JingleTransportPayload>) = 0;
+ virtual void handleSessionInfoReceived(std::shared_ptr<JinglePayload>) = 0;
virtual void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>) = 0;
virtual void handleTransportAcceptReceived(
const JingleContentID&,
- boost::shared_ptr<JingleTransportPayload>) = 0;
+ std::shared_ptr<JingleTransportPayload>) = 0;
virtual void handleTransportInfoReceived(
const JingleContentID&,
- boost::shared_ptr<JingleTransportPayload>) = 0;
+ std::shared_ptr<JingleTransportPayload>) = 0;
virtual void handleTransportRejectReceived(
- const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) = 0;
+ const JingleContentID&, std::shared_ptr<JingleTransportPayload>) = 0;
virtual void handleTransportReplaceReceived(
- const JingleContentID&, boost::shared_ptr<JingleTransportPayload>) = 0;
+ const JingleContentID&, std::shared_ptr<JingleTransportPayload>) = 0;
virtual void handleTransportInfoAcknowledged(const std::string& id) = 0;
};
diff --git a/Swiften/Jingle/JingleSessionManager.h b/Swiften/Jingle/JingleSessionManager.h
index fea6c73..0c0f775 100644
--- a/Swiften/Jingle/JingleSessionManager.h
+++ b/Swiften/Jingle/JingleSessionManager.h
@@ -7,8 +7,7 @@
#pragma once
#include <map>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <Swiften/Base/API.h>
#include <Swiften/Base/boost_bsignals.h>