summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Whiteboard/OutgoingWhiteboardSession.cpp')
-rw-r--r--Swiften/Whiteboard/OutgoingWhiteboardSession.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
index 2bfc434..49f48aa 100644
--- a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
+++ b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
@@ -12,8 +12,9 @@
#include <Swiften/Whiteboard/OutgoingWhiteboardSession.h>
+#include <memory>
+
#include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h>
#include <Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h>
@@ -28,13 +29,13 @@ namespace Swift {
}
void OutgoingWhiteboardSession::startSession() {
- boost::shared_ptr<WhiteboardPayload> payload = boost::make_shared<WhiteboardPayload>(WhiteboardPayload::SessionRequest);
- boost::shared_ptr<GenericRequest<WhiteboardPayload> > request = boost::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_);
+ std::shared_ptr<WhiteboardPayload> payload = std::make_shared<WhiteboardPayload>(WhiteboardPayload::SessionRequest);
+ std::shared_ptr<GenericRequest<WhiteboardPayload> > request = std::make_shared<GenericRequest<WhiteboardPayload> >(IQ::Set, toJID_, payload, router_);
request->onResponse.connect(boost::bind(&OutgoingWhiteboardSession::handleRequestResponse, this, _1, _2));
request->send();
}
- void OutgoingWhiteboardSession::handleRequestResponse(boost::shared_ptr<WhiteboardPayload> /*payload*/, ErrorPayload::ref error) {
+ void OutgoingWhiteboardSession::handleRequestResponse(std::shared_ptr<WhiteboardPayload> /*payload*/, ErrorPayload::ref error) {
if (error) {
onRequestRejected(toJID_);
}
@@ -47,7 +48,7 @@ namespace Swift {
}
lastOpID = op->getID();
- WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+ WhiteboardPayload::ref payload = std::make_shared<WhiteboardPayload>();
payload->setOperation(op);
sendPayload(payload);
}
@@ -58,7 +59,7 @@ namespace Swift {
lastOpID = operation->getID();
server.handleLocalOperationReceived(operation);
- WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
+ WhiteboardPayload::ref payload = std::make_shared<WhiteboardPayload>();
payload->setOperation(operation);
sendPayload(payload);
}